Merge pull request #5155 from wallabag/release/2.4.2

Prepare 2.4.2 release

.babelrc

@@ -1,5 +1,10 @@
 {
-    "presets": [
-        ["env", {"modules": false}]
+  "presets": [
+    [
+      "@babel/preset-env",
+      {
+        "modules": false
+      }
     ]
+  ]
 }

.editorconfig

@@ -15,3 +15,6 @@ indent_size = 2
 
 [*akefile]
 indent_style = tab
+
+[.github/**.yml]
+indent_size = 2

.github/ISSUE_TEMPLATE.md

@@ -1,21 +0,0 @@
-:warning: If your issue is about an error during fetching a link, please read: http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that
-
-### Issue details
-
-Please provide issue details here.
-Remember, this is _not_ a place to ask questions. For that, go to https://community.wallabag.org/ (forum) or http://gitter.im/wallabag/wallabag (chat).
-
-### Environment
-
-* wallabag version (or git revision) that exhibits the issue:
-* How did you install wallabag? Via `git clone` or by downloading the package?
-* Last wallabag version that did not exhibit the issue (if applicable):
-* php version:
-* OS:
-* type of hosting (shared or dedicated):
-* which storage system you choose at install (SQLite, MySQL/MariaDB or PostgreSQL):
-
-### Steps to reproduce/test case
-
-Please provide necessary steps for reproduction of this issue, or better the
-reduced test case (without any external dependencies, if possible).

.github/ISSUE_TEMPLATE/1-fetching-content.md

@@ -0,0 +1,30 @@
+---
+name: Fetching content
+about: If wallabag can't extract content for an URL
+title: Wrong display in wallabag (HOST)
+labels: Site Config
+assignees: ''
+
+---
+
+<!--
+Thank you for reporting a fetching issue.
+
+Please fill in as much of the template below as you're able.
+-->
+
+**Before submitting the issue, please read:**
+If wallabag can't parse / extract content for a given link, please first read the documentation about it:
+http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that
+
+We have a lot of requests about fetching config issue. It'll help us A LOT if you give a try to fix it on your own following the doc.
+If you failed to fix it yourself, tick the following boxes:
+- [ ] I've tried myself without success
+- [ ] I've replaced `HOST` in the issue title with the host of the URL that can't be fetched (ie: `nytimes.com`, `20minutes.fr`, `bbc.com`, etc.)
+
+**Content related:**
+ - URL: [full url of the content]
+ - wallabag version: [e.g. 2.4.0]
+
+**Describe what's wrong:**
+A clear and concise description of what you expected to happen.

.github/ISSUE_TEMPLATE/2-bug-report.md

@@ -0,0 +1,43 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!--
+Thank you for reporting an issue.
+
+Please fill in as much of the template below as you're able.
+
+Version:      if you know it, otherwise use the git revision
+Installation: How did you install wallabag? Using git clone, the docker image, an installer, downloading the package, etc.
+PHP version:  The version of PHP you are using
+OS:           The host running wallabag
+Database:     The storage system your instance is using (SQLite, MySQL/MariaDB or PostgreSQL) with the version
+Parameters:   Paste the content of your app/config/parameters.yml (hide sensitive stuff if you want)
+-->
+### Environment
+
+* **Version**:
+* **Installation**:
+* **PHP version**:
+* **OS**:
+* **Database**:
+* **Parameters**:
+
+<details>
+  <summary>My <code>app/config/parameters.yml</code> is:</summary>
+
+  ```
+  PASTE HERE
+  ```
+</details>
+
+### What steps will reproduce the bug?
+
+<!--
+Enter details about your bug and how to reproduce it
+-->

.github/ISSUE_TEMPLATE/3-feature-request.md

@@ -0,0 +1,26 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: Feature
+assignees: ''
+
+---
+
+<!--
+Thank you for suggesting an idea to make wallabag better.
+
+Please fill in as much of the template below as you're able.
+-->
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Want to ask something?
+    url: https://gitter.im/wallabag/wallabag
+    about: Use Gitter to ask questions.

.github/dependabot.yml

@@ -0,0 +1,36 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "04:00"
+    timezone: Europe/Paris
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: materialize-css
+    versions:
+    - "> 0.98.2"
+- package-ecosystem: composer
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "04:00"
+    timezone: Europe/Paris
+  open-pull-requests-limit: 10
+  reviewers:
+  - j0k3r
+  - tcitworld
+  - Kdecherf
+  labels:
+  - Ready for review
+  ignore:
+  - dependency-name: doctrine/doctrine-migrations-bundle
+    versions:
+    - "> 1.3.2"
+  - dependency-name: friendsofsymfony/user-bundle
+    versions:
+    - "> 2.0.2"
+  - dependency-name: nelmio/api-doc-bundle
+    versions:
+    - "> 2.13.4"

.github/workflows/assets.yml

@@ -0,0 +1,41 @@
+name: "Assets"
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - 2.*
+
+jobs:
+  js:
+    name: "Building assets"
+    runs-on: "ubuntu-20.04"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+
+      - name: "Install Node"
+        uses: actions/setup-node@v1
+        with:
+          node-version: "12"
+
+      - name: "Install dependencies with Yarn"
+        run: "yarn install"
+
+      - name: "Build dev assets"
+        run: "yarn run build:dev"
+
+      - name: "Build prod assets"
+        run: "yarn run build:prod"
+
+      - name: "Validate no change were created"
+        run: |
+          GITDIFF=`git diff`
+          if [ "$GITDIFF" == "" ]; then
+            exit 0
+          else
+            git diff
+            exit 1
+          fi

.github/workflows/coding-standards.yml

@@ -0,0 +1,45 @@
+name: "CS"
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - 2.*
+
+jobs:
+  coding-standards:
+    name: "CS Fixer & PHPStan"
+    runs-on: "ubuntu-18.04"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          coverage: "none"
+          php-version: "7.3"
+          tools: cs2pr, pecl, composer:v1
+          extensions: pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy
+          ini-values: "date.timezone=Europe/Paris"
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: "Install dependencies with Composer"
+        uses: "ramsey/composer-install@v1"
+        with:
+          composer-options: "--optimize-autoloader --prefer-dist"
+
+      - name: "Run PHP CS Fixer"
+        run: "bin/php-cs-fixer fix --verbose --dry-run --format=checkstyle | cs2pr"
+
+      - name: "Generate test cache for PHPStan"
+        run: "php bin/console cache:clear --env=test"
+
+      - name: "Install PHPUnit for PHPStan"
+        run: "php bin/simple-phpunit install"
+
+      - name: "Run PHPStan"
+        run: "php bin/phpstan analyse --no-progress --error-format=checkstyle | cs2pr"

.github/workflows/continuous-integration.yml

@@ -0,0 +1,81 @@
+name: "CI"
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - 2.*
+
+env:
+  PGPASSWORD: wallabagrocks
+  COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+  phpunit:
+    name: "PHP ${{ matrix.php }} using ${{ matrix.database }}"
+    runs-on: "ubuntu-18.04"
+    services:
+      rabbitmq:
+        image: rabbitmq:3-alpine
+        ports:
+          - 5672:5672
+      redis:
+        image: redis:6-alpine
+        ports:
+          - 6379:6379
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php:
+          - "7.2"
+          - "7.3"
+          - "7.4"
+        database:
+          - "sqlite"
+          - "mysql"
+          - "pgsql"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+        with:
+          fetch-depth: 2
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "${{ matrix.php }}"
+          coverage: none
+          tools: pecl, composer:v1
+          extensions: json, pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy
+          ini-values: "date.timezone=Europe/Paris"
+
+      - name: "Setup MySQL"
+        if: "${{ matrix.database == 'mysql' }}"
+        run: |
+          sudo systemctl start mysql.service
+          sudo mysql -u root -proot -e "CREATE DATABASE wallabag_test"
+
+      - name: "Setup PostgreSQL"
+        if: "${{ matrix.database == 'pgsql' }}"
+        run: |
+          sudo systemctl start postgresql
+          sudo -u postgres psql -d template1 -c "CREATE USER wallabag WITH PASSWORD 'wallabagrocks' CREATEDB"
+          createdb -h localhost -p 5432 -U wallabag wallabag_test
+          pg_isready -d wallabag_test -h localhost -p 5432 -U wallabag
+
+      - name: "Install dependencies with Composer"
+        uses: "ramsey/composer-install@v1"
+        with:
+          composer-options: "--optimize-autoloader --prefer-dist"
+
+      - name: "Prepare database"
+        run: "make prepare DB=${{ matrix.database }}"
+
+      - name: "Prepare fixtures"
+        run: "make fixtures"
+
+      - name: "Run PHPUnit"
+        run: "php bin/simple-phpunit -v"

.github/workflows/translations.yml

@@ -0,0 +1,47 @@
+name: "Translations"
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - 2.*
+
+jobs:
+  translations:
+    name: "Translations"
+    runs-on: "ubuntu-18.04"
+
+    strategy:
+      matrix:
+        php:
+          - "7.3"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          coverage: "none"
+          php-version: "${{ matrix.php }}"
+          tools: pecl, composer:v1
+          extensions: pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy
+          ini-values: "date.timezone=Europe/Paris"
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: "Install dependencies with Composer"
+        uses: "ramsey/composer-install@v1"
+        with:
+          composer-options: "--optimize-autoloader --prefer-dist"
+
+      - name: "Validate Core translations"
+        run: "php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v"
+
+      - name: "Validate CraueConfig translations"
+        run: "php bin/console lint:yaml app/Resources/CraueConfigBundle/translations -v"
+
+      - name: "Validate User translations"
+        run: "php bin/console lint:yaml src/Wallabag/UserBundle/Resources/translations -v"

.gitignore

@@ -14,6 +14,7 @@
 !/bin/console
 !/bin/symfony_requirements
 .php_cs.cache
+.phpunit.result.cache
 
 # Parameters
 /app/config/parameters.yml

.php_cs

@@ -38,6 +38,7 @@ return PhpCsFixer\Config::create()
     ->setFinder(
         PhpCsFixer\Finder::create()
             ->exclude([
+                'node_modules',
                 'vendor',
                 'var',
                 'web'

.scrutinizer.yml

@@ -30,6 +30,10 @@ checks:
 # use the new PHP analysis engine
 # https://scrutinizer-ci.com/docs/tools/php/php-analyzer/guides/migrate_to_new_php_analysis
 build:
+    environment:
+        php:
+            version: 7.4
+
     nodes:
         analysis:
             tests:

.stylelintrc

@@ -1,3 +1,13 @@
 {
-  "extends": "stylelint-config-standard"
+  "extends": "stylelint-config-standard",
+  "plugins": [
+    "stylelint-scss"
+  ],
+  rules: {
+    'at-rule-no-unknown': null,
+    'no-duplicate-selectors': null,
+    'font-family-no-missing-generic-family-keyword': null,
+    'no-descending-specificity': null,
+    'scss/at-rule-no-unknown': true,
+  },
 }

.travis.yml

@@ -1,79 +0,0 @@
-os: linux
-dist: xenial
-language: php
-
-services:
-    - mysql
-    - postgresql
-    - rabbitmq
-    - redis
-
-# cache vendor dirs
-cache:
-    apt: true
-    directories:
-        - $HOME/.composer/cache/files
-        - node_modules
-        - $HOME/.npm
-        - $HOME/.yarn-cache
-
-if: |
-    type = pull_request OR \
-    branch = master
-
-php:
-    - 7.1
-    - 7.2
-    - 7.3
-    - 7.4
-
-node_js:
-    - "5"
-
-env:
-    - DB=mysql
-    - DB=pgsql
-    - DB=sqlite
-
-jobs:
-    fast_finish: true
-    include:
-        - php: 7.3
-          env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite
-
-# exclude v1 branches
-branches:
-    except:
-        - legacy
-
-before_install:
-    - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
-    - PHP=$TRAVIS_PHP_VERSION
-    - echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
-    - phpenv config-rm xdebug.ini || echo "xdebug not available"
-    - composer self-update --no-progress
-    # install imagick
-    - pear config-set preferred_state beta
-    - pecl channel-update pecl.php.net
-    - yes | pecl install imagick
-
-install:
-    - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.10; fi;
-    - if [[ $ASSETS = build ]]; then npm install -g yarn@latest; fi;
-    - if [[ $ASSETS = build ]]; then yarn install; fi;
-    - composer install -o --no-interaction --no-progress --prefer-dist --no-suggest
-    - php bin/simple-phpunit install
-
-before_script:
-    - make prepare DB=$DB
-    - make fixtures
-
-script:
-    - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then ./bin/simple-phpunit -v ; fi;
-    # PHPStan needs PHPUnit to be installed and cache app to be generated
-    - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then php bin/phpstan analyse src tests --no-progress --level 1 ; fi;
-    - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix --verbose --dry-run ; fi;
-    - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;
-    - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml app/Resources/CraueConfigBundle/translations -v ; fi;
-    - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/UserBundle/Resources/translations -v ; fi;
-    - if [[ $ASSETS = build ]]; then yarn run build:prod; fi;

CHANGELOG.md

@@ -1,5 +1,137 @@
 # Changelog
 
+## [2.4.2](https://github.com/wallabag/wallabag/tree/2.4.2)
+   [Full Changelog](https://github.com/wallabag/wallabag/compare/2.4.1...2.4.2)
+
+### Fixes
+- Fix nav lang filter [#4908](https://github.com/wallabag/wallabag/pull/4908)
+- Fix accessibility problem with the 2FA QR code [#4915](https://github.com/wallabag/wallabag/pull/4915)
+- Preselect currently active section in the filter menu [#4972](https://github.com/wallabag/wallabag/pull/4972)
+- Fix translation of date in the footer using IntlDateFormatter [#4971](https://github.com/wallabag/wallabag/pull/4971)
+- Update dark theme [#4921](https://github.com/wallabag/wallabag/pull/4921)
+- Dark theme updated [#4983](https://github.com/wallabag/wallabag/pull/4983)
+- Fix account dropdown width [#4969](https://github.com/wallabag/wallabag/pull/4969)
+- Fix auto prefered color scheme [#5071](https://github.com/wallabag/wallabag/pull/5071)
+- Convert tag label to lowercase in RuleBasedTagger [#5111](https://github.com/wallabag/wallabag/pull/5111)
+- Fix myreadspeed links [#5113](https://github.com/wallabag/wallabag/pull/5113)
+- Internal server error while exporting to epub [#5052](https://github.com/wallabag/wallabag/issues/5052)
+- Error parsing image URL (with scrset) [#4914](https://github.com/wallabag/wallabag/issues/4914)
+
+## [2.4.1](https://github.com/wallabag/wallabag/tree/2.4.1)
+   [Full Changelog](https://github.com/wallabag/wallabag/compare/2.4.0...2.4.1)
+
+### Fixes
+- Fix path icons from manifest.json [#4811](https://github.com/wallabag/wallabag/pull/4811)
+- Fix missing apple-touch-icon-512.png from manifest.json [#4823](https://github.com/wallabag/wallabag/pull/4823)
+- migrations: fix mysql migration for an edge case [#4832](https://github.com/wallabag/wallabag/pull/4832)
+- Add a command to clean downloaded images [#4844](https://github.com/wallabag/wallabag/pull/4844)
+- Add a query to parse only non-hashed URL [#4865](https://github.com/wallabag/wallabag/pull/4865) [#4878](https://github.com/wallabag/wallabag/pull/4878)
+- material: fix issue with cookie check for light/dark theme [#4866](https://github.com/wallabag/wallabag/pull/4866)
+- Show OTP secret next to the QR Code [#4868](https://github.com/wallabag/wallabag/pull/4868)
+- views: add title to tag li elements, for consistency [#4894](https://github.com/wallabag/wallabag/pull/4894)
+- Add label and issuer to otp config [#4301](https://github.com/wallabag/wallabag/pull/4301)
+
+### Meta
+- Update release process and introduce 2.4.1-dev [#4808](https://github.com/wallabag/wallabag/pull/4808)
+- Remove community.wallabag.org from the issue template [#4817](https://github.com/wallabag/wallabag/pull/4817)
+- Update issue templates [#4843](https://github.com/wallabag/wallabag/pull/4843)
+- Allow GitHub Actions to run on 2.* branches [#4896](https://github.com/wallabag/wallabag/pull/4896)
+- Prepare 2.4.1 [#4904](https://github.com/wallabag/wallabag/pull/4904)
+
+## [2.4.0](https://github.com/wallabag/wallabag/tree/2.4.0)
+   [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.8...2.4.0)
+
+### Features
+
+- Allow to rename tags from the web interface [#3574](https://github.com/wallabag/wallabag/pull/3574)
+- Added possibility to change locale from login/register pages [#3216](https://github.com/wallabag/wallabag/pull/3216)
+- Add ability to import/export tagging rules [#4028](https://github.com/wallabag/wallabag/pull/4028)
+- Add quickstart into the menu [#3992](https://github.com/wallabag/wallabag/pull/3992)
+- Enable OTP 2FA via third apps (Google Authenticator, Authy or FreeOTP) [#3798](https://github.com/wallabag/wallabag/pull/3798)
+- Show untagged entries count on tag list [#3993](https://github.com/wallabag/wallabag/pull/3993)
+- Add random feature [#3526](https://github.com/wallabag/wallabag/pull/3526)
+- Added ability to revoke feed token [#3994](https://github.com/wallabag/wallabag/pull/3994)
+- Display login in config / user [#3995](https://github.com/wallabag/wallabag/pull/3995)
+- Move Ignore Origin rules to database [#4026](https://github.com/wallabag/wallabag/pull/4026)
+- Add ability to manually define the reading speed [#4053](https://github.com/wallabag/wallabag/pull/4053)
+- Added MathJax support [#4128](https://github.com/wallabag/wallabag/pull/4128)
+- Improved tags list [#4136](https://github.com/wallabag/wallabag/pull/4136)
+- Add untagged list link to filter menu [#4150](https://github.com/wallabag/wallabag/pull/4150)
+- Allow custom styles system wide [#4151](https://github.com/wallabag/wallabag/pull/4151)
+- Added elCurator import [#4175](https://github.com/wallabag/wallabag/pull/4175)
+- Added language support for Simplified Chinese（简体中文）[#4281](https://github.com/wallabag/wallabag/pull/4281)
+- Added publication date on epub export [#4315](https://github.com/wallabag/wallabag/pull/4315)
+- Enhanced article display [#4317](https://github.com/wallabag/wallabag/pull/4317)
+- Added mass actions for Material design in list view [#4326](https://github.com/wallabag/wallabag/pull/4326)
+- Added a button to disable 2FA when enabled [#4329](https://github.com/wallabag/wallabag/pull/4329)
+- Enhanced navigation menu in material theme [#4343](https://github.com/wallabag/wallabag/pull/4343)
+- Copy client info to clipboard [#4058](https://github.com/wallabag/wallabag/pull/4058)
+- Upgrade Piwik Twig Extension to Matomo [#4363](https://github.com/wallabag/wallabag/pull/4363)
+- Dark theme to Material [#4725](https://github.com/wallabag/wallabag/pull/4725)
+
+### API
+
+- Storage of hash of URL to check if pages already saved [#3158](https://github.com/wallabag/wallabag/pull/3158)
+- Added a basic search endpoint [#3627](https://github.com/wallabag/wallabag/pull/3627)
+- Entries: added add parameter detail to exclude or include content in response [#3960](https://github.com/wallabag/wallabag/pull/3960)
+- Add a new endpoint to retrieve information from the wallabag instance [#3845](https://github.com/wallabag/wallabag/pull/3845)
+- API return an error with empty quote [#4161](https://github.com/wallabag/wallabag/pull/4161)
+- Fixed bug when we delete entry via API [#4316](https://github.com/wallabag/wallabag/pull/4316)
+- Add ability to define lifetime token for the API [#4319](https://github.com/wallabag/wallabag/pull/4319)
+- Added archived_at property and updateArchived method [#3630](https://github.com/wallabag/wallabag/pull/3630)
+- Add `given_url` in Entry table to check if a redirected url has already added [#3271](https://github.com/wallabag/wallabag/pull/3271)
+
+### Technical stuff
+
+- Added support for secured emails via SMTP [#3596](https://github.com/wallabag/wallabag/pull/3596)
+- Changed RSS to Atom feed and improve paging [#3223](https://github.com/wallabag/wallabag/pull/3223)
+- MySQL: change collation of tag label [#3959](https://github.com/wallabag/wallabag/pull/3959)
+- Use httplug and graby 2.0 [#3390](https://github.com/wallabag/wallabag/pull/3390)
+- Use Imagick to keep GIF animation [#3955](https://github.com/wallabag/wallabag/pull/3955)
+- Jump to Symfony 3.4 [#3731](https://github.com/wallabag/wallabag/pull/3731)
+- Removed hardcoded database version [#3864](https://github.com/wallabag/wallabag/pull/3864)
+- Dropping PHP < 7.1 [#3758](https://github.com/wallabag/wallabag/pull/3758)
+- Dropping PHP < 7.2 [#4441](https://github.com/wallabag/wallabag/pull/4441)
+- Force default_protocol to generate an url input [#3879](https://github.com/wallabag/wallabag/pull/3879)
+- Cascade delete on oauth2 table when deleting a user [#3956](https://github.com/wallabag/wallabag/pull/3956)
+- Preview picture: use the 1st pic retrieved if no og:image set [#3965](https://github.com/wallabag/wallabag/pull/3965)
+- Force PHP version in Dockerfile [#3977](https://github.com/wallabag/wallabag/pull/3977)
+- Add Sentry support [#3990](https://github.com/wallabag/wallabag/pull/3990)
+- Fix slow/unindexed queries [#4081](https://github.com/wallabag/wallabag/pull/4081)
+- Rename internal settings table [#4084](https://github.com/wallabag/wallabag/pull/4084)
+- Add environment variables to control scripts/dev.sh behavior [#4152](https://github.com/wallabag/wallabag/pull/4152)
+- Increase php memory limit PHP Docker [#4163](https://github.com/wallabag/wallabag/pull/4163)
+- Ensure ENV is well defined when using make [#4249](https://github.com/wallabag/wallabag/pull/4249)
+- Update translations from Weblate [#4442](https://github.com/wallabag/wallabag/pull/4442)
+- Ditch Travis to use GitHub Actions [#4747](https://github.com/wallabag/wallabag/pull/4747)
+- Upgrade Webpack from v4 to v5 [#4727](https://github.com/wallabag/wallabag/pull/4727)
+
+### Translations
+
+- Add Japanese translation [#4274](https://github.com/wallabag/wallabag/pull/4274)
+- Add Croatian translation [#4518](https://github.com/wallabag/wallabag/pull/4518), [#4517](https://github.com/wallabag/wallabag/pull/4517)
+- Add Ukrainian translation [#4489](https://github.com/wallabag/wallabag/pull/4489)
+- Add language support for Simplified Chinese（简体中文）[#4281](https://github.com/wallabag/wallabag/pull/4281)
+- Add Dutch translation to the settings [#4632](https://github.com/wallabag/wallabag/pull/4632)
+- Support for Weblate [#4442](https://github.com/wallabag/wallabag/pull/4442) & [#4447](https://github.com/wallabag/wallabag/pull/4447)
+
+### Fixes
+
+- Fixed Instapaper import date order [#3980](https://github.com/wallabag/wallabag/pull/3980)
+- Add missing entries in craue_config_setting. [#3868](https://github.com/wallabag/wallabag/pull/3868)
+- Fix `reading_time` being NULL on SQLite [#4020](https://github.com/wallabag/wallabag/pull/4020)
+- Fix createdAt filter on material [#4299](https://github.com/wallabag/wallabag/pull/4299)
+- Fix duplicated icons on "Search engine" and "new link" forms [#4149](https://github.com/wallabag/wallabag/pull/4149)
+- Fix entries export from search view [#4278](https://github.com/wallabag/wallabag/pull/4278)
+- Fixed URL to share entry via twitter [#4250](https://github.com/wallabag/wallabag/pull/4250)
+- Sidebar sub entries not conditioned by hover anymore [#4254](https://github.com/wallabag/wallabag/pull/4254)
+- Fix print of long pages [#4263](https://github.com/wallabag/wallabag/pull/4263)
+- Fixed duplicated tags when renaming them [#4310](https://github.com/wallabag/wallabag/pull/4310)
+- Added authentication during import command for paywalled websites [#4325](https://github.com/wallabag/wallabag/pull/4325)
+- Added more coherence with color links for material theme [#4346](https://github.com/wallabag/wallabag/pull/4346)
+- Changed visibility for article stats [#4347](https://github.com/wallabag/wallabag/pull/4347)
+- PHP 7.4 support [#4309](https://github.com/wallabag/wallabag/pull/4309)
+
 ## [2.3.8](https://github.com/wallabag/wallabag/tree/2.3.8)
    [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.7...2.3.8)
 

GNUmakefile

@@ -31,8 +31,8 @@ run: ## Run the wallabag built-in server
 	@php bin/console server:run --env=dev
 
 build: ## Run webpack
-	@npm install
-	@npm run build:$(ENV)
+	@yarn install
+	@yarn build:$(ENV)
 
 prepare: clean ## Prepare database for testsuite
 ifdef DB

README.md

@@ -1,6 +1,10 @@
-[![Build Status](https://api.travis-ci.org/wallabag/wallabag.svg?branch=master)](https://travis-ci.org/wallabag/wallabag)
+<img src="https://raw.githubusercontent.com/wallabag/logo/master/_default/typo-horizontal/png/sm/logo-typo-horizontal-black-no-bg-no-border-sm.png" align="right" />
+
+![CI](https://github.com/wallabag/wallabag/workflows/CI/badge.svg)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wallabag/wallabag/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/wallabag/wallabag/?branch=master)
 [![Gitter](https://badges.gitter.im/gitterHQ/gitter.svg)](https://gitter.im/wallabag/wallabag)
+[![Donation Status](https://img.shields.io/liberapay/goal/wallabag.svg?logo=liberapay)](https://liberapay.com/wallabag/donate)
+[![Translation status](https://hosted.weblate.org/widgets/wallabag/-/svg-badge.svg)](https://hosted.weblate.org/engage/wallabag/?utm_source=widget)
 
 # What is wallabag?
 wallabag is a self-hostable PHP application allowing you to not miss any content anymore.
@@ -10,14 +14,12 @@ More information on our website: [wallabag.org](https://wallabag.org).
 
 If you do not have your own server, consider [the wallabag.it hosting solution](https://wallabag.it).
 
-![wallabag logo](https://raw.githubusercontent.com/wallabag/logo/master/_default/typo-horizontal/png/sm/logo-typo-horizontal-black-no-bg-no-border-sm.png)
-
 # Install wallabag
 Please read [the documentation to see the wallabag requirements](https://doc.wallabag.org/en/admin/installation/requirements.html).
 
 Then you can install wallabag by executing the following commands:
 
-```
+```bash
 git clone https://github.com/wallabag/wallabag.git
 cd wallabag && make install
 ```
@@ -29,6 +31,10 @@ Now, [configure a virtual host](https://doc.wallabag.org/en/admin/installation/v
 
 Wallabag app for [YunoHost](https://yunohost.org). See [here](https://github.com/YunoHost-Apps/wallabag2_ynh)
 
+# Translate wallabag
+
+[wallabag](https://hosted.weblate.org/projects/wallabag/) is being translated using [Weblate](https://weblate.org/), a web tool designed to ease translating for both developers and translators. Feel free to help us [translate wallabag](https://hosted.weblate.org/projects/wallabag/)!
+
 # License
 Copyright © 2013-current Nicolas Lœuillet <nicolas@loeuillet.org>
 This work is free. You can redistribute it and/or modify it under the

RELEASE_PROCESS.md

@@ -16,25 +16,6 @@ During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE` (li
 
 #### Create a new release on GitHub
 
-- Run these commands to create the tag:
-
-```
-git checkout master
-git pull origin master
-git checkout -b release-$LAST_WALLABAG_RELEASE
-composer up
-```
-
-- Then continue with these commands:
-
-```
-git add composer.lock
-git commit -m "Release wallabag $LAST_WALLABAG_RELEASE"
-git push origin release-$LAST_WALLABAG_RELEASE
-```
-
-- Create a new pull request with this title `Release wallabag $LAST_WALLABAG_RELEASE`. This pull request is used to launch builds on Travis-CI.
-- Once PR is green, merge it and delete the branch.
 - Run this command to create the package:
 
 ```
@@ -42,7 +23,7 @@ make release VERSION=$LAST_WALLABAG_RELEASE
 ```
 
 - [Create the new release on GitHub](https://github.com/wallabag/wallabag/releases/new) by targetting the `master` branch or any appropriate branch (for instance backports). You have to upload the package (generated previously).
-- Update the URL shortener (used on `wllbg.org` to update links like `https://wllbg.org/latest-v2-package` or `http://wllbg.org/latest-v2`)
+- Update nginx config to change the redirect rule for `https://wllbg.org/latest-v2-package` & `http://wllbg.org/latest-v2` (they both redirect to the asset of the GitHub release)
 - Update Dockerfile https://github.com/wallabag/docker (and create a new tag)
 - Update wallabag.org website (downloads, MD5 sum, releases and new blog post)
 - Put the next patch version suffixed with `-dev` in `app/config/wallabag.yml` (`wallabag_core.version`)

app/AppKernel.php

@@ -30,7 +30,7 @@ class AppKernel extends Kernel
             new KPhoen\RulerZBundle\KPhoenRulerZBundle(),
             new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
             new Craue\ConfigBundle\CraueConfigBundle(),
-            new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
+            new BabDev\PagerfantaBundle\BabDevPagerfantaBundle(),
             new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
             new BD\GuzzleSiteAuthenticatorBundle\BDGuzzleSiteAuthenticatorBundle(),
             new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(),

app/DoctrineMigrations/Version20190510141130.php

@@ -64,8 +64,10 @@ final class Version20190510141130 extends WallabagMigration
                 $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_access_tokens') . ' DROP FOREIGN KEY FK_368A4209A76ED395');
                 $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_access_tokens') . ' ADD CONSTRAINT FK_368A4209A76ED395 FOREIGN KEY (user_id) REFERENCES ' . $this->getTable('user') . ' (id) ON DELETE CASCADE');
 
-                $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_clients') . ' DROP FOREIGN KEY IDX_user_oauth_client');
-                $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_clients') . ' ADD CONSTRAINT FK_635D765EA76ED395 FOREIGN KEY (user_id) REFERENCES ' . $this->getTable('user') . ' (id)');
+                if ($schema->getTable($this->getTable('oauth2_clients'))->hasForeignKey('IDX_user_oauth_client')) {
+                    $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_clients') . ' DROP FOREIGN KEY IDX_user_oauth_client');
+                    $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_clients') . ' ADD CONSTRAINT FK_635D765EA76ED395 FOREIGN KEY (user_id) REFERENCES ' . $this->getTable('user') . ' (id)');
+                }
 
                 $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_refresh_tokens') . ' DROP FOREIGN KEY FK_20C9FB24A76ED395');
                 $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_refresh_tokens') . ' ADD CONSTRAINT FK_20C9FB24A76ED395 FOREIGN KEY (user_id) REFERENCES ' . $this->getTable('user') . ' (id) ON DELETE CASCADE');

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.an.yml

@@ -0,0 +1 @@
+{}

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ar.yml

@@ -0,0 +1 @@
+{}

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.cs.yml

@@ -0,0 +1,21 @@
+matomo_enabled: Povolit Matomo
+unmark_url: Unmark URL adresa, pokud je služba povolena
+scuttle_url: Scuttle URL adresa, pokud je služba povolena
+shaarli_url: Shaarli URL adresa, pokud je služba povolena
+share_unmark: Povolit sdílení na Unmark.it
+share_twitter: Povolit sdílení na Twitteru
+share_scuttle: Povolit sdílení na Scuttle
+share_shaarli: Povolit sdílení na Shaarli
+share_mail: Povolit sdílení emailem
+share_diaspora: Povolit sdílení na diaspora*
+export_xml: Povolit export do XML
+export_txt: Povolit export do TXT
+export_epub: Povolit export do ePub
+export_json: Povolit export do JSON
+export_csv: Povolit export do CSV
+export_pdf: Povolit export do PDF
+export_mobi: Povolit export do .mobi
+diaspora_url: diaspora* URL adresa, pokud je služba povolena
+carrot: Povolit sdílet na Carrot
+download_pictures: Stáhnout obrázky na váš server
+settings_changed: Nastavení bylo aktualizováno

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml

@@ -1,7 +1,6 @@
-# settings_changed: Configuration updated
 download_pictures: Download billeder på din server
 carrot: Aktiver deling til Carrot
-diaspora_url: Diaspora URL, hvis tjenesten er aktiv
+diaspora_url: diaspora* URL, hvis tjenesten er aktiv
 export_epub: Aktiver eksport til ePub
 export_mobi: Aktiver eksport til .mobi
 export_pdf: Aktiver eksport til PDF
@@ -9,12 +8,10 @@ export_csv: Aktiver eksport til CSV
 export_json: Aktiver eksport til JSON
 export_txt: Aktiver eksport til TXT
 export_xml: Aktiver eksport til XML
-# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
-# import_with_redis: Enable Redis to import data asynchronously
 shaarli_url: Shaarli-URL, hvis tjenesten er aktiv
 scuttle_url: Scuttle-URL, hvis tjenesten er aktiv
 unmark_url: Unmark-URL, hvis tjenesten er aktiv
-share_diaspora: Aktiver deling til Diaspora
+share_diaspora: Aktiver deling til diaspora*
 share_mail: Aktiver deling med email
 share_shaarli: Aktiver deling gennem Shaarli
 share_scuttle: Aktiver deling gennem Scuttle
@@ -32,9 +29,3 @@ matomo_site_id: ID for din side hos Matomo
 matomo_enabled: Aktiver Matomo
 demo_mode_enabled: "Aktiver demo-indstilling? (anvendes kun til wallabags offentlige demo)"
 demo_mode_username: "Demobruger"
-# share_public: Allow public url for entries
-# download_images_enabled: Download images locally
-# restricted_access: Enable authentication for websites with paywall
-# api_user_registration: Enable user to be registered using the API
-# store_article_headers: Enable if wallabag stores HTTP headers for each article
-# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml

@@ -1,40 +1,43 @@
-settings_changed: 'Konfiguration aktualisiert'
-download_pictures: 'Bilder auf den Server herunterladen'
-carrot: 'Teilen zu Carrot aktivieren'
-diaspora_url: 'Diaspora-URL, sofern der Service aktiviert ist'
-export_epub: 'ePUB-Export aktivieren'
-export_mobi: 'mobi-Export aktivieren'
-export_pdf: 'PDF-Export aktivieren'
-export_csv: 'CSV-Export aktivieren'
-export_json: 'JSON-Export aktivieren'
-export_txt: 'TXT-Export aktivieren'
-export_xml: 'XML-Export aktivieren'
-import_with_rabbitmq: 'Aktiviere RabbitMQ, um Artikel asynchron zu importieren'
-import_with_redis: 'Aktiviere Redis, um Artikel asynchron zu importieren'
-shaarli_url: 'Shaarli-URL, sofern der Service aktiviert ist'
-scuttle_url: 'Scuttle-URL, sofern der Service aktiviert ist'
-unmark_url: 'Unmark-URL, sofern der Service aktiviert ist'
-share_diaspora: 'Teilen zu Diaspora aktiveren'
-share_mail: 'Teilen via E-Mail aktiveren'
-share_shaarli: 'Teilen zu Shaarli aktiveren'
-share_twitter: 'Teilen zu Twitter aktiveren'
-share_unmark: 'Teilen zu Unmark.it aktiveren'
-show_printlink: 'Link anzeigen, um den Inhalt auszudrucken'
-wallabag_support_url: 'Support-URL für wallabag'
-wallabag_url: 'URL von *deiner* wallabag-Instanz'
-entry: 'Artikel'
-export: 'Export'
-import: 'Import'
-misc: 'Verschiedenes'
-modify_settings: 'Übernehmen'
-matomo_host: 'Host deiner Webseite in Matomo (ohne http:// oder https://)'
-matomo_site_id: 'ID deiner Webseite in Matomo'
-matomo_enabled: 'Matomo aktivieren'
-demo_mode_enabled: 'Test-Modus aktivieren? (nur für die öffentliche wallabag-Demo genutzt)'
-demo_mode_username: 'Test-Benutzer'
-share_public: 'Erlaube eine öffentliche URL für Einträge'
-download_images_enabled: 'Bilder lokal herunterladen'
-restricted_access: 'Authentifizierung für Webseiten mit Paywall aktivieren'
-api_user_registration: 'Registrierung eines Benutzers über die API ermöglichen'
-store_article_headers: 'Speichern von HTTP-Headern für jeden Artikel aktivieren'
-shaarli_share_origin_url: 'Original-URL mit Shaarli teilen, wenn der Service aktiviert ist'
+settings_changed: Konfiguration aktualisiert
+download_pictures: Bilder auf den Server herunterladen
+carrot: Teilen zu Carrot aktivieren
+diaspora_url: diaspora*-URL, sofern der Service aktiviert ist
+export_epub: ePUB-Export aktivieren
+export_mobi: mobi-Export aktivieren
+export_pdf: PDF-Export aktivieren
+export_csv: CSV-Export aktivieren
+export_json: JSON-Export aktivieren
+export_txt: TXT-Export aktivieren
+export_xml: XML-Export aktivieren
+import_with_rabbitmq: Aktiviere RabbitMQ, um Artikel asynchron zu importieren
+import_with_redis: Aktiviere Redis, um Artikel asynchron zu importieren
+shaarli_url: Shaarli-URL, sofern der Service aktiviert ist
+scuttle_url: Scuttle-URL, sofern der Service aktiviert ist
+unmark_url: Unmark-URL, sofern der Service aktiviert ist
+share_diaspora: Freigabe für diaspora* aktivieren
+share_mail: Freigabe per E-Mail aktivieren
+share_shaarli: Freigabe für Shaarli aktivieren
+share_twitter: Freigabe für Twitter aktivieren
+share_unmark: Freigabe für Unmark.it aktivieren
+show_printlink: Link anzeigen, um den Inhalt auszudrucken
+wallabag_support_url: Support-URL für wallabag
+wallabag_url: URL von *deiner* wallabag-Instanz
+entry: Artikel
+export: Export
+import: Import
+misc: Verschiedenes
+modify_settings: Übernehmen
+matomo_host: Host deiner Webseite in Matomo (ohne http:// oder https://)
+matomo_site_id: ID deiner Webseite in Matomo
+matomo_enabled: Matomo aktivieren
+demo_mode_enabled: Demo-Modus aktivieren? (Wird nur für die öffentliche Wallabag-Demo
+  verwendet)
+demo_mode_username: Test-Benutzer
+share_public: Öffentliche URLs für Einträge zulassen
+download_images_enabled: Bilder lokal herunterladen
+restricted_access: Authentifizierung für Webseiten mit Paywall aktivieren
+api_user_registration: Registrierung eines Benutzers über die API ermöglichen
+store_article_headers: Speichern von HTTP-Headern für jeden Artikel aktivieren
+shaarli_share_origin_url: Original-URL mit Shaarli teilen, wenn der Service aktiviert
+  ist
+share_scuttle: Freigabe für Scuttle aktivieren

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.el.yml

@@ -0,0 +1,40 @@
+shaarli_share_origin_url: Ενεργοποίηση κοινοποίησης πρωτότυπου URL στο Shaarli, αν είναι ενεργοποιημένη η υπηρεσία
+store_article_headers: Ενεργοποίηση αποθήκευσης επικεφαλίδων HTTP για κάθε άρθρο
+api_user_registration: Ενεργοποίηση εγγραφής χρήστη μέσω του API
+restricted_access: Ενεργοποίηση επαλήθευσης για ιστοσελίδες με paywall
+download_images_enabled: Λήψη εικόνων τοπικά
+share_public: Να επιτρέπονται URL για τα άρθρα
+demo_mode_username: Χρήστης demo
+demo_mode_enabled: Ενεργοποίηση λειτουργίας demo; (Χρησιμοποιείται μόνο για το δημόσιο demo του wallabag)
+matomo_enabled: Ενεργοποίηση Matomo
+matomo_site_id: ID της ιστοσελίδας σας στο Matomo
+matomo_host: Διεύθυνση της ιστοσελίδας σας στο Matomo (χωρίς http:// ή https://)
+modify_settings: εφαρμογή
+misc: ποικίλα
+import: εισαγωγή
+export: εξαγωγή
+entry: άρθρο
+wallabag_support_url: Υποστήριξη URL για wallabag
+show_printlink: Προβολή συνδέσμου για εκτύπωση περιεχομένου
+share_unmark: Ενεργοποίηση κοινοποίησης στο Unmark.it
+share_twitter: Ενεργοποίηση κοινοποίησης στο Twitter
+share_scuttle: Ενεργοποίηση κοινοποίησης στο Scuttle
+share_shaarli: Ενεργοποίηση κοινοποίησης στο Shaarli
+share_mail: Ενεργοποίηση κοινοποίησης με ηλεκτρονικό ταχυδρομείο
+share_diaspora: Ενεργοποίηση κοινοποίησης στο diaspora*
+unmark_url: URL του Unmark, αν είναι ενεργοποιημένη η υπηρεσία
+scuttle_url: URL του Scuttle, αν είναι ενεργοποιημένη η υπηρεσία
+shaarli_url: URL του Shaarli, αν είναι ενεργοποιημένη η υπηρεσία
+import_with_redis: Ενεργοποίηση Redis για την ασύγχρονη εισαγωγή δεδομένων
+import_with_rabbitmq: Ενεργοποίηση RabbitMQ για την ασύγχρονη εισαγωγή δεδομένων
+export_xml: Ενεργοποίηση εξαγωγής ΧΜΛ
+export_txt: Ενεργοποίηση εξαγωγής TXT
+export_json: Ενεργοποίηση εξαγωγής JSON
+export_csv: Ενεργοποίηση εξαγωγής CSV
+export_pdf: Ενεργοποίηση εξαγωγής PDF
+export_mobi: Ενεργοποίηση εξαγωγής .mobi
+export_epub: Ενεργοποίηση εξαγωγής ePub
+diaspora_url: URL του diaspora*, αν είναι ενεργοποιημένη η υπηρεσία
+carrot: Ενεργοποίηση κοινοποίησης στο Carrot
+download_pictures: Λήψη των εικόνων στον διακομιστή σας
+settings_changed: Η ρύθμιση παραμέτρων ενημερώθηκε

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml

@@ -1,5 +1,5 @@
 settings_changed: Configuration updated
-download_pictures: Download pictures on your server
+download_pictures: Download pictures onto your server
 carrot: Enable share to Carrot
 diaspora_url: diaspora* URL, if the service is enabled
 export_epub: Enable ePub export
@@ -22,19 +22,19 @@ share_twitter: Enable sharing to Twitter
 share_unmark: Enable sharing to Unmark.it
 show_printlink: Display a link to print content
 wallabag_support_url: Support URL for wallabag
-entry: "article"
-export: "export"
-import: "import"
-misc: "misc"
-modify_settings: "apply"
+entry: article
+export: export
+import: import
+misc: misc
+modify_settings: apply
 matomo_host: Host of your website in Matomo (without http:// or https://)
 matomo_site_id: ID of your website in Matomo
 matomo_enabled: Enable Matomo
-demo_mode_enabled: "Enable demo mode? (Only used for the public wallabag demo)"
-demo_mode_username: "Demo user"
-share_public: Allow public URL for entries
+demo_mode_enabled: Enable demo mode? (Only used for the public wallabag demo)
+demo_mode_username: Demo user
+share_public: Allow public URLs for entries
 download_images_enabled: Download images locally
 restricted_access: Enable authentication for paywalled websites
-api_user_registration: Enable user to be registered using the API
+api_user_registration: Turn on user registration via the API
 store_article_headers: Enable if wallabag stores HTTP headers for each article
-shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled
+shaarli_share_origin_url: Enable sharing origin URL to Shaarli, if the service is enabled

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml

@@ -1,7 +1,7 @@
 settings_changed: Configuración actualizada
 download_pictures: Descargar imágenes en el servidor
-carrot: Activar compartir con Carrot
-diaspora_url: URL de Diaspora, si el servicio está activado
+carrot: Activar compartir en Carrot
+diaspora_url: URL de diaspora*, si el servicio está activado
 export_epub: Activar exportación a ePub
 export_mobi: Activar exportación a .mobi
 export_pdf: Activar exportación a PDF
@@ -14,13 +14,13 @@ import_with_redis: Activar Redis para importar datos de forma asíncrona
 shaarli_url: URL de Shaarli, si el servicio está activado
 scuttle_url: URL de Scuttle, si el servicio está activado
 unmark_url: URL de Unmark, si el servicio está activado
-share_diaspora: Activar compartir con Diaspora
-share_mail: Activar compartir con Email
-share_shaarli: Activar compartir con Shaarli
-share_scuttle: Activar compartir con Scuttle
-share_twitter: Activar compartir con Twitter
-share_unmark: Activar compartir con Unmark.it
-show_printlink: Mostrar un enlace para imprimir contenido
+share_diaspora: Activar compartir en diaspora*
+share_mail: Activar compartir por correo electrónico
+share_shaarli: Activar compartir en Shaarli
+share_scuttle: Activar compartir en Scuttle
+share_twitter: Activar compartir en Twitter
+share_unmark: Activar compartir en Unmark.it
+show_printlink: Mostrar un enlace para imprimir el contenido
 wallabag_support_url: URL de soporte de wallabag
 entry: "artículo"
 export: "exportar"
@@ -32,9 +32,9 @@ matomo_site_id: ID de tu website en Matomo
 matomo_enabled: Activar Matomo
 demo_mode_enabled: "Activar modo demo (sólo usado en la demo pública de wallabag)"
 demo_mode_username: "Nombre de usuario demo"
-share_public: Permitir URL pública para los artículos
+share_public: Permitir URLs públicas para los artículos
 download_images_enabled: Descargar imágenes localmente
 restricted_access: Activar autenticación para websites con paywall
-# api_user_registration: Enable user to be registered using the API
-# store_article_headers: Enable if wallabag stores HTTP headers for each article
-# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled
+api_user_registration: Permitir el registro de usuarios utilizando el API
+shaarli_share_origin_url: Activar compartir en Shaarli, si el servicio está habilitado
+store_article_headers: Activar si wallabag almacena encabezados HTTP para cada artículo

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.eu.yml

@@ -0,0 +1 @@
+{}

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml

@@ -1,4 +1,3 @@
-# settings_changed: Configuration updated
 download_pictures: تصاویر را در کارگزار خودتان باربگیرید
 carrot: فعال‌سازی هم‌رسانی به Carrot
 diaspora_url: نشانی Diaspora، اگر فعال بود
@@ -9,8 +8,6 @@ export_csv:  فعال‌سازی برون‌سپاری به CSV
 export_json:  فعال‌سازی برون‌سپاری به JSON
 export_txt:  فعال‌سازی برون‌سپاری به TXT
 export_xml:  فعال‌سازی برون‌سپاری به XML
-# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
-# import_with_redis: Enable Redis to import data asynchronously
 shaarli_url: نشانی Shaarli، اگر فعال بود
 scuttle_url: نشانی Scuttle، اگر فعال بود
 unmark_url: نشانی Unmark، اگر فعال بود
@@ -27,14 +24,3 @@ export: "برون‌سپاری"
 import: "درون‌ریزی"
 misc: "غیره"
 modify_settings: "اعمال"
-# matomo_host: Host of your website in Matomo (without http:// or https://)
-# matomo_site_id: ID of your website in Matomo
-# matomo_enabled: Enable Matomo
-# demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
-# demo_mode_username: "Demo user"
-# share_public: Allow public url for entries
-# download_images_enabled: Download images locally
-# restricted_access: Enable authentication for websites with paywall
-# api_user_registration: Enable user to be registered using the API
-# store_article_headers: Enable if wallabag stores HTTP headers for each article
-# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml

@@ -1,7 +1,7 @@
 settings_changed: Configuration mise à jour
 download_pictures: Télécharger les images sur le serveur
 carrot: Activer le partage vers Carrot
-diaspora_url: URL de Diaspora, si le service Diaspora est activé
+diaspora_url: URL de diaspora*, si le service est activé
 export_epub: Activer l'export ePub
 export_mobi: Activer l'export .mobi
 export_pdf: Activer l'export PDF
@@ -14,27 +14,27 @@ import_with_redis: Activer Redis pour gérer les imports de façon asynchrone
 shaarli_url: URL de Shaarli, si le service Shaarli est activé
 scuttle_url: URL de Scuttle, si le service Scuttle est activé
 unmark_url: URL de Unmark, si le service Unmark est activé
-share_diaspora: Activer le partage vers Diaspora
-share_mail: Activer le partage par email
+share_diaspora: Activer le partage vers diaspora*
+share_mail: Activer le partage par courriel
 share_shaarli: Activer le partage vers Shaarli
 share_scuttle: Activer le partage vers Scuttle
 share_twitter: Activer le partage vers Twitter
 share_unmark: Activer le partage vers Unmark.it
 show_printlink: Afficher un lien pour imprimer
 wallabag_support_url: URL de support de wallabag
-entry: "article"
-export: "export"
-import: "import"
-misc: "divers"
-modify_settings: "appliquer"
+entry: article
+export: export
+import: import
+misc: divers
+modify_settings: appliquer
 matomo_host: URL de votre site dans Matomo (sans http:// ou https://)
 matomo_site_id: ID de votre site dans Matomo
 matomo_enabled: Activer Matomo
-demo_mode_enabled: "Activer le mode démo ? (utiliser uniquement pour la démo publique de wallabag)"
-demo_mode_username: "Utilisateur de la démo"
-share_public: Autoriser une URL publique pour les articles
+demo_mode_enabled: Activer le mode démo ? (Utiliser uniquement pour la démo publique de wallabag)
+demo_mode_username: Utilisateur de la démo
+share_public: Autoriser les URL publiques pour les articles
 download_images_enabled: Télécharger les images en local
-restricted_access: Activer l'authentification pour les articles derrière un paywall
+restricted_access: Activer l'authentification pour les sites avec paywall
 api_user_registration: Activer la création de compte depuis l'API
 store_article_headers: Activer le stockage des en-têtes HTTP de chaque article
 shaarli_share_origin_url: Activer le partage de l'adresse d'origine vers Shaarli, si le service est activé

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.gl.yml

@@ -0,0 +1,40 @@
+shaarli_share_origin_url: Activar a compartición do URL de orixe en Shaarli, se o servizo está activo
+store_article_headers: Activar se wallabag garda cabeceiras HTTP para cada artigo
+api_user_registration: Activar rexistro de usuarias a través da API
+restricted_access: Activar autenticación para sitios web con acceso de pagamento
+download_images_enabled: Descargar imaxes localmente
+share_public: Permitir URLs públicos para entradas
+demo_mode_username: Usuaria Demo
+demo_mode_enabled: Activar modo demostración? (Só se usa na demo pública de wallabag)
+matomo_enabled: Activar Matomo
+matomo_site_id: ID do teu sitio web en Matomo
+matomo_host: Servidor do teu sitio web en Matomo (sen http:// ou https://)
+modify_settings: aplicar
+misc: varios
+import: importar
+export: exportar
+entry: artigo
+wallabag_support_url: URL de axuda de wallabag
+show_printlink: Mostrar unha ligazón para imprimir o contido
+share_unmark: Activar a compartición en Unmark.it
+share_twitter: Activar a compartición en Twitter
+share_scuttle: Activar a compartición en Scuttle
+share_shaarli: Activar a compartición en Shaarli
+share_mail: Activar a compartición por email
+share_diaspora: Activar a compartición en diaspora*
+unmark_url: URL Unmark, se o servizo está activo
+scuttle_url: URL Scuttle, se o servizo está activo
+shaarli_url: URL Shaarli, se o servizo está activo
+import_with_redis: Activar a importación asíncrona con Redis
+import_with_rabbitmq: Activar a importación asíncrona con RabbitMQ
+export_xml: Activar exportación XML
+export_txt: Activar exportación TXT
+export_json: Activar exportación JSON
+export_csv: Activar exportación CSV
+export_pdf: Activar exportación PDF
+export_mobi: Activar exportación .mobi
+export_epub: Activar exportación ePub
+diaspora_url: URL de diaspora*, se o servizo está activo
+carrot: Activar compartir en Carrot
+download_pictures: Descargar imaxes no teu servidor
+settings_changed: Configuración actualizada

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.hi.yml

@@ -0,0 +1 @@
+{}

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.hr.yml

@@ -0,0 +1,40 @@
+share_diaspora: Aktiviraj dijeljenje na diaspora*
+share_twitter: Aktiviraj dijeljenje na Twitter
+shaarli_share_origin_url: Aktiviraj dijeljenje URL-a izvora na Shaarli, ako je usluga aktivirana
+export_csv: Aktiviraj CSV izvoz
+matomo_site_id: ID tvoje web-stranice u Matomo
+share_mail: Aktiviraj dijeljenje putem e-maila
+export_txt: Aktiviraj TXT izvoz
+download_images_enabled: Preuzmi slike lokalno
+share_scuttle: Aktiviraj dijeljenje na Scuttle
+export: izvezi
+export_json: Aktiviraj JSON izvoz
+store_article_headers: Aktiviraj, ako wallabag sprema HTTP zaglavlja za svaki članak
+entry: članak
+share_shaarli: Aktiviraj dijeljenje na Shaarli
+scuttle_url: Scuttle URL, ako je usluga aktivirana
+share_unmark: Aktiviraj dijeljenje na Unmark.it
+export_pdf: Aktiviraj PDF izvoz
+matomo_enabled: Aktiviraj Matomo
+import_with_redis: Aktiviraj Redis za asinkroni uvoz podataka
+restricted_access: Aktiviraj autentifikaciju za naplatne web-stranice
+export_mobi: Aktiviraj .mobi izvoz
+demo_mode_enabled: Aktivirati demo modus? (Koristi se samo za javnu wallabag demonstraciju)
+carrot: Aktiviraj dijeljenje na Carrot
+diaspora_url: diaspora* URL, ako je usluga aktivirana
+import_with_rabbitmq: Aktiviraj RabbitMQ za asinkroni uvoz podataka
+api_user_registration: Aktiviraj korisničku registraciju putem sučelja
+settings_changed: Konfiguracija aktualizirana
+matomo_host: Računalo tvoje web-stranice u Matomo (bez http:// ili https://)
+unmark_url: Unmark URL, ako je usluga aktivirana
+shaarli_url: Shaarli URL, ako je usluga aktivirana
+download_pictures: Preuzmi slike na vlastiti poslužitelj
+modify_settings: primijeni
+export_epub: Aktiviraj ePub izvoz
+misc: razno
+wallabag_support_url: URL podrške za wallabag
+export_xml: Aktiviraj XML izvoz
+show_printlink: Za ispis sadržaja, prikaži poveznicu
+demo_mode_username: Demo korisnik
+import: uvezi
+share_public: Dozvoli javne URL-ove za zapise

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.hu.yml

@@ -0,0 +1,42 @@
+settings_changed: Beállítások frissítve
+download_pictures: Képek letöltése a kiszolgálóra
+carrot: Megosztás engedélyezése a Carrot-ra
+diaspora_url: diaspora* URL, ha a szolgáltatás engedélyezett
+export_epub: ePub-ba exportálás engedélyezése
+export_mobi: .mobi-ba exportálás engedélyezése
+export_pdf: PDF-be exportálás engedélyezése
+export_csv: CSV-be exportálás engedélyezése
+export_json: JSON-ba exportálás engedélyezése
+export_txt: TXT-be exportálás engedélyezése
+export_xml: XML-be exportálás engedélyezése
+import_with_rabbitmq: A RabbitMQ aszinkron adatimportálásának engedélyezése
+import_with_redis: A Redis aszinkron adatimportálásának engedélyezése
+shaarli_url: Shaarli URL, ha a szolgáltatás engedélyezett
+scuttle_url: Scuttle URL, ha a szolgáltatás engedélyezett
+unmark_url: Unmark URL, ha a szolgáltatás engedélyezett
+share_diaspora: Megosztás engedélyezése a diaspora*-ra
+share_mail: Megosztás engedélyezése e-mail-ben
+share_shaarli: Megosztás engedélyezése a Shaarli-ra
+share_scuttle: Megosztás engedélyezése a Scuttle-ra
+share_twitter: Megosztás engedélyezése a Twitter-re
+share_unmark: Megosztás engedélyezése az Unmark.it-ra
+show_printlink: Hivatkozás mutatása a tartalom nyomtatására
+wallabag_support_url: Támogatási URL a wallabag-hoz
+entry: cikk
+export: exportál
+import: importál
+misc: egyéb
+modify_settings: alkalmaz
+piwik_host: Weboldalának hosztja a Piwik-en (http:// vagy https:// nélkül)
+piwik_site_id: Weboldalának azonosítója (ID-je) a Piwik-en
+piwik_enabled: Piwik engedélyezése
+demo_mode_enabled: Engedélyezi a bemutató (demó) módot? (Csak a nyilvános wallabag
+  demóhoz használva)
+demo_mode_username: Demó felhasználó
+share_public: Nyilvános URL-ek engedélyezése a bejegyzésekhez
+download_images_enabled: Képek letöltése helyileg
+restricted_access: Hitelesítés engedélyezése paywalled weboldalakhoz
+api_user_registration: Felhasználó API-n keresztüli regisztrálásának engedélyezése
+store_article_headers: HTTP fejlécek tárolása az összes cikkhez
+shaarli_share_origin_url: Az eredeti URL megosztásának engedélyezése a Shaarli-n,
+  ha a szolgáltatás engedélyezett

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml

@@ -1,7 +1,6 @@
-# settings_changed: Configuration updated
 download_pictures: Scarica le immagini sul tuo server
 carrot: Abilita la condivisione con Carrot
-diaspora_url: Diaspora URL, se il servizio è abilitato
+diaspora_url: URL di diaspora*, se il servizio è abilitato
 export_epub: Abilita esportazione ePub
 export_mobi: Abilita esportazione .mobi
 export_pdf: Abilita esportazione PDF
@@ -9,13 +8,11 @@ export_csv: Abilita esportazione CSV
 export_json: Abilita esportazione JSON
 export_txt: Abilita esportazione TXT
 export_xml: Abilita esportazione XML
-# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
-# import_with_redis: Enable Redis to import data asynchronously
 shaarli_url: Shaarli URL, se il servizio è abilitato
 scuttle_url: Scuttle URL, se il servizio è abilitato
 unmark_url: Unmark URL, se il servizio è abilitato
-share_diaspora: Abilita la condivisione con Diaspora
-share_mail: Abilita la condivisione per email
+share_diaspora: Abilita la condivisione con diaspora*
+share_mail: Abilita la condivisione per e-mail
 share_shaarli: Abilita la condivisione con Shaarli
 share_scuttle: Abilita la condivisione con Scuttle
 share_twitter: Abilita la condivisione con Twitter
@@ -32,9 +29,5 @@ matomo_site_id: ID del tuo sito in Matomo
 matomo_enabled: Abilita Matomo
 demo_mode_enabled: "Abilita modalità demo ? (usato solo per la demo pubblica di wallabag)"
 demo_mode_username: "Utente Demo"
-# share_public: Allow public url for entries
-# download_images_enabled: Download images locally
-# restricted_access: Enable authentication for websites with paywall
 api_user_registration: Abilita la registrazione dell'utente attraverso l'API
-# store_article_headers: Enable if wallabag stores HTTP headers for each article
-# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled
+settings_changed: Configurazione aggiornata

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ja.yml

@@ -1,40 +1,40 @@
-settings_changed: 構成が更新されました
-download_pictures: 画像をあなたのサーバにダウンロード
+settings_changed: 設定を更新しました
+download_pictures: サーバー上の画像をダウンロード
 carrot: Carrot への共有を有効にする
-diaspora_url: diaspora* URL、サービスが有効な場合
-export_epub: ePub 形式でのエクスポートを有効にする
-export_mobi: .mobi 形式でのエクスポートを有効にする
-export_pdf: PDF 形式でのエクスポートを有効にする
-export_csv: CSV 形式でのエクスポートを有効にする
-export_json: JSON 形式でのエクスポートを有効にする
-export_txt: TXT 形式でのエクスポートを有効にする
-export_xml: XML 形式でのエクスポートを有効にする
-import_with_rabbitmq: データを非同期的にインポートする RabbitMQ を有効にする
-import_with_redis: データを非同期的にインポートする Redis を有効にする
-shaarli_url: Shaarli URL、サービスが有効な場合
-scuttle_url: Scuttle URL、サービスが有効な場合
+diaspora_url: diaspora* URL、サービスが有効になっている場合
+export_epub: ePub のエクスポートを有効にする
+export_mobi: .mobi のエクスポートを有効にする
+export_pdf: PDF のエクスポートを有効にする
+export_csv: CSV のエクスポートを有効にする
+export_json: JSON のエクスポートを有効にする
+export_txt: TXT のエクスポートを有効にする
+export_xml: XML のエクスポートを有効にする
+import_with_rabbitmq: RabbitMQ を有効にして、データを非同期的にインポートする
+import_with_redis: Redis を有効にして、データを非同期的にインポートする
+shaarli_url: サービスが有効になっている場合、Shaarli URL
+scuttle_url: Scuttle URL、サービスが有効になっている場合
 unmark_url: Unmark URL、サービスが有効な場合
-share_diaspora: diaspora* への共有を有効にする
-share_mail: 電子メールでの共有を有効にする
-share_shaarli: Shaarli への共有を有効にする
-share_scuttle: Scuttle への共有を有効にする
-share_twitter: Twitter への共有を有効にする
-share_unmark: Unmark.it への共有を有効にする
-show_printlink: コンテンツを印刷するためのリンクを表示する
-wallabag_support_url: Wallabag のサポート URL
-entry: "記事"
-export: "エクスポート"
-import: "インポート"
-misc: "misc"
-modify_settings: "適用"
-matomo_host: Matomo でのウェブサイトのホスト (http:// または https:// は不要)
+share_diaspora: diaspora* に共有を有効にする
+share_mail: メールで共有を有効にする
+share_shaarli: Shaarli に共有を有効にする
+share_scuttle: Scuttle に共有を有効にする
+share_twitter: Twitter に共有を有効にする
+share_unmark: Unmark.it に共有を有効にする
+show_printlink: 印刷するコンテンツへのリンクを表示
+wallabag_support_url: wallabag のサポート URL
+entry: 記事
+export: エクスポート
+import: インポート
+misc: その他
+modify_settings: 適用
+matomo_host: Matomo のウェブサイトのホスト (http:// および https:// なし)
 matomo_site_id: Matomo でのあなたのウェブサイトの ID
 matomo_enabled: Matomo を有効にする
-demo_mode_enabled: "デモモードを有効にしますか？ (パブリック Wallabag のデモにのみ使用)"
-demo_mode_username: "デモユーザー"
-share_public: 記事の公開 URL を許可する
-download_images_enabled: 画像をローカルにダウンロードする
-restricted_access: ペイウォールウェブサイトの認証を有効にする
-api_user_registration: API を使用してユーザーを登録できるようにする
-store_article_headers: 各記事の HTTP ヘッダーを Wallabag が格納する場合に有効にする
-shaarli_share_origin_url: サービスが有効になっている場合、Shaarli へのオリジン URL の共有を有効にする
+demo_mode_enabled: デモモードを有効にしますか? (公開 wallabag デモでのみ使用)
+demo_mode_username: デモユーザー
+share_public: エントリの公開 URL を許可する
+download_images_enabled: 画像をローカルにダウンロード
+restricted_access: ペイウォールのあるウェブサイトへの認証を有効にする
+api_user_registration: API を使ってユーザを登録できるようにする
+store_article_headers: wallabag が各記事の HTTP ヘッダーを格納するかどうかを有効にする
+shaarli_share_origin_url: サービスが有効な場合に Shaarli に元の url の共有を有効にする

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ko.yml

@@ -0,0 +1 @@
+{}

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.nb.yml

@@ -0,0 +1,43 @@
+settings_changed: Oppsett oppdatert
+download_pictures: Last ned bilder til tjeneren din
+carrot: Skru på deling til Carrot
+diaspora_url: diaspora*-nettadresse, hvis tjenesten er avskrudd
+export_epub: Skru på ePub-eksport
+export_mobi: Skru på .mobi-eksport
+export_pdf: Skru på PDF-eksport
+export_csv: Skru på CSV-eksport
+export_json: Skru på JSON-eksport
+export_txt: Skru på TXT-eksport
+export_xml: Skru på XML-eksport
+import_with_rabbitmq: Skru på RabbitMQ for å importere data asynkront
+import_with_redis: Skru på Redis for å importere data asynkront
+shaarli_url: Shaarli-nettadresse, hvis tjenesten er avskrudd
+share_diaspora: Skru på deling til diaspora*
+share_mail: Skru på deling via e-post
+share_shaarli: Skru på deling til Shaarli
+share_twitter: Skru på deling til Twitter
+share_unmark: Skru på deling til Unmark.it
+show_printlink: Vis en lenke for å skrive ut innhold
+wallabag_support_url: Støtte-nettadresse for wallabag
+entry: artikkel
+export: eksporter
+import: importer
+misc: ymse
+modify_settings: bruk
+piwik_host: Vertskap for din nettside hos Piwik (uten http:// eller https://)
+piwik_site_id: ID for din nettside hos Piwik
+piwik_enabled: Skru på Piwik
+demo_mode_enabled: Skru på demo-modus? (Kun brukt for offentlig wallabag-demo)
+demo_mode_username: Demo-bruker
+share_public: Tillat offentlige nettadresser for oppføringer
+download_images_enabled: Last ned bilder lokalt
+restricted_access: Skru på identitetsbekreftelse for nettsider med betalingsmur
+scuttle_url: Scuttle-nettadresse, hvis tjenesten er påskrudd
+unmark_url: Unmark-nettadresse, hvis tjenesten er påskrudd
+share_scuttle: Skru på deling til Scuttle
+api_user_registration: Skru på brukerregistrering via API-et
+store_article_headers: Skru på hvis wallabag lagrer HTTP-hoder for hver artikkel
+shaarli_share_origin_url: Skru på deling av opprinnelsesnettadresse til Shaarli, hvis tjenesten er påskrudd
+matomo_host: Vertstjen din nettside i Matomo (uten http:// eller http://)
+matomo_enabled: Skru på Matomo
+matomo_site_id: ID for din nettside i Matomo

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.nl.yml

@@ -0,0 +1,40 @@
+shaarli_share_origin_url: Schakel het delen van oorspronkelijke url naar Shaarli in, wanneer deze dienst ingeschakeld is
+store_article_headers: Schakel het opslaan van HTTP headers voor ieder artikel in
+api_user_registration: Schakel gebruikersregistratie via API in
+restricted_access: Schakel authenticatie voor betaalde websites in
+download_images_enabled: Download afbeelding lokaal
+demo_mode_username: Demo gebruiker
+demo_mode_enabled: Schakel demo modus in? (Gebruik dit alleen voor de publieke wallabag demo)
+matomo_enabled: Schakel Matomo in
+matomo_site_id: ID van uw Matomo website
+matomo_host: Adres van uw Matomo website (zonder http:// of https://)
+modify_settings: bevestig
+misc: overig
+import: importeer
+export: exporteer
+entry: Artikel
+wallabag_support_url: Hulp URL voor wallabag
+show_printlink: Toon een link naar de print inhoud
+share_unmark: Schakel delen met Unmark.it in
+share_twitter: Schakel delen met Twitter in
+share_scuttle: Schakel delen met Scuttle in
+share_shaarli: Schakel delen met Shaarli in
+share_mail: Schakel delen naar e-mail in
+share_diaspora: Schakel deel naar diaspora* in
+unmark_url: Unmark URL, als de dienst ingeschakeld is
+scuttle_url: Scuttle URL, wanneer de dienst ingeschakeld is
+shaarli_url: Shaarli URL, als de service ingeschakeld is
+import_with_redis: Schakel Redis in om data asynchroon te importeren
+import_with_rabbitmq: Schakel RabbitMQ in om data asynchroon te importeren
+export_xml: Schakel XML-export in
+export_txt: Schakel TXT-export in
+export_json: Schakel JSON-export in
+export_csv: Schakel CSV-export in
+export_pdf: Schakel PDF-export in
+export_mobi: Schakel .mobi-export in
+export_epub: Schakel ePub-export in
+carrot: Schakel delen naar Carrot in
+download_pictures: Download foto's naar jouw server
+settings_changed: Instellingen bijgewerkt
+diaspora_url: diaspora* URL, als de dienst is aangezet
+share_public: Sta openbare URL's toe voor items

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml

@@ -1,7 +1,7 @@
 settings_changed: Configuracion mesa a jorn
 download_pictures: Telecargar los imatges sul servidor
 carrot: Activar lo partatge cap a Carrot
-diaspora_url: URL de Diaspora, se lo servici Diaspora es activat
+diaspora_url: URL de diaspora*, se lo servici diaspora* es activat
 export_epub: Activar l'expòrt ePub
 export_mobi: Activar l'expòrt .mobi
 export_pdf: Activar l'expòrt PDF

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml

@@ -14,26 +14,28 @@ import_with_redis: Włącz Redis dla asynchronicznego importu danych
 shaarli_url: Adress URL Shaarli, jeżeli usługa jest włączona
 scuttle_url: Adress URL Scuttle, jeżeli usługa jest włączona
 share_diaspora: Włącz udostępnianie dla Diaspora
-share_mail: Włącz udostępnianie przez email
+share_mail: Włącz udostępnianie przez e-mail
 share_shaarli: Włącz udostępnianie dla Shaarli
 share_scuttle: Włącz udostępnianie dla Scuttle
 share_twitter: Włącz udostępnianie dla Twitter
 share_unmark: Włącz udostępnianie dla Unmark.it
 show_printlink: Pokaż link do wydrukowania zawartości
 wallabag_support_url: Adres URL wsparcia dla wallabag
-entry: "artykuł"
-export: "eksport"
-import: "import"
-misc: "różne"
-modify_settings: "zatwierdź"
+entry: artykuł
+export: eksport
+import: import
+misc: różne
+modify_settings: zatwierdź
 matomo_host: Host twojej strony Matomo (bez http:// lub https://)
 matomo_site_id: ID twojej strony Matomo
 matomo_enabled: Włacz Matomo
-demo_mode_enabled: "Włacz tryb demo? (używany wyłącznie dla publicznej demonstracji Wallabag)"
-demo_mode_username: "Użytkownik Demonstracyjny"
-share_public: Zezwalaj na publiczny adres url dla wpisow
+demo_mode_enabled: Włącz tryb demo? (używany wyłącznie dla publicznej demonstracji
+  Wallabag)
+demo_mode_username: Użytkownik Demonstracyjny
+share_public: Zezwalaj na publiczne adresy url dla wpisów
 download_images_enabled: Pobierz obrazy lokalnie
-restricted_access: Włącz autoryzację dla stron z paywallem
+restricted_access: Włącz autoryzację dla stron za paywallem
 api_user_registration: Włącz rejestrację użytkownika przy użyciu API
-# store_article_headers: Enable if wallabag stores HTTP headers for each article
-# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled
+unmark_url: Odznacz URL, jeżeli usługa jest włączona
+store_article_headers: Włącz, jeżeli Wallabag zapisuje nagłówki HTTP dla każdego artykułu
+shaarli_share_origin_url: Włącz udostępnianie URL Shaarli, jeżeli usługa jest włączona

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml

@@ -1,7 +1,6 @@
-# settings_changed: Configuration updated
 download_pictures: Download imagens no seu servidor
 carrot: Habilitar compartilhamento para o Carrot
-diaspora_url: URL Diaspora caso o serviço esteja habilitado
+diaspora_url: URL de diaspora* caso o serviço esteja ativado
 export_epub: Habilita exportação para ePub
 export_mobi: Habilita exportação para .mobi
 export_pdf: Habilita exportação para PDF
@@ -9,13 +8,11 @@ export_csv: Habilita exportação para CSV
 export_json: Habilita exportação para JSON
 export_txt: Habilita exportação para TXT
 export_xml: Habilita exportação para XML
-# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
-# import_with_redis: Enable Redis to import data asynchronously
-shaarli_url: URL Shaarli caso o serviço esteja habilitado
-scuttle_url: URL Scuttle caso o serviço esteja habilitado
-unmark_url: URL Unmark caso o serviço esteja habilitado
+shaarli_url: URL de Shaarli caso o serviço esteja ativado
+scuttle_url: URL de Scuttle caso o serviço esteja ativado
+unmark_url: URL de Unmark caso o serviço esteja ativado
 pocket_consumer_key: Chave de consumidor do Pocket para importar conteúdo (https://getpocket.com/developer/docs/authentication)
-share_diaspora: Habilitar compartilhamento para o Diaspora
+share_diaspora: Habilitar compartilhamento para o diaspora*
 share_mail: Habilitar compartilhamento por e-mail
 share_shaarli: Habilitar compartilhamento para o Shaarli
 share_scuttle: Habilitar compartilhamento para o Scuttle
@@ -32,10 +29,13 @@ matomo_host: Host de seu website Matomo
 matomo_site_id: ID de seu website Matomo
 matomo_enabled: Habilitar Matomo
 demo_mode_enabled: "Habilitar modo demo? (somente usado para o demo público do wallabag)"
-demo_mode_username: "Usuário demo"
-# share_public: Allow public url for entries
-# download_images_enabled: Download images locally
-# restricted_access: Enable authentication for websites with paywall
-# api_user_registration: Enable user to be registered using the API
-# store_article_headers: Enable if wallabag stores HTTP headers for each article
-# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled
+demo_mode_username: "Utilizador demo"
+restricted_access: Habilitar autenticação para sites com paywall
+download_images_enabled: Baixar imagens localmente
+import_with_redis: Habilitar Redis para importar dados assincronamente
+import_with_rabbitmq: Permitir que RabbitMQ importe dados assincronamente
+settings_changed: Configuração atualizada
+share_public: 'Permitir URLs públicas para entradas'
+shaarli_share_origin_url: Ativar o URL de origem de compartilhamento para Shaarli, se o serviço estiver ativado
+store_article_headers: Ativar se o wallabag armazena cabeçalhos de HTTP para cada artigo
+api_user_registration: Ative o registo do utilizador através da API

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml

@@ -1,7 +1,6 @@
-# settings_changed: Configuration updated
 download_pictures: Descarcă poze pe server
 carrot: Permite share către Carrot
-diaspora_url: Diaspora URL, dacă serviciul este permis
+diaspora_url: diaspora* URL, dacă serviciul este permis
 export_epub: Permite exportare ePub
 export_mobi: Permite exportare .mobi
 export_pdf: Permite exportare PDF
@@ -9,12 +8,10 @@ export_csv: Permite exportare CSV
 export_json: Permite exportare JSON
 export_txt: Permite exportare TXT
 export_xml: Permite exportare XML
-# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
-# import_with_redis: Enable Redis to import data asynchronously
 shaarli_url: Shaarli URL, dacă serviciul este permis
 scuttle_url: Scuttle URL, dacă serviciul este permis
 unmark_url: Unmark URL, dacă serviciul este permis
-share_diaspora: Permite share către Diaspora
+share_diaspora: Permite share către diaspora*
 share_mail: Permite share prin email
 share_shaarli: Permite share către Shaarli
 share_scuttle: Permite share către Scuttle
@@ -27,14 +24,3 @@ export: "exportă"
 import: "importă"
 misc: "diverse"
 modify_settings: "aplică"
-# matomo_host: Host of your website in Matomo (without http:// or https://)
-# matomo_site_id: ID of your website in Matomo
-# matomo_enabled: Enable Matomo
-# demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
-# demo_mode_username: "Demo user"
-# share_public: Allow public url for entries
-# download_images_enabled: Download images locally
-# restricted_access: Enable authentication for websites with paywall
-# api_user_registration: Enable user to be registered using the API
-# store_article_headers: Enable if wallabag stores HTTP headers for each article
-# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ru.yml

@@ -35,6 +35,7 @@ demo_mode_username: "Демо пользователь"
 share_public: "Разрешить публичные ссылки на записи"
 download_images_enabled: "Скачивать изображения локально"
 restricted_access: "Включить авторизацию на сайте с помощью paywall"
-# api_user_registration: Enable user to be registered using the API
-# store_article_headers: Enable if wallabag stores HTTP headers for each article
-# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled
+shaarli_share_origin_url: Включите отправку URL-адреса источника для Shaarli, если услуга включена
+store_article_headers: Включите, если wallabag хранит заголовки HTTP для каждой статьи
+api_user_registration: Разрешить пользователю регистрироваться с помощью API
+share_scuttle: Включить возможность поделиться в Shaarli

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.sv.yml

@@ -0,0 +1 @@
+{}

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.th.yml

@@ -34,4 +34,3 @@ share_public: ยอมรับ URL สาธารณะจากการเ
 download_images_enabled: ดาวน์โหลดรูปภาพเฉพาะ
 restricted_access: เปิดใช้งานการรองรับบนเว็บไซต์กับ paywall
 api_user_registration: เปิดใช้งานให้ผู้ใช้ลงทะเบียนการใช้ API
-# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml

@@ -1,41 +1,40 @@
-# settings_changed: Configuration updated
-# download_pictures: Download pictures on your server
-# carrot: Enable share to Carrot
-# diaspora_url: Diaspora URL, if the service is enabled
-# export_epub: Enable ePub export
-# export_mobi: Enable .mobi export
-# export_pdf: Enable PDF export
-# export_csv: Enable CSV export
-# export_json: Enable JSON export
-# export_txt: Enable TXT export
-# export_xml: Enable XML export
-# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
-# import_with_redis: Enable Redis to import data asynchronously
-# shaarli_url: Shaarli URL, if the service is enabled
-# scuttle_url: Scuttle URL, if the service is enabled
-# unmark_url: Unmark URL, if the service is enabled
-# share_diaspora: Enable share to Diaspora
-# share_mail: Enable share by email
-# share_shaarli: Enable share to Shaarli
-# share_scuttle: Enable share to Scuttle
-# share_twitter: Enable share to Twitter
-# share_unmark: Enable share to Unmark.it
-# show_printlink: Display a link to print content
-# wallabag_support_url: Support URL for wallabag
-# wallabag_url: URL of *your* wallabag instance
-# entry: "article"
-# export: "export"
-# import: "import"
-# misc: "misc"
-# modify_settings: "apply"
-# matomo_host: Host of your website in Matomo (without http:// or https://)
-# matomo_site_id: ID of your website in Matomo
-# matomo_enabled: Enable Matomo
-# demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
-# demo_mode_username: "Demo user"
-# share_public: Allow public url for entries
-# download_images_enabled: Download images locally
-# restricted_access: Enable authentication for websites with paywall
-# api_user_registration: Enable user to be registered using the API
-# store_article_headers: Enable if wallabag stores HTTP headers for each article
-# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled
+settings_changed: Ayarlar güncellendi
+download_pictures: Resimleri sunucuya indir
+carrot: Carrot'a paylaşımı aktifleştir
+diaspora_url: diaspora* URL'i (eğer servis aktifse)
+export_epub: ePub çıktı alımını aktifleştir
+export_mobi: .mobi çıktı alımını aktifleştir
+export_pdf: PDF çıktı alımını aktifleştir
+export_csv: CSV çıktı alımını aktifleştir
+export_json: JSON çıktı alımını aktifleştir
+export_txt: TXT çıktı alımını aktifleştir
+export_xml: XML çıktı alımını aktifleştir
+import_with_rabbitmq: Verileri asenkron olarak içeri alabilmek için RabbitMQ'yu aktifleştir
+import_with_redis: Verileri asenkron olarak içeri alabilmek için Redis'i aktifleştir
+shaarli_url: Shaarli URL'i (eğer servis aktifse)
+scuttle_url: Scuttle URL'i (eğer servis aktifse)
+unmark_url: Unmark URL'i (eğer servis aktifse)
+share_diaspora: diaspora*'ya paylaşımı aktifleştir
+share_mail: E-posta'ya paylaşımı aktifleştir
+share_shaarli: Shaarli'ye paylaşımı aktifleştir
+share_scuttle: Scuttle'a paylaşımı aktifleştir
+share_twitter: Twitter'a paylaşımı aktifleştir
+share_unmark: Unmark.it'e paylaşımı aktifleştir
+show_printlink: İçeriği yazdırabilmek için bir bağlantı görüntüle
+wallabag_support_url: Wallabag destek URL'i
+entry: makale
+export: dışarı aktar
+import: içe aktar
+misc: çeşitli
+modify_settings: uygula
+matomo_host: Matomo'teki web sitenizin host adresi (başında http:// veya https:// olmadan)
+matomo_site_id: Matomo'teki web sitenizin ID'si
+matomo_enabled: Matomo'i aktifleştir
+demo_mode_enabled: Demo mod aktifleştirilsin mi (Sadece herkese açık wallabag demoları için kullanılmakta)
+demo_mode_username: Demo kullanıcısı
+share_public: Makaleler için herkese açık URL'lere izin ver
+download_images_enabled: Resimleri lokale indir
+restricted_access: Ödeme ile erişim sağlanabilen sitelere doğrulama özelliğini aktifleştir
+api_user_registration: API ile üye kaydını aktifleştir
+store_article_headers: Eğer wallabag her makale için HTTP header'larını saklıyorsa aktifleştirin
+shaarli_share_origin_url: Shaarli'ye orijinal URL'in paylaşımını aktifleştir (eğer servis aktifse)

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.uk.yml

@@ -0,0 +1,40 @@
+settings_changed: Конфігурацію оновлено
+download_pictures: Завантажити картинки на ваш сервер
+carrot: Дозволити ділитися в Carrot
+diaspora_url: diaspora* адреса, якщо сервіс увімкнено
+export_epub: Увімкнути експорт в ePub
+export_mobi: Увімкнути експорт в .mobi
+export_pdf: Увімкнути експорт в PDF
+export_csv: Увімкнути експорт в CSV
+export_json: Увімкнути експорт в JSON
+export_txt: Увімкнути експорт в TXT
+export_xml: Увімкнути експорт в XML
+import_with_rabbitmq: Увімкнути можливість асинхронного імпорту через RabbitMQ
+import_with_redis: Увімкнути можливість асинхронного імпорту через Redis
+shaarli_url: Shaarli URL, якщо сервіс увімкнено
+scuttle_url: Scuttle URL, якщо сервіс увімкнено
+unmark_url: Unmark URL, якщо сервіс увімкнено
+share_diaspora: Дозволити ділитися в diaspora*
+share_mail: Дозволити ділитись електронною поштою
+share_shaarli: Дозволити ділитися в Shaarli
+share_scuttle: Дозволити ділитися в Scuttle
+share_twitter: Дозволити ділитися в Twitter
+share_unmark: Дозволити ділитися в Unmark.it
+show_printlink: Показувати лінк для друку
+wallabag_support_url: Адреса техпідтримки для wallabag
+entry: стаття
+export: експорт
+import: імпорт
+misc: інше
+modify_settings: застосувати
+matomo_host: Host вашого сайту в Matomo (без http:// чи https://)
+matomo_site_id: ID вашого сайту в Matomo
+matomo_enabled: Увімкнути Matomo
+demo_mode_enabled: Увімкнути демо-режим? (Використовується тільки для публічних демонстрацій wallabag)
+demo_mode_username: Демо-користувач
+share_public: Дозволити публічні посилання на статті
+download_images_enabled: Завантажувати картинки локально
+restricted_access: Увімкнути аутентифікацію для сайтів з платним контентом
+api_user_registration: Дозволити користувачам реєструватись через API
+store_article_headers: Увімкнути зберігання HTTP-заголовків для кожної статті
+shaarli_share_origin_url: Увімкнути можливість ділитись оригінальним лінком в Shaarli, якщо сервіс увімкнено

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.zh_Hant.yml

@@ -0,0 +1 @@
+{}

app/Resources/static/themes/_global/share.js

@@ -1,4 +1 @@
 import './share.scss';
-
-function requireAll(r) { r.keys().forEach(r); }
-requireAll(require.context('./img/', true, /\.(jpg|png|gif|svg|ico)$/));

app/Resources/static/themes/baggy/css/print.scss

@@ -2,7 +2,7 @@
   /* ### Layout ### */
 
   body {
-    font-family: Serif;
+    font-family: serif;
     background-color: #fff;
   }
 

app/Resources/static/themes/material/css/cards.scss

@@ -293,6 +293,11 @@ a.original:not(.waves-effect) {
   }
 }
 
+.card.archived,
+.card-stacked.archived {
+  opacity: 0.5;
+}
+
 #content .collection .collection-item {
   min-height: 65px;
   height: auto;

app/Resources/static/themes/material/css/dark_theme.scss

@@ -0,0 +1,117 @@
+.dark-theme {
+  body,
+  main #content,
+  #article,
+  .card,
+  .card-panel,
+  .card .card-reveal,
+  .card-stacked .preview:not(.preview--default),
+  .card .preview:not(.preview--default),
+  .collapsible-header,
+  .collection,
+  .dropdown-content,
+  .nav-panel-add,
+  .nav-panel-search,
+  .side-nav,
+  .side-nav .collapsible-body,
+  .side-nav.fixed .collapsible-body,
+  .tabs {
+    background-color: #121212;
+  }
+
+  .dropdown-content li {
+    background-color: #232323;
+  }
+
+  .dropdown-content li:hover,
+  .dropdown-content li.active,
+  .dropdown-content li.selected {
+    background-color: #2c2c2c;
+  }
+
+  .dropdown-content .divider {
+    background-color: #383838;
+  }
+
+  .collection {
+    border-color: transparent;
+  }
+
+  .collection .collection-item {
+    border-color: #121212;
+  }
+
+  .card:hover,
+  .collection .collection-item:hover {
+    background-color: #272727;
+  }
+
+  main #content,
+  #article article,
+  #article article h1,
+  #article article h2,
+  #article article h3,
+  #article article h4,
+  #article article h5,
+  #article article h6,
+  .dropdown-content li > a,
+  .results a,
+  .side-nav li > a,
+  .side-nav li > a > i.material-icons {
+    color: #dfdfdf;
+  }
+
+  .cyan,
+  .cyan.darken-1,
+  .cyan.darken-2 {
+    background-color: #1d1d1d !important;
+  }
+
+  .grey-text.text-darken-4 {
+    color: #dfdfdf !important;
+  }
+
+  #article .chip {
+    background-color: #373737;
+  }
+
+  .side-nav li.active {
+    background-color: #2f2f2f;
+  }
+
+  .side-nav li:not(.logo) > a:hover,
+  .side-nav .collapsible-header:hover,
+  .side-nav.fixed .collapsible-header:hover {
+    background-color: #1d1d1d;
+  }
+
+  #article {
+    box-shadow: 0 0 10px #1d1d1d;
+  }
+
+  .card,
+  .collection .collection-item {
+    background-color: #1d1d1d;
+  }
+
+  .card-action {
+    background-color: transparent;
+  }
+
+  .logo img,
+  .preview.preview--default,
+  .typo-logo {
+    filter: invert(100%);
+  }
+
+  .border-bottom,
+  .collapsible {
+    border-color: #222;
+  }
+
+  @media only screen and (min-width: 992px) {
+    #article {
+      background-color: #101010;
+    }
+  }
+}

app/Resources/static/themes/material/css/index.scss

@@ -9,6 +9,7 @@
 @import 'nav';
 @import 'sidenav';
 @import 'various';
+@import 'dark_theme';
 
 /* Tools */
 @import 'fonts';

app/Resources/static/themes/material/css/media_queries.scss

@@ -15,7 +15,7 @@
 }
 
 @media screen and (min-width: 993px) {
-  body.entry main #content {
+  .entry #content {
     padding-left: 70px;
   }
 }
@@ -42,6 +42,10 @@
     padding-right: 0.75rem;
   }
 
+  .nav-panel-top {
+    padding: 6px 0;
+  }
+
   .nav-panel-buttom {
     justify-content: space-between;
   }
@@ -50,6 +54,7 @@
     max-width: 35em;
     margin-left: auto;
     margin-right: auto;
+    padding-bottom: 100px;
     font-size: 18px;
 
     > header > h1 {

app/Resources/static/themes/material/css/nav.scss

@@ -20,7 +20,8 @@ nav {
 .nav-panel-item .button-collapse {
   margin-left: 0;
   margin-right: 0.5rem;
-  padding: 0 0.5rem;
+  padding-left: 0.5rem;
+  padding-right: 0.5rem;
   height: auto;
   line-height: 1;
   background-color: transparent;
@@ -33,11 +34,15 @@ nav {
   flex-wrap: wrap;
   justify-content: space-between;
   align-items: center;
+
+  a {
+    padding: 10px 15px;
+  }
 }
 
 .nav-panel-item .material-icons {
-  height: 46px;
-  line-height: 46px;
+  height: auto;
+  line-height: 1;
 }
 
 .nav-input {
@@ -71,7 +76,6 @@ nav {
   }
 
   .input-field input:focus {
-    background-color: #fff;
     border: 0;
     box-shadow: none;
     color: #444;
@@ -108,6 +112,11 @@ nav {
   }
 }
 
+.nav-panel-add,
+.nav-panel-search {
+  background-color: white;
+}
+
 .nav-form-button {
   padding: 0;
   background-color: transparent;
@@ -136,20 +145,29 @@ nav {
   top: 0;
 }
 
+.dropdown-content {
+  width: 100%;
+
+  li {
+    min-height: auto;
+    padding-right: 15px;
+  }
+
+  li > a {
+    display: flex;
+    padding: 14px 10px;
+    align-items: center;
+    white-space: initial;
+  }
+}
+
 @media (min-width: 993px) {
   .button-collapse {
     display: none;
   }
-}
 
-.dropdown-content {
-  min-width: 300px;
-
-  .material-icons {
-    line-height: initial !important;
-  }
-
-  li > a {
-    padding: 10px;
+  .dropdown-content {
+    min-width: 300px;
+    width: initial;
   }
 }

app/Resources/static/themes/material/css/print.scss

@@ -2,7 +2,7 @@
   /* ### Layout ### */
 
   body {
-    font-family: Serif;
+    font-family: serif;
     background-color: #fff;
   }
 

app/Resources/static/themes/material/css/sidenav.scss

@@ -11,6 +11,11 @@
     &.logo > a:hover {
       background: initial;
     }
+
+    & > a > i.material-icons.theme-toggle-icon {
+      float: none;
+      margin-left: 0;
+    }
   }
 
   a {

app/Resources/static/themes/material/index.js

@@ -19,6 +19,104 @@ import './css/index.scss';
 
 const mobileMaxWidth = 993;
 
+function darkTheme() {
+  const rootEl = document.querySelector('html');
+  const themeDom = {
+    darkClass: 'dark-theme',
+
+    toggleClass(el) {
+      return el.classList.toggle(this.darkClass);
+    },
+
+    addClass(el) {
+      return el.classList.add(this.darkClass);
+    },
+
+    removeClass(el) {
+      return el.classList.remove(this.darkClass);
+    },
+  };
+  const themeCookie = {
+    values: {
+      light: 'light',
+      dark: 'dark',
+    },
+
+    name: 'theme',
+
+    getValue(isDarkTheme) {
+      return isDarkTheme ? this.values.dark : this.values.light;
+    },
+
+    setCookie(isDarkTheme) {
+      const value = this.getValue(isDarkTheme);
+      document.cookie = `${this.name}=${value};samesite=Lax;path=/;max-age=31536000`;
+    },
+
+    removeCookie() {
+      document.cookie = `${this.name}=auto;samesite=Lax;path=/;max-age=0`;
+    },
+
+    exists() {
+      return document.cookie.split(';').some((cookie) => cookie.trim().startsWith(`${this.name}=`));
+    },
+  };
+  const preferedColorScheme = {
+    choose() {
+      const themeCookieExists = themeCookie.exists();
+      if (this.isAvailable() && !themeCookieExists) {
+        const isPreferedColorSchemeDark = window.matchMedia('(prefers-color-scheme: dark)').matches === true;
+        if (!themeCookieExists) {
+          themeDom[isPreferedColorSchemeDark ? 'addClass' : 'removeClass'](rootEl);
+        }
+      }
+    },
+
+    isAvailable() {
+      return typeof window.matchMedia === 'function';
+    },
+
+    init() {
+      if (!this.isAvailable()) {
+        return false;
+      }
+      this.choose();
+      window.matchMedia('(prefers-color-scheme: dark)').addListener(() => {
+        this.choose();
+      });
+      return true;
+    },
+  };
+  preferedColorScheme.init();
+  const lightThemeButtons = document.querySelectorAll('.js-theme-toggle[data-theme="light"]');
+  [...lightThemeButtons].map((lightThemeButton) => {
+    lightThemeButton.addEventListener('click', (e) => {
+      e.preventDefault();
+      themeDom.removeClass(rootEl);
+      themeCookie.setCookie(false);
+    });
+    return true;
+  });
+  const darkThemeButtons = document.querySelectorAll('.js-theme-toggle[data-theme="dark"]');
+  [...darkThemeButtons].map((darkThemeButton) => {
+    darkThemeButton.addEventListener('click', (e) => {
+      e.preventDefault();
+      themeDom.addClass(rootEl);
+      themeCookie.setCookie(true);
+    });
+    return true;
+  });
+  const autoThemeButtons = document.querySelectorAll('.js-theme-toggle[data-theme="auto"]');
+  [...autoThemeButtons].map((autoThemeButton) => {
+    autoThemeButton.addEventListener('click', (e) => {
+      e.preventDefault();
+      themeCookie.removeCookie();
+      preferedColorScheme.choose();
+    });
+    return true;
+  });
+}
+
 const stickyNav = () => {
   const nav = $('.js-entry-nav-top');
   $('[data-toggle="actions"]').click(() => {
@@ -52,6 +150,7 @@ const articleScroll = () => {
 $(document).ready(() => {
   // sideNav
   $('.button-collapse').sideNav();
+  darkTheme();
   $('select').material_select();
   $('.collapsible').collapsible({
     accordion: false,
@@ -76,7 +175,6 @@ $(document).ready(() => {
   const toggleNav = (toShow, toFocus) => {
     $('.nav-panel-actions').hide(100);
     $(toShow).show(100);
-    $('.nav-panels').css('background', 'white');
     $(toFocus).focus();
   };
 
@@ -109,7 +207,6 @@ $(document).ready(() => {
   $('.close').on('click', (e) => {
     $(e.target).parent('.nav-panel-item').hide(100);
     $('.nav-panel-actions').show(100);
-    $('.nav-panels').css('background', 'transparent');
     return false;
   });
 

app/config/config.yml

@@ -209,6 +209,7 @@ scheb_two_factor:
 
     google:
         enabled: "%twofactor_auth%"
+        issuer: "%server_name%"
         template: WallabagUserBundle:Authentication:form.html.twig
 
     email:
@@ -277,11 +278,6 @@ old_sound_rabbit_mq:
             exchange_options:
                 name: 'wallabag.import.chrome'
                 type: topic
-        import_rss:
-            connection: default
-            exchange_options:
-                name: 'wallabag.import.rss'
-                type: topic
     consumers:
         import_pocket:
             connection: default
@@ -364,15 +360,6 @@ old_sound_rabbit_mq:
                 name: 'wallabag.import.chrome'
             callback: wallabag_import.consumer.amqp.chrome
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
-        import_rss:
-            connection: default
-            exchange_options:
-                name: 'wallabag.import.rss'
-                type: topic
-            queue_options:
-                name: 'wallabag.import.rss'
-            callback: wallabag_import.consumer.amqp.rss
-            qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
 
 fos_js_routing:
     routes_to_expose:

app/config/parameters.yml.dist

@@ -24,6 +24,7 @@ parameters:
     database_charset: utf8mb4
 
     domain_name: https://your-wallabag-url-instance.com
+    server_name: "Your wallabag instance"
 
     mailer_transport:  smtp
     mailer_user:       ~

app/config/tests/parameters_test.mysql.yml

@@ -4,7 +4,7 @@ parameters:
     test_database_port: 3306
     test_database_name: wallabag_test
     test_database_user: root
-    test_database_password: ~
+    test_database_password: root
     test_database_path: ~
     env(TEST_DATABASE_PATH): ~
     test_database_charset: utf8mb4

app/config/tests/parameters_test.pgsql.yml

@@ -3,8 +3,8 @@ parameters:
     test_database_host: localhost
     test_database_port:
     test_database_name: wallabag_test
-    test_database_user: travis
-    test_database_password: ~
+    test_database_user: wallabag
+    test_database_password: wallabagrocks
     test_database_path: ~
     env(TEST_DATABASE_PATH): ~
     test_database_charset: utf8

app/config/wallabag.yml

@@ -1,10 +1,11 @@
 wallabag_core:
-    version: 2.4.0-dev
+    version: 2.4.2
     paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
     languages:
         en: 'English'
         fr: 'Français'
         de: 'Deutsch'
+        nl: 'Dutch'
         th: 'ไทย'
         tr: 'Türkçe'
         fa: 'فارسی'
@@ -18,6 +19,8 @@ wallabag_core:
         ru: 'Русский'
         ja: '日本語'
         zh: '简体中文'
+        uk: 'Українська'
+        hr: 'Hrvatski'
     items_on_page: 12
     theme: material
     language: '%locale%'

app/config/webpack/common.js

@@ -4,37 +4,35 @@ const StyleLintPlugin = require('stylelint-webpack-plugin');
 
 const rootDir = path.resolve(__dirname, '../../../');
 
-module.exports = function () {
-  return {
-    entry: {
-      material: path.join(rootDir, './app/Resources/static/themes/material/index.js'),
-      baggy: path.join(rootDir, './app/Resources/static/themes/baggy/index.js'),
-      public: path.join(rootDir, './app/Resources/static/themes/_global/share.js'),
+module.exports = {
+  entry: {
+    material: path.join(rootDir, './app/Resources/static/themes/material/index.js'),
+    baggy: path.join(rootDir, './app/Resources/static/themes/baggy/index.js'),
+    public: path.join(rootDir, './app/Resources/static/themes/_global/share.js'),
+  },
+  output: {
+    filename: '[name].js',
+    path: path.resolve(rootDir, 'web/wallassets'),
+    publicPath: '',
+  },
+  plugins: [
+    new webpack.ProvidePlugin({
+      $: 'jquery',
+      jQuery: 'jquery',
+      'window.$': 'jquery',
+      'window.jQuery': 'jquery',
+    }),
+    new StyleLintPlugin({
+      configFile: '.stylelintrc',
+      failOnError: false,
+      quiet: false,
+      context: 'app/Resources/static/themes',
+      files: '**/*.scss',
+    }),
+  ],
+  resolve: {
+    alias: {
+      jquery: path.join(rootDir, 'node_modules/jquery/dist/jquery.js'),
     },
-    output: {
-      filename: '[name].js',
-      path: path.resolve(rootDir, 'web/wallassets'),
-      publicPath: '',
-    },
-    plugins: [
-      new webpack.ProvidePlugin({
-        $: 'jquery',
-        jQuery: 'jquery',
-        'window.$': 'jquery',
-        'window.jQuery': 'jquery',
-      }),
-      new StyleLintPlugin({
-        configFile: '.stylelintrc',
-        failOnError: false,
-        quiet: false,
-        context: 'app/Resources/static/themes',
-        files: '**/*.scss',
-      }),
-    ],
-    resolve: {
-      alias: {
-        jquery: path.join(rootDir, 'node_modules/jquery/dist/jquery.js'),
-      },
-    },
-  };
+  },
 };

app/config/webpack/dev.js

@@ -1,61 +1,65 @@
-const webpackMerge = require('webpack-merge');
+const { merge } = require('webpack-merge');
 const webpack = require('webpack');
 const commonConfig = require('./common.js');
 
-module.exports = function () {
-  return webpackMerge(commonConfig(), {
-    devtool: 'eval-source-map',
-    output: {
-      filename: '[name].dev.js',
-    },
-
-    devServer: {
-      hot: true,
-      // enable HMR on the server
-
-      contentBase: './web',
-      // match the output path
-    },
-    plugins: [
-      new webpack.HotModuleReplacementPlugin(),
-    ],
-    module: {
-      rules: [
-        {
-          enforce: 'pre',
-          test: /\.js$/,
-          loader: 'eslint-loader',
-          exclude: /node_modules/,
-        },
-        {
-          test: /\.js$/,
-          exclude: /(node_modules)/,
-          use: {
-            loader: 'babel-loader',
-            options: {
-              presets: ['env'],
-            },
+module.exports = merge(commonConfig, {
+  devtool: 'eval-source-map',
+  output: {
+    filename: '[name].dev.js',
+  },
+  mode: 'development',
+  devServer: {
+    hot: true,
+    // enable HMR on the server
+    contentBase: './web',
+    // match the output path
+  },
+  plugins: [
+    new webpack.HotModuleReplacementPlugin(),
+  ],
+  module: {
+    rules: [
+      {
+        enforce: 'pre',
+        test: /\.js$/,
+        loader: 'eslint-loader',
+        exclude: /node_modules/,
+      },
+      {
+        test: /\.js$/,
+        exclude: /(node_modules)/,
+        use: {
+          loader: 'babel-loader',
+          options: {
+            presets: ['@babel/preset-env'],
           },
         },
-        {
-          test: /\.(s)?css$/,
-          use: [
-            'style-loader',
-            {
-              loader: 'css-loader',
-              options: {
-                importLoaders: 1,
+      },
+      {
+        test: /\.(s)?css$/,
+        use: [
+          'style-loader',
+          {
+            loader: 'css-loader',
+            options: {
+              importLoaders: 1,
+            },
+          },
+          {
+            loader: 'postcss-loader',
+            options: {
+              postcssOptions: {
+                plugins: ['autoprefixer'],
               },
             },
-            'postcss-loader',
-            'sass-loader',
-          ],
-        },
-        {
-          test: /\.(jpg|png|gif|svg|ico|eot|ttf|woff|woff2)$/,
-          use: 'url-loader',
-        },
-      ],
-    },
-  });
-};
+          },
+          'sass-loader',
+        ],
+      },
+      {
+        test: /\.(jpg|png|gif|svg|ico|eot|ttf|woff|woff2)$/,
+        use: 'url-loader',
+      },
+    ],
+  },
+});

app/config/webpack/prod.js

@@ -1,111 +1,112 @@
 const webpack = require('webpack');
-const webpackMerge = require('webpack-merge');
-const ExtractTextPlugin = require('extract-text-webpack-plugin');
-const ManifestPlugin = require('webpack-manifest-plugin');
+const { merge } = require('webpack-merge');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const { WebpackManifestPlugin } = require('webpack-manifest-plugin');
+const TerserPlugin = require('terser-webpack-plugin');
 
 const commonConfig = require('./common.js');
 
-module.exports = function () {
-  return webpackMerge(commonConfig(), {
-    output: {
-      filename: '[name].js',
-    },
-    devtool: 'source-map',
-    plugins: [
-      new webpack.DefinePlugin({
-        'process.env': {
-          'NODE_ENV': JSON.stringify('production'),
+module.exports = merge(commonConfig, {
+  output: {
+    filename: '[name].js',
+  },
+  mode: 'production',
+  devtool: 'source-map',
+  optimization: {
+    minimize: true,
+    minimizer: [
+      new TerserPlugin({
+        parallel: true,
+        terserOptions: {
+          output: {
+            comments: false,
+          },
         },
-      }),
-      new webpack.optimize.UglifyJsPlugin({
-        beautify: false,
-        mangle: {
-          screw_ie8: true,
-          keep_fnames: true,
-        },
-        compress: {
-          screw_ie8: true,
-          warnings: false,
-        },
-        comments: false,
-      }),
-      new ExtractTextPlugin('[name].css'),
-      new ManifestPlugin({
-        fileName: 'manifest.json',
+        extractComments: false,
       }),
     ],
-    module: {
-      rules: [
-        {
-          enforce: 'pre',
-          test: /\.js$/,
-          loader: 'eslint-loader',
-          exclude: /node_modules/,
-        },
-        {
-          test: /\.js$/,
-          exclude: /(node_modules)/,
-          use: {
-            loader: 'babel-loader',
-            options: {
-              presets: ['env'],
-            },
+  },
+  plugins: [
+    new MiniCssExtractPlugin(),
+    new webpack.DefinePlugin({
+      'process.env': {
+        NODE_ENV: JSON.stringify('production'),
+      },
+    }),
+    new WebpackManifestPlugin({
+      fileName: 'manifest.json',
+      sort: (file1, file2) => file1.path.localeCompare(file2.path),
+    }),
+  ],
+  module: {
+    rules: [
+      {
+        enforce: 'pre',
+        test: /\.js$/,
+        loader: 'eslint-loader',
+        exclude: /node_modules/,
+      },
+      {
+        test: /\.js$/,
+        exclude: /(node_modules)/,
+        use: {
+          loader: 'babel-loader',
+          options: {
+            presets: ['@babel/preset-env'],
           },
         },
-        {
-          test: /\.(s)?css$/,
-          use: ExtractTextPlugin.extract({
-            fallback: 'style-loader',
-            use: [
-              {
-                loader: 'css-loader',
-                options: {
-                  importLoaders: 1,
-                  minimize: {
-                    discardComments: {
-                      removeAll: true,
-                    },
-                    core: true,
-                    minifyFontValues: true,
-                  },
-                },
+      },
+      {
+        test: /\.(sa|sc|c)ss$/,
+        use: [
+          MiniCssExtractPlugin.loader,
+          {
+            loader: 'css-loader',
+            options: {
+              importLoaders: 1,
+            },
+          },
+          {
+            loader: 'postcss-loader',
+            options: {
+              postcssOptions: {
+                plugins: ['autoprefixer'],
               },
-              'postcss-loader',
-              'sass-loader',
-            ],
-          }),
-        },
-        {
-          test: /\.(jpg|png|gif|svg|ico)$/,
-          include: /node_modules/,
-          use: {
-            loader: 'file-loader',
-            options: {
-              name: 'img/[name].[ext]',
             },
           },
-        },
-        {
-          test: /\.(jpg|png|gif|svg|ico)$/,
-          exclude: /node_modules/,
-          use: {
-            loader: 'file-loader',
-            options: {
-              context: 'app/Resources/static',
-              name: '[path][name].[ext]',
-            },
+          'sass-loader',
+        ],
+      },
+      {
+        test: /\.(jpg|png|gif|svg|ico)$/,
+        include: /node_modules/,
+        use: {
+          loader: 'file-loader',
+          options: {
+            name: 'img/[name].[ext]',
           },
         },
-        {
-          test: /\.(eot|ttf|woff|woff2)$/,
-          use: {
-            loader: 'file-loader',
-            options: {
-              name: 'fonts/[name].[ext]',
-            },
+      },
+      {
+        test: /\.(jpg|png|gif|svg|ico)$/,
+        exclude: /node_modules/,
+        use: {
+          loader: 'file-loader',
+          options: {
+            context: 'app/Resources/static',
+            name: '[path][name].[ext]',
           },
         },
-      ],
-    },
-  });
-};
+      },
+      {
+        test: /\.(eot|ttf|woff|woff2)$/,
+        use: {
+          loader: 'file-loader',
+          options: {
+            name: 'fonts/[name].[ext]',
+          },
+        },
+      },
+    ],
+  },
+});

composer.json

@@ -3,6 +3,8 @@
     "type": "project",
     "description": "open source self hostable read-it-later web application",
     "keywords": [
+        "poche",
+        "wallabag",
         "read-it-later",
         "read it later"
     ],
@@ -22,7 +24,7 @@
         },
         {
             "name": "Jérémy Benoist",
-            "homepage": "http://www.j0k3r.net",
+            "homepage": "https://www.j0k3r.net",
             "role": "Developer"
         }
     ],
@@ -31,7 +33,7 @@
         "issues": "https://github.com/wallabag/wallabag/issues"
     },
     "require": {
-        "php": ">=7.1.3",
+        "php": ">=7.2.5",
         "ext-ctype": "*",
         "ext-curl": "*",
         "ext-dom": "*",
@@ -47,10 +49,10 @@
         "ext-tidy": "*",
         "ext-tokenizer": "*",
         "ext-xml": "*",
+        "babdev/pagerfanta-bundle": "^2.5",
         "bdunogier/guzzle-site-authenticator": "^1.0.0",
         "craue/config-bundle": "^2.3.0",
         "defuse/php-encryption": "^2.1",
-        "doctrine/dbal": "2.9.2",
         "doctrine/doctrine-bundle": "^1.9",
         "doctrine/doctrine-cache-bundle": "^1.3",
         "doctrine/doctrine-migrations-bundle": "^1.3",
@@ -64,7 +66,7 @@
         "incenteev/composer-parameter-handler": "^2.1",
         "j0k3r/graby": "^2.0",
         "javibravo/simpleue": "^2.0",
-        "jms/serializer-bundle": "~2.2",
+        "jms/serializer-bundle": "~3.6",
         "kphoen/rulerz-bundle": "~0.13",
         "laminas/laminas-code": "^3.4",
         "laminas/laminas-diactoros": "^2.3",
@@ -75,15 +77,16 @@
         "nelmio/api-doc-bundle": "^2.13.2",
         "nelmio/cors-bundle": "~1.5",
         "ocramius/proxy-manager": "^2.1.1",
+        "pagerfanta/pagerfanta": "^2.4",
         "php-amqplib/rabbitmq-bundle": "^1.14",
         "php-http/guzzle5-adapter": "^2.0",
         "php-http/httplug-bundle": "^1.14",
         "pragmarx/recovery": "^0.1.0",
-        "predis/predis": "v1.1.x-dev",
+        "predis/predis": "^1.1.3",
         "scheb/two-factor-bundle": "^4.11.0",
         "sensio/distribution-bundle": "^5.0",
         "sensio/framework-extra-bundle": "^5.2",
-        "sentry/sentry-symfony": "3.2.1",
+        "sentry/sentry-symfony": "3.5.3",
         "stof/doctrine-extensions-bundle": "^1.2",
         "symfony/dom-crawler": "^3.4",
         "symfony/monolog-bundle": "^3.1",
@@ -93,22 +96,22 @@
         "twig/extensions": "^1.5",
         "wallabag/php-mobi": "~1.0",
         "wallabag/phpepub": "^4.0.7.2",
-        "white-october/pagerfanta-bundle": "^1.1",
-        "willdurand/hateoas-bundle": "~1.3"
+        "willdurand/hateoas-bundle": "~2.1"
     },
     "require-dev": {
-        "dama/doctrine-test-bundle": "^5.0",
+        "dama/doctrine-test-bundle": "^6.0",
         "doctrine/doctrine-fixtures-bundle": "~3.0",
         "friendsofphp/php-cs-fixer": "~2.13",
         "guzzlehttp/psr7": "^1.0",
         "m6web/redis-mock": "^5.0",
         "php-http/mock-client": "^1.0",
-        "phpstan/phpstan": "^0.11.0",
-        "phpstan/phpstan-doctrine": "^0.11.0",
-        "phpstan/phpstan-phpunit": "^0.11.0",
-        "phpstan/phpstan-symfony": "^0.11.0",
+        "phpstan/extension-installer": "^1.0",
+        "phpstan/phpstan": "^0.12",
+        "phpstan/phpstan-doctrine": "^0.12",
+        "phpstan/phpstan-phpunit": "^0.12",
+        "phpstan/phpstan-symfony": "^0.12",
         "symfony/maker-bundle": "^1.18",
-        "symfony/phpunit-bridge": "~4.3.8"
+        "symfony/phpunit-bridge": "~5.1"
     },
     "suggest": {
         "ext-imagick": "To keep GIF animation when downloading image is enabled"
@@ -159,7 +162,7 @@
     "config": {
         "bin-dir": "bin",
         "platform": {
-            "php": "7.1.3"
+            "php": "7.2.5"
         },
         "sort-packages": true
     },

package.json

@@ -7,7 +7,7 @@
     "doc": "docs"
   },
   "engines": {
-    "node": ">=6.10"
+    "node": ">=12"
   },
   "repository": {
     "type": "git",
@@ -36,52 +36,56 @@
     "url": "https://github.com/wallabag/wallabag/issues"
   },
   "devDependencies": {
-    "autoprefixer": "^7.1.1",
-    "babel-core": "^6.24.1",
-    "babel-eslint": "^7.2.3",
-    "babel-loader": "^7.0.0",
-    "babel-preset-env": "^1.4.0",
-    "css-loader": "^0.28.0",
-    "eslint": "^4.0.0",
-    "eslint-config-airbnb-base": "^11.1.3",
-    "eslint-loader": "^1.7.1",
-    "eslint-plugin-import": "^2.2.0",
-    "extract-text-webpack-plugin": "^2.1.0",
-    "file-loader": "^0.11.0",
+    "@babel/core": "^7.13.10",
+    "@babel/preset-env": "^7.13.10",
+    "autoprefixer": "^10.2.5",
+    "babel-eslint": "^10.1.0",
+    "babel-loader": "^8.2.2",
+    "css-loader": "^5.1.3",
+    "eslint": "^7.22.0",
+    "eslint-config-airbnb-base": "^14.2.1",
+    "eslint-loader": "^4.0.2",
+    "eslint-plugin-import": "^2.22.1",
+    "file-loader": "^6.2.0",
     "lato-font": "^3.0.0",
-    "node-sass": "^4.5.2",
-    "postcss-loader": "^2.0.5",
-    "sass-loader": "^6.0.3",
-    "style-loader": "^0.18.2",
-    "stylelint": "^7.9.0",
-    "stylelint-config-standard": "^16.0.0",
-    "stylelint-webpack-plugin": "^0.7.0",
-    "url-loader": "^0.5.8",
-    "webpack": "^2.3.2",
-    "webpack-dev-server": "^2.4.4",
-    "webpack-manifest-plugin": "^1.1.0",
-    "webpack-merge": "^4.1.0"
+    "mini-css-extract-plugin": "^1.3.9",
+    "node-sass": "^5.0.0",
+    "postcss": "^8.2.7",
+    "postcss-loader": "^5.2.0",
+    "sass": "^1.32.8",
+    "sass-loader": "^11.0.1",
+    "style-loader": "^2.0.0",
+    "stylelint": "^13.12.0",
+    "stylelint-config-standard": "^21.0.0",
+    "stylelint-scss": "^3.19.0",
+    "stylelint-webpack-plugin": "^2.1.1",
+    "url-loader": "^4.1.1",
+    "webpack": "^5.26.0",
+    "webpack-cli": "^4.5.0",
+    "webpack-dev-server": "^3.11.2",
+    "webpack-manifest-plugin": "^3.1.0",
+    "webpack-merge": "^5.7.3"
   },
   "dependencies": {
-    "annotator": "git://github.com/wallabag/annotator.git#0f076c7d371ed25eb0793346f46982d90f2c4c85",
-    "clipboard": "^2.0.4",
+    "annotator": "wallabag/annotator#master",
+    "clipboard": "^2.0.8",
     "hammerjs": "^2.0.8",
-    "highlight.js": "^9.12.0",
+    "highlight.js": "^10.6.0",
     "icomoon-free-npm": "^0.0.0",
-    "jquery": "^2.1.4",
+    "jquery": "^3.6.0",
     "jquery.cookie": "^1.4.1",
     "jr-qrcode": "^1.0.7",
-    "material-design-icons-iconfont": "^5.0.1",
+    "material-design-icons-iconfont": "^6.1.0",
     "materialize-css": "^0.98.1",
-    "mathjax": "^3.0.0",
+    "mathjax": "^3.1.2",
     "mousetrap": "^1.6.0",
     "ptsans-npm-webfont": "^0.0.4",
-    "roboto-fontface": "^0.7.0",
+    "roboto-fontface": "^0.10.0",
     "waypoints": "^4.0.1"
   },
   "scripts": {
-    "watch": "./node_modules/.bin/webpack-dev-server --env=dev",
-    "build:dev": "./node_modules/.bin/webpack --env=dev",
-    "build:prod": "./node_modules/.bin/webpack --env=prod"
+    "watch": "webpack-dev-server --env=dev",
+    "build:dev": "webpack --env=dev",
+    "build:prod": "webpack --env=prod"
   }
 }

phpstan.neon

@@ -1,15 +1,13 @@
-includes:
-    - vendor/phpstan/phpstan-phpunit/extension.neon
-    - vendor/phpstan/phpstan-symfony/extension.neon
-    - vendor/phpstan/phpstan-doctrine/extension.neon
-    - vendor/phpstan/phpstan-phpunit/rules.neon
-
 parameters:
+    level: 1
+    paths:
+        - src
+        - tests
+
     symfony:
         container_xml_path: %rootDir%/../../../var/cache/test/appTestDebugProjectContainer.xml
 
-    # https://github.com/phpstan/phpstan/issues/694#issuecomment-350724288
-    autoload_files:
-        - vendor/bin/.phpunit/phpunit-7.4/vendor/autoload.php
+    bootstrapFiles:
+        - vendor/bin/.phpunit/phpunit-8.3-0/vendor/autoload.php
 
     inferPrivatePropertyTypeFromConstructor: true

postcss.config.js

@@ -1,7 +0,0 @@
-module.exports = {
-  plugins: function () {
-    return [
-      require('autoprefixer'),
-    ];
-  }
-};

scripts/require.sh

@@ -3,7 +3,7 @@
 # Check for composer
 if [ ! -f composer.phar ]; then
     echo "composer.phar not found, we'll see if composer is installed globally."
-    command -v composer >/dev/null 2>&1 || { echo >&2 "wallabag requires composer but it's not installed (see http://doc.wallabag.org/en/master/user/installation.html). Aborting."; exit 1; }
+    command -v composer >/dev/null 2>&1 || { echo >&2 "wallabag requires composer but it's not installed (see https://doc.wallabag.org/en/admin/installation/requirements.html). Aborting."; exit 1; }
 else
     COMPOSER_COMMAND='./composer.phar'
 fi

src/Wallabag/AnnotationBundle/DataFixtures/AnnotationFixtures.php

@@ -4,7 +4,7 @@ namespace Wallabag\AnnotationBundle\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Wallabag\AnnotationBundle\Entity\Annotation;
 use Wallabag\CoreBundle\DataFixtures\EntryFixtures;
 use Wallabag\UserBundle\DataFixtures\UserFixtures;

src/Wallabag/ApiBundle/Controller/SearchRestController.php

@@ -5,7 +5,7 @@ namespace Wallabag\ApiBundle\Controller;
 use Hateoas\Configuration\Route;
 use Hateoas\Representation\Factory\PagerfantaFactory;
 use Nelmio\ApiDocBundle\Annotation\ApiDoc;
-use Pagerfanta\Adapter\DoctrineORMAdapter;
+use Pagerfanta\Doctrine\ORM\QueryAdapter as DoctrineORMAdapter;
 use Pagerfanta\Pagerfanta;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;

src/Wallabag/CoreBundle/Command/CleanDownloadedImagesCommand.php

@@ -0,0 +1,101 @@
+<?php
+
+namespace Wallabag\CoreBundle\Command;
+
+use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\Finder\Finder;
+
+class CleanDownloadedImagesCommand extends ContainerAwareCommand
+{
+    protected function configure()
+    {
+        $this
+            ->setName('wallabag:clean-downloaded-images')
+            ->setDescription('Cleans downloaded images which are no more associated to an entry')
+            ->addOption(
+               'dry-run',
+               null,
+               InputOption::VALUE_NONE,
+               'Do not remove images, just dump counters'
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $io = new SymfonyStyle($input, $output);
+
+        $dryRun = (bool) $input->getOption('dry-run');
+
+        if ($dryRun) {
+            $io->text('Dry run mode <info>enabled</info> (no images will be removed)');
+        }
+
+        $downloadImages = $this->getContainer()->get('wallabag_core.entry.download_images');
+        $baseFolder = $downloadImages->getBaseFolder();
+
+        $io->text('Retrieve existing images');
+
+        // retrieve _existing_ folders in the image folder
+        $finder = new Finder();
+        $finder
+            ->directories()
+            ->ignoreDotFiles(true)
+            ->depth(2)
+            ->in($baseFolder);
+
+        $existingPaths = [];
+        foreach ($finder as $file) {
+            $existingPaths[] = $file->getFilename();
+        }
+
+        $io->text(sprintf('  -> <info>%d</info> images found', \count($existingPaths)));
+
+        $io->text('Retrieve valid folders attached to a user');
+
+        $entries = $this->getContainer()->get('wallabag_core.entry_repository')->findAllEntriesIdByUserId();
+
+        // retrieve _valid_ folders from existing entries
+        $validPaths = [];
+        foreach ($entries as $entry) {
+            $path = $downloadImages->getRelativePath($entry['id']);
+
+            if (!file_exists($baseFolder . '/' . $path)) {
+                continue;
+            }
+
+            // only store the hash, not the full path
+            $validPaths[] = explode('/', $path)[2];
+        }
+
+        $io->text(sprintf('  -> <info>%d</info> folders found', \count($validPaths)));
+
+        $deletedCount = 0;
+
+        $io->text('Remove images');
+
+        // check if existing path are valid, if not, remove all images and the folder
+        foreach ($existingPaths as $existingPath) {
+            if (!\in_array($existingPath, $validPaths, true)) {
+                $fullPath = $baseFolder . '/' . $existingPath[0] . '/' . $existingPath[1] . '/' . $existingPath;
+                $files = glob($fullPath . '/*.*');
+
+                if (!$dryRun) {
+                    array_map('unlink', $files);
+                    rmdir($fullPath);
+                }
+
+                $deletedCount += \count($files);
+
+                $io->text(sprintf('Deleted images in <info>%s</info>: <info>%d</info>', $existingPath, \count($files)));
+            }
+        }
+
+        $io->success(sprintf('Finished cleaning. %d deleted images', $deletedCount));
+
+        return 0;
+    }
+}

src/Wallabag/CoreBundle/Command/GenerateUrlHashesCommand.php

@@ -59,7 +59,7 @@ class GenerateUrlHashesCommand extends ContainerAwareCommand
         $em = $this->getContainer()->get('doctrine.orm.entity_manager');
         $repo = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entry');
 
-        $entries = $repo->findByUser($user->getId());
+        $entries = $repo->findByEmptyHashedUrlAndUserId($user->getId());
 
         $i = 1;
         foreach ($entries as $entry) {

src/Wallabag/CoreBundle/Controller/ConfigController.php

@@ -327,7 +327,7 @@ class ConfigController extends Controller
         $backupCodes = (new BackupCodes())->toArray();
         $backupCodesHashed = array_map(
             function ($backupCode) {
-                return password_hash($backupCode, PASSWORD_DEFAULT);
+                return password_hash($backupCode, \PASSWORD_DEFAULT);
             },
             $backupCodes
         );
@@ -344,6 +344,7 @@ class ConfigController extends Controller
         return $this->render('WallabagCoreBundle:Config:otp_app.html.twig', [
             'backupCodes' => $backupCodes,
             'qr_code' => $this->get('scheb_two_factor.security.google_authenticator')->getQRContent($user),
+            'secret' => $secret,
         ]);
     }
 

src/Wallabag/CoreBundle/Controller/EntryController.php

@@ -3,7 +3,7 @@
 namespace Wallabag\CoreBundle\Controller;
 
 use Doctrine\ORM\NoResultException;
-use Pagerfanta\Adapter\DoctrineORMAdapter;
+use Pagerfanta\Doctrine\ORM\QueryAdapter as DoctrineORMAdapter;
 use Pagerfanta\Exception\OutOfRangeCurrentPageException;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
@@ -532,6 +532,8 @@ class EntryController extends Controller
         $searchTerm = (isset($request->get('search_entry')['term']) ? $request->get('search_entry')['term'] : '');
         $currentRoute = (null !== $request->query->get('currentRoute') ? $request->query->get('currentRoute') : '');
 
+        $formOptions = [];
+
         switch ($type) {
             case 'search':
                 $qb = $repository->getBuilderForSearchByUser($this->getUser()->getId(), $searchTerm, $currentRoute);
@@ -541,12 +543,15 @@ class EntryController extends Controller
                 break;
             case 'starred':
                 $qb = $repository->getBuilderForStarredByUser($this->getUser()->getId());
+                $formOptions['filter_starred'] = true;
                 break;
             case 'archive':
                 $qb = $repository->getBuilderForArchiveByUser($this->getUser()->getId());
+                $formOptions['filter_archived'] = true;
                 break;
             case 'unread':
                 $qb = $repository->getBuilderForUnreadByUser($this->getUser()->getId());
+                $formOptions['filter_unread'] = true;
                 break;
             case 'all':
                 $qb = $repository->getBuilderForAllByUser($this->getUser()->getId());
@@ -555,7 +560,7 @@ class EntryController extends Controller
                 throw new \InvalidArgumentException(sprintf('Type "%s" is not implemented.', $type));
         }
 
-        $form = $this->createForm(EntryFilterType::class);
+        $form = $this->createForm(EntryFilterType::class, [], $formOptions);
 
         if ($request->query->has($form->getName())) {
             // manually bind values from the request

src/Wallabag/CoreBundle/Controller/FeedController.php

@@ -3,7 +3,7 @@
 namespace Wallabag\CoreBundle\Controller;
 
 use Pagerfanta\Adapter\ArrayAdapter;
-use Pagerfanta\Adapter\DoctrineORMAdapter;
+use Pagerfanta\Doctrine\ORM\QueryAdapter as DoctrineORMAdapter;
 use Pagerfanta\Exception\OutOfRangeCurrentPageException;
 use Pagerfanta\Pagerfanta;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;

src/Wallabag/CoreBundle/DataFixtures/ConfigFixtures.php

@@ -4,7 +4,7 @@ namespace Wallabag\CoreBundle\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Wallabag\CoreBundle\Entity\Config;
 use Wallabag\UserBundle\DataFixtures\UserFixtures;
 
@@ -13,7 +13,7 @@ class ConfigFixtures extends Fixture implements DependentFixtureInterface
     /**
      * {@inheritdoc}
      */
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         $adminConfig = new Config($this->getReference('admin-user'));
 

src/Wallabag/CoreBundle/DataFixtures/EntryFixtures.php

@@ -4,7 +4,7 @@ namespace Wallabag\CoreBundle\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Wallabag\CoreBundle\Entity\Entry;
 use Wallabag\UserBundle\DataFixtures\UserFixtures;
 
@@ -13,7 +13,7 @@ class EntryFixtures extends Fixture implements DependentFixtureInterface
     /**
      * {@inheritdoc}
      */
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         $entries = [
             'entry1' => [

src/Wallabag/CoreBundle/DataFixtures/IgnoreOriginInstanceRuleFixtures.php

@@ -3,7 +3,7 @@
 namespace Wallabag\CoreBundle\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Wallabag\CoreBundle\Entity\IgnoreOriginInstanceRule;
@@ -23,7 +23,7 @@ class IgnoreOriginInstanceRuleFixtures extends Fixture implements ContainerAware
     /**
      * {@inheritdoc}
      */
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         foreach ($this->container->getParameter('wallabag_core.default_ignore_origin_instance_rules') as $ignore_origin_instance_rule) {
             $newIgnoreOriginInstanceRule = new IgnoreOriginInstanceRule();

src/Wallabag/CoreBundle/DataFixtures/IgnoreOriginUserRuleFixtures.php

@@ -4,7 +4,7 @@ namespace Wallabag\CoreBundle\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Wallabag\CoreBundle\Entity\IgnoreOriginUserRule;
 use Wallabag\UserBundle\DataFixtures\UserFixtures;
 
@@ -13,7 +13,7 @@ class IgnoreOriginUserRuleFixtures extends Fixture implements DependentFixtureIn
     /**
      * {@inheritdoc}
      */
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         $rule = new IgnoreOriginUserRule();
         $rule->setRule('host = "example.fr"');

src/Wallabag/CoreBundle/DataFixtures/InternalSettingFixtures.php

@@ -3,7 +3,7 @@
 namespace Wallabag\CoreBundle\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Wallabag\CoreBundle\Entity\InternalSetting;
@@ -23,7 +23,7 @@ class InternalSettingFixtures extends Fixture implements ContainerAwareInterface
     /**
      * {@inheritdoc}
      */
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         foreach ($this->container->getParameter('wallabag_core.default_internal_settings') as $setting) {
             $newSetting = new InternalSetting();

src/Wallabag/CoreBundle/DataFixtures/SiteCredentialFixtures.php

@@ -4,7 +4,7 @@ namespace Wallabag\CoreBundle\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Wallabag\CoreBundle\Entity\SiteCredential;
@@ -25,7 +25,7 @@ class SiteCredentialFixtures extends Fixture implements DependentFixtureInterfac
     /**
      * {@inheritdoc}
      */
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         $credential = new SiteCredential($this->getReference('admin-user'));
         $credential->setHost('.super.com');

src/Wallabag/CoreBundle/DataFixtures/TagFixtures.php

@@ -3,7 +3,7 @@
 namespace Wallabag\CoreBundle\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Wallabag\CoreBundle\Entity\Tag;
 
 class TagFixtures extends Fixture
@@ -11,7 +11,7 @@ class TagFixtures extends Fixture
     /**
      * {@inheritdoc}
      */
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         $tags = [
             'foo-bar-tag' => 'foo bar', //tag used for EntryControllerTest

src/Wallabag/CoreBundle/DataFixtures/TaggingRuleFixtures.php

@@ -4,7 +4,7 @@ namespace Wallabag\CoreBundle\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Wallabag\CoreBundle\Entity\TaggingRule;
 
 class TaggingRuleFixtures extends Fixture implements DependentFixtureInterface
@@ -12,7 +12,7 @@ class TaggingRuleFixtures extends Fixture implements DependentFixtureInterface
     /**
      * {@inheritdoc}
      */
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         $tr1 = new TaggingRule();
         $tr1->setRule('content matches "spurs"');

src/Wallabag/CoreBundle/Entity/Tag.php

@@ -84,7 +84,7 @@ class Tag
      */
     public function setLabel($label)
     {
-        $this->label = mb_convert_case($label, MB_CASE_LOWER);
+        $this->label = mb_convert_case($label, \MB_CASE_LOWER);
 
         return $this;
     }

src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php

@@ -118,12 +118,15 @@ class EntryFilterType extends AbstractType
             ])
             ->add('isArchived', CheckboxFilterType::class, [
                 'label' => 'entry.filters.archived_label',
+                'data' => $options['filter_archived'],
             ])
             ->add('isStarred', CheckboxFilterType::class, [
                 'label' => 'entry.filters.starred_label',
+                'data' => $options['filter_starred'],
             ])
             ->add('isUnread', CheckboxFilterType::class, [
                 'label' => 'entry.filters.unread_label',
+                'data' => $options['filter_unread'],
                 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
                     if (false === $values['value']) {
                         return;
@@ -177,6 +180,9 @@ class EntryFilterType extends AbstractType
         $resolver->setDefaults([
             'csrf_protection' => false,
             'validation_groups' => ['filtering'],
+            'filter_archived' => false,
+            'filter_starred' => false,
+            'filter_unread' => false,
         ]);
     }
 }

src/Wallabag/CoreBundle/Helper/ContentProxy.php

@@ -141,7 +141,7 @@ class ContentProxy
         $date = $value;
 
         // is it a timestamp?
-        if (false !== filter_var($date, FILTER_VALIDATE_INT)) {
+        if (false !== filter_var($date, \FILTER_VALIDATE_INT)) {
             $date = '@' . $date;
         }
 
@@ -163,7 +163,7 @@ class ContentProxy
      */
     public function setEntryDomainName(Entry $entry)
     {
-        $domainName = parse_url($entry->getUrl(), PHP_URL_HOST);
+        $domainName = parse_url($entry->getUrl(), \PHP_URL_HOST);
         if (false !== $domainName) {
             $entry->setDomainName($domainName);
         }
@@ -177,7 +177,7 @@ class ContentProxy
     public function setDefaultEntryTitle(Entry $entry)
     {
         $url = parse_url($entry->getUrl());
-        $path = pathinfo($url['path'], PATHINFO_BASENAME);
+        $path = pathinfo($url['path'], \PATHINFO_BASENAME);
 
         if (empty($path)) {
             $path = $url['host'];

src/Wallabag/CoreBundle/Helper/DownloadImages.php

@@ -37,6 +37,11 @@ class DownloadImages
         $this->setFolder();
     }
 
+    public function getBaseFolder()
+    {
+        return $this->baseFolder;
+    }
+
     /**
      * Process the html and extract images URLs from it.
      *
@@ -99,7 +104,7 @@ class DownloadImages
      * @param string $url          Url from where the image were found
      * @param string $relativePath Relative local path to saved the image
      *
-     * @return string Relative url to access the image from the web
+     * @return string|false Relative url to access the image from the web
      */
     public function processSingleImage($entryId, $imagePath, $url, $relativePath = null)
     {
@@ -210,6 +215,29 @@ class DownloadImages
         @rmdir($folderPath);
     }
 
+    /**
+     * Generate the folder where we are going to save images based on the entry url.
+     *
+     * @param int  $entryId      ID of the entry
+     * @param bool $createFolder Should we create the folder for the given id?
+     *
+     * @return string
+     */
+    public function getRelativePath($entryId, $createFolder = true)
+    {
+        $hashId = hash('crc32', $entryId);
+        $relativePath = $hashId[0] . '/' . $hashId[1] . '/' . $hashId;
+        $folderPath = $this->baseFolder . '/' . $relativePath;
+
+        if (!file_exists($folderPath) && $createFolder) {
+            mkdir($folderPath, 0777, true);
+        }
+
+        $this->logger->debug('DownloadImages: Folder used for that Entry id', ['folder' => $folderPath, 'entryId' => $entryId]);
+
+        return $relativePath;
+    }
+
     /**
      * Get images urls from the srcset image attribute.
      *
@@ -254,28 +282,6 @@ class DownloadImages
         }
     }
 
-    /**
-     * Generate the folder where we are going to save images based on the entry url.
-     *
-     * @param int $entryId ID of the entry
-     *
-     * @return string
-     */
-    private function getRelativePath($entryId)
-    {
-        $hashId = hash('crc32', $entryId);
-        $relativePath = $hashId[0] . '/' . $hashId[1] . '/' . $hashId;
-        $folderPath = $this->baseFolder . '/' . $relativePath;
-
-        if (!file_exists($folderPath)) {
-            mkdir($folderPath, 0777, true);
-        }
-
-        $this->logger->debug('DownloadImages: Folder used for that Entry id', ['folder' => $folderPath, 'entryId' => $entryId]);
-
-        return $relativePath;
-    }
-
     /**
      * Make an $url absolute based on the $base.
      *

src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php

@@ -94,6 +94,7 @@ class RuleBasedTagger
      */
     private function getTag($label)
     {
+        $label = mb_convert_case($label, \MB_CASE_LOWER);
         $tag = $this->tagRepository->findOneByLabel($label);
 
         if (!$tag) {

src/Wallabag/CoreBundle/Helper/TagsAssigner.php

@@ -44,7 +44,7 @@ class TagsAssigner
         }
 
         foreach ($tags as $label) {
-            $label = trim(mb_convert_case($label, MB_CASE_LOWER));
+            $label = trim(mb_convert_case($label, \MB_CASE_LOWER));
 
             // avoid empty tag
             if (0 === \strlen($label)) {

src/Wallabag/CoreBundle/Repository/EntryRepository.php

@@ -5,7 +5,7 @@ namespace Wallabag\CoreBundle\Repository;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\NoResultException;
 use Doctrine\ORM\QueryBuilder;
-use Pagerfanta\Adapter\DoctrineORMAdapter;
+use Pagerfanta\Doctrine\ORM\QueryAdapter as DoctrineORMAdapter;
 use Pagerfanta\Pagerfanta;
 use Wallabag\CoreBundle\Entity\Entry;
 use Wallabag\CoreBundle\Entity\Tag;
@@ -369,6 +369,22 @@ class EntryRepository extends EntityRepository
         );
     }
 
+    /**
+     * Find all entries which have an empty value for hash.
+     *
+     * @return Entry|false
+     */
+    public function findByEmptyHashedUrlAndUserId(int $userId)
+    {
+        return $this->createQueryBuilder('e')
+            ->where('e.hashedUrl = :empty')->setParameter('empty', '')
+            ->orWhere('e.hashedUrl is null')
+            ->andWhere('e.user = :user_id')->setParameter('user_id', $userId)
+            ->andWhere('e.url is not null')
+            ->getQuery()
+            ->getResult();
+    }
+
     /**
      * Find an entry by its hashed url and its owner.
      * If it exists, return the entry otherwise return false.