Merge pull request #6291 from wallabag/release/2.5.4

Prepare 2.5.4

.eslintrc.json

@@ -1,6 +1,6 @@
 {
     "extends": "airbnb-base",
-    "parser": "babel-eslint",
+    "parser": "@babel/eslint-parser",
     "env": {
         "browser": true,
         "es6": true

.gitattributes

@@ -0,0 +1,7 @@
+/.editorconfig export-ignore
+/.gitattributes export-ignore
+/.github export-ignore
+/.gitignore export-ignore
+/phpstan.neon export-ignore
+/phpunit.xml.dist export-ignore
+/tests export-ignore

.github/CONTRIBUTING.md

@@ -6,11 +6,15 @@
 
 - Clone the repository
 - Ensure your Docker daemon is running
-- Launch `docker-compose up`
+- Copy `docker/php/env.example` to `docker/php/env` and customize
+- Launch `docker-compose run --rm php composer install` to bootstrap php dependencies
+- Launch `docker-compose run --rm php bin/console wallabag:install` to bootstrap your installation
+- Launch `docker-compose run --rm php yarn install` to bootstrap dependencies for the frontend
+- Launch `docker-compose run --rm php yarn build:dev` to build assets for the frontend
+- Launch `docker-compose up -d` to start the stack
 
 You'll then have:
-- a web server (nginx)
-- a PHP daemon (using FPM)
+- a PHP daemon with standalone web server
 - a Redis database (to handle imports)
 - a SQLite database to store articles
 
@@ -20,7 +24,7 @@ If you want to test using an other database than SQLite, uncomment the `postgres
 
 ### Using your own PHP server
 
-- Ensure you are running PHP > 7.1.
+- Ensure you are running PHP >= 7.4.
 - Clone the repository
 - Launch `composer install`
 - If you got some errors, fix them (they might be related to some missing PHP extension from your machine)

.github/dependabot.yml

@@ -3,7 +3,7 @@ updates:
 - package-ecosystem: npm
   directory: "/"
   schedule:
-    interval: daily
+    interval: weekly
     time: "04:00"
     timezone: Europe/Paris
   open-pull-requests-limit: 10
@@ -34,3 +34,10 @@ updates:
   - dependency-name: nelmio/api-doc-bundle
     versions:
     - "> 2.13.4"
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: weekly
+    time: "04:00"
+    timezone: Europe/Paris
+  open-pull-requests-limit: 10

.github/release.yml

@@ -0,0 +1,6 @@
+changelog:
+  exclude:
+    labels:
+      - Dependencies
+    authors:
+      - dependabot

.github/workflows/assets.yml

@@ -7,6 +7,9 @@ on:
       - master
       - 2.*
 
+permissions:
+  contents: read
+
 jobs:
   js:
     name: "Building assets"
@@ -14,12 +17,12 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v3"
 
       - name: "Install Node"
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
-          node-version: "12"
+          node-version: "16"
 
       - name: "Install dependencies with Yarn"
         run: "yarn install"

.github/workflows/coding-standards.yml

@@ -7,28 +7,31 @@ on:
       - master
       - 2.*
 
+permissions:
+  contents: read
+
 jobs:
   coding-standards:
     name: "CS Fixer & PHPStan"
-    runs-on: "ubuntu-18.04"
+    runs-on: "ubuntu-20.04"
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v3"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
         with:
           coverage: "none"
-          php-version: "7.3"
-          tools: cs2pr, pecl, composer:v1
+          php-version: "7.4"
+          tools: cs2pr, pecl, composer:2.2
           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"
+        uses: "ramsey/composer-install@v2"
         with:
           composer-options: "--optimize-autoloader --prefer-dist"
 

.github/workflows/continuous-integration.yml

@@ -14,7 +14,7 @@ env:
 jobs:
   phpunit:
     name: "PHP ${{ matrix.php }} using ${{ matrix.database }}"
-    runs-on: "ubuntu-18.04"
+    runs-on: "ubuntu-20.04"
     services:
       rabbitmq:
         image: rabbitmq:3-alpine
@@ -29,9 +29,9 @@ jobs:
       fail-fast: false
       matrix:
         php:
-          - "7.2"
-          - "7.3"
           - "7.4"
+          - "8.0"
+          - "8.1"
         database:
           - "sqlite"
           - "mysql"
@@ -39,7 +39,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v3"
         with:
           fetch-depth: 2
 
@@ -48,7 +48,7 @@ jobs:
         with:
           php-version: "${{ matrix.php }}"
           coverage: none
-          tools: pecl, composer:v1
+          tools: pecl, composer:2.2
           extensions: json, pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy
           ini-values: "date.timezone=Europe/Paris"
 
@@ -56,7 +56,7 @@ jobs:
         if: "${{ matrix.database == 'mysql' }}"
         run: |
           sudo systemctl start mysql.service
-          sudo mysql -u root -proot -e "CREATE DATABASE wallabag_test"
+          sudo mysql -u root -proot -h 127.0.0.1 -e "CREATE DATABASE wallabag_test"
 
       - name: "Setup PostgreSQL"
         if: "${{ matrix.database == 'pgsql' }}"
@@ -67,7 +67,7 @@ jobs:
           pg_isready -d wallabag_test -h localhost -p 5432 -U wallabag
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v1"
+        uses: "ramsey/composer-install@v2"
         with:
           composer-options: "--optimize-autoloader --prefer-dist"
 

.github/workflows/dependabot-automerge-js.yml

@@ -0,0 +1,25 @@
+name: Auto-merge Dependabot JS
+on: pull_request_target
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'dependabot[bot]' }}
+    steps:
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v1.3.4
+        with:
+          github-token: '${{ secrets.GITHUB_TOKEN }}'
+      - name: Approve and merge minor updates
+        if: ${{ steps.metadata.outputs.package-ecosystem == 'npm_and_yarn' && (steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.update-type == 'version-update:semver-patch') }}
+        run: |
+          gh pr review --approve "$PR_URL"
+          gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{ github.event.pull_request.html_url }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/translations.yml

@@ -7,33 +7,36 @@ on:
       - master
       - 2.*
 
+permissions:
+  contents: read
+
 jobs:
   translations:
     name: "Translations"
-    runs-on: "ubuntu-18.04"
+    runs-on: "ubuntu-20.04"
 
     strategy:
       matrix:
         php:
-          - "7.3"
+          - "7.4"
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v3"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
         with:
           coverage: "none"
           php-version: "${{ matrix.php }}"
-          tools: pecl, composer:v1
+          tools: pecl, composer:2.2
           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"
+        uses: "ramsey/composer-install@v2"
         with:
           composer-options: "--optimize-autoloader --prefer-dist"
 

.github/workflows/upload-release-package.yml

@@ -0,0 +1,39 @@
+name: "Upload release package"
+
+on:
+  release:
+    types:
+      - created
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        php:
+          - "7.4"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v3"
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          coverage: "none"
+          php-version: "${{ matrix.php }}"
+          tools: pecl, composer:2.2
+          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: Create the package
+        run: make release VERSION=${{ github.event.release.tag_name }}
+
+      - name: Upload the package to the release
+        uses: shogo82148/actions-upload-release-asset@v1
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: /tmp/wllbg-release/wallabag-${{ github.event.release.tag_name }}.tar.gz

.gitignore

@@ -15,6 +15,7 @@
 !/bin/symfony_requirements
 .php_cs.cache
 .phpunit.result.cache
+phpunit.xml
 
 # Parameters
 /app/config/parameters.yml
@@ -35,16 +36,15 @@ web/uploads/
 /build
 /coverage
 
+# Development
+docker/php/env
+
 # Composer PHAR
 /composer.phar
 
 # Data for wallabag
 data/db/wallabag*.sqlite
 
-# Docker container logs and data
-docker/logs/
-docker/data/
-
 # assets stuff
 node_modules/
 bin

.nvmrc

@@ -0,0 +1 @@
+16

.scrutinizer.yml

@@ -1,47 +0,0 @@
-filter:
-    paths:
-        - src/*
-    excluded_paths:
-        - 'vendor/*'
-        - 'app/*'
-        - 'var/*'
-        - 'web/*'
-        - 'src/Wallabag/*Bundle/Tests/*'
-        - '*Test.php'
-
-tools:
-    php_cs_fixer: true
-    php_analyzer: true
-    php_mess_detector: true
-    php_changetracking: true
-    php_code_sniffer: true
-    php_pdepend: true
-    sensiolabs_security_checker: true
-    #external_code_coverage:
-    #    timeout: 3600
-    php_code_coverage: true
-    php_sim: false
-    php_cpd: false
-
-checks:
-    php:
-        code_rating: true
-
-# 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:
-                override:
-                    - php-scrutinizer-run
-
-    dependencies:
-        override:
-            - npm install -g 'yarn'
-            - yarn install --force
-            - COMPOSER_MEMORY_LIMIT=-1 composer install -o --no-interaction --no-progress --prefer-dist

CHANGELOG.md

@@ -1,5 +1,139 @@
 # Changelog
 
+## [2.5.4](https://github.com/wallabag/wallabag/tree/2.5.4)
+   [Full Changelog](https://github.com/wallabag/wallabag/compare/2.5.3...2.5.4)
+
+### Security fixes
+* Fix adding tag to entries from other people by @j0k3r in https://github.com/wallabag/wallabag/pull/6290
+* Fix XSS on username on share page by @j0k3r in https://github.com/wallabag/wallabag/pull/6288
+* Fix CSRF on user deletion by @j0k3r in https://github.com/wallabag/wallabag/pull/6289
+
+### Meta
+* Fix release script by @j0k3r in https://github.com/wallabag/wallabag/pull/6275
+
+## [2.5.3](https://github.com/wallabag/wallabag/tree/2.5.3)
+   [Full Changelog](https://github.com/wallabag/wallabag/compare/2.5.2...2.5.3)
+
+### Security fixes
+* Fix GHSA-qwx8-mxxx-mg96 https://github.com/wallabag/wallabag/commit/0f7460dbab9e29f4f7d2944aca20210f828b6abb by @Kdecherf, thanks to @bAuh0lz
+* Fix GHSA-mrqx-mjc4-vfh3 https://github.com/wallabag/wallabag/commit/5ac6b6bff9e2e3a87fd88c2904ff3c6aac40722e by @Kdecherf, thanks to @bAuh0lz
+
+### Meta
+* Update deps before 2.5.3 by @j0k3r in https://github.com/wallabag/wallabag/pull/6241
+
+## [2.5.2](https://github.com/wallabag/wallabag/tree/2.5.2)
+   [Full Changelog](https://github.com/wallabag/wallabag/compare/2.5.1...2.5.2)
+
+### Fixes
+* Add `nbEntries` to the API tags list response by @j0k3r in https://github.com/wallabag/wallabag/pull/5984
+* Typofixes by @nexxai in https://github.com/wallabag/wallabag/pull/6004
+* Add `domain_name` to entries api endpoint by @yotamN in https://github.com/wallabag/wallabag/pull/6019
+* Add support to download SVG locally by @j0k3r in https://github.com/wallabag/wallabag/pull/5992
+
+### Meta
+* Automatically create the package after a release by @j0k3r in https://github.com/wallabag/wallabag/pull/5851
+* Add .gitattributes, exclude tests from archive by @iamvar in https://github.com/wallabag/wallabag/pull/5910
+* Allow auto merging of Dependabot JS minor or patch by @j0k3r in https://github.com/wallabag/wallabag/pull/6003
+* Fix random failing tests by @j0k3r in https://github.com/wallabag/wallabag/pull/6013
+
+## [2.5.1](https://github.com/wallabag/wallabag/tree/2.5.1)
+   [Full Changelog](https://github.com/wallabag/wallabag/compare/2.5.0...2.5.1)
+
+### Fixes
+- Jump to Node 16 to build assets by @j0k3r in https://github.com/wallabag/wallabag/pull/5822
+- Update some deps by @j0k3r in https://github.com/wallabag/wallabag/pull/5834
+- Fix error about template not found in 2fa form by @j0k3r in https://github.com/wallabag/wallabag/pull/5833
+- Translations update from Hosted Weblate by @weblate in https://github.com/wallabag/wallabag/pull/5846
+- material: fix "untagged entries" chip style by @Kdecherf in https://github.com/wallabag/wallabag/pull/5840
+
+## [2.5.0](https://github.com/wallabag/wallabag/tree/2.5.0)
+   [Full Changelog](https://github.com/wallabag/wallabag/compare/2.4.3...2.5.0)
+
+### Features
+
+- Add Delicious import by @j0k3r in https://github.com/wallabag/wallabag/pull/5022
+- Add route to list entries with annotations by @nicosomb in https://github.com/wallabag/wallabag/pull/4341
+- Add an option to sort the feed entries by `updated_at` by @agallou in https://github.com/wallabag/wallabag/pull/5659
+- Add support to download webp image locally by @j0k3r in https://github.com/wallabag/wallabag/pull/5687
+- Update readme and docker development env by @Kdecherf in https://github.com/wallabag/wallabag/pull/5662
+- Add action to assign a search as a tag to each result by @nicosomb in https://github.com/wallabag/wallabag/pull/5381
+- Drop PHP prior to 7.4 by @yguedidi in https://github.com/wallabag/wallabag/pull/5791
+
+### Deprecated features
+- Deprecate Baggy theme by @j0k3r in https://github.com/wallabag/wallabag/pull/5742
+- Deprecate mobi export by @Kdecherf in https://github.com/wallabag/wallabag/pull/5775
+
+### API
+
+- Add new endpoint for API: config by @nicosomb in https://github.com/wallabag/wallabag/pull/5673
+
+### Technical stuff
+
+- Fix test with `usinenouvelle.com` being flaky these times by @j0k3r in https://github.com/wallabag/wallabag/pull/5686
+- Replace `iconv()` calls with Transliterator by @Kdecherf in https://github.com/wallabag/wallabag/pull/5680
+- Composer 2.3 isn't compatible with wallabag by @j0k3r in https://github.com/wallabag/wallabag/pull/5708
+- CI workaround for PHP < 7.4 & MySQL 8 by @j0k3r in https://github.com/wallabag/wallabag/pull/5729
+- Set permissions for GitHub actions by @naveensrinivasan in https://github.com/wallabag/wallabag/pull/5732
+- Included githubactions in the dependabot config by @naveensrinivasan in https://github.com/wallabag/wallabag/pull/5737
+- Remove bundle inheritance by @yguedidi in https://github.com/wallabag/wallabag/pull/5746
+- Fix SQLite database location by @yguedidi in https://github.com/wallabag/wallabag/pull/5771
+- Disable XDebug in test make recipe by @yguedidi in https://github.com/wallabag/wallabag/pull/5770
+- Exclude local phpunit.xml by @yguedidi in https://github.com/wallabag/wallabag/pull/5757
+- Upgrade PHP dependencies by @yguedidi in https://github.com/wallabag/wallabag/pull/5778
+
+### Translations
+
+- Enabled greek translation by @nicosomb in https://github.com/wallabag/wallabag/pull/5656
+- Translations update from Hosted Weblate by @weblate see https://github.com/wallabag/wallabag/pulls?q=is%3Apr+author%3Aweblate+milestone%3A2.5.0+is%3Amerged
+
+### Fixes
+
+- Fix tagging rule match when user has a custom reading speed by @j0k3r in https://github.com/wallabag/wallabag/pull/5646
+- Feat/home entries updated by @Simounet in https://github.com/wallabag/wallabag/pull/5664
+- Fix row and card style regressions by @Simounet in https://github.com/wallabag/wallabag/pull/5676
+- Fix epub language by @j0k3r in https://github.com/wallabag/wallabag/pull/5647
+- material: improve mass buttons style, mostly for smartphone screens by @Kdecherf in https://github.com/wallabag/wallabag/pull/5695
+- Fix composer version in docker dev configuration by @nicosomb in https://github.com/wallabag/wallabag/pull/5715
+- Use site with subdomain as tagging rule example by @jonas-hagen in https://github.com/wallabag/wallabag/pull/5744
+- Fix PHP Docker image by @yguedidi in https://github.com/wallabag/wallabag/pull/5772
+
+## [2.4.3](https://github.com/wallabag/wallabag/tree/2.4.3)
+   [Full Changelog](https://github.com/wallabag/wallabag/compare/2.4.2...2.4.3)
+
+### Fixes
+* Tag view: order tags by label @Kdecherf in https://github.com/wallabag/wallabag/pull/5296
+* Pagination style updated by @Simounet in https://github.com/wallabag/wallabag/pull/5202
+* Improve performance of REST exists call by @Kdecherf in https://github.com/wallabag/wallabag/pull/5261
+* Make RSS feed entry links valid and accessible by @hennevogel in https://github.com/wallabag/wallabag/pull/5347
+* Fixed search on homepage by @nicosomb in https://github.com/wallabag/wallabag/pull/5379
+* Fixed timeout when assigning tags to entry by @nicosomb in https://github.com/wallabag/wallabag/pull/5156
+* Fixed reading time in epub/pdf exports by @nicosomb in https://github.com/wallabag/wallabag/pull/5405
+* Fix dark theme developper page by @Simounet in https://github.com/wallabag/wallabag/pull/5453
+* Fix dark mode background color for pre tags by @Kdecherf in https://github.com/wallabag/wallabag/pull/5465
+* Show when articles is read by @nicosomb in https://github.com/wallabag/wallabag/pull/5378
+* Added random button on article view by @nicosomb in https://github.com/wallabag/wallabag/pull/5380
+* Fixed wrong number of entries for tag feeds by @christianjunk in https://github.com/wallabag/wallabag/pull/5585
+* Add support for RTL content by @Monirzadeh in https://github.com/wallabag/wallabag/pull/5599
+* Avoid overlapping images when downloading them by @j0k3r in https://github.com/wallabag/wallabag/pull/5594
+
+### Meta
+* Fix/tests by @Simounet in https://github.com/wallabag/wallabag/pull/5217
+* dependabot: change schedule to check updates once a month by @Kdecherf in https://github.com/wallabag/wallabag/pull/5260
+* Update dependencies by @Kdecherf in https://github.com/wallabag/wallabag/pull/5326
+* Create SECURITY.md by @zidingz in https://github.com/wallabag/wallabag/pull/5406
+* Add build test on PHP 8.0 & 8.1 by @j0k3r in https://github.com/wallabag/wallabag/pull/5591
+* Fix Dependabot alerts for `tar` & `json-schema` by @j0k3r in https://github.com/wallabag/wallabag/pull/5541
+* Change the name of the static package's root directory by @oupala in https://github.com/wallabag/wallabag/pull/5542
+* Fixed unavailable russian website in test by @nicosomb in https://github.com/wallabag/wallabag/pull/5376
+* Update deps by @j0k3r in https://github.com/wallabag/wallabag/pull/5540
+
+### Translations
+* Translations update from Weblate by @weblate in https://github.com/wallabag/wallabag/pull/5187
+* Translations update from Weblate by @weblate in https://github.com/wallabag/wallabag/pull/5391
+* Add Czech language by @marapavelka in https://github.com/wallabag/wallabag/pull/5535
+* Translations update from Hosted Weblate by @weblate in https://github.com/wallabag/wallabag/pull/5580
+* Translations update from Hosted Weblate by @weblate in https://github.com/wallabag/wallabag/pull/5581
+
 ## [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)
 

CREDITS.md

@@ -1,3 +1,3 @@
-wallabag is mainly developed by [Nicolas Lœuillet](https://github.com/nicosomb), [@j0k3r](https://github.com/j0k3r) and [@tcitworld](https://github.com/tcitworld) under the MIT License.
+wallabag is mainly developed by [Nicolas Lœuillet](https://github.com/nicosomb), [@j0k3r](https://github.com/j0k3r), [@tcitworld](https://github.com/tcitworld) and [@Kdecherf](https://github.com/Kdecherf) under the MIT License.
 
 Thank you [to others contributors](https://github.com/wallabag/wallabag/graphs/contributors).

GNUmakefile

@@ -46,7 +46,7 @@ fixtures: ## Load fixtures into database
 	php bin/console doctrine:fixtures:load --no-interaction --env=test
 
 test: prepare fixtures ## Launch wallabag testsuite
-	bin/simple-phpunit -v
+	XDEBUG_MODE=off bin/simple-phpunit -v
 
 release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`).
 ifndef VERSION

README.md

@@ -1,20 +1,32 @@
-<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" />
+# wallabag
 
 ![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)
+![License](https://img.shields.io/github/license/wallabag/wallabag)
 
-# What is wallabag?
-wallabag is a self-hostable PHP application allowing you to not miss any content anymore.
-Click, save and read it when you can. It extracts content so that you can read it when you have time.
+wallabag is a web application allowing you to save web pages for later reading.
+Click, save and read it when you want. It extracts content so that you won't be distracted by pop-ups and cie.
 
-More information on our website: [wallabag.org](https://wallabag.org).
+You can install it on your own server, or you can create an account on [wallabag.it](https://wallabag.it).
 
-If you do not have your own server, consider [the wallabag.it hosting solution](https://wallabag.it).
+![wallabag](./.github/images/screenshot.png)
+
+* Website: [wallabag.org](https://wallabag.org)
+* Android app: [wallabag/android-app](https://github.com/wallabag/android-app)
+* iOS app: [wallabag/ios-app](https://github.com/wallabag/ios-app)
+* Browser extension: [wallabag/wallabagger](https://github.com/wallabag/wallabagger)
+
+## Documentation
+
+The documentation is available at https://doc.wallabag.org.
+
+You can contribute to it through its dedicated repository, available here: https://github.com/wallabag/doc.
+
+## Installation
 
-# 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:
@@ -26,16 +38,24 @@ cd wallabag && make install
 
 Now, [configure a virtual host](https://doc.wallabag.org/en/admin/installation/virtualhosts.html) to use your wallabag.
 
-# Run on YunoHost
-[![Install Wallabag with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=wallabag2)
+### Other methods
 
-Wallabag app for [YunoHost](https://yunohost.org). See [here](https://github.com/YunoHost-Apps/wallabag2_ynh)
+Refer to the [installation documentation](https://doc.wallabag.org/en/admin/installation/installation.html) for other installation methods.
 
-# Translate wallabag
+## Translation
 
-[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/)!
+This project uses [Weblate](https://weblate.org/) for translation.
 
-# License
+Feel free to help us [translating wallabag](https://hosted.weblate.org/projects/wallabag/).
+
+## Contributing
+
+To learn more about developing wallabag, please refer to the [contribution guide](./.github/CONTRIBUTING.md).
+
+Content extraction relies on [Graby](https://github.com/j0k3r/graby), [php-readability](https://github.com/j0k3r/php-readability) and [ftr-site-config](https://github.com/fivefilters/ftr-site-config).
+
+## License
 Copyright © 2013-current Nicolas Lœuillet <nicolas@loeuillet.org>
+
 This work is free. You can redistribute it and/or modify it under the
-terms of the MIT License. See the COPYING file for more details.
+terms of the MIT License. See the [COPYING.md](./COPYING.md) file for more details.

RELEASE_PROCESS.md

@@ -16,13 +16,7 @@ During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE` (li
 
 #### Create a new release on GitHub
 
-- Run this command to create the package:
-
-```
-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).
+- [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).
 - 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)
@@ -38,7 +32,7 @@ be locally specified in `composer.lock`:
 ```json
     "config": {
         "platform": {
-            "php": "7.1.3",
+            "php": "7.4.29",
             "ext-something": "4.0"
         }
     }

SECURITY.md

@@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+Please report security issues to `hello@wallabag.org`

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

@@ -1,12 +1,12 @@
 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
+unmark_url: Adresa URL Unmark, pokud je služba povolena
+scuttle_url: Adresa URL Scuttle, pokud je služba povolena
+shaarli_url: Adresa URL Shaarli, 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_mail: Povolit sdílení e-mailem
 share_diaspora: Povolit sdílení na diaspora*
 export_xml: Povolit export do XML
 export_txt: Povolit export do TXT
@@ -15,7 +15,26 @@ 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
+diaspora_url: Adresa URL diaspora*, pokud je služba povolena
+carrot: Povolit sdílení na Carrot
 download_pictures: Stáhnout obrázky na váš server
-settings_changed: Nastavení bylo aktualizováno
+settings_changed: Konfigurace byla aktualizována
+shaarli_share_origin_url: Povolit sdílení původní adresy URL na Shaarli, pokud je služba povolena
+store_article_headers: Povolit, pokud Wallabag ukládá záhlaví HTTP pro každý článek
+api_user_registration: Zapnout registraci uživatelů prostřednictvím API
+restricted_access: Povolit ověřování pro placené webové stránky
+download_images_enabled: Stahovat obrázky místně
+share_public: Povolit veřejné adresy URL pro položky
+demo_mode_username: Ukázkový uživatel
+demo_mode_enabled: Povolit ukázkový režim (Používá se pouze pro veřejnou ukázku Wallabag)
+matomo_site_id: ID vaší webové stránky na Matomo
+matomo_host: Hostitel vaší webové stránky na Matomo (bez http:// nebo https://)
+modify_settings: použít
+misc: různé
+import: import
+export: export
+entry: článek
+wallabag_support_url: Adresa URL pro podporu Wallabag
+show_printlink: Zobrazit odkaz pro vytištění obsahu
+import_with_redis: Povolit Redis pro asynchronní import dat
+import_with_rabbitmq: Povolit RabbitMQ pro asynchronní import dat

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

@@ -3,7 +3,7 @@ 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
-export_mobi: Enable .mobi export
+export_mobi: Enable .mobi export (deprecated, will be removed soon)
 export_pdf: Enable PDF export
 export_csv: Enable CSV export
 export_json: Enable JSON export

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

@@ -3,7 +3,7 @@ download_pictures: Télécharger les images sur le serveur
 carrot: Activer le partage vers Carrot
 diaspora_url: URL de diaspora*, si le service est activé
 export_epub: Activer l'export ePub
-export_mobi: Activer l'export .mobi
+export_mobi: Activer l'export .mobi (déprécié, sera supprimé prochainement)
 export_pdf: Activer l'export PDF
 export_csv: Activer l'export CSV
 export_json: Activer l'export JSON

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

@@ -32,7 +32,7 @@ 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_mobi: Activar exportación .mobi (xa non se usa, vai ser eliminada)
 export_epub: Activar exportación ePub
 diaspora_url: URL de diaspora*, se o servizo está activo
 carrot: Activar compartir en Carrot

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

@@ -18,7 +18,7 @@ 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
+export_mobi: Aktiviraj .mobi izvoz (zastarjelo, uskoro će se ukloniti)
 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

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.id.yml

@@ -0,0 +1,40 @@
+export_txt: Aktifkan pengeksporan TXT
+export_json: Aktifkan pengeksporan JSON
+export_csv: Aktifkan pengeksporan CSV
+export_pdf: Aktifkan pengeksporan PDF
+export_mobi: Aktifkan pengeksporan .mobi
+export_epub: Aktifkan pengeksporan ePub
+diaspora_url: URL diaspora*, jika layanan diaktifkan
+carrot: Aktifkan bagikan ke Carrot
+settings_changed: Konfigurasi diperbarui
+share_unmark: Aktifkan berbagi ke Unmark.it
+shaarli_share_origin_url: Aktifkan berbagi URL asal ke Shaarli, jika layanan diaktifkan
+share_public: Izinkan URL publik untuk entri
+share_scuttle: Aktifkan berbagi ke Scuttle
+restricted_access: Aktifkan otentikasi untuk situs web berbayar
+share_twitter: Aktifkan berbagi ke Twitter
+demo_mode_enabled: Aktifkan mode demo? (Hanya digunakan untuk demo wallabag publik)
+download_images_enabled: Unduh gambar secara lokal
+store_article_headers: Aktifkan jika wallabag menyimpan header HTTP untuk setiap artikel
+api_user_registration: Aktifkan pendaftaran pengguna melalui API
+demo_mode_username: Pengguna demo
+scuttle_url: Scuttle URL, jika layanan diaktifkan
+download_pictures: Unduh gambar ke server Anda
+export_xml: Aktifkan ekspor XML
+import_with_rabbitmq: Aktifkan RabbitMQ untuk mengimpor data secara asinkron
+import_with_redis: Aktifkan Redis untuk mengimpor data secara asinkron
+shaarli_url: URL Shaarli, jika layanan diaktifkan
+unmark_url: Unmark URL, jika layanan diaktifkan
+share_diaspora: Aktifkan berbagi ke diaspora*
+share_mail: Aktifkan berbagi melalui email
+share_shaarli: Aktifkan berbagi ke Shaarli
+show_printlink: Tampilkan tautan untuk mencetak konten
+wallabag_support_url: URL dukungan untuk wallabag
+entry: artikel
+export: ekspor
+import: impor
+misc: lainnya
+modify_settings: terapkan
+matomo_host: Host situs web Anda di Matomo (tanpa http:// atau https://)
+matomo_site_id: ID situs web Anda di Matomo
+matomo_enabled: Aktifkan Matomo

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

@@ -1,18 +1,18 @@
 download_pictures: Scarica le immagini sul tuo server
-carrot: Abilita la condivisione con Carrot
+carrot: Abilita condivisione con Carrot
 diaspora_url: URL di diaspora*, se il servizio è abilitato
 export_epub: Abilita esportazione ePub
-export_mobi: Abilita esportazione .mobi
+export_mobi: Abilita esportazione .mobi (deprecato, verrà rimosso presto)
 export_pdf: Abilita esportazione PDF
 export_csv: Abilita esportazione CSV
 export_json: Abilita esportazione JSON
 export_txt: Abilita esportazione TXT
 export_xml: Abilita esportazione XML
-shaarli_url: Shaarli URL, se il servizio è abilitato
-scuttle_url: Scuttle URL, se il servizio è abilitato
-unmark_url: Unmark URL, se il servizio è abilitato
+shaarli_url: URL Shaarli, se il servizio è abilitato
+scuttle_url: URL Scuttle, se il servizio è abilitato
+unmark_url: URL Unmark, se il servizio è abilitato
 share_diaspora: Abilita la condivisione con diaspora*
-share_mail: Abilita la condivisione per e-mail
+share_mail: Abilita la condivisione via e-mail
 share_shaarli: Abilita la condivisione con Shaarli
 share_scuttle: Abilita la condivisione con Scuttle
 share_twitter: Abilita la condivisione con Twitter

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

@@ -3,7 +3,7 @@ download_pictures: サーバー上の画像をダウンロード
 carrot: Carrot への共有を有効にする
 diaspora_url: diaspora* URL、サービスが有効になっている場合
 export_epub: ePub のエクスポートを有効にする
-export_mobi: .mobi のエクスポートを有効にする
+export_mobi: .mobi のエクスポートを有効にする（非推奨、近日中に削除されます）
 export_pdf: PDF のエクスポートを有効にする
 export_csv: CSV のエクスポートを有効にする
 export_json: JSON のエクスポートを有効にする

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

@@ -1 +1,40 @@
-{}
+download_pictures: 서버로 이미지를 다운로드
+shaarli_share_origin_url: Shaarli에서 원래 URL 공유 활성화 (서비스가 활성화 된 경우)
+store_article_headers: Wallabag이 각 기사에 대한 HTTP 헤더를 저장하는 경우 활성화
+api_user_registration: API를 통해 사용자 등록 활성화
+restricted_access: 유료 웹 사이트에 대한 인증 활성화
+download_images_enabled: 이미지를 로컬로 다운로드
+share_public: 항목의 공개 URL 허용
+demo_mode_username: 데모 사용자
+demo_mode_enabled: 데모 모드를 사용 하시겠습니까? (공개 Wallabag 데모에만 사용됨)
+matomo_enabled: Matomo 활성화
+matomo_site_id: Matomo 웹 사이트 ID
+matomo_host: Matomo 웹 사이트의 호스트 (http:// 또는 https:// 없음)
+modify_settings: 적용
+misc: 기타
+import: 가져오기
+export: 내보내기
+entry: 기사
+wallabag_support_url: Wallabag 지원 URL
+show_printlink: 콘텐츠 인쇄 링크 표시
+share_unmark: Unmark.it 공유 활성화
+diaspora_url: Diaspora* URL (서비스가 활성화 된 경우)
+share_scuttle: Scuttle 공유 활성화
+share_shaarli: Shaarli 공유 활성화
+share_mail: 이메일 공유 활성화
+share_diaspora: Diaspora* 공유 활성화
+share_twitter: Twitter 공유 활성화
+unmark_url: Unmark URL (서비스가 활성화 된 경우)
+scuttle_url: Scuttle URL (서비스가 활성화 된 경우)
+shaarli_url: Shaarli URL (서비스가 활성화 된 경우)
+import_with_redis: Redis가 데이터를 비동기적으로 가져오도록 설정
+import_with_rabbitmq: RabbitMQ가 데이터를 비동기적으로 가져오도록 설정
+export_xml: XML 내보내기 활성화
+export_txt: TXT 내보내기 활성화
+export_json: JSON 내보내기 활성화
+export_csv: CSV 내보내기 활성화
+export_pdf: PDF 내보내기 활성화
+export_mobi: .mobi 내보내기 활성화
+export_epub: ePub 내보내기 활성화
+carrot: Carrot에 공유 활성화
+settings_changed: 설정을 업데이트했습니다

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.lt.yml

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

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

@@ -3,7 +3,7 @@ download_pictures: Pobierz obrazy na swój serwer
 carrot: Włącz udostępnianie dla Carrot
 diaspora_url: Adres URL Diaspora, jeżeli usługa jest włączona
 export_epub: Włącz eksport do ePub
-export_mobi: Włącz eksport do .mobi
+export_mobi: Włącz eksport do plików .mobi (przestarzałe, zostanie wkrótce usunięte)
 export_pdf: Włącz eksport do PDF
 export_csv: Włącz eksport do CSV
 export_json: Włącz eksport do JSON
@@ -29,13 +29,12 @@ 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łą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
+demo_mode_enabled: Włączyć tryb demonstracyjny? (Używany wyłącznie do 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 za paywallem
 api_user_registration: Włącz rejestrację użytkownika przy użyciu API
 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
+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 oryginalnego adresu URL do Shaarli, jeśli usługa jest włączona

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

@@ -1,4 +1,4 @@
-download_pictures: Download imagens no seu servidor
+download_pictures: Descarregar imagens ao seu servidor
 carrot: Habilitar compartilhamento para o Carrot
 diaspora_url: URL de diaspora* caso o serviço esteja ativado
 export_epub: Habilita exportação para ePub

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

@@ -1,25 +1,25 @@
 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
+carrot: Carrot'a paylaşımı etkinleştir
+diaspora_url: hizmet etkinse diaspora* URL'si
+export_epub: ePub dışa aktarımını etkinleştir
+export_mobi: .mobi dışa aktarımını etkinleştir (kullanım dışı, yakında kaldırılacak)
+export_pdf: PDF dışa aktarımını etkinleştir
+export_csv: CSV dışa aktarımını etkinleştir
+export_json: JSON dışa aktarımını etkinleştir
+export_txt: TXT dışa aktarımını etkinleştir
+export_xml: XML dışa aktarımını etkinleştir
+import_with_rabbitmq: Verileri eşzamansız olarak içe aktarmak için RabbitMQ'yu etkinleştir
+import_with_redis: Verileri eşzamansız olarak içe aktarmak için Redis'i etkinleştir
+shaarli_url: Hizmet etkinse Shaarli URL'si
+scuttle_url: Hizmet etkinse Scuttle URL'si
+unmark_url: Hizmet etkinse Unmark URL'si
+share_diaspora: diaspora*'ya paylaşımı etkinleştir
+share_mail: E-posta ile paylaşımı etkinleştir
+share_shaarli: Shaarli'ye paylaşımı etkinleştir
+share_scuttle: Scuttle'a paylaşımı etkinleştir
+share_twitter: Twitter'a paylaşımı etkinleştir
+share_unmark: Unmark.it'e paylaşımı etkinleş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
@@ -29,12 +29,12 @@ 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)
+matomo_enabled: Matomo'yu etkinleştir
+demo_mode_enabled: Demo mod etkinleştirilsin mi (Yalnızca herkese açık wallabag demoları için kullanılır)
 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)
+restricted_access: Ödeme ile erişim sağlanabilen siteler için kimlik doğrulamayı etkinleştir
+api_user_registration: API aracılığıyla kullanıcı kaydını aç
+store_article_headers: Eğer wallabag her makale için HTTP üst bilgilerini saklıyorsa etkinleştirin
+shaarli_share_origin_url: Hizmet etkinse, orijinal URL'yi Shaarli'ye paylaşmayı etkinleştir

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.zh.yml

@@ -3,7 +3,7 @@ download_pictures: 在你的服务器上缓存图片
 carrot: 启用分享到 Carrot
 diaspora_url: diaspora* 链接，如果该服务已被启用
 export_epub: 启用 ePub 导出
-export_mobi: 启用 .mobi 导出
+export_mobi: 启用 .mobi 导出（已废弃，不久后将移除）
 export_pdf: 启用 PDF 导出
 export_csv: 启用 CSV 导出
 export_json: 启用 JSON 导出
@@ -26,15 +26,15 @@ entry: "文章"
 export: "导出"
 import: "导入"
 misc: "杂项"
-modify_settings: "申请"
+modify_settings: "应用"
 matomo_host: 你的网站在 Matomo 的主机名（不包括 http:// or https://）
 matomo_site_id: 你的网站在 Matomo 的 ID
 matomo_enabled: 启用 Matomo
 demo_mode_enabled: "启用演示模式？(仅用于 wallabag 公开演示)"
-demo_mode_username: "Demo user"
+demo_mode_username: "Demo 用户名"
 share_public: 允许为项目启用公开链接
 download_images_enabled: 在本地缓存图片
 restricted_access: 启用针对带有付费墙网站的认证
 api_user_registration: 允许新用户通过 API 注册
 store_article_headers: 让 wallabag 存储每篇文章的 HTTP header
-shaarli_share_origin_url: 选择分享原始链接到 Shaarli，如果该服务已被启用
+shaarli_share_origin_url: 如果启用了服务，则将原始链接分享到 Shaarli

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

@@ -1 +1,5 @@
-{}
+download_pictures: 下載圖片至你的服務器上
+diaspora_url: diaspora* URL(如果該服務已啟用)
+settings_changed: 已更新設定
+export_epub: 啟用 ePub 輸出
+carrot: 啟用分享至 Carrot

app/Resources/static/themes/_global/global.scss

@@ -5,9 +5,9 @@
 .material-icons.md-48 { font-size: 48px; }
 
 /* Rules for using icons as black on a light background. */
-.material-icons.md-dark { color: rgba(0, 0, 0, 0.54); }
-.material-icons.md-dark.md-inactive { color: rgba(0, 0, 0, 0.26); }
+.material-icons.md-dark { color: rgb(0 0 0 / 54%); }
+.material-icons.md-dark.md-inactive { color: rgb(0 0 0 / 26%); }
 
 /* Rules for using icons as white on a dark background. */
-.material-icons.md-light { color: rgba(255, 255, 255, 1); }
-.material-icons.md-light.md-inactive { color: rgba(255, 255, 255, 0.3); }
+.material-icons.md-light { color: rgb(255 255 255 / 100%); }
+.material-icons.md-light.md-inactive { color: rgb(255 255 255 / 30%); }

app/Resources/static/themes/_global/img/icons/Diaspora-asterisk.svg

@@ -1,67 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="800"
-   height="770"
-   id="svg4004"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="New document 11">
-  <defs
-     id="defs4006" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.7"
-     inkscape:cx="359.23155"
-     inkscape:cy="349.10374"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1631"
-     inkscape:window-height="1026"
-     inkscape:window-x="49"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata4009">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(21.42857,-101.6479)">
-    <image
-       y="101.6479"
-       x="-21.42857"
-       id="image4071"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAMCCAYAAACRFKJVAAAABHNCSVQICAgIfAhkiAAAIABJREFU
+<svg height="770" width="800" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g transform="translate(21.42857 -101.6479)"><image height="770" width="800" x="-21.42857" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAMCCAYAAACRFKJVAAAABHNCSVQICAgIfAhkiAAAIABJREFU
 eJzt3e2VVEeWLuCXu/r/ZFswiQU3sUApC7qwQGDBgAUqLICxAGQB1RYorwUqD5QeqDyo+yPIJkVS
 ReXHORFxzvOsxWK6B1TRiDoZ79k7djy7v78PAADAGP5P7QUAAADzIYAAAACjEUAAAIDRCCAAAMBo
 BBAAAGA0AggAADAaAQQAABiNAAIAAIxGAAEAAEYjgAAAAKMRQAAAgNH845hf/OzZs6HWATCEV0l+
@@ -321,14 +258,4 @@ AMNRAQEAvuvMau4i5TzI6ke/8AnepcKN5vZIMAwBBAD4rgu0k65S7gc51a6quzl3IaewR4JhaMEC
 AIZym9PHgW+SPE+l8AEMRwUEAPiuCw7UOHY079tc/gzJ0eyRYBgCCADwXRcMIIskf375+THblJar
 JsaI2yPBMLRgAQBD243PfcxNTrhAFeiPAAIAjOGh0by7cDLGBYZAA7RgAQDfNcClqt+O5r1NCR9N
 Vj3skWAYKiAAwFj2W7E+Jfk5jYYPYDgqIADAdw1QAdlZphw4b5o9EgxDAAEAAEajBQsAABiNAAIA
-AIxGAAEAAEYjgAAAAKMRQAAAgNEIIAAAwGj+P10o1H/ia8mRAAAAAElFTkSuQmCC
-"
-       height="770"
-       width="800" />
-    <path
-       style="fill:#FFF"
-       d="m 482.45517,806.8979 c -21.575,-30.1125 -55.23748,-77.12866 -74.80551,-104.48035 -19.98598,-27.9359 -36.2457,-49.73896 -37.10125,-49.75 -0.87914,-0.0113 -32.32337,42.25713 -74.37706,99.98035 -40.06973,55 -73.18741,100 -73.59485,100 -1.1396,0 -144.46068,-100.94983 -144.829571,-102.01235 -0.178476,-0.51406 32.221521,-48.07611 72.000001,-105.69344 39.77847,-57.61732 72.3245,-105.66675 72.3245,-106.77649 0,-1.78957 -12.89022,-6.31508 -114,-40.0232 -62.7,-20.90302 -114.613999,-38.24519 -115.364443,-38.53815 -1.043816,-0.4075 4.925559,-20.38013 25.402971,-84.99452 14.722078,-46.45402 27.100359,-84.84113 27.507293,-85.3047 0.406933,-0.46357 54.900599,16.97442 121.097029,38.75107 66.19643,21.77666 120.91108,39.59345 121.5881,39.59285 0.67702,-5.9e-4 1.44284,-1.01357 1.70181,-2.25107 0.25898,-1.2375 0.83006,-57.6 1.26906,-125.25 0.439,-67.65 1.16224,-123.5625 1.6072,-124.25 0.63709,-0.98436 19.23178,-1.24675 87.5,-1.23469 47.68004,0.008 87.18776,0.34593 87.79493,0.75 0.76529,0.50931 2.07325,37.70117 4.26357,121.23469 3.5965,137.16189 3.67401,139 5.86123,139 0.84816,0 53.3106,-17.56056 116.58321,-39.02347 63.2726,-21.46291 115.34958,-38.67541 115.72663,-38.25 1.27822,1.44219 53.1745,170.39371 52.53554,171.03267 -0.34901,0.34901 -53.15524,18.43347 -117.34717,40.18769 -88.30357,29.92548 -116.78951,39.96068 -117.02855,41.22754 -0.17651,0.93542 30.19001,46.31568 68.80279,102.8201 38.0153,55.63011 68.97925,101.56053 68.80877,102.06759 -0.39157,1.16463 -142.63129,105.93788 -143.82081,105.93788 -0.48298,0 -18.53042,-24.6375 -40.10542,-54.75 z"
-       id="path4093"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
+AIxGAAEAAEYjgAAAAKMRQAAAgNEIIAAAwGj+P10o1H/ia8mRAAAAAElFTkSuQmCC" y="101.6479"/><path d="m482.45517 806.8979c-21.575-30.1125-55.23748-77.12866-74.80551-104.48035-19.98598-27.9359-36.2457-49.73896-37.10125-49.75-.87914-.0113-32.32337 42.25713-74.37706 99.98035-40.06973 55-73.18741 100-73.59485 100-1.1396 0-144.46068-100.94983-144.829571-102.01235-.178476-.51406 32.221521-48.07611 72.000001-105.69344 39.77847-57.61732 72.3245-105.66675 72.3245-106.77649 0-1.78957-12.89022-6.31508-114-40.0232-62.7-20.90302-114.613999-38.24519-115.364443-38.53815-1.043816-.4075 4.925559-20.38013 25.402971-84.99452 14.722078-46.45402 27.100359-84.84113 27.507293-85.3047.406933-.46357 54.900599 16.97442 121.097029 38.75107 66.19643 21.77666 120.91108 39.59345 121.5881 39.59285.67702-.00059 1.44284-1.01357 1.70181-2.25107.25898-1.2375.83006-57.6 1.26906-125.25s1.16224-123.5625 1.6072-124.25c.63709-.98436 19.23178-1.24675 87.5-1.23469 47.68004.008 87.18776.34593 87.79493.75.76529.50931 2.07325 37.70117 4.26357 121.23469 3.5965 137.16189 3.67401 139 5.86123 139 .84816 0 53.3106-17.56056 116.58321-39.02347 63.2726-21.46291 115.34958-38.67541 115.72663-38.25 1.27822 1.44219 53.1745 170.39371 52.53554 171.03267-.34901.34901-53.15524 18.43347-117.34717 40.18769-88.30357 29.92548-116.78951 39.96068-117.02855 41.22754-.17651.93542 30.19001 46.31568 68.80279 102.8201 38.0153 55.63011 68.97925 101.56053 68.80877 102.06759-.39157 1.16463-142.63129 105.93788-143.82081 105.93788-.48298 0-18.53042-24.6375-40.10542-54.75z" fill="#fff"/></g></svg>

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

@@ -1,5 +1,4 @@
-top['bookmarklet-url@wallabag.org'] =
-    '<!DOCTYPE html><html><head><title>bag it!</title>' +
-    '<link rel="icon" href="tpl/img/favicon.ico" />' +
-    '</head><body><script>window.onload=function(){window.setTimeout' +
-    '(function(){history.back();},250);};</script></body></html>';
+top['bookmarklet-url@wallabag.org'] = '<!DOCTYPE html><html><head><title>bag it!</title>'
+    + '<link rel="icon" href="tpl/img/favicon.ico" />'
+    + '</head><body><script>window.onload=function(){window.setTimeout'
+    + '(function(){history.back();},250);};</script></body></html>';

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

@@ -1,8 +1,8 @@
 import 'highlight.js/styles/atom-one-light.css';
-import * as hljs from 'highlight.js';
+import hljs from 'highlight.js';
 
 window.addEventListener('load', () => {
-  document.querySelectorAll('pre').forEach((node) => {
-    hljs.highlightBlock(node);
+  document.querySelectorAll('pre').forEach((element) => {
+    hljs.highlightElement(element);
   });
 });

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

@@ -112,7 +112,7 @@ blockquote::before,
 blockquote::after,
 q::before,
 q::after {
-  content: '';
+  content: "";
   content: none;
 }
 
@@ -300,8 +300,6 @@ dl dt {
   overflow: hidden;
   clear: left;
   text-align: right;
-  -ms-text-overflow: ellipsis;
-  -o-text-overflow: ellipsis;
   text-overflow: ellipsis;
   white-space: nowrap;
   font-weight: bold;
@@ -314,8 +312,6 @@ dl dd {
 }
 
 pre {
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
   box-sizing: border-box;
   margin: 4em 0;
   border: 0.0625em solid #efefef;
@@ -378,7 +374,7 @@ thead tr {
 }
 
 tbody tr:nth-child(2n+1) {
-  background: rgba(0, 0, 0, 0.1);
+  background: rgb(0 0 0 / 10%);
 }
 
 tbody {

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

@@ -1,4 +1,3 @@
-
 #article {
   width: 70%;
   margin-bottom: 3em;
@@ -159,7 +158,7 @@ pre code {
     text-transform: uppercase;
     text-decoration: none;
     font-weight: 400;
-    font-family: PT Sans, sans-serif;
+    font-family: "PT Sans", sans-serif;
     transition: all 0.5s ease;
   }
 }

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

@@ -1,4 +1,3 @@
-
 ::selection {
   color: #fff;
   background-color: #000;
@@ -60,9 +59,9 @@ form input[type="email"] {
   color: #666;
 }
 
-@media screen and (-webkit-min-device-pixel-ratio: 0) {
+@media screen {
   select {
-    -webkit-appearance: none;
+    appearance: none;
     border-radius: 0;
     background: #fff url("../../_global/img/bg-select.png") no-repeat right center;
   }
@@ -109,10 +108,6 @@ input[type="submit"]:hover,
 input[type="submit"]:focus {
   background-color: #fff;
   color: #000;
-  -webkit-transition: all 0.5s ease;
-  -moz-transition: all 0.5s ease;
-  -ms-transition: all 0.5s ease;
-  -o-transition: all 0.5s ease;
   transition: all 0.5s ease;
 }
 
@@ -148,7 +143,7 @@ h2::after {
   background-color: #333;
   padding-top: 9.5em;
   height: 100%;
-  box-shadow: inset -4px 0 20px rgba(0, 0, 0, 0.6);
+  box-shadow: inset -4px 0 20px rgb(0 0 0 / 60%);
   z-index: 15;
 
   > li > a {

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

@@ -1,13 +1,13 @@
 /* Style */
-@import 'guide';
-@import 'layout';
-@import 'article';
-@import 'pictos';
-@import 'login';
-@import 'save';
-@import 'messages';
+@import "guide";
+@import "layout";
+@import "article";
+@import "pictos";
+@import "login";
+@import "save";
+@import "messages";
 
 /* Tools */
-@import 'media_queries';
-@import 'print';
-@import 'ratatouille';
+@import "media_queries";
+@import "print";
+@import "ratatouille";

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

@@ -40,7 +40,7 @@ footer {
   display: inline-block;
   margin: 0 5px;
   padding: 5px 12px;
-  background-color: rgba(0, 0, 0, 0.6);
+  background-color: rgb(0 0 0 / 60%);
   border-radius: 3px;
   max-height: 2em;
   overflow: hidden;
@@ -78,7 +78,7 @@ footer {
 .entry {
   background-color: #fff;
   letter-spacing: normal;
-  box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+  box-shadow: 0 3px 7px rgb(0 0 0 / 30%);
   display: inline-block;
   width: 32%;
   margin-bottom: 1.5em;
@@ -120,7 +120,7 @@ footer {
   }
 
   &:hover {
-    box-shadow: 0 3px 10px rgba(0, 0, 0, 1);
+    box-shadow: 0 3px 10px rgb(0 0 0 / 100%);
 
     &::after {
       height: 40px;
@@ -219,7 +219,7 @@ footer {
     li {
       margin: 10px 10px 10px auto;
       padding: 5px 12px 5px 25px;
-      background-color: rgba(0, 0, 0, 0.6);
+      background-color: rgb(0 0 0 / 60%);
       border-radius: 0 3px 3px 0;
       color: #fff;
       cursor: default;

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

@@ -9,7 +9,7 @@
   form {
     background-color: #fff;
     padding: 1.5em;
-    box-shadow: 0 1px 8px rgba(0, 0, 0, 0.9);
+    box-shadow: 0 1px 8px rgb(0 0 0 / 90%);
     width: 20em;
     position: absolute;
     top: 8em;

app/Resources/static/themes/baggy/css/main.css

@@ -30,7 +30,7 @@ body {
 .login form {
   background-color: #fff;
   padding: 1.5em;
-  box-shadow: 0 1px 8px rgba(0, 0, 0, 0.9);
+  box-shadow: 0 1px 8px rgb(0 0 0 / 90%);
   width: 20em;
   position: absolute;
   top: 8em;
@@ -110,9 +110,9 @@ form input[type="email"] {
   color: #666;
 }
 
-@media screen and (-webkit-min-device-pixel-ratio: 0) {
+@media screen and (min-device-pixel-ratio: 0) {
   select {
-    -webkit-appearance: none;
+    appearance: none;
     border-radius: 0;
     background: #fff url("../../_global/img/bg-select.png") no-repeat right center;
   }
@@ -157,10 +157,6 @@ input[type="submit"]:hover,
 input[type="submit"]:focus {
   background-color: #fff;
   color: #000;
-  -webkit-transition: all 0.5s ease;
-  -moz-transition: all 0.5s ease;
-  -ms-transition: all 0.5s ease;
-  -o-transition: all 0.5s ease;
   transition: all 0.5s ease;
 }
 
@@ -196,7 +192,7 @@ h2::after {
   background-color: #333;
   padding-top: 9.5em;
   height: 100%;
-  box-shadow: inset -4px 0 20px rgba(0, 0, 0, 0.6);
+  box-shadow: inset -4px 0 20px rgb(0 0 0 / 60%);
   z-index: 15;
 }
 
@@ -217,10 +213,6 @@ h2::after {
   text-decoration: none;
   font-weight: normal;
   font-family: "PT Sans", sans-serif;
-  -webkit-transition: all 0.5s ease;
-  -moz-transition: all 0.5s ease;
-  -ms-transition: all 0.5s ease;
-  -o-transition: all 0.5s ease;
   transition: all 0.5s ease;
 }
 
@@ -365,7 +357,7 @@ footer a {
 .card-entry-labels li {
   margin: 10px 10px 10px auto;
   padding: 5px 12px 5px 25px;
-  background-color: rgba(0, 0, 0, 0.6);
+  background-color: rgb(0 0 0 / 60%);
   border-radius: 0 3px 3px 0;
   color: #fff;
   cursor: default;
@@ -387,7 +379,7 @@ footer a {
   display: inline-block;
   margin: 0 5px;
   padding: 5px 12px;
-  background-color: rgba(0, 0, 0, 0.6);
+  background-color: rgb(0 0 0 / 60%);
   border-radius: 3px;
   max-height: 2em;
   overflow: hidden;
@@ -425,7 +417,7 @@ footer a {
 .entry {
   background-color: #fff;
   letter-spacing: normal;
-  box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+  box-shadow: 0 3px 7px rgb(0 0 0 / 30%);
   display: inline-block;
   width: 32%;
   margin-bottom: 1.5em;
@@ -448,10 +440,6 @@ footer a {
   bottom: 0.3em;
   z-index: 10;
   right: 1.5em;
-  -webkit-transition: all 0.5s ease;
-  -moz-transition: all 0.5s ease;
-  -ms-transition: all 0.5s ease;
-  -o-transition: all 0.5s ease;
   transition: all 0.5s ease;
 }
 
@@ -463,15 +451,11 @@ footer a {
   bottom: 0;
   left: 0;
   background-color: #000;
-  -webkit-transition: all 0.5s ease;
-  -moz-transition: all 0.5s ease;
-  -ms-transition: all 0.5s ease;
-  -o-transition: all 0.5s ease;
   transition: all 0.5s ease;
 }
 
 .entry:hover {
-  box-shadow: 0 3px 10px rgba(0, 0, 0, 1);
+  box-shadow: 0 3px 10px rgb(0 0 0 / 100%);
 }
 
 .entry:hover::after {
@@ -501,10 +485,6 @@ footer a {
   text-decoration: none;
   color: #000;
   word-wrap: break-word;
-  -webkit-transition: all 0.5s ease;
-  -moz-transition: all 0.5s ease;
-  -ms-transition: all 0.5s ease;
-  -o-transition: all 0.5s ease;
   transition: all 0.5s ease;
 }
 
@@ -537,10 +517,6 @@ img.preview {
   z-index: 10;
   padding-right: 0.5em;
   text-align: right;
-  -webkit-transition: all 0.5s ease;
-  -moz-transition: all 0.5s ease;
-  -ms-transition: all 0.5s ease;
-  -o-transition: all 0.5s ease;
   transition: all 0.5s ease;
 }
 
@@ -626,7 +602,7 @@ div.pagination ul .current {
   ========================================================================== */
 
 .popup-form {
-  background: rgba(0, 0, 0, 0.5);
+  background: rgb(0 0 0 / 50%);
   position: absolute;
   top: 0;
   left: 10em;
@@ -752,7 +728,7 @@ a.add-to-wallabag-link-after::after {
 }
 
 @font-face {
-  font-family: 'Material Icons';
+  font-family: "Material Icons";
   font-style: normal;
   font-weight: 400;
   src: url(../fonts/MaterialIcons-Regular.eot);
@@ -762,7 +738,7 @@ a.add-to-wallabag-link-after::after {
 }
 
 .material-icons {
-  font-family: 'Material Icons';
+  font-family: "Material Icons";
   font-weight: normal;
   font-style: normal;
   font-size: 1em;  /* Preferred icon size */
@@ -786,7 +762,7 @@ a.add-to-wallabag-link-after::after {
   -moz-osx-font-smoothing: grayscale;
 
   /* Support for IE. */
-  font-feature-settings: 'liga';
+  font-feature-settings: "liga";
 }
 
 .material-icons.md-18 { font-size: 18px; }
@@ -812,11 +788,6 @@ a.add-to-wallabag-link-after::after {
 
   /* Enable Ligatures ================ */
   letter-spacing: 0;
-  -webkit-font-feature-settings: "liga";
-  -moz-font-feature-settings: "liga=1";
-  -moz-font-feature-settings: "liga";
-  -ms-font-feature-settings: "liga" 1;
-  -o-font-feature-settings: "liga";
   font-feature-settings: "liga";
 
   /* Better Font Rendering =========== */
@@ -1026,10 +997,6 @@ blockquote {
   margin: 0;
 }
 
-#article h1 {
-  text-align: left;
-}
-
 #article h2,
 #article h3,
 #article h4 {

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

@@ -1,4 +1,3 @@
-
 @media screen and (max-width: 1050px) {
   .entry {
     width: 49%;

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

@@ -4,13 +4,13 @@
 
 @font-face {
   font-family: icomoon;
-  src: url('~icomoon-free-npm/Font/IcoMoon-Free.ttf');
+  src: url("~icomoon-free-npm/Font/IcoMoon-Free.ttf");
   font-weight: normal;
   font-style: normal;
 }
 
 .material-icons {
-  font-family: 'Material Icons';
+  font-family: "Material Icons";
   font-weight: normal;
   font-style: normal;
   font-size: 1em;  /* Preferred icon size */
@@ -34,7 +34,7 @@
   -moz-osx-font-smoothing: grayscale;
 
   /* Support for IE. */
-  font-feature-settings: 'liga';
+  font-feature-settings: "liga";
 
   .md-18 { font-size: 18px; }
   .md-24 { font-size: 24px; }
@@ -64,11 +64,6 @@
 
   /* Enable Ligatures ================ */
   letter-spacing: 0;
-  -webkit-font-feature-settings: "liga";
-  -moz-font-feature-settings: "liga=1";
-  -moz-font-feature-settings: "liga";
-  -ms-font-feature-settings: "liga" 1;
-  -o-font-feature-settings: "liga";
   font-feature-settings: "liga";
 
   /* Better Font Rendering =========== */

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

@@ -5,15 +5,12 @@
 */
 
 * {
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
   box-sizing: border-box;
 }
 
 html {
   font-family: sans-serif; /* 1 */
-  -ms-text-size-adjust: 100%; /* 2 */
-  -webkit-text-size-adjust: 100%; /* 2 */
+  text-size-adjust: 100%; /* 2 */
 }
 
 body {
@@ -100,7 +97,7 @@ textarea {
 }
 
 input[type="search"] {
-  -webkit-appearance: textfield;
+  appearance: textfield;
 }
 
 /* ==========================================================================
@@ -218,9 +215,9 @@ video {
   display: inline-block;
 }
 
-@media screen and (-webkit-min-device-pixel-ratio: 0) {
+@media screen {
   select {
-    -webkit-appearance: none;
+    appearance: none;
     border-radius: 0;
   }
 }

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

@@ -3,7 +3,7 @@
   ========================================================================== */
 
 .popup-form {
-  background: rgba(0, 0, 0, 0.5);
+  background: rgb(0 0 0 / 50%);
   position: absolute;
   top: 0;
   left: 10em;

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

@@ -6,16 +6,6 @@ main {
   #content {
     padding: 0 0.5rem;
   }
-
-  ul.row {
-    margin: 0.4rem 0 0;
-    padding: 0 0.75rem;
-  }
-}
-
-.data .card .card-body {
-  height: 19em;
-  overflow: hidden;
 }
 
 @mixin mixin-reading-time {
@@ -37,6 +27,11 @@ main {
 }
 
 .card {
+  .card-content {
+    padding-bottom: 12px;
+    flex-grow: 1;
+  }
+
   .card-content .card-title,
   .card-reveal .card-title {
     line-height: 22.8px;
@@ -95,7 +90,7 @@ main {
   }
 
   .card-action {
-    padding: 10px 5px 10px 15px;
+    padding: 10px 10px 10px 15px;
 
     ul.links {
       margin: 0;
@@ -112,8 +107,9 @@ main {
       color: #fff;
     }
 
-    ul.tools li a.tool {
-      margin-right: 5px !important;
+    .tool {
+      display: flex;
+      margin-right: 0 !important;
     }
 
     @include mixin-reading-time;
@@ -134,6 +130,12 @@ main {
   }
 }
 
+.card-body {
+  display: flex;
+  flex-grow: 1;
+  flex-direction: column;
+}
+
 a.original:not(.waves-effect) {
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -162,6 +164,7 @@ a.original:not(.waves-effect) {
   border-radius: 3px;
   color: #fff;
   cursor: default;
+  line-height: 20px;
 }
 
 .card-entry-labels li {
@@ -186,7 +189,7 @@ a.original:not(.waves-effect) {
 }
 
 .card-tag-link {
-  width: calc(100% - 48px);
+  width: calc(100% - 24px);
   line-height: 1.3;
   white-space: nowrap;
   text-overflow: ellipsis;
@@ -210,7 +213,7 @@ a.original:not(.waves-effect) {
 
 .card-tag-labels {
   display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
+  grid-template-columns: repeat(auto-fill, minmax(240px, 1fr));
 }
 
 .card-tag-labels li {
@@ -285,7 +288,7 @@ a.original:not(.waves-effect) {
     flex-basis: 5em;
     align-self: flex-end;
     float: right;
-    max-width: 6em;
+    max-width: 8em;
   }
 
   .tags {
@@ -311,3 +314,23 @@ a.original:not(.waves-effect) {
 .settings .div_tabs {
   padding-bottom: 15px;
 }
+
+.entries-row {
+  display: grid;
+  margin: 0.4rem 0 0;
+  padding: 0 0.75rem;
+  gap: 20px;
+}
+
+.entry-card {
+  display: flex;
+  margin: 0;
+  height: 100%;
+  flex-direction: column;
+}
+
+
+.tools {
+  display: flex;
+  gap: 10px;
+}

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

@@ -19,13 +19,17 @@
     background-color: #121212;
   }
 
+  table.striped > tbody > tr:nth-child(2n+1),
   .dropdown-content li {
     background-color: #232323;
   }
 
   .dropdown-content li:hover,
   .dropdown-content li.active,
-  .dropdown-content li.selected {
+  .dropdown-content li.selected,
+  .pagination li:not(.active) a:hover,
+  .pagination li:not(.active) a:active,
+  .pagination li:not(.active) a:focus {
     background-color: #2c2c2c;
   }
 
@@ -105,10 +109,22 @@
   }
 
   .border-bottom,
-  .collapsible {
+  .collapsible,
+  .collapsible-body,
+  .collapsible-header {
     border-color: #222;
   }
 
+  .pagination li.active {
+    background-color: #666;
+  }
+
+  .hljs,
+  #article pre.hljs {
+    color: #abb2bf;
+    background-color: #282c34;
+  }
+
   @media only screen and (min-width: 992px) {
     #article {
       background-color: #101010;

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

@@ -3,7 +3,7 @@
  * ========================================================================== */
 
 .mass-buttons {
-  margin: 5px;
+  margin: 10px 5px 10px 20px;
 
   #selectAll {
     position: relative;
@@ -17,17 +17,18 @@
 
   button {
     i {
-      font-size: 12px;
+      font-size: 15px;
     }
 
     height: 24px;
     line-height: 24px;
     padding: 0 0.5rem;
+    margin-right: 0.75rem;
   }
 }
 
 .card-stacked {
-  input[type=checkbox] {
+  input[type="checkbox"] {
     position: relative;
     opacity: initial;
     left: 0;
@@ -38,8 +39,13 @@
   }
 }
 
+.entries {
+  list-style: none;
+}
+
 .collection {
-  margin: 15px 15px 0;
+  margin: 5px 15px 0;
+  padding: 0;
 
   .collection-item {
     padding: 7px;
@@ -77,6 +83,16 @@
 
   li {
     padding: 0;
+
+    &:not(.active) a:hover,
+    &:not(.active) a:active,
+    &:not(.active) a:focus {
+      background-color: #e6e6e6;
+    }
+
+    &:not(:last-of-type) {
+      margin-right: 10px;
+    }
   }
 
   span,

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

@@ -8,7 +8,7 @@
  *
  */
 .material-icons {
-  font-family: 'Material Icons';
+  font-family: "Material Icons";
   font-weight: normal;
   font-style: normal;
   font-size: 24px; /* Preferred icon size */
@@ -32,7 +32,7 @@
   -moz-osx-font-smoothing: grayscale;
 
   /* Support for IE. */
-  font-feature-settings: 'liga';
+  font-feature-settings: "liga";
 
   .md-18 {
     font-size: 18px;
@@ -51,18 +51,18 @@
   }
 
   .md-dark {
-    color: rgba(0, 0, 0, 0.54);
+    color: rgb(0 0 0 / 54%);
 
     .md-inactive {
-      color: rgba(0, 0, 0, 0.26);
+      color: rgb(0 0 0 / 26%);
     }
   }
 
   .md-light {
-    color: rgba(255, 255, 255, 1);
+    color: rgb(255 255 255 / 100%);
 
     .md-inactive {
-      color: rgba(255, 255, 255, 0.3);
+      color: rgb(255 255 255 / 30%);
     }
   }
 }
@@ -185,5 +185,5 @@ footer [class*=" icon-"] {
 
 footer [class^="icon-"]:hover,
 footer [class*=" icon-"]:hover {
-  text-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
+  text-shadow: 0 0 10px rgb(0 0 0 / 30%);
 }

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

@@ -1,18 +1,18 @@
-@import 'variables';
+@import "variables";
 
 /* Style */
-@import 'article';
-@import 'cards';
-@import 'entries';
-@import 'filters';
-@import 'layout';
-@import 'nav';
-@import 'sidenav';
-@import 'various';
-@import 'dark_theme';
+@import "article";
+@import "cards";
+@import "entries";
+@import "filters";
+@import "layout";
+@import "nav";
+@import "sidenav";
+@import "various";
+@import "dark_theme";
 
 /* Tools */
-@import 'fonts';
-@import 'icons';
-@import 'print';
-@import 'media_queries';
+@import "fonts";
+@import "icons";
+@import "print";
+@import "media_queries";

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

@@ -2,6 +2,12 @@
    Media queries
    ========================================================================== */
 
+@media only screen and (min-width: 450px) {
+  .entries-row {
+    grid-template-columns: repeat(auto-fill, minmax(340px, 1fr));
+  }
+}
+
 @media only screen and (min-width: 992px) {
   nav,
   body:not(.entry):not(.login) main,
@@ -103,7 +109,7 @@
 
 @media only screen and (min-width: 1200px) and (max-width: 1650px) {
   .row .col.l3 {
-    width: 33.33333%;
+    width: 33.3333%;
     margin-left: 0;
   }
 }
@@ -116,12 +122,12 @@
     }
 
     .col.l2 {
-      width: 33.33333%;
+      width: 33.3333%;
       margin-left: 0;
     }
 
     .col.l3 {
-      width: 41.66667%;
+      width: 41.6667%;
       margin-left: 0;
     }
 
@@ -131,12 +137,12 @@
     }
 
     .col.l5 {
-      width: 58.33333%;
+      width: 58.333%;
       margin-left: 0;
     }
 
     .col.l6 {
-      width: 66.66667%;
+      width: 66.6667%;
       margin-left: 0;
     }
 
@@ -146,12 +152,12 @@
     }
 
     .col.l8 {
-      width: 83.33333%;
+      width: 83.3333%;
       margin-left: 0;
     }
 
     .col.l9 {
-      width: 91.66667%;
+      width: 91.6667%;
       margin-left: 0;
     }
 
@@ -180,15 +186,6 @@
   }
 }
 
-@media screen and (max-width: 310px),
-  screen and (min-width: 601px) and (max-width: 660px),
-  screen and (min-width: 993px) and (max-width: 1050px),
-  screen and (min-width: 1201px) and (max-width: 1250px) {
-  .card .card-action .reading-time .card-created-at {
-    display: none;
-  }
-}
-
 @media only print {
   body {
     display: block;

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

@@ -1,4 +1,3 @@
-
 /* ==========================================================================
    Nav
    ========================================================================== */

app/config/config.yml

@@ -248,6 +248,11 @@ old_sound_rabbit_mq:
             exchange_options:
                 name: 'wallabag.import.pinboard'
                 type: topic
+        import_delicious:
+            connection: default
+            exchange_options:
+                name: 'wallabag.import.delicious'
+                type: topic
         import_instapaper:
             connection: default
             exchange_options:
@@ -315,6 +320,15 @@ old_sound_rabbit_mq:
                 name: 'wallabag.import.pinboard'
             callback: wallabag_import.consumer.amqp.pinboard
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
+        import_delicious:
+            connection: default
+            exchange_options:
+                name: 'wallabag.import.delicious'
+                type: topic
+            queue_options:
+                name: 'wallabag.import.delicious'
+            callback: wallabag_import.consumer.amqp.delicious
+            qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_wallabag_v1:
             connection: default
             exchange_options:

app/config/routing.yml

@@ -41,6 +41,18 @@ homepage:
 fos_user:
     resource: "@FOSUserBundle/Resources/config/routing/all.xml"
 
+fos_user_security_login:
+    path: /login
+    defaults:
+        _controller: Wallabag\UserBundle\Controller\SecurityController::loginAction
+    methods: [GET, POST]
+
+fos_user_registration_register:
+    path: /register
+    defaults:
+        _controller: Wallabag\UserBundle\Controller\RegistrationController::registerAction
+    methods: [GET, POST]
+
 fos_oauth_server_token:
     resource: "@FOSOAuthServerBundle/Resources/config/routing/token.xml"
 

app/config/security.yml

@@ -69,11 +69,11 @@ security:
         - { path: ^/logout, roles: [IS_AUTHENTICATED_ANONYMOUSLY, IS_AUTHENTICATED_2FA_IN_PROGRESS] }
         - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY }
-        - { path: /(unread|starred|archive|all).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: /(unread|starred|archive|annotated|all).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/locale, role: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: /tags/(.*).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/feed, roles: IS_AUTHENTICATED_ANONYMOUSLY }
-        - { path: /(unread|starred|archive).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY } # For backwards compatibility
+        - { path: /(unread|starred|archive|annotated).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY } # For backwards compatibility
         - { path: ^/share, roles: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/settings, roles: ROLE_SUPER_ADMIN }
         - { path: ^/annotations, roles: ROLE_USER }

app/config/tests/parameters_test.mysql.yml

@@ -1,6 +1,6 @@
 parameters:
     test_database_driver: pdo_mysql
-    test_database_host: localhost
+    test_database_host: 127.0.0.1
     test_database_port: 3306
     test_database_name: wallabag_test
     test_database_user: root

app/config/wallabag.yml

@@ -1,5 +1,5 @@
 wallabag_core:
-    version: 2.4.2
+    version: 2.5.4
     paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
     languages:
         en: 'English'
@@ -21,6 +21,8 @@ wallabag_core:
         zh: '简体中文'
         uk: 'Українська'
         hr: 'Hrvatski'
+        cs: 'Čeština'
+        el: 'Ελληνικά'
     items_on_page: 12
     theme: material
     language: '%locale%'
@@ -97,7 +99,7 @@ wallabag_core:
             section: export
         -
             name: export_mobi
-            value: 1
+            value: 0
             section: export
         -
             name: export_pdf

app/config/webpack/common.js

@@ -23,7 +23,7 @@ module.exports = {
       'window.jQuery': 'jquery',
     }),
     new StyleLintPlugin({
-      configFile: '.stylelintrc',
+      configFile: 'stylelint.config.js',
       failOnError: false,
       quiet: false,
       context: 'app/Resources/static/themes',

app/config/webpack/dev.js

@@ -1,6 +1,6 @@
 const { merge } = require('webpack-merge');
-const webpack = require('webpack');
-const commonConfig = require('./common.js');
+const ESLintPlugin = require('eslint-webpack-plugin');
+const commonConfig = require('./common');
 
 module.exports = merge(commonConfig, {
   devtool: 'eval-source-map',
@@ -9,22 +9,15 @@ module.exports = merge(commonConfig, {
   },
   mode: 'development',
   devServer: {
-    hot: true,
-    // enable HMR on the server
-    contentBase: './web',
-    // match the output path
+    static: {
+      directory: './web',
+    },
   },
   plugins: [
-    new webpack.HotModuleReplacementPlugin(),
+    new ESLintPlugin(),
   ],
   module: {
     rules: [
-      {
-        enforce: 'pre',
-        test: /\.js$/,
-        loader: 'eslint-loader',
-        exclude: /node_modules/,
-      },
       {
         test: /\.js$/,
         exclude: /(node_modules)/,
@@ -58,7 +51,7 @@ module.exports = merge(commonConfig, {
       },
       {
         test: /\.(jpg|png|gif|svg|ico|eot|ttf|woff|woff2)$/,
-        use: 'url-loader',
+        type: 'asset/inline',
       },
     ],
   },

app/config/webpack/prod.js

@@ -1,10 +1,11 @@
 const webpack = require('webpack');
 const { merge } = require('webpack-merge');
+const ESLintPlugin = require('eslint-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const { WebpackManifestPlugin } = require('webpack-manifest-plugin');
 const TerserPlugin = require('terser-webpack-plugin');
 
-const commonConfig = require('./common.js');
+const commonConfig = require('./common');
 
 module.exports = merge(commonConfig, {
   output: {
@@ -27,6 +28,7 @@ module.exports = merge(commonConfig, {
     ],
   },
   plugins: [
+    new ESLintPlugin(),
     new MiniCssExtractPlugin(),
     new webpack.DefinePlugin({
       'process.env': {
@@ -40,12 +42,6 @@ module.exports = merge(commonConfig, {
   ],
   module: {
     rules: [
-      {
-        enforce: 'pre',
-        test: /\.js$/,
-        loader: 'eslint-loader',
-        exclude: /node_modules/,
-      },
       {
         test: /\.js$/,
         exclude: /(node_modules)/,
@@ -80,31 +76,24 @@ module.exports = merge(commonConfig, {
       {
         test: /\.(jpg|png|gif|svg|ico)$/,
         include: /node_modules/,
-        use: {
-          loader: 'file-loader',
-          options: {
-            name: 'img/[name].[ext]',
-          },
+        type: 'asset/resource',
+        generator: {
+          filename: '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]',
-          },
+        type: 'asset/resource',
+        generator: {
+          filename: (content) => content.filename.replace('app/Resources/static/', ''),
         },
       },
       {
         test: /\.(eot|ttf|woff|woff2)$/,
-        use: {
-          loader: 'file-loader',
-          options: {
-            name: 'fonts/[name].[ext]',
-          },
+        type: 'asset/resource',
+        generator: {
+          filename: 'fonts/[name][ext]',
         },
       },
     ],

composer.json

@@ -33,13 +33,14 @@
         "issues": "https://github.com/wallabag/wallabag/issues"
     },
     "require": {
-        "php": ">=7.2.5",
+        "php": ">=7.4",
         "ext-ctype": "*",
         "ext-curl": "*",
         "ext-dom": "*",
         "ext-gd": "*",
         "ext-hash": "*",
         "ext-iconv": "*",
+        "ext-intl": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
         "ext-pcre": "*",
@@ -49,6 +50,7 @@
         "ext-tidy": "*",
         "ext-tokenizer": "*",
         "ext-xml": "*",
+        "composer": "< 2.3",
         "babdev/pagerfanta-bundle": "^2.5",
         "bdunogier/guzzle-site-authenticator": "^1.0.0",
         "craue/config-bundle": "^2.3.0",
@@ -57,6 +59,7 @@
         "doctrine/doctrine-cache-bundle": "^1.3",
         "doctrine/doctrine-migrations-bundle": "^1.3",
         "doctrine/orm": "^2.6",
+        "enshrined/svg-sanitize": "^0.15.4",
         "friendsofsymfony/jsrouting-bundle": "^2.2",
         "friendsofsymfony/oauth-server-bundle": "^1.5",
         "friendsofsymfony/rest-bundle": "~2.1",
@@ -81,7 +84,7 @@
         "php-amqplib/rabbitmq-bundle": "^1.14",
         "php-http/guzzle5-adapter": "^2.0",
         "php-http/httplug-bundle": "^1.14",
-        "pragmarx/recovery": "^0.1.0",
+        "pragmarx/recovery": "^0.2.0",
         "predis/predis": "^1.1.3",
         "scheb/two-factor-bundle": "^4.11.0",
         "sensio/distribution-bundle": "^5.0",
@@ -95,7 +98,7 @@
         "tecnickcom/tcpdf": "^6.3.0",
         "twig/extensions": "^1.5",
         "wallabag/php-mobi": "~1.0",
-        "wallabag/phpepub": "^4.0.7.2",
+        "wallabag/phpepub": "^4.0.10",
         "willdurand/hateoas-bundle": "~2.1"
     },
     "require-dev": {
@@ -111,7 +114,7 @@
         "phpstan/phpstan-phpunit": "^0.12",
         "phpstan/phpstan-symfony": "^0.12",
         "symfony/maker-bundle": "^1.18",
-        "symfony/phpunit-bridge": "~5.1"
+        "symfony/phpunit-bridge": "~6.0"
     },
     "suggest": {
         "ext-imagick": "To keep GIF animation when downloading image is enabled"
@@ -162,9 +165,12 @@
     "config": {
         "bin-dir": "bin",
         "platform": {
-            "php": "7.2.5"
+            "php": "7.4.29"
         },
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "phpstan/extension-installer": true
+        }
     },
     "minimum-stability": "dev",
     "prefer-stable": true

docker-compose.yml

@@ -1,52 +1,64 @@
-version: '2'
+version: '3.8'
 services:
-    nginx:
-        image: nginx:alpine
-        ports:
-            - "8000:80"
-        volumes:
-            - ./docker/nginx/nginx.conf:/nginx.conf
-            - ./docker/logs/nginx:/var/log/nginx
-            - .:/var/www/html
-        links:
-            - php:php
-        command: nginx -c /nginx.conf
 
     php:
         build:
             context: docker/php
-            args:
-                # Set here your timezone using one of this: https://php.net/manual/en/timezones.php
-                timezone: 'Europe/Monaco'
-        ports:
-            - "9000:9000"
+            # Use target 'rootless' if you run rootless Docker
+            target: default
         volumes:
             - .:/var/www/html
-        #links:
-            # - "postgres:rdbms"
-            # - "mariadb:rdbms"
+            # Volumes for data-related folders
+            - assets:/var/www/html/web/assets
+            - data:/var/www/html/data
+            - cache:/var/www/.cache
+            # Uncomment the following volume if you run rootless Docker
+            # A limitation blocks permissions on root docker, see
+            # https://github.com/moby/moby/issues/40881
+            # - type: tmpfs
+            #   target: /var/www/html/var/cache
+            # Override third-party libraries for dev
+            # - ../graby-site-config:/var/www/html/vendor/j0k3r/graby-site-config
+            # - ../php-readability:/var/www/html/vendor/j0k3r/php-readability
+            # - ../graby:/var/www/html/vendor/j0k3r/graby
+            # - ../HTMLawed:/var/www/html/vendor/fossar/htmlawed
+            # - ../PHPePub:/var/www/html/vendor/wallabag/phpepub
+            # - ../guzzle-site-authenticator:/var/www/html/vendor/bdunogier/guzzle-site-authenticator
         env_file:
+            # Copy docker/php/env.example to docker/php/env and customize
             - ./docker/php/env
-            # Comment non-used DBMS lines
-            # If all DBMS are commented out, sqlite will be used as default
-            # - ./docker/postgres/env
+            # Uncomment the database engine you want, it will use sqlite if both are commented
             # - ./docker/mariadb/env
+            # - ./docker/postgres/env
+            # Uncomment to enable Xdebug
+            # - ./docker/php/xdebug
+        ports:
+            - 8000:8000
+            # Uncomment to permit Xdebug remote session
+            # - 9000:9000
+        depends_on:
+            # - mariadb
+            # - postgres
+            - redis
 
     # postgres:
-    #    image: postgres:11-alpine
-    #    ports:
-    #        - "5432:5432"
-    #    volumes:
-    #        - ./docker/data/pgsql:/var/lib/postgresql/data
-    #    env_file:
-    #        - ./docker/postgres/env
+    #     image: postgres:11-alpine
+    #     volumes:
+    #         - db-data:/var/lib/postgresql/data
+    #     env_file:
+    #         - ./docker/postgres/env
+    #     healthcheck:
+    #         test: ["CMD-SHELL", "pg_isready -q || exit 1"]
+    #         interval: 10s
+    #         timeout: 3s
+    #         retries: 3
 
     # mariadb:
     #    image: mariadb:10
     #    ports:
     #        - "3306:3306"
     #    volumes:
-    #        - ./docker/data/mariadb:/var/lib/mysql
+    #        - db-data:/var/lib/mysql
     #    env_file:
     #        - ./docker/mariadb/env
 
@@ -56,6 +68,19 @@ services:
     #         - "15672:15672"
 
     redis:
-        image: redis:4-alpine
-        ports:
-            - "6379:6379"
+        image: redis:6-alpine
+        healthcheck:
+            test: ["CMD", "redis-cli", "ping"]
+            interval: 10s
+            timeout: 3s
+            retries: 3
+
+volumes:
+    db-data:
+        driver: local
+    assets:
+        driver: local
+    data:
+        driver: local
+    cache:
+        driver: local

docker/mariadb/env

@@ -2,9 +2,9 @@ MYSQL_ROOT_PASSWORD=wallaroot
 MYSQL_USER=wallabag
 MYSQL_PASSWORD=wallapass
 MYSQL_DATABASE=wallabag
-SYMFONY__ENV__DATABASE_DRIVER=pdo_mysql
-SYMFONY__ENV__DATABASE_HOST=rdbms
-SYMFONY__ENV__DATABASE_PORT=3306
-SYMFONY__ENV__DATABASE_NAME=wallabag
-SYMFONY__ENV__DATABASE_USER=wallabag
-SYMFONY__ENV__DATABASE_PASSWORD=wallapass
+DATABASE_DRIVER=pdo_mysql
+DATABASE_HOST=mysql
+DATABASE_PORT=3306
+DATABASE_NAME=wallabag
+DATABASE_USER=wallabag
+DATABASE_PASSWORD=wallapass

docker/nginx/nginx.conf

@@ -1,89 +0,0 @@
-user  nginx;
-worker_processes  1;
-pid        /var/run/nginx.pid;
-
-events {
-    worker_connections  2048;
-    multi_accept on;
-    use epoll;
-}
-
-http {
-
-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
-
-    access_log  /var/log/nginx/access.log  main;
-
-    server_tokens off;
-    sendfile on;
-    tcp_nopush on;
-    tcp_nodelay on;
-    keepalive_timeout 15;
-    types_hash_max_size 2048;
-    include /etc/nginx/mime.types;
-    default_type application/octet-stream;
-    access_log off;
-    error_log off;
-    gzip on;
-    gzip_disable "msie6";
-    open_file_cache max=100;
-
-
-    upstream php-upstream {
-        server php:9000;
-    }
-
-    server {
-        #server_name domain.tld www.domain.tld;
-        root /var/www/html/web;
-
-        location / {
-            # try to serve file directly, fallback to app.php
-            try_files $uri /app.php$is_args$args;
-        }
-        # DEV
-        # This rule should only be placed on your development environment
-        # In production, don't include this and don't deploy app_dev.php or config.php
-        location ~ ^/(app_dev|config)\.php(/|$) {
-            fastcgi_pass php-upstream;
-            fastcgi_split_path_info ^(.+\.php)(/.*)$;
-            include fastcgi_params;
-            # When you are using symlinks to link the document root to the
-            # current version of your application, you should pass the real
-            # application path instead of the path to the symlink to PHP
-            # FPM.
-            # Otherwise, PHP's OPcache may not properly detect changes to
-            # your PHP files (see https://github.com/zendtech/ZendOptimizerPlus/issues/126
-            # for more information).
-            fastcgi_param  SCRIPT_FILENAME  $realpath_root$fastcgi_script_name;
-            fastcgi_param DOCUMENT_ROOT $realpath_root;
-        }
-        # PROD
-        location ~ ^/app\.php(/|$) {
-            fastcgi_pass php-upstream;
-            fastcgi_split_path_info ^(.+\.php)(/.*)$;
-            include fastcgi_params;
-            # When you are using symlinks to link the document root to the
-            # current version of your application, you should pass the real
-            # application path instead of the path to the symlink to PHP
-            # FPM.
-            # Otherwise, PHP's OPcache may not properly detect changes to
-            # your PHP files (see https://github.com/zendtech/ZendOptimizerPlus/issues/126
-            # for more information).
-            fastcgi_param  SCRIPT_FILENAME  $realpath_root$fastcgi_script_name;
-            fastcgi_param DOCUMENT_ROOT $realpath_root;
-            # Prevents URIs that include the front controller. This will 404:
-            # http://domain.tld/app.php/some-path
-            # Remove the internal directive to allow URIs like this
-            internal;
-        }
-
-        error_log /var/log/nginx/project_error.log;
-        access_log /var/log/nginx/project_access.log;
-    }
-
-}
-
-daemon off;

docker/php/Dockerfile

@@ -1,8 +1,19 @@
-FROM php:7.2-fpm
+FROM php:7.4-fpm AS rootless
 
-# Default timezone. To change it, use the argument in the docker-compose.yml file
-ARG timezone='Europe/Paris'
-ARG memorylimit='512M'
+ARG DEBIAN_FRONTEND=noninteractive
+ARG NODE_VERSION=16
+
+RUN apt-get update \
+    && apt-get install -y \
+      ca-certificates \
+      curl \
+      gnupg \
+      lsb-release \
+      openssl \
+      software-properties-common
+
+RUN curl 'https://deb.nodesource.com/gpgkey/nodesource.gpg.key' | apt-key add - \
+    && echo "deb https://deb.nodesource.com/node_${NODE_VERSION}.x $(lsb_release -cs) main" > /etc/apt/sources.list.d/nodesource.list
 
 RUN apt-get update && apt-get install -y \
         libmcrypt-dev \
@@ -11,30 +22,77 @@ RUN apt-get update && apt-get install -y \
         libxml2-dev \
         libpng-dev \
         libjpeg-dev \
+        libwebp-dev \
         libsqlite3-dev \
         imagemagick \
         libmagickwand-dev \
         libtidy-dev \
-        git
-RUN docker-php-ext-install \
-        iconv \
-        mbstring \
+        libonig-dev \
+        libzip-dev \
+        libfreetype6-dev \
+        zlib1g-dev \
+        git \
+        build-essential \
+        nodejs
+RUN docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp
+RUN docker-php-ext-install -j "$(nproc)" \
+        bcmath \
         gd \
+        gettext \
+        iconv \
         intl \
+        mbstring \
+        opcache \
         pdo \
         pdo_mysql \
         pdo_pgsql \
         pdo_sqlite \
         sockets \
         tidy \
-        bcmath \
         zip
 
-RUN printf "\n" | pecl install imagick && docker-php-ext-enable imagick
+RUN pecl install redis; \
+    pecl install imagick; \
+    pecl install xdebug; \
+    docker-php-ext-enable \
+        redis \
+        imagick \
+        xdebug \
+    ;
 
-RUN echo "date.timezone="$timezone > /usr/local/etc/php/conf.d/date_timezone.ini
-RUN echo "memory_limit ="$memorylimit > /usr/local/etc/php/conf.d/memory_limit.ini
+RUN npm install -g yarn
 
-RUN usermod -u 1000 www-data
+RUN curl -L -o /usr/local/bin/envsubst https://github.com/a8m/envsubst/releases/download/v1.1.0/envsubst-`uname -s`-`uname -m`; \
+    chmod +x /usr/local/bin/envsubst
 
-CMD ["php-fpm"]
+COPY --from=composer:2.2.12 /usr/bin/composer /usr/local/bin/composer
+
+COPY entrypoint.sh /entrypoint.sh
+COPY config/ /opt/wallabag/config/
+
+RUN mkdir -p \
+        /var/www/html/app/config/ \
+        /var/www/html/var/cache \
+        /var/www/html/web/assets \
+        /var/www/html/data \
+        /var/www/html/data/db \
+        /var/www/.cache
+
+ENTRYPOINT ["/entrypoint.sh"]
+CMD ["php", "bin/console", "--env=dev", "server:run", "0.0.0.0:8000"]
+
+FROM rootless AS default
+
+ARG USER_UID=1000
+ARG USER_GID=1000
+
+RUN groupmod -g 1000 www-data ; \
+    usermod -u ${USER_UID} -g www-data www-data ; \
+    touch /usr/local/etc/php/conf.d/wallabag-php.ini \
+        /var/www/.yarnrc ; \
+    chown -R www-data: /var/www/html \
+        /usr/local/etc/php/conf.d/wallabag-php.ini \
+        /var/www/.cache \
+        /var/www/.yarnrc
+
+USER www-data

docker/php/config/parameters.yml

@@ -0,0 +1,62 @@
+parameters:
+    database_driver: ${DATABASE_DRIVER:-pdo_sqlite}
+    database_driver_class: ${DATABASE_DRIVER_CLASS:-~}
+    database_host: ${DATABASE_HOST:-127.0.0.1}
+    database_port: ${DATABASE_PORT:-~}
+    database_name: ${DATABASE_NAME:-symfony}
+    database_user: ${DATABASE_USER:-root}
+    database_password: ${DATABASE_PASSWORD:-~}
+    database_path: ${DATABASE_PATH:-"%kernel.root_dir%/data/db/wallabag.sqlite"}
+    database_table_prefix: wallabag_
+    database_socket: null
+    database_charset: ${DATABASE_CHARSET:-utf8}
+
+    domain_name: ${DOMAIN_NAME:-https://www.example.com}
+    server_name: ${SERVER_NAME:-"Your wallabag instance"}
+
+    mailer_transport:  ${MAILER_TRANSPORT:-smtp}
+    mailer_user:       ${MAILER_USER:-~}
+    mailer_password:   ${MAILER_PASSWORD:-~}
+    mailer_host:       ${MAILER_HOST:-127.0.0.1}
+    mailer_port:       ${MAILER_PORT:-25}
+    mailer_encryption: ${MAILER_ENCRYPTION:-~}
+    mailer_auth_mode:  ${MAILER_AUTH_MODE:-~}
+
+    locale:            ${LOCALE:-en}
+
+    # A secret key that's used to generate certain security-related tokens
+    secret: ${SECRET:-~}
+
+    # two factor stuff
+    twofactor_auth: ${TWOFACTOR_AUTH:-true}
+    twofactor_sender: ${TWOFACTOR_SENDER:-no-reply@wallabag.org}
+
+    # fosuser stuff
+    fosuser_registration: ${FOSUSER_REGISTRATION:-true}
+    fosuser_confirmation: ${FOSUSER_CONFIRMATION:-true}
+
+    fos_oauth_server_access_token_lifetime: 3600
+    fos_oauth_server_refresh_token_lifetime: 1209600
+
+    from_email: ${FROM_EMAIL:-wallabag@example.com}
+
+    rss_limit: 50
+
+    # RabbitMQ processing
+    rabbitmq_host: localhost
+    rabbitmq_port: 5672
+    rabbitmq_user: guest
+    rabbitmq_password: guest
+    rabbitmq_prefetch_count: 10
+
+    # Redis processing
+    redis_scheme: ${REDIS_SCHEME:-tcp}
+    redis_host: ${REDIS_HOST:-redis}
+    redis_port: ${REDIS_PORT:-6379}
+    redis_path: ${REDIS_PATH:-~}
+    redis_password: ${REDIS_PASSWORD:-~}
+
+    # Sentry
+    sentry_dsn: ${SENTRY_DSN:-~}
+
+    session_handler: ${SESSION_HANDLER:-session.handler.native_file}

docker/php/config/wallabag-php.ini

@@ -0,0 +1,10 @@
+memory_limit = ${PHP_MEMORY_LIMIT:-512M}
+
+max_execution_time = ${PHP_MAX_EXECUTION_TIME:-60}
+
+date.time = ${PHP_TIMEZONE:-Europe/Paris}
+
+session.save_handler = ${PHP_SESSION_HANDLER:-files}
+session.save_path = "${PHP_SESSION_SAVE_PATH:-}"
+
+upload_max_filesize = 10M

docker/php/entrypoint.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+envsubst < /opt/wallabag/config/wallabag-php.ini > /usr/local/etc/php/conf.d/wallabag-php.ini
+envsubst < /opt/wallabag/config/parameters.yml > /var/www/html/app/config/parameters.yml
+
+exec "$@"

docker/php/env

@@ -1,6 +0,0 @@
-SYMFONY__ENV__DATABASE_DRIVER=pdo_sqlite
-SYMFONY__ENV__DATABASE_HOST=127.0.0.1
-SYMFONY__ENV__DATABASE_PORT=~
-SYMFONY__ENV__DATABASE_NAME=symfony
-SYMFONY__ENV__DATABASE_USER=root
-SYMFONY__ENV__DATABASE_PASSWORD=~