Merge pull request #7516 from wallabag/dependabot/composer/phpstan-dependencies-3fc8ae98df

Bumps the phpstan-dependencies group with 1 update: [phpstan/phpstan](https://github.com/phpstan/phpstan).


Updates `phpstan/phpstan` from 1.11.2 to 1.11.3
- [Release notes](https://github.com/phpstan/phpstan/releases)
- [Changelog](https://github.com/phpstan/phpstan/blob/1.11.x/CHANGELOG.md)
- [Commits](https://github.com/phpstan/phpstan/compare/1.11.2...1.11.3)

---
updated-dependencies:
- dependency-name: phpstan/phpstan
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: phpstan-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

.editorconfig

@@ -18,3 +18,6 @@ indent_style = tab
 
 [.github/**.yml]
 indent_size = 2
+
+[phpstan-baseline.neon]
+indent_style = tab

.env

@@ -0,0 +1,4 @@
+BLACKFIRE_SERVER_ID=CHANGE_ME
+BLACKFIRE_SERVER_TOKEN=CHANGE_ME
+BLACKFIRE_CLIENT_ID=CHANGE_ME
+BLACKFIRE_CLIENT_TOKEN=CHANGE_ME

.github/CONTRIBUTING.md

@@ -45,3 +45,18 @@ Note : If you have large portions of text, use [Github's Gist service](https://g
 
 ## You want to fix a bug or to add a feature
 Please fork wallabag and work with **the master branch**.
+
+## Run Tests and PHP formatter
+
+All pull requests need to pass the tests and the code needs match the style guide.
+
+To run the tests locally run:
+
+- when testing using Docker: `docker-compose run --rm php bin/phpunit` (or `docker-compose run --rm php make test` if you
+  prefer using `make`)
+- otherwise: `bin/phpunit` (or `make test`)
+
+To run the PHP formatter:
+
+- when testing using Docker: `docker-compose run --rm php bin/php-cs-fixer fix`
+- otherwise: `php bin/php-cs-fixer fix`

.github/dependabot.yml

@@ -7,6 +7,13 @@ updates:
     time: "04:00"
     timezone: Europe/Paris
   open-pull-requests-limit: 10
+  groups:
+    babel-dependencies:
+      patterns:
+        - "*babel*"
+    fontsource-dependencies:
+      patterns:
+        - "*fontsource*"
   ignore:
   - dependency-name: materialize-css
     versions:
@@ -18,22 +25,28 @@ updates:
     time: "04:00"
     timezone: Europe/Paris
   open-pull-requests-limit: 10
+  groups:
+    symfony-dependencies:
+      patterns:
+        - "symfony/*"
+    twig-dependencies:
+      patterns:
+        - "twig/*"
+    phpstan-dependencies:
+      patterns:
+        - "phpstan/*"
   reviewers:
   - j0k3r
-  - tcitworld
+  - yguedidi
   - Kdecherf
-  labels:
-  - Ready for review
   ignore:
-  - dependency-name: doctrine/doctrine-migrations-bundle
+  - dependency-name: lcobucci/jwt
     versions:
-    - "> 1.3.2"
-  - dependency-name: friendsofsymfony/user-bundle
+    - ">= 4.2.0"
+  # until we add support for Symfony 5+
+  - dependency-name: symfony/*
     versions:
-    - "> 2.0.2"
-  - dependency-name: nelmio/api-doc-bundle
-    versions:
-    - "> 2.13.4"
+    - ">= 5.0.0"
 - package-ecosystem: github-actions
   directory: "/"
   schedule:

.github/release.yml

@@ -4,3 +4,4 @@ changelog:
       - Dependencies
     authors:
       - dependabot
+      - weblate

.github/workflows/assets.yml

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

.github/workflows/coding-standards.yml

@@ -5,44 +5,56 @@ on:
   push:
     branches:
       - master
-      - 2.*
+      - "2.**"
 
 permissions:
   contents: read
 
 jobs:
   coding-standards:
-    name: "CS Fixer & PHPStan"
+    name: "CS Fixer, PHPStan & TwigCS"
     runs-on: "ubuntu-20.04"
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
         with:
           coverage: "none"
           php-version: "7.4"
-          tools: cs2pr, pecl, composer:2.2
+          tools: cs2pr, pecl
           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: "Setup MySQL"
+        run: |
+          sudo systemctl start mysql.service
+          sudo mysql -u root -proot -h 127.0.0.1 -e "CREATE DATABASE wallabag_test"
+          cp app/config/tests/parameters_test.mysql.yml app/config/parameters_test.yml
+
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           composer-options: "--optimize-autoloader --prefer-dist"
 
+      - name: "Run Composer dependency analyser"
+        run: "bin/composer-dependency-analyser"
+
       - name: "Run PHP CS Fixer"
         run: "bin/php-cs-fixer fix --verbose --dry-run --format=checkstyle | cs2pr"
 
       - name: "Generate test cache for PHPStan"
         run: "php bin/console cache:clear --env=test"
 
-      - name: "Install PHPUnit for PHPStan"
-        run: "php bin/simple-phpunit install"
-
       - name: "Run PHPStan"
         run: "php bin/phpstan analyse --no-progress --error-format=checkstyle | cs2pr"
+
+      - name: "Run TwigCS"
+        run: "php bin/twigcs --severity=error --display=blocking --reporter checkstyle app/ src/ | cs2pr"
+
+      - name: "Run ergebnis/composer-normalize"
+        run: "composer normalize --dry-run --no-check-lock"

.github/workflows/continuous-integration.yml

@@ -5,9 +5,11 @@ on:
   push:
     branches:
       - master
-      - 2.*
+      - "2.**"
 
 env:
+  # Force disabling the reporting of Doctrine deprecation notices for now
+  DOCTRINE_DEPRECATIONS: none
   PGPASSWORD: wallabagrocks
   COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -32,6 +34,8 @@ jobs:
           - "7.4"
           - "8.0"
           - "8.1"
+          - "8.2"
+          - "8.3"
         database:
           - "sqlite"
           - "mysql"
@@ -39,7 +43,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
         with:
           fetch-depth: 2
 
@@ -48,7 +52,7 @@ jobs:
         with:
           php-version: "${{ matrix.php }}"
           coverage: none
-          tools: pecl, composer:2.2
+          tools: pecl
           extensions: json, pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy
           ini-values: "date.timezone=Europe/Paris"
 
@@ -67,15 +71,80 @@ jobs:
           pg_isready -d wallabag_test -h localhost -p 5432 -U wallabag
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           composer-options: "--optimize-autoloader --prefer-dist"
 
-      - name: "Prepare database"
-        run: "make prepare DB=${{ matrix.database }}"
-
-      - name: "Prepare fixtures"
-        run: "make fixtures"
+      - name: "Prepare database configuration"
+        run: cp app/config/tests/parameters_test.${{ matrix.database }}.yml app/config/parameters_test.yml
 
       - name: "Run PHPUnit"
-        run: "php bin/simple-phpunit -v"
+        run: "php bin/phpunit -v"
+
+  phpunit_no_prefix:
+    name: "PHP ${{ matrix.php }} using ${{ matrix.database }} without prefix"
+    runs-on: "ubuntu-20.04"
+    services:
+      rabbitmq:
+        image: rabbitmq:3-alpine
+        ports:
+          - 5672:5672
+      redis:
+        image: redis:6-alpine
+        ports:
+          - 6379:6379
+
+    strategy:
+      fail-fast: true
+      matrix:
+        php:
+          - "8.2"
+        database:
+          - "sqlite"
+          - "mysql"
+          - "pgsql"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v4"
+        with:
+          fetch-depth: 2
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "${{ matrix.php }}"
+          coverage: none
+          tools: pecl
+          extensions: json, pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy
+          ini-values: "date.timezone=Europe/Paris"
+
+      - name: "Remove database prefix"
+        run: |
+          pip install --user yq
+          yq -Y --in-place '.parameters.database_table_prefix = ""' app/config/parameters.yml.dist
+
+      - name: "Setup MySQL"
+        if: "${{ matrix.database == 'mysql' }}"
+        run: |
+          sudo systemctl start mysql.service
+          sudo mysql -u root -proot -h 127.0.0.1 -e "CREATE DATABASE wallabag_test"
+
+      - name: "Setup PostgreSQL"
+        if: "${{ matrix.database == 'pgsql' }}"
+        run: |
+          sudo systemctl start postgresql
+          sudo -u postgres psql -d template1 -c "CREATE USER wallabag WITH PASSWORD 'wallabagrocks' CREATEDB"
+          createdb -h localhost -p 5432 -U wallabag wallabag_test
+          pg_isready -d wallabag_test -h localhost -p 5432 -U wallabag
+
+      - name: "Install dependencies with Composer"
+        uses: "ramsey/composer-install@v3"
+        with:
+          composer-options: "--optimize-autoloader --prefer-dist"
+
+      - name: "Prepare database configuration"
+        run: cp app/config/tests/parameters_test.${{ matrix.database }}.yml app/config/parameters_test.yml
+
+      - name: "Run PHPUnit"
+        run: "php bin/phpunit -v"

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

@@ -12,7 +12,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.3.4
+        uses: dependabot/fetch-metadata@v2.1.0
         with:
           github-token: '${{ secrets.GITHUB_TOKEN }}'
       - name: Approve and merge minor updates

.github/workflows/translations.yml

@@ -5,7 +5,7 @@ on:
   push:
     branches:
       - master
-      - 2.*
+      - "2.**"
 
 permissions:
   contents: read
@@ -22,29 +22,23 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
         with:
           coverage: "none"
           php-version: "${{ matrix.php }}"
-          tools: pecl, composer:2.2
+          tools: pecl
           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@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           composer-options: "--optimize-autoloader --prefer-dist"
 
-      - name: "Validate Core translations"
-        run: "php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v"
-
-      - name: "Validate CraueConfig translations"
-        run: "php bin/console lint:yaml app/Resources/CraueConfigBundle/translations -v"
-
-      - name: "Validate User translations"
-        run: "php bin/console lint:yaml src/Wallabag/UserBundle/Resources/translations -v"
+      - name: "Validate translations"
+        run: "php bin/console lint:yaml translations -v"

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

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
@@ -29,6 +29,12 @@ jobs:
         env:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: "Install Node"
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: ".nvmrc"
+          cache: "yarn"
+
       - name: Create the package
         run: make release VERSION=${{ github.event.release.tag_name }}
 

.gitignore

@@ -9,13 +9,13 @@
 !/var/sessions
 /var/sessions/*
 !var/sessions/.gitkeep
-!var/SymfonyRequirements.php
 /bin/*
 !/bin/console
-!/bin/symfony_requirements
-.php_cs.cache
+.php-cs-fixer.php
+.php-cs-fixer.cache
 .phpunit.result.cache
 phpunit.xml
+docker-compose.override.yml
 
 # Parameters
 /app/config/parameters.yml
@@ -29,7 +29,7 @@ web/uploads/
 !/web/bundles/.gitkeep
 /web/assets/images/*
 !web/assets/images/.gitkeep
-/web/wallassets/*.dev.js
+/web/wallassets/*
 
 # Build
 /app/build
@@ -48,9 +48,7 @@ data/db/wallabag*.sqlite
 # assets stuff
 node_modules/
 bin
-app/Resources/build/
-!/src/Wallabag/CoreBundle/Resources/public
-/src/Wallabag/CoreBundle/Resources/public/*
+package-lock.json
 
 # Test-generated files
 admin-export.json
@@ -59,3 +57,5 @@ specialexport.json
 
 # Custom CSS file
 web/custom.css
+
+.env.local

.nvmrc

@@ -1 +1 @@
-16
+20

.php-cs-fixer.dist.php

@@ -1,38 +1,44 @@
 <?php
 
-return PhpCsFixer\Config::create()
+$config = new PhpCsFixer\Config();
+
+return $config
     ->setRiskyAllowed(true)
     ->setRules([
         '@Symfony' => true,
         '@Symfony:risky' => true,
         'array_syntax' => [
-            'syntax' => 'short'
+            'syntax' => 'short',
         ],
         'combine_consecutive_unsets' => true,
         'heredoc_to_nowdoc' => true,
-        'no_extra_consecutive_blank_lines' => [
-        'break',
-            'continue',
-            'extra',
-            'return',
-            'throw',
-            'use',
-            'parenthesis_brace_block',
-            'square_brace_block',
-            'curly_brace_block'
+        'no_extra_blank_lines' => [
+            'tokens' => [
+                'break',
+                'continue',
+                'extra',
+                'return',
+                'throw',
+                'use',
+                'parenthesis_brace_block',
+                'square_brace_block',
+                'curly_brace_block',
+            ],
         ],
         'no_unreachable_default_argument_value' => true,
+        'no_useless_concat_operator' => false,
         'no_useless_else' => true,
         'no_useless_return' => true,
         'ordered_class_elements' => true,
         'ordered_imports' => true,
         'php_unit_strict' => true,
         'phpdoc_order' => true,
-        // 'psr4' => true,
+        'phpdoc_separation' => false,
+        // 'psr_autoloading' => true,
         'strict_comparison' => true,
         'strict_param' => true,
         'concat_space' => [
-            'spacing' => 'one'
+            'spacing' => 'one',
         ],
     ])
     ->setFinder(
@@ -41,8 +47,9 @@ return PhpCsFixer\Config::create()
                 'node_modules',
                 'vendor',
                 'var',
-                'web'
+                'web',
             ])
             ->in(__DIR__)
     )
+    ->setCacheFile('.php-cs-fixer.cache')
 ;

CHANGELOG.md

@@ -1,5 +1,203 @@
 # Changelog
 
+## [2.6.8](https://github.com/wallabag/wallabag/tree/2.6.8)
+[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.7...2.6.8)
+
+### Fixes
+* Update deps & Node 20 by @j0k3r in https://github.com/wallabag/wallabag/pull/7134
+* Fix dark mode disabled url 2.6 by @Simounet in https://github.com/wallabag/wallabag/pull/7133
+* Make database dependent commands lazy by @yguedidi in https://github.com/wallabag/wallabag/pull/7142
+* Fix docker setup by @yguedidi in https://github.com/wallabag/wallabag/pull/7141
+* Remove session-based redirection by @yguedidi in https://github.com/wallabag/wallabag/pull/7140
+
+## [2.6.7](https://github.com/wallabag/wallabag/tree/2.6.7)
+[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.6...2.6.7)
+
+### Security fix
+* A user can disable her 2FA unintentionally by @kdecherf in https://github.com/wallabag/wallabag/commit/0cfdddc2eb0aee5ffb69bf499d377d75655ba157
+
+### Fixes
+* Fix deprecated null tag parameter by @Simounet in https://github.com/wallabag/wallabag/pull/6985
+* Full clickable card on mass action by @Simounet in https://github.com/wallabag/wallabag/pull/6991
+* Add tag form submit button always displayed by @Simounet in https://github.com/wallabag/wallabag/pull/6986
+
+## [2.6.6](https://github.com/wallabag/wallabag/tree/2.6.6)
+[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.5...2.6.6)
+
+### Security fix
+* Force secure cookie on HTTPS connection by @j0k3r in https://github.com/wallabag/wallabag/pull/6924
+
+### Fixes
+* Fix checkboxes pointer events issue by @Simounet in https://github.com/wallabag/wallabag/pull/6897
+* Add Google mailer by @j0k3r in https://github.com/wallabag/wallabag/pull/6899
+* Improve performance on homepage by @Simounet in https://github.com/wallabag/wallabag/pull/6909
+* Mass action layout improved by @Simounet in https://github.com/wallabag/wallabag/pull/6912
+
+## [2.6.5](https://github.com/wallabag/wallabag/tree/2.6.5)
+[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.4...2.6.5)
+
+### Fixes
+* "Fix checkboxes pointer-events disabled" by @Simounet https://github.com/wallabag/wallabag/pull/6874
+* "Fix nav input styles" by @Simounet https://github.com/wallabag/wallabag/pull/6877
+* "Change domain status filters html types" by @Simounet https://github.com/wallabag/wallabag/pull/6888
+
+## [2.6.4](https://github.com/wallabag/wallabag/tree/2.6.4)
+[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.3...2.6.4)
+
+### Fixes
+* Fix API token generation by @nicosomb https://github.com/wallabag/wallabag/pull/6869
+* Fix checkboxes which were broken by @nicosomb https://github.com/wallabag/wallabag/pull/6864
+
+## [2.6.3](https://github.com/wallabag/wallabag/tree/2.6.3)
+[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.2...2.6.3)
+
+### Security fixes
+* Replace GET way to POST way to reset data user by @nicosomb https://github.com/wallabag/wallabag/commit/78b0b55c40511e1f22d5bbb4897aa10fca68441c
+* Replace GET way to POST way to delete API client by @nicosomb https://github.com/wallabag/wallabag/commit/ffcc5c9062fcc8cd922d7d6d65edbe5efae96806
+
+### Improvement
+* Add confirmation before reload entry by @nicosomb https://github.com/wallabag/wallabag/pull/6778
+* Remove external dependencies on howto page by @viktoriussuwandi https://github.com/wallabag/wallabag/pull/6775
+
+### Fixes
+* Use Session instead of Referrer for Redirection by @Spoons https://github.com/wallabag/wallabag/pull/6119
+* Reduce risk of collision for #content by @kdecherf https://github.com/wallabag/wallabag/pull/6829
+* Update dependencies to fix vulnerabilities by @nicosomb https://github.com/wallabag/wallabag/pull/6783
+* Fix failing randomly test by @nicosomb https://github.com/wallabag/wallabag/pull/6763
+
+### Technical stuff
+* Add check if git is installed by @nicosomb https://github.com/wallabag/wallabag/pull/6788
+* Replace kernel.root_dir by kernel.project_dir by @yguedidi https://github.com/wallabag/wallabag/pull/6809
+* Split symfony/symfony by @yguedidi https://github.com/wallabag/wallabag/pull/6817
+* Make Crawler::extract get an array by @yguedidi https://github.com/wallabag/wallabag/pull/6812
+* Use PSR-17 and PSR-18 by @yguedidi https://github.com/wallabag/wallabag/pull/6816
+* Replace Client by KernelBrowser by @yguedidi https://github.com/wallabag/wallabag/pull/6813
+* Replace Debug component by ErrorHandler component by @yguedidi https://github.com/wallabag/wallabag/pull/6810
+* Make ImportController extends AbstractController by @yguedidi https://github.com/wallabag/wallabag/pull/6808
+* Use Twig instead of templating by @yguedidi https://github.com/wallabag/wallabag/pull/6797
+* Identify platforms by their class by @yguedidi https://github.com/wallabag/wallabag/pull/6799
+* Move from transchoice to trans by @yguedidi https://github.com/wallabag/wallabag/pull/6800
+* Replace GetResponseEvent by RequestEvent by @yguedidi https://github.com/wallabag/wallabag/pull/6811
+* Ensure the kernel is shut down before calling createClient by @yguedidi https://github.com/wallabag/wallabag/pull/6803
+* Ignore docker-compose.override.yml by @yguedidi https://github.com/wallabag/wallabag/pull/6814
+* Add composer normalizer by @nicosomb https://github.com/wallabag/wallabag/pull/6762
+
+## [2.6.2](https://github.com/wallabag/wallabag/tree/2.6.2)
+[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.1...2.6.2)
+
+### Fixes
+* Fix mass action input on dark theme by @simounet https://github.com/wallabag/wallabag/pull/6673
+* Fix undefined variable by @nicosomb https://github.com/wallabag/wallabag/pull/6672
+* Fix table name in migration by @nicosomb https://github.com/wallabag/wallabag/pull/6653
+
+### Technical stuff
+* Add a new build to test when no database table prefix are defined by @j0k3r https://github.com/wallabag/wallabag/pull/6731
+* Keep escaped table name while migrating by @Glandos https://github.com/wallabag/wallabag/pull/6710
+* Remove twofactor_auth parameter by @nicosomb https://github.com/wallabag/wallabag/pull/6723
+* ApiDoc: Add response description to UserRestController by @caspermeijn https://github.com/wallabag/wallabag/pull/6684
+* ApiDoc: Add response description to WallabagRestController by @caspermeijn https://github.com/wallabag/wallabag/pull/6102
+* Skip migration if the table was already renamed by @gramakri https://github.com/wallabag/wallabag/pull/6678
+
+### Meta
+* Document how to run tests and formatter for new contributors by @caspermeijn https://github.com/wallabag/wallabag/pull/6685
+* Add link to wallabag ecosystem resources by @nicosomb https://github.com/wallabag/wallabag/pull/6700
+
+## [2.6.1](https://github.com/wallabag/wallabag/tree/2.6.1)
+[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.0...2.6.1)
+
+### Fixes
+* Do not autoload fixtures by @j0k3r https://github.com/wallabag/wallabag/pull/6648
+* Add confirmation alert when deleting articles from list view by @nicosomb https://github.com/wallabag/wallabag/pull/6644
+
+## [2.6.0](https://github.com/wallabag/wallabag/tree/2.6.0)
+[Full Changelog](https://github.com/wallabag/wallabag/compare/2.5.4...2.6.0)
+
+### Features
+* Add tag deletion from tags list by @nicosomb https://github.com/wallabag/wallabag/pull/5861
+* Add support of mass action to tag entries by @kdecherf https://github.com/wallabag/wallabag/pull/5838
+* Mass action interface by @Simounet https://github.com/wallabag/wallabag/pull/6547
+* Empty space on the top bar used for more add url toggle clickable target by @Simounet https://github.com/wallabag/wallabag/pull/6612
+* Add new setting to show / hide articles thumbnails by @nicosomb https://github.com/wallabag/wallabag/pull/6609
+
+### Fixes
+* Add prefix for tag slugs by @kdecherf https://github.com/wallabag/wallabag/pull/6226
+* Fix open all external links in new tab in Config by @wyntonfranklin https://github.com/wallabag/wallabag/pull/6256
+* Fix dark theme for pre HTML tags by @Simounet https://github.com/wallabag/wallabag/pull/6495
+* Fix dark mode top bar contrast by @Simounet https://github.com/wallabag/wallabag/pull/6510
+* Dark mode contrast improved by @Simounet https://github.com/wallabag/wallabag/pull/6512
+* Fix dark mode URL add input color by @Simounet https://github.com/wallabag/wallabag/pull/6525
+* Fix round reading time in export by @mart-e https://github.com/wallabag/wallabag/pull/6545
+* Fix images downloading with numeric HTML entity by @Simounet https://github.com/wallabag/wallabag/pull/6563
+* Fix DownloadImages not following redirections by @Simounet https://github.com/wallabag/wallabag/pull/6562
+* Fix auto dark theme detection flickering by @Simounet https://github.com/wallabag/wallabag/pull/6584
+* Fix RSS feed_route not set by @Simounet https://github.com/wallabag/wallabag/pull/6606
+* Add flash message when we try to add too much tags by @nicosomb https://github.com/wallabag/wallabag/pull/6607
+* Changed default value for domain_name parameter by @nicosomb https://github.com/wallabag/wallabag/pull/6616
+* Improved tags display by @Simounet https://github.com/wallabag/wallabag/pull/6613
+* Fix mousetrap enter issue by @Simounet https://github.com/wallabag/wallabag/pull/6624
+* Fix duplicate tags creation when assigning search results to tag by @nicosomb https://github.com/wallabag/wallabag/pull/6629
+
+### Meta
+* Removed Carrot & Scuttle share by @nicosomb https://github.com/wallabag/wallabag/pull/6047
+* Remove old, not so maintained and buggy baggy theme by @nicosomb https://github.com/wallabag/wallabag/pull/4332
+* Remove Scrutinizer badge by @j0k3r https://github.com/wallabag/wallabag/pull/6179
+* Add mention to unofficial linux client by @imhemish https://github.com/wallabag/wallabag/pull/6203
+
+### Technical stuff
+* Remove SensioDistributionBundle by @yguedidi https://github.com/wallabag/wallabag/pull/5761
+* Back to latest composer version by @yguedidi https://github.com/wallabag/wallabag/pull/5810
+* Clean composer.lock after SensioDistributionBundle removal by @yguedidi https://github.com/wallabag/wallabag/pull/5839
+* Remove transitive dependencies by @yguedidi https://github.com/wallabag/wallabag/pull/5784
+* Register missed commands by @yguedidi https://github.com/wallabag/wallabag/pull/5928
+* Extend right FOSRestBundle controller class by @yguedidi https://github.com/wallabag/wallabag/pull/5929
+* Remove PHP-CS-Fixer deprecations by @yguedidi https://github.com/wallabag/wallabag/pull/5914
+* Upgrade FOSUserBundle to 2.1 by @yguedidi https://github.com/wallabag/wallabag/pull/5782
+* Add TwigCS by @yguedidi https://github.com/wallabag/wallabag/pull/5759
+* Use FQCN as service name by @yguedidi https://github.com/wallabag/wallabag/pull/5748
+* Migrate to new template reference notation by @yguedidi https://github.com/wallabag/wallabag/pull/5758
+* Migrate from old colon notation to FQCN by @yguedidi https://github.com/wallabag/wallabag/pull/5943
+* Use autowiring by @yguedidi https://github.com/wallabag/wallabag/pull/5946
+* Use FQCN to fetch services by @yguedidi https://github.com/wallabag/wallabag/pull/5951
+* Run tests without memory limit by @yguedidi https://github.com/wallabag/wallabag/pull/5953
+* Import used classes by @yguedidi https://github.com/wallabag/wallabag/pull/5952
+* Rework command tests by @yguedidi https://github.com/wallabag/wallabag/pull/5954
+* Switch to Swagger for api documentation by @caspermeijn https://github.com/wallabag/wallabag/pull/6062
+* Remove some deprecation by @j0k3r https://github.com/wallabag/wallabag/pull/6085
+* Remove deprecated options from FOSRest by @j0k3r https://github.com/wallabag/wallabag/pull/6095
+* Remove LiipThemeBundle by @j0k3r https://github.com/wallabag/wallabag/pull/6097
+* Upgrade PHPStan and move to level 2 with baseline by @j0k3r https://github.com/wallabag/wallabag/pull/6098
+* Upgrade to Symfony 4.4 by @j0k3r https://github.com/wallabag/wallabag/pull/6099
+* Update to FOSUserBundle 3.1 by @j0k3r https://github.com/wallabag/wallabag/pull/6136
+* Update to scheb/2fa-bundle by @j0k3r https://github.com/wallabag/wallabag/pull/6144
+* Upgrade to Twig 3 by @j0k3r https://github.com/wallabag/wallabag/pull/6151
+* Move translations files to /translations by @j0k3r https://github.com/wallabag/wallabag/pull/6153
+* Fix EventDispatcher & events by @j0k3r https://github.com/wallabag/wallabag/pull/6154
+* Replace SwiftMailer by Symfony Mailer by @j0k3r https://github.com/wallabag/wallabag/pull/6150
+* Remove ContainerAwareCommand from commands by @j0k3r https://github.com/wallabag/wallabag/pull/6152
+* Update all Doctrine deps by @j0k3r https://github.com/wallabag/wallabag/pull/6143
+* Update PagerFanta by @j0k3r https://github.com/wallabag/wallabag/pull/6145
+* Move to controller as a service by @j0k3r https://github.com/wallabag/wallabag/pull/6159
+* Add RabbitMQConsumerTotalProxy to lazy RabbitMQ services for messages by @j0k3r https://github.com/wallabag/wallabag/pull/6166
+* Properly handle json_array type removal by @j0k3r https://github.com/wallabag/wallabag/pull/6171
+* Fix database_path in Docker env by @j0k3r https://github.com/wallabag/wallabag/pull/6174
+* Docker: database_table_prefix may be configured from environment by @fcatt https://github.com/wallabag/wallabag/pull/6196
+* Update annotations to OpenApi 3 by @caspermeijn https://github.com/wallabag/wallabag/pull/6182
+* Fix public folder for Symfony 4+ by @kdecherf https://github.com/wallabag/wallabag/pull/6217
+* Fix API allowed_registration by @caspermeijn https://github.com/wallabag/wallabag/pull/6315
+* Enable PHP 8.2 in CI by @j0k3r https://github.com/wallabag/wallabag/pull/6469
+* Fix/build stylelint error by @Simounet https://github.com/wallabag/wallabag/pull/6586
+
+## [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)
 

GNUmakefile

@@ -14,9 +14,6 @@ endif
 help: ## Display this help menu
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
-clean: ## Clear the application cache
-	rm -rf var/cache/*
-
 install: ## Install wallabag with the latest version
 	@./scripts/install.sh $(ENV)
 
@@ -34,19 +31,8 @@ build: ## Run webpack
 	@yarn install
 	@yarn build:$(ENV)
 
-prepare: clean ## Prepare database for testsuite
-ifdef DB
-	cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml
-endif
-	-php bin/console doctrine:database:drop --force --env=test
-	php bin/console doctrine:database:create --env=test
-	php bin/console doctrine:migrations:migrate --no-interaction --env=test
-
-fixtures: ## Load fixtures into database
-	php bin/console doctrine:fixtures:load --no-interaction --env=test
-
-test: prepare fixtures ## Launch wallabag testsuite
-	XDEBUG_MODE=off bin/simple-phpunit -v
+test: ## Launch wallabag testsuite
+	XDEBUG_MODE=off php -dmemory_limit=-1 bin/phpunit -v
 
 release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`).
 ifndef VERSION
@@ -57,6 +43,6 @@ endif
 deploy: ## Deploy wallabag
 	@bundle exec cap staging deploy
 
-.PHONY: help clean prepare install fixtures update build test release deploy run dev
+.PHONY: help install update build test release deploy run dev
 
 .DEFAULT_GOAL := install

README.md

@@ -1,7 +1,6 @@
 # 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)
@@ -18,6 +17,8 @@ You can install it on your own server, or you can create an account on [wallabag
 * 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)
+* GNOME (Linux) app: [read-it-later](https://gitlab.gnome.org/World/read-it-later) (not maintained by this project)
+* All resources about wallabag ecosystem are listed here: https://github.com/wallabag/wallabag/wiki/wallabag-ecosystem
 
 ## Documentation
 
@@ -54,6 +55,10 @@ To learn more about developing wallabag, please refer to the [contribution guide
 
 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).
 
+## Sponsors
+
+<img src="https://api.blackfire.io/blackfire-logo.png" alt="Blackfire" width="200" />
+
 ## License
 Copyright © 2013-current Nicolas Lœuillet <nicolas@loeuillet.org>
 

RELEASE_PROCESS.md

@@ -9,7 +9,7 @@ During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE` (li
 #### Prepare the release
 
 - Update these files with new information
-    - `app/config/wallabag.yml` (`wallabag_core.version`)
+    - `app/config/wallabag.yml` (`wallabag.version`)
     - `CHANGELOG.md`
 - Create a PR named "Prepare $LAST_WALLABAG_RELEASE release".
 - Wait for test to be ok, merge it.
@@ -17,10 +17,9 @@ During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE` (li
 #### Create a new release on GitHub
 
 - [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 [website](https://github.com/wallabag/website) to change MD5 sum and create the release blog post (based on the changelog).
 - Update Dockerfile https://github.com/wallabag/docker (and create a new tag)
-- Update wallabag.org website (downloads, MD5 sum, releases and new blog post)
-- Put the next patch version suffixed with `-dev` in `app/config/wallabag.yml` (`wallabag_core.version`)
+- Put the next patch version suffixed with `-dev` in `app/config/wallabag.yml` (`wallabag.version`)
 - Drink a :beer:!
 
 ### Target PHP version

app/AppKernel.php

@@ -3,6 +3,7 @@
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel;
+use Wallabag\Import\ImportCompilerPass;
 
 class AppKernel extends Kernel
 {
@@ -13,7 +14,6 @@ class AppKernel extends Kernel
             new Symfony\Bundle\SecurityBundle\SecurityBundle(),
             new Symfony\Bundle\TwigBundle\TwigBundle(),
             new Symfony\Bundle\MonologBundle\MonologBundle(),
-            new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
             new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
             new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
             new FOS\RestBundle\FOSRestBundle(),
@@ -21,9 +21,8 @@ class AppKernel extends Kernel
             new JMS\SerializerBundle\JMSSerializerBundle(),
             new Nelmio\ApiDocBundle\NelmioApiDocBundle(),
             new Nelmio\CorsBundle\NelmioCorsBundle(),
-            new Liip\ThemeBundle\LiipThemeBundle(),
             new Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle(),
-            new Lexik\Bundle\FormFilterBundle\LexikFormFilterBundle(),
+            new Spiriit\Bundle\FormFilterBundle\SpiriitFormFilterBundle(),
             new FOS\OAuthServerBundle\FOSOAuthServerBundle(),
             new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
             new Scheb\TwoFactorBundle\SchebTwoFactorBundle(),
@@ -32,23 +31,15 @@ class AppKernel extends Kernel
             new Craue\ConfigBundle\CraueConfigBundle(),
             new BabDev\PagerfantaBundle\BabDevPagerfantaBundle(),
             new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
-            new BD\GuzzleSiteAuthenticatorBundle\BDGuzzleSiteAuthenticatorBundle(),
             new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(),
             new Http\HttplugBundle\HttplugBundle(),
             new Sentry\SentryBundle\SentryBundle(),
-
-            // wallabag bundles
-            new Wallabag\CoreBundle\WallabagCoreBundle(),
-            new Wallabag\ApiBundle\WallabagApiBundle(),
-            new Wallabag\UserBundle\WallabagUserBundle(),
-            new Wallabag\ImportBundle\WallabagImportBundle(),
-            new Wallabag\AnnotationBundle\WallabagAnnotationBundle(),
+            new Twig\Extra\TwigExtraBundle\TwigExtraBundle(),
         ];
 
         if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
             $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle();
             $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
-            $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
             $bundles[] = new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle();
 
             if ('test' === $this->getEnvironment()) {
@@ -64,11 +55,6 @@ class AppKernel extends Kernel
         return $bundles;
     }
 
-    public function getRootDir()
-    {
-        return __DIR__;
-    }
-
     public function getCacheDir()
     {
         return dirname(__DIR__) . '/var/cache/' . $this->getEnvironment();
@@ -81,15 +67,15 @@ class AppKernel extends Kernel
 
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
-        $loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml');
+        $loader->load($this->getProjectDir() . '/app/config/config_' . $this->getEnvironment() . '.yml');
 
         $loader->load(function ($container) {
             if ($container->getParameter('use_webpack_dev_server')) {
                 $container->loadFromExtension('framework', [
-                   'assets' => [
-                       'base_url' => 'http://localhost:8080/',
-                   ],
-               ]);
+                    'assets' => [
+                        'base_url' => 'http://localhost:8080/',
+                    ],
+                ]);
             } else {
                 $container->loadFromExtension('framework', [
                     'assets' => [
@@ -104,5 +90,42 @@ class AppKernel extends Kernel
             // $container->setParameter('container.dumper.inline_class_loader', true);
             $container->addObjectResource($this);
         });
+
+        $loader->load(function (ContainerBuilder $container) {
+            $this->processDatabaseParameters($container);
+        });
+    }
+
+    protected function build(ContainerBuilder $container)
+    {
+        $container->addCompilerPass(new ImportCompilerPass());
+    }
+
+    private function processDatabaseParameters(ContainerBuilder $container)
+    {
+        switch ($container->getParameter('database_driver')) {
+            case 'pdo_mysql':
+                $scheme = 'mysql';
+                break;
+            case 'pdo_pgsql':
+                $scheme = 'pgsql';
+                break;
+            case 'pdo_sqlite':
+                $scheme = 'sqlite';
+                break;
+            default:
+                throw new RuntimeException('Unsupported database driver: ' . $container->getParameter('database_driver'));
+        }
+
+        $container->setParameter('database_scheme', $scheme);
+
+        if ('sqlite' === $scheme) {
+            $container->setParameter('database_name', $container->getParameter('database_path'));
+        }
+
+        $container->setParameter('database_user', (string) $container->getParameter('database_user'));
+        $container->setParameter('database_password', (string) $container->getParameter('database_password'));
+        $container->setParameter('database_port', (string) $container->getParameter('database_port'));
+        $container->setParameter('database_socket', (string) $container->getParameter('database_socket'));
     }
 }

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

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

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

@@ -1,261 +0,0 @@
-<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,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
-eJzt3e2VVEeWLuCXu/r/ZFswiQU3sUApC7qwQGDBgAUqLICxAGQB1RYorwUqD5QeqDyo+yPIJkVS
-ReXHORFxzvOsxWK6B1TRiDoZ79k7djy7v78PAADAGP5P7QUAAADzIYAAAACjEUAAAIDRCCAAAMBo
-BBAAAGA0AggAADAaAQQAABiNAAIAAIxGAAEAAEYjgAAAAKMRQAAAgNH845hf/OzZs6HWATCEV0l+
-qb0IuIDbJG9rLwJ6cn9/X3sJPOCoAALQmWWSdeU1AAB7tGABAACjEUAAAIDRCCAA0L5F7QUAXIoA
-AgDtW9VeAMClCCAAAMBoBBAAAGA0AggAADAaAQQAABiNAAIAAIxGAAGm7L9qLwAA+DsBBJgyo0sB
-oDECCAAAMBoBBAD6sK69AIBLEEAAAIDRCCAAAMBoBBAAAGA0AggAADAaAQQAABiNAAIAAIxGAAEA
-AEYjgAAAAKMRQACgD+vaCwC4BAEEAAAYjQACAACMRgABAABGI4AAAACjEUAAAIDRCCAAAMBoBBAA
-AGA0AggAADAaAQQA+vB/ay8A4BIEEADow6L2AgAuQQABAABGI4AAAACjEUAAAIDRCCAAAMBoBBAA
-AGA0AggAADAaAQQAABiNAAIAfVjWXgDAJQggANCHZe0FAFzCs/v7+6f/4mfPBlwKwMU9/QEHffBB
-DE90zB6XcamAAAAAoxFAAACA0QggAADAaAQQAABgNAIIAAAwmn/UXgAAAFxay9Nb5z6hSwUEAPqx
-rL0AgHMJIADQj2XtBQCcSwABAABGI4AAAACjEUAAAIDRCCAAAMBoBBAAAGA0AggAADAaAQQAABiN
-AAIA/VjUXgDAuQQQAOjHqvYCAM4lgAAAAKMRQAAAgNEIIAAAwGgEEAAAYDQCCAAAMBoBBAAAGI0A
-AgAAjEYAAQAARiOAAEA/fqq9AIBzCSAAAMBoBBAAAGA0AggAADAaAQQAABiNAAJM1br2AgCAQwII
-AAAwGgEEAAAYjQACAACMRgABgH6sai8A4FwCCAD0Y1F7AQDnEkAAAIDRCCAAAMBoBBAAAGA0AggA
-ADAaAQQAABiNAAIAAIxGAAEAAEYjgABAX1xGCHRNAAGAvriMEOiaAAIAAIxGAAEAAEYjgAAAAKMR
-QAAAgNEIIAAAwGgEEAAAYDQCCAAAMBoBBAD6sqy9AIBzCCAA0Jdl7QUAnEMAAQAARiOAAAAAoxFA
-AACA0QggAADAaAQQAABgNAIIAAAwGgEEAAAYjQACTNWq9gJgIP9VewEA5xBAgKla1F4ADES4Brom
-gAAAAKMRQAAAgNEIIAAAwGgEEAAAYDQCCAAAMBoBBAAAGI0AAgAAjEYAAYC+uOMG6JoAAgB9cREh
-0DUBBAAAGI0AAgAAjEYAAQAARiOAAAAAoxFAAACA0QggAADAaAQQAABgNAIIAAAwGgEEAPqzrr0A
-gFMJIAAAwGgEEAAAYDQCCAAAMBoBBAAAGI0AAgAAjEYAAQAARiOAAAAAoxFAAACA0QggANCfVe0F
-AJxKAAGA/ixqLwDgVAIIAAAwGgEEmKr/rr0AAOCQAAJM1bL2AgCAQwIIAAAwGgEEAAAYjQACAACM
-RgABAABGI4AAQH9MeQO6JYAAQH+WtRcAcCoBBAAAGI0AAgAAjEYAAQAARiOAAAAAoxFAAACA0Qgg
-AADAaAQQAABgNAIIAPRnWXsBAKcSQACgP8vaCwA4lQACAACMRgABAABGI4AAAACjEUAAAIDRCCAA
-AMBoBBAAAGA0AggAADAaAQQA+rSovQCAUwggANCnVe0FAJxCAAEAAEYjgAAAAKMRQAAAgNEIIAAA
-wGgEEAAAYDQCCDBVy9oLAAAOCSDAVC1rLwAAOCSAAAAAoxFAAKBP69oLADiFAAIAAIxGAAEAAEYj
-gHz1McmbOLgKAACDEUCKZZJXSd4n+TPJHxFGAADg4gSQ4uqb/7zKYRhZjb0oAACYmn/UXkAj/vXI
-/2+Vr+Fjm+QmyW9JbgdeEwAATI4KSLLI00cZLlOqIX+kVEfeR2UEAACeTAA5bL96qmWEEQAAOIoA
-8nj71VMtI4wAMK6fai8A4BTP7u/vn/6Lnz0bcClVLJL8NeA/fxtnRqCWpz/coE+bJD/XXgRwvGP2
-31M09wrIqe1XT7WMyggAAPzH3APImOXrZQ7DyNABCACAuq5S9n18MfcWrL9S2rBquktp0/r3l5+B
-y5h3fZs52EQLFrRqleSXlIuud3vNF/nSkq8Fa76uUj98JGUNr5J8TglEH6MyAgDQm+9dZL2/17S/
-+2LOAeQS068uTRgBAOjH90LH8oFf2+Les4o5t2C10H71VNq04Hjzrm8zB5towYIadu1VV3k4bDzk
-eZKtFqx5Wqef8JGojAAA1HRMpeMx9m+ZbwXkfcpfnN6pjMDD5v16iTm4S/LP2ouACVumBIb/yWlh
-43s2SX6eewVkrgHkz1zuL1JL9sPIXeW1QG3zfrozF5P5YIZGLFNCxy8Z7u62f97f3896nzbHALJK
-KZ1NnTDC3AkgzMEkPpihsmWGDx37Xt/f338a4es0a44BZCrtV8cQRpgjAYQ5mMQHM1SwzLihY9/N
-/f39y5G/ZlPmGED+yPh/0VoijDAXAghzMIkPZhjJMvVCx767+/v7WZ/fmlsAWaac/6AQRpgyAYQ5
-6P6DGQa2SAkd/0pbE6heZgIDhE49TD+3Mbwt/cVrwVXKSN+/Ukb8vkpf44kBAL7Vw/UFs76UcG4V
-kLm3Xz3VTZL/9+Xnbd2lwMlUQJiD7j+Y4UJarXQ8ZJtyKWHXTq2AzCmALKP96hS3SX6LMEJ/BBDm
-oOsPZjhTb6HjWy9S9lnd0oL1Yz3+xWzBpW7+BODylrUXACProb3qqX6pvYBa5lQB+Zx+/4K2SGWE
-li1SPphg6n5OuVkZpm6/0jGV86rbdN6GpQXrcTYjwxJGaM06ye+1FwEjEECYsimGjm89T8d7Jy1Y
-j1P5GJY2LQDgEuY2oXOWe9S5BJBZjzobmTACABxjbqFj3yzPgcyhBUv7VRtuU9oEfkvnEx/owjpa
-sJgHLVj0ap2y+Z5ye9VT/TOdXgitBeth69oLIEmpjLxJqYr8mVIlcScLAMzHfpfE75lXpeMxs2vD
-mkMA0X7VnmWEEQCYA63ZPza7veocWrD+inTdi23KJC1tWpxrHS1YzIMWLFq0ytf2qmXdpXSjyzYs
-LVjfp6+wL8uojAAcw2ccrVDpOM+69gLGNPUAMruS1oQsI4wA/IjnIjUtI3Rcyqz2rFMPILM71DNR
-yxyGkXXF9QDAXC3z989koeMyZrVnnXIAWUVpeoqWKQ+731PO93zMzL5pAWBky+hKGNoiM3q5OuUA
-MsuLXWZmkTLC73OEEQC4pGWEjrHNpg1rygHERnRehBEAOM8yQkdNs9m3TDWArKIfcc6EEQB4mt1n
-ptBR3zIz+bOfagCx2WRHGAGAv/veZ+MsNr4dmMUeZaoBZDY9dBxFGAFgrnwG9mEWe9h/1F7AAJaR
-4vmx3YP4VcrNo5sk/065ib27m0iB2fqv2gugaYuUkPGvCBu92B0j2NZdxrCmWAHxDcaxdg/ojylv
-hT6nBBNjnIHWeeHGt1Q6+jf5f19TDCDG73IuYQSA3lxF6JiKn2ovYGjP7u/vn/6Lnz0bcCkXsUyZ
-4ABDuIk2rV6sUy6rhKnbJPm59iKoZr+9youyaflnOthrHJMj9k2tArKuvQAmTWUEgNp8Fs3DpCtY
-Uwsgs5gcQBN8AAAwFp858zPpNqwptWAtUr4xoSZtWm1YRwsW87CJFqyp0l41b3cpbVhN04I18VIV
-3dh/S/VHkjcpZ5MA4EdWKTeRq3Swm9A5SVMKINqvaM3ug+TPCCMAfN/3PiuEDpIJ722n1IJ1Wg0I
-xneb5LeUNq1t3aVM1jpasJiHTbRg9WiVcm3AVbyY4mHbJM9rL+Ixp7ZgTSWA7GZfQ2+EkWGsI4Aw
-H81+OPM3QgeneJGyV2jSqQHkHxdeRy2TLVExeat8Lb8LIwDTInRwrl/ScAA51VQqIH9FvyTTIoyc
-Zx0VEOaj2Q/nmVqmBI7/idDB+W5TqiBNmnMLlvYrpu42X0f7Tu4tyEDWEUCYjyY/nGdmmbIf+SWl
-6gGX9DyNvoyc8xhe7VdM3SrJrynTUf5MadfyAfc4FVFgaMuUiVWezQxtcuN4p1AB+TNKnMzTNqUq
-8ltURr51nRLaYA6a/HCeqGVUOhhfs21Yc23BWqW8eYC520YY2XcdAYT5aO7DeWKWETqo758pt6M3
-Za4tWL/UXgA0YhmtAACXski5hfxzPFNpw6TasHoPIJP6lwEXsowwAnCs/dDxV5KPsc+gHZM689xz
-C5b2KzjONvNp07qOFizmo+mLyhq3SAkZ/4qwQfua2ogn82zBWtdeAHRmma+VEW/3YDpMfTuOSge9
-mszf054DiPMfcDofwMCceOYxBZNpw+o1gCyjpx0uxQczMFVXKc+0P+PZRv8m8/f3H7UXcKLJ/AuA
-xuzCyKuUcX83+XoLO0AP9s90aE9jShYpL+C7P/PVawDRfgXDE0aAXggdzMUvmUAA6bEFa5f+gPFo
-0wJas2uv+ivl2fQqwgfTN4nP3h4rIJP4g4eOPVQZ2aTBW1qBSVmnvAFW6WCulplAG1aPAWQyEwBg
-AvbDSPL3Ni1hBLiEVb6GjmXdpUAT1uk8gPTWgrW7MAhok5YIGN8U25JXSd6nTK/6I+UOo2XNBUFD
-uj8L3VsAET6gH8IIjGMq31dCBzzNKp1/b/QWQLRfQZ+EEeB7hA44zbr2As7RWwBZ114AcDZhBOZt
-GaEDztX1S/meAoiJFzA9wgjMwzIlaPyREjyEDjhP1/vingJI10kP+KH9MPJ7bFCgd8v8PXS8zzQP
-zEMt3Z6N7imAdPuHDBxtHS0a0KNlhA4Yy0+1F3CqXgJI12Um4CwOqULblhE6oIZuX873EkC6TXjA
-RQkj0IbdJaRCB9TT7f14vQSQLv9wgUEJI1D890hfZxc6Pqec1foYoQNq6/Il/bP7+/un/+JnzwZc
-yoNWKZsLgKe4TXIXY7uZj02Snwf6Z+/esP4rXgZCi7ZJntf64sfkiH3/uPA6htD9dfPAqLyRhfMI
-HdCPZcrn3m3ldRylhwDi4QcAwxI6oF9X6SyAtH4GZBk93QAwlKv8/UyH8AH96e6uvNYrIB6EAHBZ
-+5UOI+6hf6uUF/bbust4utYDiPMfAHA+oQOm7SrJh9qLeKqWA8gyDpMCwKmEDpiPf0UAuQjtVwBw
-HKED5mmd8j1/V3kdT9JyAOnuQA0AVLBIuZTzVYQOmLOrJJ9qL+IpWr2IcJEykQMAAPixmyQvx/yC
-p15E2OoYXu1XAADwdOvaC3iqVgOI9isAAHi63YWizWsxgHTzhwcAAA3p4iV+iwFE+AAAgON1sY9u
-MYD8VHsBAADQoUU6uEevxQDSRXIDAIAG/VJ7AT/SWgBxcRIAAJyu+Zf5rQWQLg7OAABAo5ZffjSr
-tQDSfGIDAIDGNb2nbimArKP9CgAAztX0OZCWAoj2KwAAON8qDbdhtRRAmi4VAQBAR9a1F/CQVgJI
-0ykNAAA602x3USsBpOk+NQAA6Eyz11u0EkDWtRcAAAATs669gO9pIYAs08GV8QAA0Jkm27BaCCAO
-nwMAwOU1uc9uIYA4/wEAAJe3SINtWLUDyDLarwAAYCjNtWHVDiBNloUAAGAimttv1w4gP1X++gAA
-MGXLNNZxVDOALNJgIgMAgIlpas9dM4A09QcBAAAT1dQ5kJoBpKk/CAAAmKhVSitWE2oFEO1XAAAw
-nmb23rUCyLrS1wUAgDlqZvhTrQCi/QoAAMZzldKFVF2tANJMCQgAAGaiiT14jQDSTPoCAIAZaaIL
-qUYAaeJ/OAAAzMy69gKSehUQAABgXE1Moh07gKyi/QoAAGqp3o00dgD5ZeSvBwAAfLWuvYCxA0j1
-kg8AAMzYMqUrqZoxA0hTV8ADAMBMVe1KGjOAqH4AAEB965pffMwAUv3ACwAAULczaawAskzlXjMA
-AOA/qnUnjRVAtF8BAEA7qp0DeXZ/f//0X/zs2alf54+ogAAAQEv+meTu1N98TI7YN0YFZBnhAwAA
-WlOlS2mMALIe4WsAAADHqTIkaowAYvoVAAC0Z5IVkEUcQAcAgFaNvlcfOoAIHwAA0K7Ru5WGDiDa
-rwAAoF2jFwyGHsN72mwuAABgLD8n2Rz7m1ocw6v9CgAA2jdq19KQAUT7FQAAtG/UwsGQLVh/pUzB
-AgAA2vYiye0xv6G1FqyrCB8AANCL9VhfaKgAov0KAAD68ctYX2ioFqw/kyxPWA8AAFDH8yTbp/7i
-llqwVhE+AACgN6McRh8igIxWvgEAAC7mpzG+yBAtWNqvAACgT/9McveUX9hKC5b2KwAA6NfgbViX
-DiDrC//zAACA8QzehnXpFqw/UqogAABAf+5S2rB+qIUWrGWEDwAA6NkiA7dhXTKAjDK2CwAAGNSg
-bViXbMHSfgUAAP3bplxK+KhTW7AuFUAWSf46aQUAAEBrXiS5fewX1D4Dov0KAACmY7DLxS8VQP51
-oX8OAABQ33qof/AlWrC0XwEAwPQ8TzkP8l01W7C0XwEAwPQMss+/RADRfgUAANMzyD7/Ei1Yf6W0
-YQEAANPyz5Tb0Q/UasG6ivABAABTdfE2rHMDiPYrAACYrovv989twdJ+BQAA0/bdcxg1WrC0XwEA
-wPRdtA3rnADy08VWAQAAtOqibVjntGD9mWR5ycUAAADNuUuZhvU3Y7dgrSJ8AADAHCxS9v8XcWoA
-+eVSCwAAAJp3sf3/qS1Y2q8AAGA+tkme7/8XY7ZgLSN8AADAnCxzoQxwSgC5+G2IAABA8y6SA04J
-IM5/AADA/FwkBxx7BmSZcv4DAACYn+cp50FGOwOi/QoAAOZrfe4/4NgAcpfk9twvCgAAdOnsW9FP
-HcO7TKmG/JILXkoCAAA0759J7k5twTo1gOxbRhgBAIC5eJnkpmYA2beMMAIAAFP2KcnrVgLIvmWE
-EQAAmJq7JP9sMYDsW0YYAQCAqXh5f39/c8pvPOUiwlNsk3xI8iJldvDbJCctGAAAqO6nU3/jWBWQ
-hyxSKiP/ijtGAACgF9v7+/vnp/zGowLIkJ49eyaMAABAP17c398ffUfgWC1YT3GXcqL+Zcps4dfR
-pgUAAK06qWjQUgDZJ4wAAEC77k79jS21YD3ll2nTAgCAem6S/DulWJBTskRvAWSfMAIAAMPbhY6b
-fFP5mFsA2SeMAADA5TwYOvbNOYDsE0YAAOB4Twod+wSQQ8IIAAA87OjQsU8AeZwwAgAAyW2S31IO
-kp88zSoRQI4hjAAAMCe70HGTZHupf6gAchphBACAKRokdOwTQM4njAAA0LPBQ8c+AeSyhBEAAHow
-aujYJ4AMRxgBAKAl25TA8VtKAKlCABmHMAIAQA3bNBA69gkg4xNGAAAY0jaNhY59AkhdwggAAJew
-TcOhY58A0o5dGPnpy8+LussBAKBx23QSOvYJIO3ar4wIIwAAJOUW8psk//7yc3cEkD4IIwAA89V9
-6NgngPRHGAEAmL6/hY5W9t+1CCDtEEYAAKbjwUpHK/vvWgSQNgkjAAD9eVJ7VSv771oEkPYJIwAA
-bdsPHXc/+sWt7L9rEUD6IowAALThqNCxr5X9dy0CSL+EEQCAcZ0cOva1sv+uRQCZBmEEAGAYFwkd
-+1rZf9cigEyPMAIAcJ6Lh459rey/axFApk0YAQB4mtskv6WEju2QX6iV/XctAsh8CCMAAH83WujY
-18r+uxYBZJ6EEQBgrqqEjn2t7L9rEUAQRgCAqaseOva1sv+uRQBhnzACAEzFNsn/ppHQsa+V/Xct
-AggPEUYAgN5sUwLHbylVjya1sv+uRQDhKYQRAKBV23QQOva1sv+uRQDhWMIIAFDbNp2Fjn2t7L9r
-EUA4x1WSn778vKy7FABg4rbpOHTsa2X/XYsAwqWskvwSYQQAuJy7JJ8ygdCxr5X9dy0CCEMQRgCA
-U92lVDr+/eXnyWll/12LAMLQhBEA4EcmHzr2tbL/rkUAYUzCCACwM6vQsa+V/XctAgi1CCMAMD+z
-DR37Wtl/1yKA0AJhBACm7VNmHjr2tbL/rkUAoTXCCABMw36l467yWprSyv67FgGElgkjANAXoeMJ
-Wtl/1yKA0AthBADaJHQcqZX9dy0CCD0SRgCgLqHjDK3sv2sRQOidMAIA49ik3EgudJyplf13LQII
-UyKMAMBl3eZr6NjWXcp0tLL/rkUAYaqEEQA4jdAxsFb237UIIMyBMAIAjxM6RtTK/rsWAYS5EUYA
-oBA6Kmll/12LAMKcCSMAzM02JXR8itBRTSv771oEECiEEQCmaptS5fgtpepBZa3sv2sRQOCQMAJA
-77YROprVyv67FgEEHrdKCSL/+vJ/A0CrthE6utDK/rsWAQSebpkSRn6JMAJAG7YROrrTyv67FgEE
-TrOMMAJAHXcpoeN/I3R0qZX9dy0CCJxvGWEEgGHtQse/v/xMx1rZf9cigMBlLSOMAHAZQsdEtbL/
-rkUAgeEsI4wAcByhYwZa2X/XIoDAOJYRRgD4PqFjAK3scTkkgMD4lhFGAPg6vUroGEAre1wOCSBQ
-1zLCCMCc7Fc67iqvZdJa2eNySACBdiwjjABMkdBRQSt7XA4JINCmZYQRgJ4JHZW1ssflkAAC7VtG
-GAHogdDRkFb2uBwSQKAvywgjAC25TbmRXOhoTCt7XA4JINCvZYQRgBpu83V61bbuUnhIK3tcDgkg
-MA3LlDDyvvI6AKZK6OhMK3tcDv2j9gKAi9jWXgDABAkdMAAVEJiGZZI/kiwqrwOgd0LHRLSyx+WQ
-CghMw8cIHwCn2qYEjv+N0AGDE0Cgf9dJ1pXXANCbbUro+C2l6gGMRAsW9G2V0noFwI9tI3TMRit7
-XA6pgEDfPtZeAEDjthE6oCkCCPTrfdz/AfA92wgd0CwtWNCndZLfay8CoCF3+Ro6NnWXQgta2eNy
-SACB/ixSzn0sK68DoLZd6Pj3l5/hP1rZ43JICxb0532ED2C+hA7onAoI9OUqyefaiwAYmdDB0VrZ
-43JIAIF+LJL8GRcOAvMgdHCWVva4HNKCBf1w2zkwB7vQ8anyOoCBCCDQh1cp7VcAU/dbVDxg0rRg
-QfuWKVOvVD+AObhL8vzLz3CyVva4HPo/tRcA/JDWK2BOFinPPWCiBBBo25uUSwcB5uQq2k5hsrRg
-QbtWKa1XAHOkFYuztLLH5ZAKCLRLCwIwZ4u49wgmSQCBNl2nVEAA5myd0ooKTIgWLGjPOsnvtRcB
-0Ii7JC+SbCuvg860ssflkAoItMX0F4C/81yEiRFAoC2/ptz7AcBX62jFgsnQggXtWEfrFcBD7pL8
-nOS29kLoQyt7XA4JINCGRZI/48JBgMfcppwHgR9qZY/LIS1Y0Aa3nQP82CplSiDQMRUQqO8qZt0D
-HONFtGLxA63scTkkgEBdy5TbzlU/AJ5OKxY/1Moel0NasKAurVcAx1sleV97EcBpBBCo503K5CsA
-jucZCp3SggV1rFJG7qp+AJxum9KKdVd5HTSolT0uh1RAoA6tVwDnW6Zc4Ap0RACB8V2nVEAAOJ9W
-LOiMFiwY1ypl6hUAl7ONViy+0coel0MqIDCeRUrrFQCXtYznK3RDAIHx/BqtVwBDufryA2icFiwY
-xzpl6hUAw7lL8jxasYgWrJapgMDwtF4BjMPzFjoggMDwPqb0JwMwvKskr2ovAniYFiwY1lWSz7UX
-ATAzdylTsbaV10FFrexxOSSAwHAWSf6MCwcBatgk+bn2IqinlT0uh7RgwXA+R/gAqGWdckkh0BgV
-EBjGmyTvay8CYOa0Ys1YK3tcDgkgcHnLlNvOVT8A6rtNCSHMTCt7XA5pwYLL+xjhA6AVqyTXtRcB
-fKUCApd1nXLjOQBteZFSDWEmWtnjckgAgctZpbReAdAerVgz08oel0NasOBy3L4L0C6tWNAIFRC4
-jPcx7hGgB1qxZqKVPS6HBBA43zrJ77UXAcCTbFNCyF3ldTCwVva4HNKCBedZROsVQE+WMSwEqhJA
-4DzvUz7MAOjHm5TqNVCBFiw43VWSz7UXAcBJttGKNWmt7HE5pAICp9F6BdC3ZUoVGxiZAAKncds5
-QP9epVSzgRFpwYLjvYrqB8BU3CV5Hq1Yk9PKHpdDKiBwnGWU7AGmREstjEwAgeNovQKYnqtoxYLR
-CCDwdMY2AkyXF0wwEmdA4GlWSf6ovQgABrVJ8nPtRXAZrexxOaQCAk+jPxhg+tYp1W5gQAII/Nh1
-SgUEgOn7NWXgCDAQLVjwuHWS32svAoBRbaIVq3ut7HE5pAICDzOaEWCe1tGKBYMRQOBhyvAA8/U+
-2m9hEFqw4PvW0XoFMHe3SV7UXgSnaWWPyyEVEDi0SPK59iIAqG6VMogEuCAVEDj0OW7EBeCrFynV
-EDrSyh6XQyog8HdXET4A+Du3pMMFCSDw1TKmXgFwaJUymAS4AC1Y8NXvKYfPAeB7fk65I4QOtLLH
-5ZAKCBRvInwA8DitWHABAggorQPwNMv4vICzacGC5I+4bAqAp9OK1YFW9rgcUgFh7q4jfABwnM/R
-igUnUwFhzlYp1Q8AONZNkpe1F8HDWtnjckgFhLlaxMhdAE7n3ig4kQDCXP0arVcAnMdULDiBAMIc
-rVPG7gLAOVTT4QQCCHPjwwKAS7qKl1pwFIfQmZvP0bMLwGXdJXmRZFt5HexpZY/LIRUQ5sSBQQCG
-oLoORxBAmAsfDgAMaR2tWPAkWrCYi99TPhwAYChasRrSyh6XQyogzMGbCB8ADG+RctYQeIQAwtQt
-U+78AIAxrJJc114EtEwLFlOn9QqAGl4kua29iDlrZY/LIRUQpuw6wgcAdRh8Ag8QQJiqVbReAVCP
-Vix4gBYspuqPlIc/ANT0c5JN7UXMUSt7XA6pgDBF7yN8ANCGjynTsYC0+wmHAAAZv0lEQVQvBBCm
-Zh0XQQHQjmW0BMPfaMFiShYprVfLyusAgG9pxRpZK3tcDqmAMCXvI3wA0CatWPCFAMJUXCV5VXsR
-APCAZYzmhSRasJiGRZI/480SAO17meSm9iLmoJU9LodUQJgCZW0AeuEzi9kTQOjdq5T2KwDowSJa
-sZg5LVj0bJky9cqbJAB6oxVrYK3scTkkgNCz31Pu/QCA3twleZFkW3kdk9XKHpdDWrDo1ZsIHwD0
-SysWs6UCQo9WKa1XANC7t0k+1F7EFLWyx+WQAEKP/kgJIQDQO61YA2llj8shLVj05jrCBwDToRWL
-2RFA6Mk6ya+1FwEAF7ZOecEGs6AFi14sUlqvlpXXAQBDeZHktvYipqKVPS6HVEDoxa8RPgCYNq1Y
-zIIAQg/WKWN3AWDKVtGKxQxowaJ1iyR/xm3nAMyHVqwLaGWPyyEVEFr3McIHAPPis49JE0Bo2dWX
-HwAwJ6uY+siEacGiVcuUqVfeAAEwVz8n2dReRK9a2eNySAWEVik/AzB3PguZJAGEFr1JmXwFAHO2
-jFYsJkgLFq1ZJfk93vgAwM7LJDe1F9GbVva4HBJAaM0fKSEEqOttkv+OO3igBXdJnn/5mSdqZY/L
-IS1YtOQ6wge0YJPkQ5J3cRcBtGARt6QzISogtGKVUv0A6vr2TavvTWiHVqwjtLLH5ZAKCC3wZgfa
-8TJ/b/O4TWnHAuozFYtJEEBowa/RegUt+JDv3znw0H8PjGuR5HPtRcC5tGBR2zpl6hVQ122SF4/8
-/xdJ/oy3r9CCtykvBnhEK3tcDgkg1LRI6S1fVl4HzN1dSvjY/uDXreOFAbTgqd+zs9bKHpdDWrCo
-6WOED2jB6zxtI7OJt67QAmcn6ZoAQi1XX34AdX3KcVN13sZoXmjBOu7poVNasKhBLzm04TbJzzn+
-crNVSiuW72Go6y7le9hLge9oZY/LIRUQavgcGxdoweucdrPybcolhUBdWrHokgDC2N6klI2Bus5t
-pfoQF6JBC1ZJrmsvAo6hBYsxLVOmXql+QF03KRcOnks7JbTjRbRi/U0re1wOqYAwJje4Qn13Ka1X
-l/pnXSLIAOfTikU3BBDGch2tV9CClznt3MdDNjGaF1qwSvK+9iLgKbRgMYZVSusVUNe7DNcr/kfK
-9zpQ188pLwZmr5U9LocEEMZgYwL13ab0iA/FaF5owzble/2Slc4utbLH5ZAWLIb2PsIH1DbGWQ2j
-eaENyyS/1l4EPEYFhCGtU96IAnW9zHgjcz8nuRrpawEPm30rVit7XA4JIAxlkdJ6tay8Dpi7T7nc
-1KunMJoX2rDNzFuxWtnjckgLFkN5H+EDartNuXBwTEbzQhuWMZqXRgkgDOEqyavai4CZ2933UePt
-5yZG80ILrqIlkgZpweLStF9AG96mfggwAQ/qu0vyPDNsxWplj8shFRAuzW3nUN9N6oePpF4FBvhq
-Ea1YNEYA4ZJeRakXattm3EPnj6lxBgU4pDWapmjB4lKWKe0Wqh9QV4ujN43mhfruUqZibSuvYzSt
-7HE5pALCpWi9gvrepb3wkZSKzLb2ImDmtGLRDAGES3iTcukgUM8myXXlNTxkN5ELqGud8pkNVWnB
-4lyrlNYroJ5eWiuuk/xaexEwc708L87Wyh6XQwII5zJmE+p7mTL5qgeeGVDfbUoImbRW9rgc0oLF
-Oa5jIwG1fUg/4SMpYcloXqhrlXZbNpkBFRBOtU7ye+1FwMzdpky96m1D/yoOw0ILXqQ8RyaplT0u
-hwQQTrFIaaNYVl4HzNldSvjodfNgNC/UN+lWrFb2uBzSgsUpfo3wAbW9S7/hIzGaF1qgFYsqVEA4
-1jpar6C2m5SzFL1bx/MEWjDJVqxW9rgcUgHhGIuUtgmgnm2mc6fGJqWSA9T1OS4TZkQCCMdw2znU
-9zr9HTp/zHUm+OYVOrOMO3oYkQDCU13FgVGo7V1K1WBqjOaF+t6ktEXC4JwB4SmWKVOvVD+gnk3K
-1KupehWjeaG2bcp5kEm8EGhlj8shFRCeQusV1HWXaRw6f8yn9HWhIkzRMsn72otg+gQQfkRJFuqb
-2rmPhxjNC/W9ipZrBqYFi8esUkZkqn5APR+SvK29iBGtUlo+gXrukjxP5y8+WtnjckgFhMdovYK6
-bjOv8JGU/81G80JdiziTxYAEEB5ynfImEqjjLtO57+NY15nmtC/oiemXDEYLFt+jBQLqe51yMHuu
-ljF9D2rruhWrlT0uh1RA+JayK9R3k3mHj2RaN75DrxYpt6TDRQkgfOvXaL2Cmrax8d4RxKC+dcpE
-TLgYLVjsW6dMvQLqeZFyEJtikdKKtay8Dpizu5Rn07byOo7Syh6XQyog7Gi9gvreRfj41hwuYYTW
-2SNwUQIIOx/jDSPUtEmZ/sQho3mhvnW0YnEhWrBIypg9h8ygnq4nzYzo95RNEFBPN22irexxOSSA
-sEjyZ4y6hJpephy45nHLGM0Ltd2mhJDmtbLH5ZAWLD7HhznU9CHCx1NtY0IY1LaKdlHOpAIyb2+S
-vK+9CJixbt4kNuZjkle1FwEz13wrVit7XA4JIPO1jFYGqOkuyc9p/AO8UUbzQn23Kc+wZs+utbLH
-5ZAWrPn6GOEDanob4eNURvNCfauUy4vhaALIPF3HJBmo6VPc8H0uo3mhvjexn+AEWrDmZ5XSugDU
-sU3pnW62baEzRvNCXds0+kxrZY/LIRWQ+XGTKdT1Mg1+UHfsdfx5Qk3LaMXiSALIvLxPqYAAdTj3
-cXnbGM0LtWnF4ihasOZjndKqANSxSZkYwzDep2yCgDrukjxPQxXJVva4HBJA5sHISqiruQ/mCVqk
-vGRR5YV6btLQhLpW9rgc0oI1D+8jfEBNzn0M7y5asaC2qy8/4FECyPRdxY3BUNOHlPYrhnebcs4G
-qMc9Y/yQFqxpWyT5Mx4EUMttynhKxmU0L9TVRCtWK3tcDqmATJu3EFCP27rr0fIGdV3FUAgeIYBM
-16vow4Sa3qaMiGV8zoNAfb/G+VMeIIBM0zLl4DlQx6cvP6jnJuX8DVDHIi4/5gHOgEyT/meoZ5ty
-7kMLUH1G80J9b1PpZUAre1wOCSDT8yaqH1DTi7jtvCWrlHuQgDruUp6L27G/cCt7XA5pwZqWVYQP
-qOlthI/WGM0LdS2SfK69CNqiAjItf0SrAdSySfJz7UXwIK2pUNe7JNdjfsFW9rgcEkCm4zpl4gQw
-vrskz+PcR8vciwT1jdqi2soel0NasKZhHeEDanLvRPuM5oX6TMUiiQAyBcbcQV3vUtqvaJ/RvFDX
-KiO3YdEmLVj9ex+3jUIttyktBfTDaF6o7+eM8OKmlT0uhwSQvq1TPkiB8VUbLcnZVinPTudBoI5t
-RrgvqZU9Loe0YPXLWDuo63WEj17dprTOAXUs4+zqrKmA9Otzkqvai4CZ+hQHmqfAcxTqGrQVq5U9
-LocEkD5dRfUDarlN+dA09ap/RvNCXdsM2IrVyh6XQ1qw+rOMqVdQ0+sIH1NxlzJCGahjGXuaWRJA
-+vMx3tZBLW8z4iVajGITo3mhpqtohZwdLVh9eZMydhcY3028LZ+yP2I0L9Ryl+R5LlxdbmWPyyEB
-pB/GRkI9g3w40hTPWKjr4i95WtnjckgLVj+0XkE9LyN8TJ3RvFCXVqwZEUD6cB2tAVDLu4xwYy9N
-+JDyFhao42PKwXQmTgtW+1YpvcnA+G5TRkQyH0bzQl2blFHnZ2tlj8shFZC2LWI8HdRiROs8+fcO
-da1Thu4wYQJI236N1iuo5XXKJVnMzyZG80JNv0Yr1qRpwWrXOmUiCzC+Dyl3fjBvRvNCPZuc2YrV
-yh6XQyogbdJ6BfWYhsSOW++hnnXKEB4mSABpkykQUMddbDr5ShiFurSiT5QA0h5zsKGedymbTtgx
-mhfq0hEyQc6AtMX4R6jn4rfwMhmLlPMgy8rrgLl6lxPasVrZ43JIAGnL7yk9j8C4tin3fWi94iHr
-GAwCNb3IkRXqVva4HNKC1Y43ET6gFuc++JFNnAeBmj5Gh8hkqIC0YZlS3veNBeM7qbTPbBnNC/Uc
-NSK9lT0uhwSQNmi9gjo2OXPOPLOzjBdGUNPPKc/uH2plj8shLVj1LeODDGrYjdyFY2zjkkqoSSvW
-BAgg9W1TDlbpLYZxvU75/oNjfYrRvFDLMuV+EDqmBast67iEEMZwVB8xfIfRvFDXy/zgRUAre1wO
-CSDtWSR5n+RV5XXAVN2m9BCbesW51jGaF2q5S/I8jzzLW9njckgLVnt2fekvY4MEl7b7/vK9xSVs
-on0WalnELendEkDadZNyNmRTeR0wJe9y5EVW8APX8XcKalnWXgCnEUDatk1pFdGrDue7STn7AZem
-Yg3j+xRj1LvlDEg/VimlRhdgwfG2KRVFm0SG8iraQWAMu1baH06ia2WPyyEBpD/vk7ypvQjozIto
-k2F4n5Nc1V4ETNhtSsVx+5Rf3Moel0NasPrzNqXkuK28DuiFcx+Mxd0yMJwPKS+TtpXXwQWogPRr
-N/3B2zZ42CZ6hBnXOkbzwiU9ueXqW63scTmkAtKvu5QypJGi8H277xEY0yZG88KlbFLu+jg6fNA2
-AaR/n2JcL3yPcE4t19H2B+d6F5fGTpYAMg3blG9Sb92g+BBvzKjLaF44zV3Knua68joYkDMg02Nc
-L3N3m1IVhNquUiZjAU9zkwtWr1vZ43JIBWR6blPeHLhwjTnaHVaEFtyktMkCP/Y2KoezoQIybVcp
-1ZBF7YXASF7Hho+2LJL8kWRZeR3Qqm1K8Lj4ualW9rgcUgGZtpuYHsF8eNtMi0xjg4d9iotiZ0kA
-mb7dh9/bKGsyXdtovaJdtzEkBPbt2mVNK5wpLVjzskw5EOmAOlPjDRo9+D3lokKYs9uU4DH4M7uV
-PS6HVEDmZZuyUfMmjil5F+GDPnjby9x9SBmU45k9cyog87VOOaC+rLsMOMsm5cMMemE0L3O0a7ka
-9UxqK3tcDgkg87ZI8j7Jq8rrgFPcpQxZ8EaZ3nyM5y7zcZtyFnU79hduZY/LIS1Y87Z7I2HuNj3S
-zkKv3qbCZgwq+JDS+r2tvA4aowLCziKlLWBdeR3wFB9SNnHQq1XK/SAwRbsJnJuai2hlj8shFRB2
-7lJ66W3qaN1t/D2lf0bzMlWblPbYTd1l0DIVEL5nldKjbFwvrbmLcj7TYjQvU/IuyXXtRey0ssfl
-kAoI33Obssn7UHsh8A2980yNs0xMwTali+K67jLohQDCY96mPFC2ldcBSfLpyw+Ykm1KCIFe3aS8
-tNxUXgcd0YLFUyxSWrKuai+E2dqmfMB5U8xUGc1Lj96m4W6JVva4HBJAOMarlHtDFpXXwfy8iJtz
-mbZFynkQZ+/owW1K5a7p53Ire1wOacHiGJ+izMr43qbxDzm4gN29TNC6Tynt2Z7LnEwA4VjblAeP
-8ZGMYZOGy/twYUZM07JdSDY4gbNpweIcxvUypLuUWfI+6Jgbo3lpTRctV99qZY/LIRUQznGbUg3x
-hpohvIzwwTz5u09LPsQ5PC5MAOFcd/k6rtcHJpfyIc4aMV/Og9CCu5QwrC2Qi9OCxSUZ18sl7C7C
-hLl7n+RN7UUwS7cp4WNbeR1naWWPyyEVEC5p/22Jagin2P0dAsqwD20vjO1dykugbeV1MGEqIAxl
-meRzHFDnOK/jtnPYt0ryR+1FMAu7F0Cbyuu4mFb2uBxSAWEo25Q3KMb18lSfInzAt4zmZQyblKmD
-m7rLYC5UQBjDKqUasqy8Dtq1m6imdQ++z2hehvIuyXXtRQyhlT0uhwQQxrJIOVD5qvI6aJMRj/C4
-RZI/v/wMl7BNabma7LO3lT0uh7RgMZbdWEnz7fnW20z4AxAuxGheLukmXvxQkQDC2G6iz5SvbuIi
-S3gq3y+ca3d3l5eBVKUFi5reJPk1Wgrm6i4ljPoQhKdbpJwHMWGQY92mVNFmU/VoZY/LIRUQavqQ
-cvB4Ng9D/sYbODieVixO8Sk+b2mIAEJtu1uvtRXMy7tow4NTGc3LU+0C6+t44UNDtGDRknWSjzGu
-d+p2oRM4z+ckV7UXQbNuUyrN28rrqKaVPS6HBBBas0gJIT5Up+kuJXxsK68DpsBoXh7yIapkAkjD
-tGDRmruUNzbOB0zT6wgfcCm75yXs7P5OzD580DYBhFbtZpRvKq+Dy/mU8u8VuJxNnKGj2KR8bnrO
-0jwtWPTgOmVcL/26TZnAoqoFw/gjRvPO2buUz0r2tLLH5ZAAQi9WKWdDfMD2yY27MKxVyv0gzoPM
-y67lalN5HU1qZY/LIS1Y9GL3Bl2rQX/eRviAod2mvAVnPjYpl7lu6i4DjqcCQo/WKeMnvelr300c
-koUxGc07D2/jhdwPtbLH5ZAAQq+M623fXcrbOec+YDxG807bNuWljqryE7Syx+WQFix6tT9q0Aa3
-TUYpw/iM5p2u3XRI4YPuCSD07kM8kFv0LvqSoZZNtOdMyV3KHUpe6jAZWrCYkusY19uCTcrAAKAu
-o3n7d5sSPrxkO0Ere1wOCSBMzSrlEOay8jrm6i6lIrWtvA7AaN7efYo247O0ssflkBYspuY2ZQOs
-/aCO1xE+oBVG8/Zpd47ndYQPJkoFhCm7SpmU5e3fOD6kvK0D2mI0bz9uU8LHtvI6JqGVPS6HBBCm
-bpHy4buuvI6p210U6W0dtMdo3j54iXNhrexxOaQFi6m7S9kY66Mdzm5Ciz9faJPRvG3bHysPsyCA
-MBcfUoKISSKX9y7+XKF1mzgb16JNyoWtN5XXAaPSgsUcXce43ku5iTer0BOjedvxLuXziIG0ssfl
-kADCXK1TDqgv6y6ja9uUiWNar6Afy5QQ4jxIPbuWq03ldUxeK3tcDmnBYq42KZtnZe/TOfcB/dnG
-WYOablJarjaV1wFVCSDM2e4t1MvYSB/rXXyAQq8+xcuXGt7G5w0k0YIFO8uUlqx13WV0YZNyoB/o
-1yKlFWtZeR1zsE0JHoZ1jKyVPS6HVECg2ObruF4ethu5C/TN9/I4PqW0+wofsEcAgb/7EB8Wj3kd
-N/TCVGxS2im5vF3Ac1YOvkMLFnzfImVU75vaC2mIW3phmozmvazblODhRVZlrexxOSSAwOPWST7H
-yMrblBY1b/JgepYxmvdSPqRUlTwrG9DKHpdDWrDgcZu4pXbXSuADFaZpG9XNc+2mKr6NZyX8kAAC
-P7b7YJnrJvxttBLA1H3KvF+0nOM27pWCo2jBguMsU1qy5tIvfZMSvoDpM5r3eM7GNayVPS6HVEDg
-ONuUN11zmByzjTGdMCdG8z7dXYxuh5MJIHCa65Qgsq27jEG5sRfmZ5N5vGA5xyblbOCm7jKgXwII
-nG7X9/uh9kIG8C7OfcBcXcf3/0PexURAOJszIHAZV0k+ZhpjLDcpH7DAfC1jNO++bUp72qbuMjhG
-K3tcDqmAwGXcZBol+d3EL2DetnG+Yecmpdq9qbwOmAwBBC5n/1Bir+X5uY4aBg59+vJjzt7GeTi4
-uGZasGBKnj17tkppyeppXO+H+/t7bzyB/3j27NlcR/PeJnl9f3/vLAwMQACBAeydabpO8mu9lTzZ
-bZIXngfAvi/PslVKCJmLT/lSyfZMhGFowYJhXae0ZW3rLuNRZv8Dj7nNPEbz7p6FWlFhYCogMIDv
-THVbJHmf5NXoi/mx1/nS5+15AOz75ln2e5J1nZUM7jblWfi3livPRBiGAAIDeGSsdGvjem+yN/XK
-8wDY982zbJlpjub9kAcmfnkmwjAEEBjAD+61WaaEkPUYa3nENmW05H9aDTwPgH3feZZdJflcYSlD
-2LVc3Tz0CzwTYRjOgMD4tvk6rrcmoyWBY91kGqN5b1NewDwYPoDhCCBQz4eUD8AaYx7fVvq6QP/e
-pu3BGj/yLuXZu628DpgtLVgwgB+0YH3P+yRvBljK92xSKjAHPA+AfY88y3oczXuXUvndPPU3eCbC
-MFRAoA1vU0LB0C1Ruw9ggHP0Npp3k+R5jggfwHAEEGjHJuUDcsieZOc+gEu5Th8b+ncZ5wUP8EQC
-CLRlV6EY4iKsD+ljswD0o+VL+7YpZz2u6y4D+JYzIDCAE86AfM8ylxvXu5v48ijPA2DfE59lLY7m
-vckFwpFnIgxDBQTatU1pGzi3z9q5D2BILY3mvUs5U6fdFBqmAgIDuFAFZN8q5Q3j8oTf+zpP3Bx4
-HgD7jniWLVKmYi0HW8yP3aY87y42YtwzEYahAgJ92LVQfTjy931KO28mgemqXWn9lFIxdr8RdEAA
-gX4c21qwTf3b1oH5qDGa9y6l6tHyYXjgG1qwYAADtGB9a5FyQP3qkV9z9C3rngfAvhOfZb/nMsMz
-fuQ25YXMdqgv4JkIw1ABgT7t2h3e5vtv/d5GKwJQxxgHwD+kvGTZDvx1gAGogMAARqiA7FulVENW
-X/7zJqUX+mieB8C+M55lQ43m3bVcDXlh6394JsIwVECgf7sD6u9S/yAoQFICwrFDM35kk/KsGyV8
-AMNRAQEAvuvMau4i5TzI6ke/8AnepcKN5vZIMAwBBAD4rgu0k65S7gc51a6quzl3IaewR4JhaMEC
-AIZym9PHgW+SPE+l8AEMRwUEAPiuCw7UOHY079tc/gzJ0eyRYBgCCADwXRcMIIskf375+THblJar
-JsaI2yPBMLRgAQBD243PfcxNTrhAFeiPAAIAjOGh0by7cDLGBYZAA7RgAQDfNcClqt+O5r1NCR9N
-Vj3skWAYKiAAwFj2W7E+Jfk5jYYPYDgqIADAdw1QAdlZphw4b5o9EgxDAAEAAEajBQsAABiNAAIA
-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/baggy/css/article.scss

@@ -1,164 +0,0 @@
-#article {
-  width: 70%;
-  margin-bottom: 3em;
-  text-align: justify;
-
-  .tags {
-    margin-bottom: 1em;
-  }
-
-  i {
-    font-style: normal;
-  }
-
-  h1 {
-    text-align: left;
-  }
-
-  h2::after {
-    content: none;
-  }
-
-  h2,
-  h3,
-  h4 {
-    text-transform: none;
-  }
-}
-
-blockquote {
-  border: 1px solid #999;
-  background-color: #fff;
-  padding: 1em;
-  margin: 0;
-}
-
-.topPosF {
-  position: fixed;
-  right: 20%;
-  bottom: 2em;
-  font-size: 1.5em;
-}
-
-#article_toolbar {
-  margin-bottom: 1em;
-
-  li {
-    display: inline-block;
-    margin: 3px auto;
-  }
-
-  a {
-    background-color: #000;
-    padding: 0.3em 0.5em 0.2em;
-    color: #fff;
-    text-decoration: none;
-
-    &:hover,
-    &:focus {
-      background-color: #999;
-    }
-  }
-}
-
-#nav-btn-add-tag {
-  cursor: pointer;
-}
-
-.shaarli::before {
-  content: "*";
-}
-
-.return {
-  text-decoration: none;
-  margin-top: 1em;
-  display: block;
-}
-
-.return::before {
-  margin-right: 0.5em;
-}
-
-.notags {
-  font-style: italic;
-  color: #999;
-}
-
-.icon-feed {
-  background-color: #000;
-  color: #fff;
-  padding: 0.2em 0.5em;
-
-  &::before {
-    position: relative;
-    top: 2px;
-  }
-}
-
-.list-tags {
-  li {
-    margin-bottom: 0.5em;
-  }
-
-  .icon-feed:hover,
-  .icon-feed:focus {
-    background-color: #fff;
-    color: #000;
-    text-decoration: none;
-  }
-
-  a {
-    text-decoration: none;
-
-    &:hover,
-    &:focus {
-      text-decoration: underline;
-    }
-  }
-}
-
-pre code {
-  font-family: "Courier New", Courier, monospace;
-}
-
-#filters {
-  position: fixed;
-  width: 20%;
-  height: 100%;
-  top: 0;
-  right: 0;
-  background-color: #fff;
-  padding: 30px 30px 15px 15px;
-  border-left: 1px #333 solid;
-  z-index: 12;
-  min-width: 300px;
-
-  form .filter-group {
-    margin: 5px;
-  }
-}
-
-#download-form {
-  position: fixed;
-  width: 10%;
-  height: 100%;
-  top: 0;
-  right: 0;
-  background-color: #fff;
-  padding: 30px 30px 15px 15px;
-  border-left: 1px #333 solid;
-  z-index: 12;
-  min-width: 200px;
-
-  li {
-    display: block;
-    padding: 0.5em 2em 0.5em 1em;
-    color: #fff;
-    position: relative;
-    text-transform: uppercase;
-    text-decoration: none;
-    font-weight: 400;
-    font-family: "PT Sans", sans-serif;
-    transition: all 0.5s ease;
-  }
-}

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

@@ -1,258 +0,0 @@
-::selection {
-  color: #fff;
-  background-color: #000;
-}
-
-.desktopHide {
-  display: none;
-}
-
-.logo {
-  position: fixed;
-  z-index: 20;
-  top: 0.4em;
-  left: 0.6em;
-}
-
-h2,
-h3,
-h4 {
-  font-family: "PT Sans", sans-serif;
-  text-transform: uppercase;
-}
-
-p,
-li,
-label {
-  color: #666;
-}
-
-a {
-  color: #000;
-  font-weight: bold;
-
-  &.nostyle {
-    text-decoration: none;
-  }
-
-  &:hover,
-  &:focus {
-    text-decoration: none;
-  }
-}
-
-form fieldset {
-  border: 0;
-  padding: 0;
-  margin: 0;
-}
-
-form input[type="text"],
-form input[type="number"],
-select,
-form input[type="password"],
-form input[type="url"],
-form input[type="email"] {
-  border: 1px solid #999;
-  padding: 0.5em 1em;
-  min-width: 12em;
-  color: #666;
-}
-
-@media screen {
-  select {
-    appearance: none;
-    border-radius: 0;
-    background: #fff url("../../_global/img/bg-select.png") no-repeat right center;
-  }
-}
-
-.inline {
-  .row {
-    display: inline-block;
-    margin-right: 0.5em;
-  }
-
-  label {
-    min-width: 6em;
-  }
-}
-
-fieldset label {
-  display: inline-block;
-  min-width: 12.5em;
-  color: #666;
-}
-
-label {
-  margin-right: 0.5em;
-}
-
-form .row {
-  margin-bottom: 0.5em;
-}
-
-form button,
-input[type="submit"] {
-  cursor: pointer;
-  background-color: #000;
-  color: #fff;
-  padding: 0.5em 1em;
-  display: inline-block;
-  border: 1px solid #000;
-}
-
-form button:hover,
-form button:focus,
-input[type="submit"]:hover,
-input[type="submit"]:focus {
-  background-color: #fff;
-  color: #000;
-  transition: all 0.5s ease;
-}
-
-#bookmarklet {
-  cursor: move;
-}
-
-h2::after {
-  content: "";
-  height: 4px;
-  width: 20%;
-  background-color: #000;
-  display: block;
-}
-
-.links {
-  padding: 0;
-  margin: 0;
-
-  li {
-    list-style: none;
-    margin: 0;
-    padding: 0;
-  }
-}
-
-#links {
-  position: fixed;
-  top: 0;
-  width: 10em;
-  left: 0;
-  text-align: right;
-  background-color: #333;
-  padding-top: 9.5em;
-  height: 100%;
-  box-shadow: inset -4px 0 20px rgb(0 0 0 / 60%);
-  z-index: 15;
-
-  > li > a {
-    display: block;
-    padding: 0.5em 2em 0.5em 1em;
-    color: #fff;
-    position: relative;
-    text-transform: uppercase;
-    text-decoration: none;
-    font-weight: normal;
-    font-family: "PT Sans", sans-serif;
-    transition: all 0.5s ease;
-
-    &:hover,
-    &:focus {
-      background-color: #999;
-      color: #000;
-    }
-  }
-
-  .current::after {
-    content: "";
-    width: 0;
-    height: 0;
-    position: absolute;
-    border: 10px solid transparent;
-    border-right-color: #eee;
-    right: 0;
-    top: 50%;
-    margin-top: -10px;
-  }
-
-  li:last-child {
-    position: fixed;
-    bottom: 1em;
-    width: 10em;
-
-    a::before {
-      font-size: 1.2em;
-      position: relative;
-      top: 2px;
-    }
-  }
-}
-
-#main {
-  margin-left: 12em;
-  position: relative;
-  z-index: 10;
-  padding-right: 5%;
-  padding-bottom: 1em;
-}
-
-#sort {
-  padding: 0;
-  list-style-type: none;
-  opacity: 0.5;
-  display: inline-block;
-
-  li {
-    display: inline;
-    font-size: 0.9em;
-
-    & + li {
-      margin-left: 10px;
-    }
-  }
-
-  a {
-    padding: 2px 2px 0;
-    vertical-align: middle;
-  }
-
-  img {
-    vertical-align: baseline;
-
-    :hover {
-      cursor: pointer;
-    }
-  }
-}
-
-#display-mode {
-  float: right;
-  margin-top: 10px;
-  margin-bottom: 10px;
-  opacity: 0.5;
-}
-
-#listmode {
-  width: 16px;
-  display: inline-block;
-  text-decoration: none;
-
-  &.tablemode {
-    background: url("../../_global/img/table.png") no-repeat bottom;
-  }
-
-  .listmode {
-    background: url("../../_global/img/list.png") no-repeat bottom;
-  }
-}
-
-#warning_message {
-  position: fixed;
-  background-color: #ff6347;
-  z-index: 1000;
-  bottom: 0;
-  left: 0;
-  width: 100%;
-  color: #000;
-}

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

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

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

@@ -1,309 +0,0 @@
-#content {
-  margin-top: 2em;
-  min-height: 30em;
-}
-
-footer {
-  text-align: right;
-  position: relative;
-  bottom: 0;
-  right: 5em;
-  color: #999;
-  font-size: 0.8em;
-  font-style: italic;
-  z-index: 20;
-
-  a {
-    color: #999;
-    font-weight: normal;
-  }
-}
-
-.list-entries {
-  letter-spacing: -5px;
-}
-
-.listmode.entry {
-  width: 100%;
-  height: inherit;
-}
-
-.card-entry-tags {
-  max-height: 2em;
-  overflow-y: hidden;
-  padding: 0;
-  margin: 0;
-}
-
-.card-entry-tags li,
-.card-entry-tags span {
-  display: inline-block;
-  margin: 0 5px;
-  padding: 5px 12px;
-  background-color: rgb(0 0 0 / 60%);
-  border-radius: 3px;
-  max-height: 2em;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.card-entry-tags a,
-.card-entry-labels a {
-  text-decoration: none;
-  font-weight: normal;
-  color: #fff;
-}
-
-.nav-panel-add-tag {
-  margin-top: 10px;
-}
-
-.list-entries + .results {
-  margin-bottom: 2em;
-}
-
-.reading-time,
-.created-at {
-  color: #999;
-  font-style: italic;
-  font-weight: normal;
-  font-size: 0.9em;
-}
-
-.estimatedTime small {
-  position: relative;
-  top: -1px;
-}
-
-.entry {
-  background-color: #fff;
-  letter-spacing: normal;
-  box-shadow: 0 3px 7px rgb(0 0 0 / 30%);
-  display: inline-block;
-  width: 32%;
-  margin-bottom: 1.5em;
-  vertical-align: top;
-  margin-right: 1%;
-  position: relative;
-  overflow: hidden;
-  padding: 1.5em 0 3em;
-  height: 440px;
-
-  img.preview {
-    width: 100%;
-    object-fit: cover;
-    height: 100%;
-  }
-
-  &::before {
-    content: "";
-    width: 0;
-    height: 0;
-    border: 10px solid transparent;
-    border-bottom-color: #000;
-    position: absolute;
-    bottom: 0.7em;
-    z-index: 10;
-    right: 1.5em;
-    transition: all 0.5s ease;
-  }
-
-  &::after {
-    content: "";
-    position: absolute;
-    height: 7px;
-    width: 100%;
-    bottom: 0;
-    left: 0;
-    background-color: #000;
-    transition: all 0.5s ease;
-  }
-
-  &:hover {
-    box-shadow: 0 3px 10px rgb(0 0 0 / 100%);
-
-    &::after {
-      height: 40px;
-    }
-
-    &::before {
-      bottom: 2.3em;
-    }
-
-    h2 a {
-      color: #666;
-    }
-
-    .tools {
-      bottom: 0;
-    }
-  }
-
-  h2 {
-    text-transform: none;
-    margin-bottom: 0;
-    line-height: 1.2;
-    margin-left: 5px;
-  }
-
-  &::after {
-    content: none;
-  }
-
-  a {
-    display: block;
-    text-decoration: none;
-    color: #000;
-    word-wrap: break-word;
-    transition: all 0.5s ease;
-  }
-
-  p {
-    color: #666;
-    font-size: 0.9em;
-    line-height: 1.7;
-    margin: 5px 5px auto;
-  }
-
-  h2 a::first-letter {
-    text-transform: uppercase;
-  }
-
-  .tools {
-    position: absolute;
-    bottom: -40px;
-    left: 0;
-    background: #000;
-    width: 100%;
-    z-index: 10;
-    padding-right: 0.5em;
-    text-align: right;
-    transition: all 0.5s ease;
-
-    a {
-      color: #666;
-      text-decoration: none;
-      display: block;
-      padding: 0.4em;
-
-      &:hover {
-        color: #fff;
-      }
-    }
-
-    li {
-      display: inline-block;
-      margin-top: 10px;
-    }
-
-    li:first-child {
-      float: left;
-      font-size: 0.9em;
-      max-width: calc(100% - 40px * 4);
-      text-overflow: ellipsis;
-      overflow: hidden;
-      white-space: nowrap;
-      max-height: 2em;
-      margin-left: 10px;
-    }
-  }
-
-  .card-entry-labels {
-    position: absolute;
-    top: 100px;
-    left: -1em;
-    z-index: 90;
-    max-width: 50%;
-    padding-left: 0;
-
-    li {
-      margin: 10px 10px 10px auto;
-      padding: 5px 12px 5px 25px;
-      background-color: rgb(0 0 0 / 60%);
-      border-radius: 0 3px 3px 0;
-      color: #fff;
-      cursor: default;
-      max-height: 2em;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-
-      a {
-        color: #fff;
-      }
-    }
-  }
-}
-
-.entry:nth-child(3n+1) {
-  margin-left: 0;
-}
-
-.results {
-  letter-spacing: -5px;
-  padding: 0 0 0.5em;
-
-  > * {
-    display: inline-block;
-    vertical-align: top;
-    letter-spacing: normal;
-    width: 50%;
-    text-align: right;
-  }
-}
-
-div.pagination ul {
-  text-align: right;
-}
-
-.nb-results {
-  text-align: left;
-  font-style: italic;
-  color: #999;
-  display: inline-flex;
-}
-
-div.pagination ul {
-  a {
-    color: #999;
-    text-decoration: none;
-
-    &:hover,
-    &:focus {
-      text-decoration: underline;
-    }
-  }
-
-  > * {
-    display: inline-block;
-    margin-left: 0.5em;
-  }
-
-  .prev.disabled,
-  .next.disabled {
-    display: none;
-  }
-
-  .current {
-    height: 25px;
-    padding: 4px 8px;
-    border: 1px solid #d5d5d5;
-    text-decoration: none;
-    font-weight: bold;
-    color: #000;
-    background-color: #ccc;
-  }
-}
-
-.card-tag-form {
-  display: inline-block;
-}
-
-.card-tag-form input[type="text"] {
-  min-width: 20em;
-}
-
-.hide,
-.hidden {
-  display: none;
-}

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

@@ -1,26 +0,0 @@
-.login {
-  background-color: #333;
-
-  #main {
-    padding: 0;
-    margin: 0;
-  }
-
-  form {
-    background-color: #fff;
-    padding: 1.5em;
-    box-shadow: 0 1px 8px rgb(0 0 0 / 90%);
-    width: 20em;
-    position: absolute;
-    top: 8em;
-    left: 50%;
-    margin-left: -10em;
-  }
-
-  .logo {
-    position: absolute;
-    top: 2em;
-    left: 50%;
-    margin-left: -55px;
-  }
-}

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

@@ -1,177 +0,0 @@
-@media screen and (max-width: 1050px) {
-  .entry {
-    width: 49%;
-  }
-
-  .entry:nth-child(3n+1) {
-    margin-left: 1.5%;
-  }
-
-  .entry:nth-child(2n+1) {
-    margin-left: 0;
-  }
-}
-
-@media screen and (max-width: 900px) {
-  #article {
-    width: 80%;
-  }
-
-  .topPosF {
-    right: 2.5em;
-  }
-}
-
-@media screen and (max-width: 700px) {
-  .entry {
-    width: 100%;
-    margin-left: 0;
-  }
-
-  #display-mode {
-    display: none;
-  }
-}
-
-@media screen and (max-height: 770px) {
-  .menu.users,
-  .menu.internal,
-  .menu.developer {
-    display: none;
-  }
-}
-
-@media screen and (max-width: 500px) {
-  .entry {
-    width: 100%;
-    margin-left: 0;
-  }
-
-  body > header {
-    background-color: #333;
-    position: fixed;
-    top: 0;
-    width: 100%;
-    height: 3em;
-    z-index: 11;
-  }
-
-  #links li:last-child {
-    position: static;
-    width: auto;
-  }
-
-  #links li:last-child a::before {
-    content: none;
-  }
-
-  .logo {
-    width: 1.25em;
-    height: 1.25em;
-    left: 0;
-    top: 0;
-  }
-
-  .login > header {
-    position: static;
-  }
-
-  .login form {
-    width: 100%;
-    position: static;
-    margin-left: 0;
-  }
-
-  .login .logo {
-    height: auto;
-    top: 0.5em;
-    width: 75px;
-    margin-left: -37.5px;
-  }
-
-  .desktopHide {
-    display: block;
-    position: fixed;
-    z-index: 20;
-    top: 0;
-    right: 0;
-    border: 0;
-    width: 2.5em;
-    height: 2.5em;
-    cursor: pointer;
-    background-color: #999;
-    font-size: 1.2em;
-  }
-
-  .desktopHide:hover,
-  .desktopHide:focus {
-    background-color: #fff;
-  }
-
-  #links {
-    display: none;
-    width: 100%;
-    height: auto;
-    padding-top: 3em;
-  }
-
-  #links.menu--open {
-    display: block;
-  }
-
-  footer {
-    position: static;
-    margin-right: 3em;
-  }
-
-  #main {
-    margin-left: 1.5em;
-    padding-right: 1.5em;
-    position: static;
-    margin-top: 3em;
-  }
-
-  .card-entry-labels {
-    display: none;
-  }
-
-  #article_toolbar .topPosF {
-    display: none;
-  }
-
-  #article {
-    width: 100%;
-  }
-
-  #article h1 {
-    font-size: 1.5em;
-  }
-
-  #article_toolbar a {
-    padding: 0.3em 0.4em 0.2em;
-  }
-
-  #display-mode {
-    display: none;
-  }
-
-  .popup-form,
-  #bagit-form,
-  #search-form {
-    left: 0;
-    width: 100%;
-    border-left: none;
-  }
-
-  .popup-form form,
-  #bagit-form form,
-  #search-form form {
-    width: 100%;
-  }
-}
-
-@media only print {
-  header h1.logo {
-    display: none;
-  }
-}

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

@@ -1,50 +0,0 @@
-/* ==========================================================================
-   Messages
-   ========================================================================== */
-
-.messages {
-  text-align: left;
-  width: 60%;
-  margin: auto 17%;
-
-  > * {
-    display: inline-block;
-  }
-
-  .install {
-    text-align: left;
-
-    &.error {
-      border: 1px solid #c42608;
-      color: #c00 !important;
-      background: #fff0ef;
-    }
-
-    &.notice {
-      border: 1px solid #ebcd41;
-      color: #000;
-      background: #fffcd3;
-    }
-
-    &.success {
-      border: 1px solid #6dc70c;
-      background: #e0fbcc !important;
-    }
-  }
-}
-
-.warning {
-  font-weight: bold;
-  display: block;
-  width: 100%;
-}
-
-.more-info {
-  font-size: 0.85em;
-  line-height: 1.5;
-  color: #aaa;
-
-  a {
-    color: #aaa;
-  }
-}

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

@@ -1,205 +0,0 @@
-/* ==========================================================================
-   Pictos
-   ========================================================================== */
-
-@font-face {
-  font-family: icomoon;
-  src: url("~icomoon-free-npm/Font/IcoMoon-Free.ttf");
-  font-weight: normal;
-  font-style: normal;
-}
-
-.material-icons {
-  font-family: "Material Icons";
-  font-weight: normal;
-  font-style: normal;
-  font-size: 1em;  /* Preferred icon size */
-  width: 1em;
-  height: 1em;
-  display: inline-block;
-  line-height: 1;
-  text-transform: none;
-  letter-spacing: normal;
-  word-wrap: normal;
-  white-space: nowrap;
-  direction: ltr;
-
-  /* Support for all WebKit browsers. */
-  -webkit-font-smoothing: antialiased;
-
-  /* Support for Safari and Chrome. */
-  text-rendering: optimizeLegibility;
-
-  /* Support for Firefox. */
-  -moz-osx-font-smoothing: grayscale;
-
-  /* Support for IE. */
-  font-feature-settings: "liga";
-
-  .md-18 { font-size: 18px; }
-  .md-24 { font-size: 24px; }
-  .md-36 { font-size: 36px; }
-  .md-48 { font-size: 48px; }
-
-  .vertical-align-middle {
-    vertical-align: middle !important;
-  }
-}
-
-.icon span,
-.icon-image span {
-  position: absolute;
-  top: -9999px;
-}
-
-[class^="icon-"]::before,
-[class*=" icon-"]::before {
-  font-family: icomoon;
-  speak: none;
-  font-style: normal;
-  font-weight: normal;
-  font-variant: normal;
-  text-transform: none;
-  line-height: 1;
-
-  /* Enable Ligatures ================ */
-  letter-spacing: 0;
-  font-feature-settings: "liga";
-
-  /* Better Font Rendering =========== */
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-.icon-flattr::before {
-  content: "\ead4";
-}
-
-.icon-mail::before {
-  content: "\ea86";
-}
-
-.icon-up-open::before {
-  content: "\e80b";
-}
-
-.icon-star::before {
-  content: "\e9d9";
-}
-
-.icon-check::before {
-  content: "\ea10";
-}
-
-.icon-link::before {
-  content: "\e9cb";
-}
-
-.icon-reply::before {
-  content: "\e806";
-}
-
-.icon-menu::before {
-  content: "\e9bd";
-}
-
-.icon-clock::before {
-  content: "\e803";
-}
-
-.icon-twitter::before {
-  content: "\ea96";
-}
-
-.icon-down-open::before {
-  content: "\e809";
-}
-
-.icon-trash::before {
-  content: "\e9ac";
-}
-
-.icon-delete::before {
-  content: "\ea0d";
-}
-
-.icon-power::before {
-  content: "\ea14";
-}
-
-.icon-arrow-up-thick::before {
-  content: "\ea3a";
-}
-
-.icon-feed::before {
-  content: "\e808";
-}
-
-.icon-print::before {
-  content: "\e954";
-}
-
-.icon-reload::before {
-  content: "\ea2e";
-}
-
-.icon-price-tags::before {
-  content: "\e936";
-}
-
-.icon-eye::before {
-  content: "\e9ce";
-}
-
-.icon-no-eye::before {
-  content: "\e9d1";
-}
-
-.icon-calendar::before {
-  content: "\e953";
-}
-
-.icon-time::before {
-  content: "\e952";
-}
-
-/* .icon-image class, for image-based icons
-  ========================================================================== */
-
-.icon-image {
-  background: no-repeat center/80%;
-  padding-right: 1em !important;
-  padding-left: 1em !important;
-}
-
-/* Carrot (http://carrot.org) */
-.icon-image--carrot {
-  background-image: url("../../_global/img/icons/carrot-icon--white.png");
-}
-
-/* Diaspora */
-.icon-image--diaspora {
-  background-image: url("../../_global/img/icons/Diaspora-asterisk.svg");
-}
-
-/* Unmark.it */
-.icon-image--unmark {
-  background-image: url("../../_global/img/icons/unmark-icon--black.png");
-}
-
-/* shaarli */
-.icon-image--shaarli {
-  background-image: url("../../_global/img/icons/shaarli.png");
-}
-
-/* ==========================================================================
-   Icon selected
-   ========================================================================== */
-
-.icon-star.fav::before {
-  color: #fff;
-}
-
-.icon-check.archive::before {
-  color: #fff;
-}

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

@@ -1,63 +0,0 @@
-@media print {
-  /* ### Layout ### */
-
-  body {
-    font-family: serif;
-    background-color: #fff;
-  }
-
-  @page {
-    margin: 1cm;
-  }
-
-  img {
-    max-width: 100% !important;
-  }
-
-  /* ### Content ### */
-
-  /* Hide useless blocks */
-  body > .logo,
-  #article_toolbar,
-  #links,
-  #sort,
-  body > footer,
-  .top_link,
-  div.tools,
-  header div,
-  .messages,
-  .entrie + .results,
-  #article .mbm a,
-  #article-informations {
-    display: none !important;
-  }
-
-  article {
-    border: none !important;
-  }
-
-  /* Add URL after links */
-  .vieworiginal a::after {
-    content: " (" attr(href) ")";
-  }
-
-  /* Add explanation after abbr */
-  abbr[title]::after {
-    content: " (" attr(title) ")";
-  }
-
-  /* Change border on current pager item */
-  .pagination span.current {
-    border-style: dashed;
-  }
-
-  #main {
-    width: 100%;
-    margin: 0;
-    padding: 0;
-  }
-
-  #article {
-    width: 100%;
-  }
-}

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

@@ -1,223 +0,0 @@
-/*
-  Ratatouille mini Framework css by Thomas LEBEAU
-  Base on KNACSS => www.KNACSS.com (2013-10) @author: Raphael Goetter, Alsacreations
-  and normalize.css
-*/
-
-* {
-  box-sizing: border-box;
-}
-
-html {
-  font-family: sans-serif; /* 1 */
-  text-size-adjust: 100%; /* 2 */
-}
-
-body {
-  font-size: 1em;
-  line-height: 1.5;
-  margin: 0;
-}
-
-/* ==========================================================================
-   Mise en forme
-   ========================================================================== */
-
-h1:first-child,
-h2:first-child,
-h3:first-child,
-h4:first-child,
-h5:first-child,
-h6:first-child,
-p:first-child,
-ul:first-child,
-ol:first-child,
-dl:first-child {
-  margin-top: 0;
-}
-
-code,
-kbd,
-pre,
-samp {
-  font-family: monospace, serif;
-}
-
-pre {
-  white-space: pre-wrap;
-}
-
-.upper {
-  text-transform: uppercase;
-}
-
-.bold {
-  font-weight: bold;
-}
-
-.inner {
-  margin: 0 auto;
-  max-width: 61.25em; /* 980px */
-}
-
-table,
-img,
-figure {
-  max-width: 100%;
-  height: auto;
-}
-
-iframe {
-  max-width: 100%;
-}
-
-.fl {
-  float: left;
-}
-
-.fr {
-  float: right;
-}
-
-table {
-  border-collapse: collapse;
-}
-
-figure {
-  margin: 0;
-}
-
-button,
-input,
-select,
-textarea {
-  font-family: inherit;
-  font-size: 100%;
-  margin: 0;
-}
-
-input[type="search"] {
-  appearance: textfield;
-}
-
-/* ==========================================================================
-   Mise en page
-   ========================================================================== */
-
-.dib {
-  display: inline-block;
-  vertical-align: middle;
-}
-
-.dnone {
-  display: none;
-}
-
-.dtable {
-  display: table;
-}
-
-.dtable > * {
-  display: table-row;
-}
-
-.dtable > * > * {
-  display: table-cell;
-}
-
-.element-invisible {
-  border: 0;
-  clip: rect(0 0 0 0);
-  height: 1px;
-  margin: -1px;
-  overflow: hidden;
-  padding: 0;
-  position: absolute;
-  width: 1px;
-}
-
-.small {
-  font-size: 0.8em;
-}
-
-.big {
-  font-size: 1.2em;
-}
-
-/* Width */
-
-.w100 {
-  width: 100%;
-}
-
-.w90 {
-  width: 90%;
-}
-
-.w80 {
-  width: 80%;
-}
-
-.w70 {
-  width: 70%;
-}
-
-.w60 {
-  width: 60%;
-}
-
-.w50 {
-  width: 50%;
-}
-
-.w40 {
-  width: 40%;
-}
-
-.w30 {
-  width: 30%;
-}
-
-.w20 {
-  width: 20%;
-}
-
-.w10 {
-  width: 10%;
-}
-
-/* ==========================================================================
-   Internet Explorer
-   ========================================================================== */
-
-/* IE8 and IE9 */
-
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-main,
-nav,
-section,
-summary {
-  display: block;
-}
-
-/* IE8 and IE9 */
-
-audio,
-canvas,
-video {
-  display: inline-block;
-}
-
-@media screen {
-  select {
-    appearance: none;
-    border-radius: 0;
-  }
-}

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

@@ -1,115 +0,0 @@
-/* ==========================================================================
-  "save a link" related styles
-  ========================================================================== */
-
-.popup-form {
-  background: rgb(0 0 0 / 50%);
-  position: absolute;
-  top: 0;
-  left: 10em;
-  z-index: 20;
-  height: 100%;
-  width: 100%;
-  margin: 0;
-  margin-top: -30% !important;
-  padding: 2em;
-  display: none;
-  border-left: 1px #eee solid;
-
-  form {
-    background-color: #fff;
-    position: absolute;
-    top: 0;
-    left: 0;
-    z-index: 20;
-    border: 10px solid #000;
-    width: 400px;
-    height: 200px;
-    padding: 2em;
-  }
-}
-
-#bagit-form-form .addurl {
-  margin-left: 0;
-}
-
-.closeMessage,
-.close-button {
-  background-color: #000;
-  color: #fff;
-  font-size: 1.2em;
-  line-height: 1.6;
-  width: 1.6em;
-  height: 1.6em;
-  text-align: center;
-  text-decoration: none;
-
-  &:hover,
-  &:focus {
-    background-color: #999;
-    color: #000;
-  }
-}
-
-.close-button--popup {
-  display: inline-block;
-  position: absolute;
-  top: 0;
-  right: 0;
-  font-size: 1.4em;
-}
-
-.active-current {
-  background-color: #999;
-
-  &::after {
-    content: "";
-    width: 0;
-    height: 0;
-    position: absolute;
-    border: 10px solid transparent;
-    border-right-color: #eee;
-    right: 0;
-    top: 50%;
-    margin-top: -10px;
-  }
-}
-
-.opacity03 {
-  opacity: 0.3;
-}
-
-.add-to-wallabag-link-after {
-  background-color: #000;
-  color: #fff;
-  padding: 0 3px 2px;
-}
-
-a.add-to-wallabag-link-after {
-  visibility: hidden;
-  position: absolute;
-  opacity: 0;
-  transition-duration: 2s;
-  transition-timing-function: ease-out;
-}
-
-#article article a:hover + a.add-to-wallabag-link-after,
-a.add-to-wallabag-link-after:hover {
-  opacity: 1;
-  visibility: visible;
-  transition-duration: 0.3s;
-  transition-timing-function: ease-in;
-}
-
-a.add-to-wallabag-link-after::after {
-  content: "w";
-}
-
-#add-link-result {
-  font-weight: bold;
-  font-size: 0.9em;
-}
-
-.btn-clickable {
-  cursor: pointer;
-}

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

@@ -1,266 +0,0 @@
-import $ from 'jquery';
-
-/* Global imports */
-import '../_global/index';
-
-/* Shortcuts */
-import './js/shortcuts/main';
-import './js/shortcuts/entry';
-
-/* Tools */
-import toggleSaveLinkForm from './js/uiTools';
-
-/* Theme style */
-import './css/index.scss';
-
-$(document).ready(() => {
-  /* ==========================================================================
-     Menu
-     ========================================================================== */
-
-  $('#menu').click(() => {
-    $('#links').toggleClass('menu--open');
-    const content = $('#content');
-    if (content.hasClass('opacity03')) {
-      content.removeClass('opacity03');
-    }
-  });
-
-  /* ==========================================================================
-     Add tag panel
-     ========================================================================== */
-
-  $('#nav-btn-add-tag').on('click', () => {
-    $('.baggy-add-tag').toggle(100);
-    $('.nav-panel-menu').addClass('hidden');
-    $('#tag_label').focus();
-    return false;
-  });
-
-  /**
-   * Filters & Export
-   */
-  // no display if filters not available
-  if ($('div').is('#filters')) {
-    $('#button_filters').show();
-    $('#clear_form_filters').on('click', () => {
-      $('#filters input').val('');
-      $('#filters :checked').removeAttr('checked');
-      return false;
-    });
-  }
-
-  /**
-   * Close window after adding entry if popup
-   */
-  const currentUrl = window.location.href;
-  if (currentUrl.match('&closewin=true')) {
-    window.close();
-  }
-
-  /**
-  if ($('article').size() > 0) {
-    const waypoint = new Waypoint({
-      element: $('.wallabag-title').get(0),
-      handler: (direction) => {
-        console.log(direction);
-        if (direction === 'down') {
-          $('aside.tags').fadeIn('slow');
-        } else {
-          $('aside.tags').fadeOut('slow');
-        }
-      },
-      offset: 250,
-    });
-  }
-   */
-
-  /**
-   * Tags autocomplete
-   */
-  /**
-   * Not working on v2
-   *
-
-  $('#value').bind('keydown', (event) => {
-    if (event.keyCode === $.ui.keyCode.TAB && $(this).data('ui-autocomplete').menu.active) {
-      event.preventDefault();
-    }
-  }).autocomplete({
-    source: function source(request, response) {
-      $.getJSON('./?view=tags', {
-        term: extractLast(request.term),
-        //id: $(':hidden#entry_id').val()
-      }, response);
-    },
-    search: function search() {
-      // custom minLength
-      const term = extractLast(this.value);
-      return term.length >= 1;
-    },
-    focus: function focus() {
-      // prevent value inserted on focus
-      return false;
-    },
-    select: function select(event, ui) {
-      const terms = split(this.value);
-      // remove the current input
-      terms.pop();
-      // add the selected item
-      terms.push(ui.item.value);
-      // add placeholder to get the comma-and-space at the end
-      terms.push('');
-      this.value = terms.join(', ');
-      return false;
-    },
-  });
-  */
-
-  //---------------------------------------------------------------------------
-  // Close the message box when the user clicks the close icon
-  //---------------------------------------------------------------------------
-  $('a.closeMessage').on('click', () => {
-    $(this).parents('div.messages').slideUp(300, () => { $(this).remove(); });
-    return false;
-  });
-
-  $('#search-form').hide();
-  $('#bagit-form').hide();
-  $('#filters').hide();
-  $('#download-form').hide();
-
-  //---------------------------------------------------------------------------
-  // Toggle the 'Search' popup in the sidebar
-  //---------------------------------------------------------------------------
-  function toggleSearch() {
-    $('#search-form').toggle();
-    $('#search').toggleClass('current');
-    $('#search').toggleClass('active-current');
-    $('#search-arrow').toggleClass('arrow-down');
-    if ($('#search').hasClass('current')) {
-      $('#content').addClass('opacity03');
-    } else {
-      $('#content').removeClass('opacity03');
-    }
-  }
-
-  //---------------------------------------------------------------------------
-  // Toggle the 'Filter' popup on entries list
-  //---------------------------------------------------------------------------
-  function toggleFilter() {
-    $('#filters').toggle();
-  }
-
-  //---------------------------------------------------------------------------
-  // Toggle the 'Download' popup on entries list
-  //---------------------------------------------------------------------------
-  function toggleDownload() {
-    $('#download-form').toggle();
-  }
-
-  //---------------------------------------------------------------------------
-  // Toggle the 'Save a Link' popup in the sidebar
-  //---------------------------------------------------------------------------
-  function toggleBagit() {
-    $('#bagit-form').toggle();
-    $('#bagit').toggleClass('current');
-    $('#bagit').toggleClass('active-current');
-    $('#bagit-arrow').toggleClass('arrow-down');
-    if ($('#bagit').hasClass('current')) {
-      $('#content').addClass('opacity03');
-    } else {
-      $('#content').removeClass('opacity03');
-    }
-  }
-
-  //---------------------------------------------------------------------------
-  // Close all #links popups in the sidebar
-  //---------------------------------------------------------------------------
-  function closePopups() {
-    $('#links .messages').hide();
-    $('#links > li > a').removeClass('active-current');
-    $('#links > li > a').removeClass('current');
-    $('[id$=-arrow]').removeClass('arrow-down');
-    $('#content').removeClass('opacity03');
-  }
-
-  $('#search').click(() => {
-    closePopups();
-    toggleSearch();
-    $('#searchfield').focus();
-  });
-
-  $('.filter-btn').click(() => {
-    closePopups();
-    toggleFilter();
-  });
-
-  $('.download-btn').click(() => {
-    closePopups();
-    toggleDownload();
-  });
-
-  $('#bagit').click(() => {
-    closePopups();
-    toggleBagit();
-    $('#plainurl').focus();
-  });
-
-  $('#search-form-close').click(() => {
-    toggleSearch();
-  });
-
-  $('#filter-form-close').click(() => {
-    toggleFilter();
-  });
-
-  $('#download-form-close').click(() => {
-    toggleDownload();
-  });
-
-  $('#bagit-form-close').click(() => {
-    toggleBagit();
-  });
-
-  const bagitFormForm = $('#bagit-form-form');
-
-  /* ==========================================================================
-   bag it link and close button
-   ========================================================================== */
-
-  // send 'bag it link' form request via ajax
-  bagitFormForm.submit((event) => {
-    $('body').css('cursor', 'wait');
-    $('#add-link-result').empty();
-
-    $.ajax({
-      type: bagitFormForm.attr('method'),
-      url: bagitFormForm.attr('action'),
-      data: bagitFormForm.serialize(),
-      success: function success() {
-        $('#add-link-result').html('Done!');
-        $('#plainurl').val('').blur('');
-        $('body').css('cursor', 'auto');
-      },
-      error: function error() {
-        $('#add-link-result').html('Failed!');
-        $('body').css('cursor', 'auto');
-      },
-    });
-
-    event.preventDefault();
-  });
-
-  /* ==========================================================================
-   Process all links inside an article
-   ========================================================================== */
-
-  $('article a[href^="http"]').after(
-    () => `<a href="${$(this).attr('href')}" class="add-to-wallabag-link-after" title="add to wallabag"></a>`,
-  );
-
-  $('.add-to-wallabag-link-after').click((event) => {
-    toggleSaveLinkForm($(this).attr('href'), event);
-    event.preventDefault();
-  });
-});

app/Resources/static/themes/baggy/js/autoCompleteTags.js

@@ -1,8 +0,0 @@
-function split(val) {
-  return val.split(/,\s*/);
-}
-function extractLast(term) {
-  return split(term).pop();
-}
-
-export default { split, extractLast };

app/Resources/static/themes/baggy/js/shortcuts/entry.js

@@ -1,26 +0,0 @@
-import Mousetrap from 'mousetrap';
-import $ from 'jquery';
-
-$(document).ready(() => {
-  if ($('#article').length > 0) {
-    /* Article view */
-    Mousetrap.bind('o', () => {
-      $('div#article_toolbar ul.links a.original')[0].click();
-    });
-
-    /* mark as favorite */
-    Mousetrap.bind('f', () => {
-      $('div#article_toolbar ul.links a.favorite')[0].click();
-    });
-
-    /* mark as read */
-    Mousetrap.bind('a', () => {
-      $('div#article_toolbar ul.links a.markasread')[0].click();
-    });
-
-    /* delete */
-    Mousetrap.bind('del', () => {
-      $('div#article_toolbar ul.links a.delete')[0].click();
-    });
-  }
-});

app/Resources/static/themes/baggy/js/shortcuts/main.js

@@ -1,10 +0,0 @@
-import $ from 'jquery';
-import Mousetrap from 'mousetrap';
-
-$(document).ready(() => {
-  Mousetrap.bind('s', () => {
-    $('#search').trigger('click');
-    $('#search_entry_term').focus();
-    return false;
-  });
-});

app/Resources/static/themes/baggy/js/uiTools.js

@@ -1,35 +0,0 @@
-import $ from 'jquery';
-
-function toggleSaveLinkForm(url, event) {
-  $('#add-link-result').empty();
-
-  const $bagit = $('#bagit');
-  const $bagitForm = $('#bagit-form');
-
-  $bagit.toggleClass('active-current');
-
-  // only if bag-it link is not presented on page
-  if ($bagit.length === 0) {
-    if (event !== 'undefined' && event) {
-      $bagitForm.css({ position: 'absolute', top: event.pageY, left: event.pageX - 200 });
-    } else {
-      $bagitForm.css({ position: 'relative', top: 'auto', left: 'auto' });
-    }
-  }
-
-  const searchForm = $('#search-form');
-  const plainUrl = $('#plainurl');
-  if (searchForm.length !== 0) {
-    $('#search').removeClass('current');
-    $('#search-arrow').removeClass('arrow-down');
-    searchForm.hide();
-  }
-  $bagitForm.toggle();
-  $('#content').toggleClass('opacity03');
-  if (url !== 'undefined' && url) {
-    plainUrl.val(url);
-  }
-  plainUrl.focus();
-}
-
-export default toggleSaveLinkForm;

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

@@ -1,140 +0,0 @@
-/* ==========================================================================
- * Entries
- * ========================================================================== */
-
-.mass-buttons {
-  margin: 10px 5px 10px 20px;
-
-  #selectAll {
-    position: relative;
-    opacity: initial;
-    left: 0;
-  }
-
-  span {
-    padding: 3px;
-  }
-
-  button {
-    i {
-      font-size: 15px;
-    }
-
-    height: 24px;
-    line-height: 24px;
-    padding: 0 0.5rem;
-    margin-right: 0.75rem;
-  }
-}
-
-.card-stacked {
-  input[type="checkbox"] {
-    position: relative;
-    opacity: initial;
-    left: 0;
-  }
-
-  .entry-checkbox {
-    margin-right: 10px;
-  }
-}
-
-.entries {
-  list-style: none;
-}
-
-.collection {
-  margin: 5px 15px 0;
-  padding: 0;
-
-  .collection-item {
-    padding: 7px;
-    height: 65px;
-  }
-}
-
-.results {
-  display: flex;
-  padding: 1rem 1rem 0;
-  flex-wrap: wrap;
-  justify-content: space-between;
-
-  .nb-results {
-    display: inline-flex;
-  }
-
-  a {
-    color: #444;
-  }
-}
-
-.pagination {
-  ul {
-    display: flex;
-    margin: 0;
-    flex-wrap: wrap;
-    justify-content: space-around;
-
-    .prev.disabled,
-    .next.disabled {
-      display: none;
-    }
-  }
-
-  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,
-  a {
-    padding: 0 10px;
-    height: 30px;
-    display: block;
-    line-height: 30px;
-  }
-
-  .disabled {
-    margin-right: 10px;
-    margin-left: 10px;
-  }
-
-  li.active span {
-    padding: 0 10px;
-    height: 30px;
-    display: block;
-    color: #fff;
-  }
-}
-
-.footer-text {
-  margin: 0.7rem 0.5rem;
-}
-
-.hidden {
-  display: none;
-}
-
-.picker__date-display {
-  display: none;
-}
-
-footer {
-  &.page-footer {
-    margin-top: 10px;
-    padding-top: 0;
-  }
-
-  .row {
-    margin-bottom: 10px;
-  }
-}

app/config/config.yml

@@ -8,12 +8,14 @@ parameters:
     # Allows to use the live reload feature for changes in assets
     use_webpack_dev_server: false
     craue_config.cache_adapter.class: Craue\ConfigBundle\CacheAdapter\SymfonyCacheComponentAdapter
+    env(DATABASE_URL): '%database_scheme%://%database_user%:%database_password%@%database_host%:%database_port%/%database_name%?unix_socket=%database_socket%&charset=%database_charset%'
 
 framework:
     #esi:             ~
     translator:
         enabled: true
         fallback: "%locale%"
+        default_path: '%kernel.project_dir%/translations'
     secret: "%secret%"
     router:
         resource: "%kernel.project_dir%/app/config/routing.yml"
@@ -22,44 +24,57 @@ framework:
     csrf_protection: ~
     validation:
         enable_annotations: true
-    templating:
-        engines: ['twig']
     default_locale: "%locale%"
     trusted_hosts: ~
     session:
         # handler_id set to null will use default session handler from php.ini
         handler_id: session.handler.native_file
         save_path: "%kernel.project_dir%/var/sessions/%kernel.environment%"
+        cookie_secure: auto
     fragments: ~
     http_method_override: true
     assets: ~
+    mailer:
+        dsn: "%mailer_dsn%"
+    http_client:
+        scoped_clients:
+            download_images.client:
+                scope: '.*'
+            pocket.client:
+                scope: '.*'
+                headers:
+                    Content-Type: 'application/json'
+                    X-Accept: 'application/json'
 
 # Twig Configuration
 twig:
+    default_path: '%kernel.project_dir%/templates'
     debug: "%kernel.debug%"
     strict_variables: "%kernel.debug%"
     form_themes:
-        - "LexikFormFilterBundle:Form:form_div_layout.html.twig"
-    exception_controller: wallabag_core.exception_controller:showAction
+        - "@SpiriitFormFilter/Form/form_div_layout.html.twig"
+    globals:
+        registration_enabled: '%fosuser_registration%'
 
 # Doctrine Configuration
 doctrine:
     dbal:
-        driver: "%database_driver%"
-        host: "%database_host%"
-        port: "%database_port%"
-        dbname: "%database_name%"
-        user: "%database_user%"
-        password: "%database_password%"
-        charset: "%database_charset%"
-        path: "%database_path%"
-        unix_socket: "%database_socket%"
+        url: '%env(resolve:DATABASE_URL)%'
+        types:
+            json_array: Wallabag\Doctrine\JsonArrayType
 
     orm:
         auto_generate_proxy_classes: "%kernel.debug%"
         entity_managers:
             default:
                 auto_mapping: true
+                mappings:
+                    Wallabag:
+                        type: annotation
+                        is_bundle: false
+                        dir: '%kernel.project_dir%/src/Entity'
+                        prefix: 'Wallabag\Entity'
+                        alias: Wallabag
 
 stof_doctrine_extensions:
     default_locale: "%locale%"
@@ -70,22 +85,14 @@ stof_doctrine_extensions:
             sluggable: true
 
 doctrine_migrations:
-    dir_name: "%kernel.project_dir%/app/DoctrineMigrations"
-    namespace: Application\Migrations
-    table_name: migration_versions
-    name: Application Migrations
-
-# Swiftmailer Configuration
-swiftmailer:
-    transport:   "%mailer_transport%"
-    username:    "%mailer_user%"
-    password:    "%mailer_password%"
-    host:        "%mailer_host%"
-    port:        "%mailer_port%"
-    encryption:  "%mailer_encryption%"
-    auth_mode:   "%mailer_auth_mode%"
-    spool:
-        type: memory
+    migrations_paths:
+        'Application\Migrations': '%kernel.project_dir%/migrations'
+    storage:
+        table_storage:
+            table_name: 'migration_versions'
+            version_column_name: 'version'
+            version_column_length: 192
+            executed_at_column_name: 'executed_at'
 
 fos_rest:
     param_fetcher_listener: true
@@ -99,8 +106,6 @@ fos_rest:
                 - 'application/pdf'
             epub:
                 - 'application/epub+zip'
-            mobi:
-                - 'application/x-mobipocket-ebook'
         view_response_listener: 'force'
         formats:
             xml: true
@@ -109,31 +114,39 @@ fos_rest:
             csv: true
             pdf: true
             epub: true
-            mobi: true
-        templating_formats:
-            html: false
-        force_redirects:
-            html: true
         failed_validation: HTTP_BAD_REQUEST
-        default_engine: twig
-    routing_loader:
-        default_format: json
+    routing_loader: false
     format_listener:
         enabled: true
         rules:
-            - { path: "^/api/entries/([0-9]+)/export.(.*)", priorities: ['epub', 'mobi', 'pdf', 'txt', 'csv'], fallback_format: json, prefer_extension: false }
+            - { path: "^/api/entries/([0-9]+)/export.(.*)", priorities: ['epub', 'pdf', 'txt', 'csv'], fallback_format: json, prefer_extension: false }
             - { path: "^/api", priorities: ['json', 'xml'], fallback_format: json, prefer_extension: false }
             - { path: "^/annotations", priorities: ['json', 'xml'], fallback_format: json, prefer_extension: false }
             # for an unknown reason, EACH REQUEST goes to FOS\RestBundle\EventListener\FormatListener
             # so we need to add custom rule for custom api export but also for all other routes of the application...
             - { path: '^/', priorities: ['text/html', '*/*'], fallback_format: html, prefer_extension: false }
+    exception:
+        messages:
+            Symfony\Component\HttpKernel\Exception\BadRequestHttpException: true
 
 nelmio_api_doc:
-    sandbox:
-        enabled: false
-    cache:
-        enabled: true
-    name: wallabag API documentation
+    areas:
+        default:
+            disable_default_routes: true
+    documentation:
+        info:
+            title: wallabag API documentation
+            description: This is the API documentation of wallabag
+            version: 2.x
+        components:
+            securitySchemes:
+                Bearer:
+                    type: apiKey
+                    description: 'Value: Bearer {jwt}'
+                    name: Authorization
+                    in: header
+        security:
+            - Bearer: []
 
 nelmio_cors:
     defaults:
@@ -164,34 +177,25 @@ nelmio_cors:
             max_age: 3600
             hosts: ['^api\.']
 
-liip_theme:
-    load_controllers: false
-    themes:
-        - baggy
-        - material
-    autodetect_theme: wallabag_core.helper.detect_active_theme
-
-    path_patterns:
-        bundle_resource:
-            - "%%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%"
-
 fos_user:
     db_driver: orm
     firewall_name: secured_area
-    user_class: Wallabag\UserBundle\Entity\User
+    user_class: Wallabag\Entity\User
     registration:
         confirmation:
             enabled: "%fosuser_confirmation%"
     from_email:
-        address:        "%from_email%"
-        sender_name:    wallabag
+        address: "%from_email%"
+        sender_name: wallabag
+    service:
+        mailer: Wallabag\Mailer\UserMailer
 
 fos_oauth_server:
     db_driver:           orm
-    client_class:        Wallabag\ApiBundle\Entity\Client
-    access_token_class:  Wallabag\ApiBundle\Entity\AccessToken
-    refresh_token_class: Wallabag\ApiBundle\Entity\RefreshToken
-    auth_code_class:     Wallabag\ApiBundle\Entity\AuthCode
+    client_class:        Wallabag\Entity\Api\Client
+    access_token_class:  Wallabag\Entity\Api\AccessToken
+    refresh_token_class: Wallabag\Entity\Api\RefreshToken
+    auth_code_class:     Wallabag\Entity\Api\AuthCode
     service:
         user_provider: fos_user.user_provider.username_email
         options:
@@ -205,21 +209,21 @@ scheb_two_factor:
         lifetime: 2592000
 
     backup_codes:
-        enabled: "%twofactor_auth%"
+        enabled: true
 
     google:
-        enabled: "%twofactor_auth%"
+        enabled: true
         issuer: "%server_name%"
-        template: WallabagUserBundle:Authentication:form.html.twig
+        template: "Authentication/form.html.twig"
 
     email:
-        enabled: "%twofactor_auth%"
+        enabled: true
         sender_email: "%twofactor_sender%"
         digits: 6
-        template: WallabagUserBundle:Authentication:form.html.twig
-        mailer: wallabag_user.auth_code_mailer
+        template: "Authentication/form.html.twig"
+        mailer: Wallabag\Mailer\AuthCodeMailer
 
-kphoen_rulerz:
+rulerz:
     targets:
         doctrine: true
 
@@ -283,6 +287,16 @@ old_sound_rabbit_mq:
             exchange_options:
                 name: 'wallabag.import.chrome'
                 type: topic
+        import_shaarli:
+            connection: default
+            exchange_options:
+                name: 'wallabag.import.shaarli'
+                type: topic
+        import_pocket_html:
+            connection: default
+            exchange_options:
+                name: 'wallabag.import.pocket_html'
+                type: topic
     consumers:
         import_pocket:
             connection: default
@@ -291,7 +305,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.pocket'
-            callback: wallabag_import.consumer.amqp.pocket
+            callback: wallabag.consumer.amqp.pocket
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_readability:
             connection: default
@@ -300,7 +314,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.readability'
-            callback: wallabag_import.consumer.amqp.readability
+            callback: wallabag.consumer.amqp.readability
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_instapaper:
             connection: default
@@ -309,7 +323,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.instapaper'
-            callback: wallabag_import.consumer.amqp.instapaper
+            callback: wallabag.consumer.amqp.instapaper
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_pinboard:
             connection: default
@@ -318,7 +332,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.pinboard'
-            callback: wallabag_import.consumer.amqp.pinboard
+            callback: wallabag.consumer.amqp.pinboard
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_delicious:
             connection: default
@@ -327,7 +341,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.delicious'
-            callback: wallabag_import.consumer.amqp.delicious
+            callback: wallabag.consumer.amqp.delicious
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_wallabag_v1:
             connection: default
@@ -336,7 +350,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.wallabag_v1'
-            callback: wallabag_import.consumer.amqp.wallabag_v1
+            callback: wallabag.consumer.amqp.wallabag_v1
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_wallabag_v2:
             connection: default
@@ -345,7 +359,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.wallabag_v2'
-            callback: wallabag_import.consumer.amqp.wallabag_v2
+            callback: wallabag.consumer.amqp.wallabag_v2
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_elcurator:
             connection: default
@@ -354,7 +368,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.elcurator'
-            callback: wallabag_import.consumer.amqp.elcurator
+            callback: wallabag.consumer.amqp.elcurator
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_firefox:
             connection: default
@@ -363,7 +377,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.firefox'
-            callback: wallabag_import.consumer.amqp.firefox
+            callback: wallabag.consumer.amqp.firefox
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_chrome:
             connection: default
@@ -372,7 +386,25 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.chrome'
-            callback: wallabag_import.consumer.amqp.chrome
+            callback: wallabag.consumer.amqp.chrome
+            qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
+        import_shaarli:
+            connection: default
+            exchange_options:
+                name: 'wallabag.import.shaarli'
+                type: topic
+            queue_options:
+                name: 'wallabag.import.shaarli'
+            callback: wallabag.consumer.amqp.shaarli
+            qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
+        import_pocket_html:
+            connection: default
+            exchange_options:
+                name: 'wallabag.import.pocket_html'
+                type: topic
+            queue_options:
+                name: 'wallabag.import.pocket_html'
+            callback: wallabag.consumer.amqp.pocket_html
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
 
 fos_js_routing:
@@ -403,26 +435,19 @@ sensio_framework_extra:
 
 httplug:
     clients:
-        wallabag_core:
-            factory: 'wallabag_core.http_client_factory'
+        wallabag:
+            factory: Wallabag\Helper\HttpClientFactory
             config:
                 defaults:
                     timeout: 10
             plugins: ['httplug.plugin.logger']
-        wallabag_core.entry.download_images:
-            factory: 'httplug.factory.auto'
-            plugins: ['httplug.plugin.logger']
-        wallabag_import.pocket.client:
-            factory: 'httplug.factory.auto'
-            plugins:
-                - 'httplug.plugin.logger'
-                - header_defaults:
-                      headers:
-                          'content-type': 'application/json'
-                          'X-Accept': 'application/json'
     discovery:
         client: false
 
 # define custom entity so we can override length attribute to fix utf8mb4 issue
 craue_config:
-    entity_name: Wallabag\CoreBundle\Entity\InternalSetting
+    entity_name: Wallabag\Entity\InternalSetting
+
+when@dev:
+    maker:
+        root_namespace: 'Wallabag'

app/config/config_dev.yml

@@ -8,6 +8,10 @@ framework:
     profiler:
         only_exceptions: false
 
+    mailer:
+        # see https://mailcatcher.me/
+        dsn: smtp://127.0.0.1:1025
+
 web_profiler:
     toolbar: true
     intercept_redirects: false
@@ -35,12 +39,6 @@ monolog:
                 VERBOSITY_DEBUG: DEBUG
             channels: [doctrine]
 
-swiftmailer:
-    # see https://mailcatcher.me/
-    transport: smtp
-    host: 'localhost'
-    port: 1025
-
 # If you want to use cache for queries used in WallabagExtension
 # Uncomment the following lines
 #doctrine:

app/config/config_test.yml

@@ -3,6 +3,10 @@ imports:
     - { resource: parameters_test.yml }
     - { resource: services_test.yml }
 
+parameters:
+    fosuser_registration: true
+    wallabag_dbname_suffix: '_test'
+
 framework:
     test: ~
     session:
@@ -11,26 +15,17 @@ framework:
         collect: false
     translator:
         enabled: false
+    mailer:
+        dsn: 'null://null'
 
 web_profiler:
     toolbar: false
     intercept_redirects: false
 
-swiftmailer:
-    # to be able to read emails sent
-    spool:
-        type: file
-
 doctrine:
     dbal:
-        driver: "%test_database_driver%"
-        host: "%test_database_host%"
-        port: "%test_database_port%"
-        dbname: "%test_database_name%"
-        user: "%test_database_user%"
-        password: "%test_database_password%"
-        charset: "%test_database_charset%"
-        path: "%env(TEST_DATABASE_PATH)%"
+        dbname_suffix: '%wallabag_dbname_suffix%' # for MySQL and PostgreSQL
+        use_savepoints: true
 
     orm:
         metadata_cache_driver:
@@ -39,3 +34,8 @@ doctrine:
         query_cache_driver:
             type: service
             id: filesystem_cache
+
+dama_doctrine_test:
+    enable_static_connection: true
+    enable_static_meta_data_cache: true
+    enable_static_query_cache: true

app/config/parameters.yml.dist

@@ -23,16 +23,10 @@ parameters:
     # with PostgreSQL and SQLite, you must set "utf8"
     database_charset: utf8mb4
 
-    domain_name: https://your-wallabag-url-instance.com
+    domain_name: https://your-wallabag-instance.wallabag.org
     server_name: "Your wallabag instance"
 
-    mailer_transport:  smtp
-    mailer_user:       ~
-    mailer_password:   ~
-    mailer_host:       127.0.0.1
-    mailer_port:       false
-    mailer_encryption: ~
-    mailer_auth_mode:  ~
+    mailer_dsn: smtp://127.0.0.1
 
     locale: en
 
@@ -40,11 +34,10 @@ parameters:
     secret: CHANGE_ME_TO_SOMETHING_SECRET_AND_RANDOM
 
     # two factor stuff
-    twofactor_auth: true
     twofactor_sender: no-reply@wallabag.org
 
     # fosuser stuff
-    fosuser_registration: true
+    fosuser_registration: false
     fosuser_confirmation: true
 
     # how long the access token should live in seconds for the API

app/config/parameters_addons.yml

@@ -5,5 +5,5 @@ parameters:
         opera: https://addons.opera.com/en/extensions/details/wallabagger/?display=en
         f_droid: https://f-droid.org/app/fr.gaulupeau.apps.InThePoche
         google_play: https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche
-        ios: https://itunes.apple.com/app/wallabag-2/id1170800946?mt=8
+        ios: https://apps.apple.com/app/wallabag-2/id1170800946?mt=8
         windows: https://www.microsoft.com/store/apps/wallabag/9nblggh11646

app/config/parameters_test.yml

@@ -1,10 +1,2 @@
 parameters:
-    test_database_driver: pdo_sqlite
-    test_database_host: 127.0.0.1
-    test_database_port: null
-    test_database_name: null
-    test_database_user: null
-    test_database_password: null
-    test_database_path: "%env(TEST_DATABASE_PATH)%"
-    env(TEST_DATABASE_PATH): "%kernel.project_dir%/data/db/wallabag_test.sqlite"
-    test_database_charset: utf8
+    database_path: "%kernel.project_dir%/data/db/wallabag%wallabag_dbname_suffix%.sqlite"

app/config/routing.yml

@@ -1,39 +1,20 @@
-wallabag_annotation:
-  type : rest
-  resource: "@WallabagAnnotationBundle/Resources/config/routing_annotations.yml"
-
-wallabag_import:
-    resource: "@WallabagImportBundle/Controller/"
-    type: annotation
-    prefix: /import
-
-wallabag_user:
-    resource: "@WallabagUserBundle/Controller/"
-    type: annotation
-    prefix: /users
-
-wallabag_api:
-    resource: "@WallabagApiBundle/Controller/"
-    type: annotation
-    prefix: /
-
 app:
-    resource: "@WallabagCoreBundle/Controller/"
+    resource: ../../src/Controller/
     type: annotation
 
 doc-api:
-    resource: "@NelmioApiDocBundle/Resources/config/routing.yml"
+    resource: "@NelmioApiDocBundle/config/routing/swaggerui.xml"
     prefix: /api/doc
 
-rest :
-    type : rest
-    resource : "routing_rest.yml"
-    prefix : /api
+doc-api-json:
+    path: /api/doc.json
+    methods: GET
+    defaults: { _controller: nelmio_api_doc.controller.swagger }
 
 homepage:
     path: "/{page}"
     defaults:
-        _controller: WallabagCoreBundle:Entry:showUnread
+        _controller: 'Wallabag\Controller\EntryController::showUnreadAction'
         page : 1
     requirements:
         page: \d+
@@ -41,25 +22,13 @@ 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"
 
 craue_config_settings_modify:
     path: /settings
     defaults:
-        _controller: CraueConfigBundle:Settings:modify
+        _controller: 'Craue\ConfigBundle\Controller\SettingsController::modifyAction'
 
 fos_js_routing:
     resource: "@FOSJsRoutingBundle/Resources/config/routing/routing.xml"
@@ -76,34 +45,34 @@ fos_js_routing:
 rss_to_atom_unread:
     path: /{username}/{token}/unread.xml
     defaults:
-        _controller: FrameworkBundle:Redirect:redirect
+        _controller: 'Symfony\Bundle\FrameworkBundle\Controller\RedirectController::redirectAction'
         route: unread_feed
         permanent: true
 
 rss_to_atom_archive:
     path: /{username}/{token}/archive.xml
     defaults:
-        _controller: FrameworkBundle:Redirect:redirect
+        _controller: 'Symfony\Bundle\FrameworkBundle\Controller\RedirectController::redirectAction'
         route: archive_feed
         permanent: true
 
 rss_to_atom_starred:
     path: /{username}/{token}/starred.xml
     defaults:
-        _controller: FrameworkBundle:Redirect:redirect
+        _controller: 'Symfony\Bundle\FrameworkBundle\Controller\RedirectController::redirectAction'
         route: starred_feed
         permanent: true
 
 rss_to_atom_all:
     path: /{username}/{token}/all.xml
     defaults:
-        _controller: FrameworkBundle:Redirect:redirect
+        _controller: 'Symfony\Bundle\FrameworkBundle\Controller\RedirectController::redirectAction'
         route: all_feed
         permanent: true
 
 rss_to_atom_tags:
     path: /{username}/{token}/tags/{slug}.xml
     defaults:
-        _controller: FrameworkBundle:Redirect:redirect
+        _controller: 'Symfony\Bundle\FrameworkBundle\Controller\RedirectController::redirectAction'
         route: tag_feed
         permanent: true

app/config/routing_dev.yml

@@ -7,7 +7,7 @@ _profiler:
     prefix: /_profiler
 
 _errors:
-    resource: "@TwigBundle/Resources/config/routing/errors.xml"
+    resource: '@FrameworkBundle/Resources/config/routing/errors.xml'
     prefix: /_error
 
 _main:

app/config/routing_rest.yml

@@ -1,3 +0,0 @@
-Rest_Wallabag:
-    type : rest
-    resource: "@WallabagApiBundle/Resources/config/routing_rest.yml"

app/config/security.yml

@@ -9,7 +9,7 @@ security:
     providers:
         administrators:
             entity:
-                class: WallabagUserBundle:User
+                class: 'Wallabag\Entity\User'
                 property: username
         fos_userbundle:
             id: fos_user.user_provider.username_email
@@ -34,12 +34,10 @@ security:
             provider: fos_userbundle
 
         login_firewall:
-            logout_on_user_change: true
             pattern: ^/login$
             anonymous:  ~
 
         secured_area:
-            logout_on_user_change: true
             pattern: ^/
             form_login:
                 provider: fos_userbundle
@@ -78,6 +76,4 @@ security:
         - { path: ^/settings, roles: ROLE_SUPER_ADMIN }
         - { path: ^/annotations, roles: ROLE_USER }
         - { path: ^/2fa, role: IS_AUTHENTICATED_2FA_IN_PROGRESS }
-        - { path: ^/users, roles: ROLE_SUPER_ADMIN }
-        - { path: ^/ignore-origin-instance-rules, roles: ROLE_SUPER_ADMIN }
         - { path: ^/, roles: ROLE_USER }

app/config/services.yml

@@ -1,40 +1,163 @@
+imports:
+    - { resource: services_rabbit.yml }
+    - { resource: services_redis.yml }
+    - { resource: parameters_addons.yml }
+
 parameters:
-    lexik_form_filter.get_filter.doctrine_orm.class: Wallabag\CoreBundle\Event\Subscriber\CustomDoctrineORMSubscriber
+    spiriit_form_filter.get_filter.doctrine_orm.class: Wallabag\Event\Subscriber\CustomDoctrineORMSubscriber
 
 services:
-    twig.extension.text:
-        class: Twig_Extensions_Extension_Text
-        tags:
-            - { name: twig.extension }
+    _defaults:
+        autowire: true
+        autoconfigure: true
+        public: true
+        bind:
+            $projectDir: '%kernel.project_dir%'
+            $debug: '%kernel.debug%'
+            $defaultLocale: '%kernel.default_locale%'
+            $wallabagUrl: '%domain_name%'
+            $tablePrefix: "%database_table_prefix%"
+            $encryptionKeyPath: "%wallabag.site_credentials.encryption_key_path%"
+            $fetchingErrorMessageTitle: "%wallabag.fetching_error_message_title%"
+            $fetchingErrorMessage: '%wallabag.fetching_error_message%'
+            $languages: '%wallabag.languages%'
+            $lifeTime: '%wallabag.cache_lifetime%'
+            $cookieFile: "%kernel.cache_dir%/cookiejar.json"
+            $logoPath: 'web/img/appicon/apple-touch-icon-152.png'
+            $registrationEnabled: '%fosuser_registration%'
+            $restrictedAccess: '@=service(''craue_config'').get(''restricted_access'')'
+            $senderEmail: "%scheb_two_factor.email.sender_email%"
+            $senderName: "%scheb_two_factor.email.sender_name%"
+            $storeArticleHeaders: '@=service(''craue_config'').get(''store_article_headers'')'
+            $supportUrl: '@=service(''craue_config'').get(''wallabag_support_url'')'
+            $fonts: '%wallabag.fonts%'
 
-    wallabag.twig_extension:
-        class: Wallabag\CoreBundle\Twig\WallabagExtension
-        public: false
+    Wallabag\:
+        resource: '../../src/*'
+        exclude: ['../../src/{Consumer,Controller,Entity,ExpressionLanguage,DataFixtures,Redis}', '../../src/Event/*Event.php']
+
+    # controllers are imported separately to make sure services can be injected
+    # as action arguments even if you don't extend any base controller class
+    Wallabag\Controller\:
+        resource: '../../src/Controller/'
+        tags: ['controller.service_arguments']
+
+    # inject alias service into controllers
+    Wallabag\Controller\Import\ChromeController:
         arguments:
-            - "@wallabag_core.entry_repository"
-            - "@wallabag_core.tag_repository"
-            - "@security.token_storage"
-            - "%wallabag_core.cache_lifetime%"
-            - "@translator"
-            - "%kernel.root_dir%"
-        tags:
-            - { name: twig.extension }
+            $rabbitMqProducer: '@old_sound_rabbit_mq.import_chrome_producer'
+            $redisProducer: '@wallabag.producer.redis.chrome'
 
-    wallabag.twig_matomo_extension:
-        class: MatomoTwigExtension\MatomoTwigExtension
+    Wallabag\Controller\Import\DeliciousController:
+        arguments:
+            $rabbitMqProducer: '@old_sound_rabbit_mq.import_delicious_producer'
+            $redisProducer: '@wallabag.producer.redis.delicious'
+
+    Wallabag\Controller\Import\ElcuratorController:
+        arguments:
+            $rabbitMqProducer: '@old_sound_rabbit_mq.import_elcurator_producer'
+            $redisProducer: '@wallabag.producer.redis.elcurator'
+
+    Wallabag\Controller\Import\FirefoxController:
+        arguments:
+            $rabbitMqProducer: '@old_sound_rabbit_mq.import_firefox_producer'
+            $redisProducer: '@wallabag.producer.redis.firefox'
+
+    Wallabag\Controller\Import\InstapaperController:
+        arguments:
+            $rabbitMqProducer: '@old_sound_rabbit_mq.import_instapaper_producer'
+            $redisProducer: '@wallabag.producer.redis.instapaper'
+
+    Wallabag\Controller\Import\PinboardController:
+        arguments:
+            $rabbitMqProducer: '@old_sound_rabbit_mq.import_pinboard_producer'
+            $redisProducer: '@wallabag.producer.redis.pinboard'
+
+    Wallabag\Controller\Import\PocketController:
+        arguments:
+            $rabbitMqProducer: '@old_sound_rabbit_mq.import_pocket_producer'
+            $redisProducer: '@wallabag.producer.redis.pocket'
+
+    Wallabag\Controller\Import\ReadabilityController:
+        arguments:
+            $rabbitMqProducer: '@old_sound_rabbit_mq.import_readability_producer'
+            $redisProducer: '@wallabag.producer.redis.readability'
+
+    Wallabag\Controller\Import\WallabagV1Controller:
+        arguments:
+            $rabbitMqProducer: '@old_sound_rabbit_mq.import_wallabag_v1_producer'
+            $redisProducer: '@wallabag.producer.redis.wallabag_v1'
+
+    Wallabag\Controller\Import\WallabagV2Controller:
+        arguments:
+            $rabbitMqProducer: '@old_sound_rabbit_mq.import_wallabag_v2_producer'
+            $redisProducer: '@wallabag.producer.redis.wallabag_v2'
+
+    Wallabag\Controller\Import\ShaarliController:
+        arguments:
+            $rabbitMqProducer: '@old_sound_rabbit_mq.import_shaarli_producer'
+            $redisProducer: '@wallabag.producer.redis.shaarli'
+
+    Wallabag\Controller\Import\PocketHtmlController:
+        arguments:
+            $rabbitMqProducer: '@old_sound_rabbit_mq.import_pocket_html_producer'
+            $redisProducer: '@wallabag.producer.redis.pocket_html'
+
+    Doctrine\DBAL\Connection:
+        alias: doctrine.dbal.default_connection
+
+    Doctrine\ORM\EntityManagerInterface:
+        alias: doctrine.orm.entity_manager
+
+    Doctrine\Migrations\Metadata\Storage\TableMetadataStorageConfiguration:
+        alias: doctrine.migrations.storage.table_storage
+
+    Doctrine\Persistence\ManagerRegistry:
+        alias: doctrine
+
+    Craue\ConfigBundle\Util\Config:
+        alias: craue_config
+
+    JMS\Serializer\SerializerInterface:
+        alias: jms_serializer
+
+    Spiriit\Bundle\FormFilterBundle\Filter\FilterBuilderUpdaterInterface:
+        alias: spiriit_form_filter.query_builder_updater
+
+    Scheb\TwoFactorBundle\Security\TwoFactor\Provider\Google\GoogleAuthenticatorInterface:
+        alias: scheb_two_factor.security.google_authenticator
+
+    Symfony\Component\HttpFoundation\Session\SessionInterface:
+        alias: session
+
+    Symfony\Component\EventDispatcher\EventDispatcherInterface:
+        alias: event_dispatcher
+
+    Symfony\Component\Form\FormFactoryInterface:
+        alias: form.factory
+
+    Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface:
+        alias: security.token_storage
+
+    Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface:
+        alias: security.authorization_checker
+
+    Symfony\Component\Translation\TranslatorInterface:
+        alias: translator
+
+    Symfony\Component\Validator\Validator\ValidatorInterface:
+        alias: validator
+
+    FOS\UserBundle\Model\UserManagerInterface:
+        alias: fos_user.user_manager
+
+    MatomoTwigExtension\MatomoTwigExtension:
         public: false
-        tags:
-            - { name: twig.extension }
 
-    wallabag.locale_listener:
-        class: Wallabag\CoreBundle\Event\Listener\LocaleListener
-        arguments: ["%kernel.default_locale%"]
-        tags:
-            - { name: kernel.event_subscriber }
+    ScssPhp\ScssPhp\Compiler:
+        public: false
 
-    wallabag.user_locale_listener:
-        class: Wallabag\CoreBundle\Event\Listener\UserLocaleListener
-        arguments: ["@session"]
+    Wallabag\Event\Listener\UserLocaleListener:
         tags:
             - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin }
 
@@ -42,6 +165,187 @@ services:
         class: Symfony\Component\Cache\Adapter\FilesystemAdapter
         public: false
         arguments:
-            - 'craue_config'
-            - 0
-            - '%kernel.cache_dir%'
+            $namespace: 'craue_config'
+            $defaultLifetime: 0
+            $directory: '%kernel.cache_dir%'
+
+    Wallabag\ParamConverter\UsernameFeedTokenConverter:
+        tags:
+            - { name: request.param_converter, converter: username_feed_token_converter }
+
+    Wallabag\Event\Subscriber\TablePrefixSubscriber:
+        tags:
+            - { name: doctrine.event_subscriber }
+
+    Wallabag\Event\Subscriber\SchemaAdapterSubscriber:
+        arguments:
+            $databaseTablePrefix: "%database_table_prefix%"
+        tags:
+            - { name: doctrine.event_subscriber }
+
+    Graby\Graby:
+        arguments:
+            $config:
+                error_message: '%wallabag.fetching_error_message%'
+                error_message_title: '%wallabag.fetching_error_message_title%'
+        calls:
+            - [ setLogger, [ "@logger" ] ]
+        tags:
+            - { name: monolog.logger, channel: graby }
+
+    Graby\SiteConfig\ConfigBuilder:
+        arguments:
+            $config: {}
+
+    wallabag.http_client:
+        alias: 'httplug.client.wallabag'
+
+    Wallabag\SiteConfig\GrabySiteConfigBuilder:
+        tags:
+            - { name: monolog.logger, channel: graby }
+
+    # service alias override
+    Wallabag\SiteConfig\SiteConfigBuilder:
+        alias: Wallabag\SiteConfig\GrabySiteConfigBuilder
+
+    GuzzleHttp\Cookie\CookieJar:
+        alias: 'Wallabag\Helper\FileCookieJar'
+
+    Wallabag\Helper\HttpClientFactory:
+        calls:
+            - ['addSubscriber', ['@Wallabag\Guzzle\AuthenticatorSubscriber']]
+            - ['addSubscriber', ['@Wallabag\Guzzle\FixupMondeDiplomatiqueUriSubscriber']]
+
+    RulerZ\RulerZ:
+        alias: rulerz
+
+    Wallabag\Operator\PHP\Matches:
+        tags:
+            - { name: rulerz.operator, target: native, operator: matches }
+
+    Wallabag\Operator\Doctrine\Matches:
+        tags:
+            - { name: rulerz.operator, target: doctrine, operator: matches, inline: true }
+
+    Wallabag\Operator\PHP\NotMatches:
+        tags:
+            - { name: rulerz.operator, target: native, operator: notmatches }
+
+    Wallabag\Operator\Doctrine\NotMatches:
+        tags:
+            - { name: rulerz.operator, target: doctrine, operator: notmatches, inline: true }
+
+    Wallabag\Operator\PHP\PatternMatches:
+        tags:
+            - { name: rulerz.operator, target: native, operator: "~" }
+
+    Predis\Client:
+        arguments:
+            $parameters:
+                scheme: '%redis_scheme%'
+                host: '%redis_host%'
+                port: '%redis_port%'
+                path: '%redis_path%'
+                password: '%redis_password%'
+
+    Wallabag\Event\Subscriber\SQLiteCascadeDeleteSubscriber:
+        tags:
+            - { name: doctrine.event_subscriber }
+
+    Wallabag\Event\Subscriber\DownloadImagesSubscriber:
+        arguments:
+            $enabled: '@=service(''craue_config'').get(''download_images_enabled'')'
+
+    Wallabag\Helper\DownloadImages:
+        arguments:
+            $baseFolder: "%kernel.project_dir%/web/assets/images"
+
+    Wallabag\Command\InstallCommand:
+        arguments:
+            $databaseDriver: '%database_driver%'
+            $defaultSettings: '%wallabag.default_internal_settings%'
+            $defaultIgnoreOriginInstanceRules: '%wallabag.default_ignore_origin_instance_rules%'
+
+    Wallabag\Mailer\UserMailer:
+        arguments:
+            $parameters:
+                template:
+                    confirmation: '%fos_user.registration.confirmation.template%'
+                    resetting: '%fos_user.resetting.email.template%'
+                from_email:
+                    confirmation: '%fos_user.registration.confirmation.from_email%'
+                    resetting: '%fos_user.resetting.email.from_email%'
+
+    Wallabag\Event\Listener\CreateConfigListener:
+        arguments:
+            $itemsOnPage: "%wallabag.items_on_page%"
+            $feedLimit: "%wallabag.feed_limit%"
+            $language: "%wallabag.language%"
+            $readingSpeed: "%wallabag.reading_speed%"
+            $actionMarkAsRead: "%wallabag.action_mark_as_read%"
+            $listMode: "%wallabag.list_mode%"
+            $displayThumbnails: "%wallabag.display_thumbnails%"
+
+    Wallabag\Event\Listener\AuthenticationFailureListener:
+        tags:
+            - { name: kernel.event_listener, event: security.authentication.failure, method: onAuthenticationFailure }
+
+    Wallabag\Import\PocketImport:
+        calls:
+            - [ setClient, [ '@Symfony\Contracts\HttpClient\HttpClientInterface $pocketClient' ] ]
+        tags:
+            -  { name: wallabag.import, alias: pocket }
+
+    Wallabag\Import\WallabagV1Import:
+        tags:
+            -  { name: wallabag.import, alias: wallabag_v1 }
+
+    Wallabag\Import\WallabagV2Import:
+        tags:
+            -  { name: wallabag.import, alias: wallabag_v2 }
+
+    Wallabag\Import\ElcuratorImport:
+        tags:
+            -  { name: wallabag.import, alias: elcurator }
+
+    Wallabag\Import\ReadabilityImport:
+        tags:
+            -  { name: wallabag.import, alias: readability }
+
+    Wallabag\Import\InstapaperImport:
+        tags:
+            -  { name: wallabag.import, alias: instapaper }
+
+    Wallabag\Import\PinboardImport:
+        tags:
+            -  { name: wallabag.import, alias: pinboard }
+
+    Wallabag\Import\DeliciousImport:
+        tags:
+            -  { name: wallabag.import, alias: delicious }
+
+    Wallabag\Import\FirefoxImport:
+        tags:
+            -  { name: wallabag.import, alias: firefox }
+
+    Wallabag\Import\ChromeImport:
+        tags:
+            -  { name: wallabag.import, alias: chrome }
+
+    Wallabag\Import\ShaarliImport:
+        tags:
+            -  { name: wallabag.import, alias: shaarli }
+
+    Wallabag\Import\PocketHtmlImport:
+        tags:
+            -  { name: wallabag.import, alias: pocket_html }
+
+    # to factorize the proximity and bypass translation for prev & next
+    pagerfanta.view.default_wallabag:
+        class: Pagerfanta\View\OptionableView
+        arguments:
+            - '@pagerfanta.view.twitter_bootstrap'
+            - { proximity: 1, prev_message: "<", next_message: ">" }
+        public: false
+        tags:
+            - { name: pagerfanta.view, alias: default_wallabag }

app/config/services_rabbit.yml

@@ -0,0 +1,81 @@
+# RabbitMQ stuff
+services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+        public: true
+
+    Wallabag\Consumer\RabbitMQConsumerTotalProxy:
+        arguments:
+            $pocketConsumer: '@old_sound_rabbit_mq.import_pocket_consumer'
+            $readabilityConsumer: '@old_sound_rabbit_mq.import_readability_consumer'
+            $wallabagV1Consumer: '@old_sound_rabbit_mq.import_wallabag_v1_consumer'
+            $wallabagV2Consumer: '@old_sound_rabbit_mq.import_wallabag_v2_consumer'
+            $firefoxConsumer: '@old_sound_rabbit_mq.import_firefox_consumer'
+            $chromeConsumer: '@old_sound_rabbit_mq.import_chrome_consumer'
+            $instapaperConsumer: '@old_sound_rabbit_mq.import_instapaper_consumer'
+            $pinboardConsumer: '@old_sound_rabbit_mq.import_pinboard_consumer'
+            $deliciousConsumer: '@old_sound_rabbit_mq.import_delicious_consumer'
+            $elcuratorConsumer: '@old_sound_rabbit_mq.import_elcurator_consumer'
+            $shaarliConsumer: '@old_sound_rabbit_mq.import_shaarli_consumer'
+            $pocketHtmlConsumer: '@old_sound_rabbit_mq.import_pocket_html_consumer'
+
+    wallabag.consumer.amqp.pocket:
+        class: Wallabag\Consumer\AMQPEntryConsumer
+        arguments:
+            $import: '@Wallabag\Import\PocketImport'
+
+    wallabag.consumer.amqp.readability:
+        class: Wallabag\Consumer\AMQPEntryConsumer
+        arguments:
+            $import: '@Wallabag\Import\ReadabilityImport'
+
+    wallabag.consumer.amqp.instapaper:
+        class: Wallabag\Consumer\AMQPEntryConsumer
+        arguments:
+            $import: '@Wallabag\Import\InstapaperImport'
+
+    wallabag.consumer.amqp.pinboard:
+        class: Wallabag\Consumer\AMQPEntryConsumer
+        arguments:
+            $import: '@Wallabag\Import\PinboardImport'
+
+    wallabag.consumer.amqp.delicious:
+        class: Wallabag\Consumer\AMQPEntryConsumer
+        arguments:
+            $import: '@Wallabag\Import\DeliciousImport'
+
+    wallabag.consumer.amqp.wallabag_v1:
+        class: Wallabag\Consumer\AMQPEntryConsumer
+        arguments:
+            $import: '@Wallabag\Import\WallabagV1Import'
+
+    wallabag.consumer.amqp.wallabag_v2:
+        class: Wallabag\Consumer\AMQPEntryConsumer
+        arguments:
+            $import: '@Wallabag\Import\WallabagV2Import'
+
+    wallabag.consumer.amqp.elcurator:
+        class: Wallabag\Consumer\AMQPEntryConsumer
+        arguments:
+            $import: '@Wallabag\Import\ElcuratorImport'
+
+    wallabag.consumer.amqp.firefox:
+        class: Wallabag\Consumer\AMQPEntryConsumer
+        arguments:
+            $import: '@Wallabag\Import\FirefoxImport'
+
+    wallabag.consumer.amqp.chrome:
+        class: Wallabag\Consumer\AMQPEntryConsumer
+        arguments:
+            $import: '@Wallabag\Import\ChromeImport'
+
+    wallabag.consumer.amqp.shaarli:
+        class: Wallabag\Consumer\AMQPEntryConsumer
+        arguments:
+            $import: '@Wallabag\Import\ShaarliImport'
+
+    wallabag.consumer.amqp.pocket_html:
+        class: Wallabag\Consumer\AMQPEntryConsumer
+        arguments:
+            $import: '@Wallabag\Import\PocketHtmlImport'

app/config/services_redis.yml

@@ -0,0 +1,198 @@
+# Redis stuff
+services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+        public: true
+
+    # readability
+    wallabag.queue.redis.readability:
+        class: Simpleue\Queue\RedisQueue
+        arguments:
+            $queueName: "wallabag.import.readability"
+
+    wallabag.producer.redis.readability:
+        class: Wallabag\Redis\Producer
+        arguments:
+            - "@wallabag.queue.redis.readability"
+
+    wallabag.consumer.redis.readability:
+        class: Wallabag\Consumer\RedisEntryConsumer
+        arguments:
+            $import: '@Wallabag\Import\ReadabilityImport'
+
+    # instapaper
+    wallabag.queue.redis.instapaper:
+        class: Simpleue\Queue\RedisQueue
+        arguments:
+            $queueName: "wallabag.import.instapaper"
+
+    wallabag.producer.redis.instapaper:
+        class: Wallabag\Redis\Producer
+        arguments:
+            - "@wallabag.queue.redis.instapaper"
+
+    wallabag.consumer.redis.instapaper:
+        class: Wallabag\Consumer\RedisEntryConsumer
+        arguments:
+            $import: '@Wallabag\Import\InstapaperImport'
+
+    # pinboard
+    wallabag.queue.redis.pinboard:
+        class: Simpleue\Queue\RedisQueue
+        arguments:
+            $queueName: "wallabag.import.pinboard"
+
+    wallabag.producer.redis.pinboard:
+        class: Wallabag\Redis\Producer
+        arguments:
+            - "@wallabag.queue.redis.pinboard"
+
+    wallabag.consumer.redis.pinboard:
+        class: Wallabag\Consumer\RedisEntryConsumer
+        arguments:
+            $import: '@Wallabag\Import\PinboardImport'
+
+    # delicious
+    wallabag.queue.redis.delicious:
+        class: Simpleue\Queue\RedisQueue
+        arguments:
+            $queueName: "wallabag.import.delicious"
+
+    wallabag.producer.redis.delicious:
+        class: Wallabag\Redis\Producer
+        arguments:
+            - "@wallabag.queue.redis.delicious"
+
+    wallabag.consumer.redis.delicious:
+        class: Wallabag\Consumer\RedisEntryConsumer
+        arguments:
+            $import: '@Wallabag\Import\DeliciousImport'
+
+    # pocket
+    wallabag.queue.redis.pocket:
+        class: Simpleue\Queue\RedisQueue
+        arguments:
+            $queueName: "wallabag.import.pocket"
+
+    wallabag.producer.redis.pocket:
+        class: Wallabag\Redis\Producer
+        arguments:
+            - "@wallabag.queue.redis.pocket"
+
+    wallabag.consumer.redis.pocket:
+        class: Wallabag\Consumer\RedisEntryConsumer
+        arguments:
+            $import: '@Wallabag\Import\PocketImport'
+
+    # wallabag v1
+    wallabag.queue.redis.wallabag_v1:
+        class: Simpleue\Queue\RedisQueue
+        arguments:
+            $queueName: "wallabag.import.wallabag_v1"
+
+    wallabag.producer.redis.wallabag_v1:
+        class: Wallabag\Redis\Producer
+        arguments:
+            - "@wallabag.queue.redis.wallabag_v1"
+
+    wallabag.consumer.redis.wallabag_v1:
+        class: Wallabag\Consumer\RedisEntryConsumer
+        arguments:
+            $import: '@Wallabag\Import\WallabagV1Import'
+
+    # wallabag v2
+    wallabag.queue.redis.wallabag_v2:
+        class: Simpleue\Queue\RedisQueue
+        arguments:
+            $queueName: "wallabag.import.wallabag_v2"
+
+    wallabag.producer.redis.wallabag_v2:
+        class: Wallabag\Redis\Producer
+        arguments:
+            - "@wallabag.queue.redis.wallabag_v2"
+
+    wallabag.consumer.redis.wallabag_v2:
+        class: Wallabag\Consumer\RedisEntryConsumer
+        arguments:
+            $import: '@Wallabag\Import\WallabagV2Import'
+
+    # elcurator
+    wallabag.queue.redis.elcurator:
+        class: Simpleue\Queue\RedisQueue
+        arguments:
+            $queueName: "wallabag.import.elcurator"
+
+    wallabag.producer.redis.elcurator:
+        class: Wallabag\Redis\Producer
+        arguments:
+            - "@wallabag.queue.redis.elcurator"
+
+    wallabag.consumer.redis.elcurator:
+        class: Wallabag\Consumer\RedisEntryConsumer
+        arguments:
+            $import: '@Wallabag\Import\ElcuratorImport'
+
+    # firefox
+    wallabag.queue.redis.firefox:
+        class: Simpleue\Queue\RedisQueue
+        arguments:
+            $queueName: "wallabag.import.firefox"
+
+    wallabag.producer.redis.firefox:
+        class: Wallabag\Redis\Producer
+        arguments:
+            - "@wallabag.queue.redis.firefox"
+
+    wallabag.consumer.redis.firefox:
+        class: Wallabag\Consumer\RedisEntryConsumer
+        arguments:
+            $import: '@Wallabag\Import\FirefoxImport'
+
+    # chrome
+    wallabag.queue.redis.chrome:
+        class: Simpleue\Queue\RedisQueue
+        arguments:
+            $queueName: "wallabag.import.chrome"
+
+    wallabag.producer.redis.chrome:
+        class: Wallabag\Redis\Producer
+        arguments:
+            - "@wallabag.queue.redis.chrome"
+
+    wallabag.consumer.redis.chrome:
+        class: Wallabag\Consumer\RedisEntryConsumer
+        arguments:
+            $import: '@Wallabag\Import\ChromeImport'
+
+    # shaarli
+    wallabag.queue.redis.shaarli:
+        class: Simpleue\Queue\RedisQueue
+        arguments:
+            $queueName: "wallabag.import.shaarli"
+
+    wallabag.producer.redis.shaarli:
+        class: Wallabag\Redis\Producer
+        arguments:
+            - "@wallabag.queue.redis.shaarli"
+
+    wallabag.consumer.redis.shaarli:
+        class: Wallabag\Consumer\RedisEntryConsumer
+        arguments:
+            $import: '@Wallabag\Import\ShaarliImport'
+
+    # pocket html
+    wallabag.queue.redis.pocket_html:
+        class: Simpleue\Queue\RedisQueue
+        arguments:
+            $queueName: "wallabag.import.pocket_html"
+
+    wallabag.producer.redis.pocket_html:
+        class: Wallabag\Redis\Producer
+        arguments:
+            - "@wallabag.queue.redis.pocket_html"
+
+    wallabag.consumer.redis.pocket_html:
+        class: Wallabag\Consumer\RedisEntryConsumer
+        arguments:
+            $import: '@Wallabag\Import\PocketHtmlImport'

app/config/services_test.yml

@@ -1,38 +1,11 @@
 services:
-    # see https://github.com/symfony/symfony/issues/24543
-    fos_user.user_manager.test:
-        alias: fos_user.user_manager
-        public: true
-
-    fos_user.security.login_manager.test:
-        alias: fos_user.security.login_manager
-        public: true
-
-    wallabag_core.entry_repository.test:
-        alias: wallabag_core.entry_repository
-        public: true
-
-    wallabag_user.user_repository.test:
-        alias: wallabag_user.user_repository
-        public: true
-
     filesystem_cache:
         class: Doctrine\Common\Cache\FilesystemCache
         arguments:
             - "%kernel.cache_dir%/doctrine/metadata"
 
     # fixtures
-    Wallabag\UserBundle\DataFixtures\:
-        resource: '../../src/Wallabag/UserBundle/DataFixtures/*'
-        tags: ['doctrine.fixture.orm']
-        autowire: true
-
-    Wallabag\CoreBundle\DataFixtures\:
-        resource: '../../src/Wallabag/CoreBundle/DataFixtures/*'
-        tags: ['doctrine.fixture.orm']
-        autowire: true
-
-    Wallabag\AnnotationBundle\DataFixtures\:
-        resource: '../../src/Wallabag/AnnotationBundle/DataFixtures/*'
+    Wallabag\DataFixtures\:
+        resource: '../../fixtures/*'
         tags: ['doctrine.fixture.orm']
         autowire: true

app/config/tests/parameters_test.mysql.yml

@@ -1,10 +1,2 @@
 parameters:
-    test_database_driver: pdo_mysql
-    test_database_host: 127.0.0.1
-    test_database_port: 3306
-    test_database_name: wallabag_test
-    test_database_user: root
-    test_database_password: root
-    test_database_path: ~
-    env(TEST_DATABASE_PATH): ~
-    test_database_charset: utf8mb4
+    env(DATABASE_URL): mysql://root:root@127.0.0.1:3306/wallabag?charset=utf8mb4

app/config/tests/parameters_test.pgsql.yml

@@ -1,10 +1,2 @@
 parameters:
-    test_database_driver: pdo_pgsql
-    test_database_host: localhost
-    test_database_port:
-    test_database_name: wallabag_test
-    test_database_user: wallabag
-    test_database_password: wallabagrocks
-    test_database_path: ~
-    env(TEST_DATABASE_PATH): ~
-    test_database_charset: utf8
+    env(DATABASE_URL): postgres://wallabag:wallabagrocks@localhost/wallabag?charset=utf8

app/config/tests/parameters_test.sqlite.yml

@@ -1,12 +1,2 @@
 parameters:
-    test_database_driver: pdo_sqlite
-    test_database_host: localhost
-    test_database_port:
-    test_database_name: ~
-    test_database_user: ~
-    test_database_password: ~
-    # Using an environnement variable in order to avoid the error "attempt to write a readonly database"
-    # when the schema is dropped then recreate
-    test_database_path: "%env(TEST_DATABASE_PATH)%"
-    env(TEST_DATABASE_PATH): "%kernel.project_dir%/data/db/wallabag_test.sqlite"
-    test_database_charset: utf8
+    env(DATABASE_URL): sqlite:///%kernel.project_dir%/data/db/wallabag%wallabag_dbname_suffix%.sqlite?charset=utf8

app/config/wallabag.yml

@@ -1,7 +1,7 @@
-wallabag_core:
-    version: 2.5.3
-    paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
-    languages:
+parameters:
+    wallabag.version: 2.6.8
+    wallabag.paypal_url: "https://liberapay.com/wallabag/donate"
+    wallabag.languages:
         en: 'English'
         fr: 'Français'
         de: 'Deutsch'
@@ -23,28 +23,25 @@ wallabag_core:
         hr: 'Hrvatski'
         cs: 'Čeština'
         el: 'Ελληνικά'
-    items_on_page: 12
-    theme: material
-    language: '%locale%'
-    rss_limit: 50
-    reading_speed: 200
-    cache_lifetime: 10
-    action_mark_as_read: 1
-    list_mode: 0
-    fetching_error_message_title: 'No title found'
-    fetching_error_message: |
+        gl: 'Galego'
+    wallabag.items_on_page: 12
+    wallabag.language: '%locale%'
+    wallabag.feed_limit: 50
+    wallabag.reading_speed: 200
+    wallabag.cache_lifetime: 10
+    wallabag.action_mark_as_read: 1
+    wallabag.list_mode: 0
+    wallabag.display_thumbnails: 1
+    wallabag.fetching_error_message_title: 'No title found'
+    wallabag.fetching_error_message: |
         wallabag can't retrieve contents for this article. Please <a href="https://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
-    api_limit_mass_actions: 10
-    encryption_key_path: "%kernel.project_dir%/data/site-credentials-secret-key.txt"
-    default_internal_settings:
+    wallabag.api_limit_mass_actions: 10
+    wallabag.site_credentials.encryption_key_path: "%kernel.project_dir%/data/site-credentials-secret-key.txt"
+    wallabag.default_internal_settings:
         -
             name: share_public
             value: 1
             section: entry
-        -
-            name: carrot
-            value: 1
-            section: entry
         -
             name: share_diaspora
             value: 1
@@ -65,17 +62,17 @@ wallabag_core:
             name: share_shaarli
             value: 1
             section: entry
-        -
-            name: share_scuttle
-            value: 1
-            section: entry
         -
             name: shaarli_url
             value: https://myshaarli.com
             section: entry
         -
-            name: scuttle_url
-            value: https://scuttle.org
+            name: share_linkding
+            value: 1
+            section: entry
+        -
+            name: linkding_url
+            value: https://linkding.example.com
             section: entry
         -
             name: share_mail
@@ -97,10 +94,6 @@ wallabag_core:
             name: export_epub
             value: 1
             section: export
-        -
-            name: export_mobi
-            value: 0
-            section: export
         -
             name: export_pdf
             value: 1
@@ -141,14 +134,6 @@ wallabag_core:
             name: matomo_site_id
             value: 1
             section: analytics
-        -
-            name: demo_mode_enabled
-            value: 0
-            section: misc
-        -
-            name: demo_mode_username
-            value: wallabag
-            section: misc
         -
             name: download_images_enabled
             value: 0
@@ -170,17 +155,21 @@ wallabag_core:
             value: 0
             section: entry
 
-    default_ignore_origin_instance_rules:
+    wallabag.default_ignore_origin_instance_rules:
         -
             rule: host = "feedproxy.google.com"
         -
             rule: host = "feeds.reuters.com"
         -
             rule: _all ~ "https?://www\.lemonde\.fr/tiny.*"
-
-wallabag_user:
-    registration_enabled: "%fosuser_registration%"
-
-wallabag_import:
-    allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv']
-    resource_dir: "%kernel.project_dir%/web/uploads/import"
+    wallabag.fonts:
+        - 'Sans-serif'
+        - 'Serif'
+        - 'Atkinson Hyperlegible'
+        - 'EB Garamond'
+        - 'Lato'
+        - 'Montserrat'
+        - 'OpenDyslexicRegular'
+        - 'Oswald'
+    wallabag.allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv', 'text/html']
+    wallabag.resource_dir: "%kernel.project_dir%/web/uploads/import"

app/config/webpack/common.js

@@ -2,17 +2,16 @@ const path = require('path');
 const webpack = require('webpack');
 const StyleLintPlugin = require('stylelint-webpack-plugin');
 
-const rootDir = path.resolve(__dirname, '../../../');
+const projectDir = path.resolve(__dirname, '../../../');
 
 module.exports = {
   entry: {
-    material: path.join(rootDir, './app/Resources/static/themes/material/index.js'),
-    baggy: path.join(rootDir, './app/Resources/static/themes/baggy/index.js'),
-    public: path.join(rootDir, './app/Resources/static/themes/_global/share.js'),
+    material: path.join(projectDir, './assets/material/index.js'),
+    public: path.join(projectDir, './assets/_global/share.js'),
   },
   output: {
     filename: '[name].js',
-    path: path.resolve(rootDir, 'web/wallassets'),
+    path: path.resolve(projectDir, 'web/wallassets'),
     publicPath: '',
   },
   plugins: [
@@ -26,13 +25,13 @@ module.exports = {
       configFile: 'stylelint.config.js',
       failOnError: false,
       quiet: false,
-      context: 'app/Resources/static/themes',
+      context: 'assets',
       files: '**/*.scss',
     }),
   ],
   resolve: {
     alias: {
-      jquery: path.join(rootDir, 'node_modules/jquery/dist/jquery.js'),
+      jquery: path.join(projectDir, 'node_modules/jquery/dist/jquery.js'),
     },
   },
 };

app/config/webpack/prod.js

@@ -85,9 +85,6 @@ module.exports = merge(commonConfig, {
         test: /\.(jpg|png|gif|svg|ico)$/,
         exclude: /node_modules/,
         type: 'asset/resource',
-        generator: {
-          filename: (content) => content.filename.replace('app/Resources/static/', ''),
-        },
       },
       {
         test: /\.(eot|ttf|woff|woff2)$/,

assets/_global/img/icons/linkding.svg

@@ -0,0 +1 @@
+<svg clip-rule="evenodd" fill-rule="evenodd" height="512" stroke-linejoin="round" stroke-miterlimit="1.5" viewBox="0 0 512 512" width="512" xmlns="http://www.w3.org/2000/svg"><circle cx="255.0164" cy="254.9236" fill="#5856e0" r="224.78528" stroke-width="1.18"/><g fill="none" stroke="#fff" stroke-width="31.25"><path d="m1244.39 1293.95v199.64s-.81 67.89 74.9 68.88c75.98.99 74.88-68.88 74.88-68.88v-199.64" transform="matrix(.70710678 .70710678 -.70710678 .70710678 284.139117 -1684.198509)"/><path d="m1244.39 1293.95v199.64s-.81 67.89 74.9 68.88c75.98.99 74.88-68.88 74.88-68.88v-199.64" transform="matrix(-.70957074 -.70463421 .70463421 -.70957074 235.113139 2195.434643)"/></g></svg>

assets/_global/index.js

@@ -10,13 +10,18 @@ import 'mathjax/es5/tex-svg';
 /* Fonts */
 import 'material-design-icons-iconfont/dist/material-design-icons.css';
 import 'lato-font/css/lato-font.css';
+import 'open-dyslexic/open-dyslexic-regular.css';
+import '@fontsource/atkinson-hyperlegible';
+import '@fontsource/eb-garamond';
+import '@fontsource/montserrat';
+import '@fontsource/oswald';
 import './global.scss';
 
 /* Shortcuts */
 import './js/shortcuts/entry';
 import './js/shortcuts/main';
 
-/* Hightlight */
+/* Highlight */
 import './js/highlight';
 
 import { savePercent, retrievePercent } from './js/tools';
@@ -26,7 +31,7 @@ import { savePercent, retrievePercent } from './js/tools';
  ========================================================================== */
 
 $(document).ready(() => {
-  if ($('article').length) {
+  if ($('#article').length) {
     const app = new annotator.App();
 
     app.include(annotator.ui.main, {

assets/material/css/article.scss

@@ -2,7 +2,7 @@
    Article
    ========================================================================== */
 
-#article {
+#article, #preview-article {
   font-size: 20px;
   margin: 0 auto;
   max-width: 45em;
@@ -54,7 +54,7 @@
     }
 
     a {
-      border-bottom: 1px dotted $blueAccentColor;
+      border-bottom: 1px dotted $blue-accent-color;
       text-decoration: none;
     }
 
@@ -105,14 +105,15 @@
     margin: 2.1rem 0 0.68rem;
   }
 
-  aside {
+  .entry-info {
     .tools {
       display: flex;
-      flex-flow: row wrap;
+      margin: 8px 5px 5px;
+      flex-wrap: wrap;
 
       .stats {
+        margin: 0;
         font-size: 0.7em;
-        margin: 8px 5px 5px;
 
         li {
           display: inline-flex;
@@ -133,18 +134,21 @@
       }
 
       .tags {
-        float: right;
-        margin: 5px 15px 10px;
+        display: flex;
+        margin: 0;
+        align-items: center;
+        gap: 5px;
       }
     }
 
     .chip {
-      background-color: #9e9e9e;
-      padding: 0 15px 0 10px;
-      margin: auto 2px;
-      border-radius: 6px;
-      height: 18px;
-      line-height: 18px;
+      display: flex;
+      margin: 0;
+      padding: 0;
+      height: 25px;
+      line-height: 25px;
+      align-items: center;
+      background-color: transparent;
 
       a,
       i {
@@ -152,15 +156,45 @@
       }
 
       i.material-icons {
-        float: right;
         font-size: 16px;
-        line-height: 18px;
-        padding-left: 8px;
+        vertical-align: sub;
       }
     }
+
+    .chip-label {
+        padding-left: 10px;
+        padding-right: 5px;
+        background-color: #9e9e9e;
+        border-radius: 6px 0 0 6px;
+    }
+
+    .chip-action {
+      padding: 0 5px;
+      background-color: #868686;
+      border-radius: 0 6px 6px 0;
+    }
+
+    .chip-label,
+    .chip-action {
+      min-width: 30px;
+      text-align: center;
+    }
+
+    .chip-label:hover,
+    .chip-label:active,
+    .chip-label:focus,
+    .chip-action:hover,
+    .chip-action:active,
+    .chip-action:focus {
+      background-color: #5e5e5e;
+    }
   }
 }
 
+.entry-info {
+  margin-bottom: 40px;
+}
+
 .reader-mode {
   width: 70px !important;
   transition: width 0.2s ease;
@@ -200,3 +234,42 @@
   margin: 0;
   z-index: 9999;
 }
+
+.tags-add-form {
+  display: flex;
+  align-items: center;
+  gap: 20px;
+}
+
+@media only screen and (max-width: 640px) {
+  .entry-info {
+    margin-bottom: 20px;
+  }
+
+  #article .entry-info .tools {
+    margin-left: 0;
+    margin-right: 0;
+  }
+
+  #article .entry-info .tools .tags {
+    gap: 10px;
+  }
+
+  #article .entry-info .chip {
+    height: 32px;
+    line-height: 32px;
+  }
+
+  #article .entry-info .chip-label,
+  #article .entry-info .chip-action {
+    min-width: 40px;
+  }
+
+  .tags-add-form {
+    display: block;
+  }
+
+  .tags-add-form-submit {
+    margin-top: 10px;
+  }
+}

assets/material/css/cards.scss

@@ -3,7 +3,7 @@
    ========================================================================== */
 
 main {
-  #content {
+  div#content {
     padding: 0 0.5rem;
   }
 }
@@ -73,7 +73,7 @@ main {
 
   .card-entry-labels-hidden li {
     display: inline-block;
-    background-color: $blueAccentColor;
+    background-color: $blue-accent-color;
     margin: 0 5px;
     padding: 5px 12px;
     border-radius: 3px;
@@ -85,10 +85,6 @@ main {
     white-space: nowrap;
   }
 
-  .card-content .estimatedTime {
-    margin-bottom: 10px;
-  }
-
   .card-action {
     padding: 10px 10px 10px 15px;
 
@@ -160,7 +156,7 @@ a.original:not(.waves-effect) {
 .card-tag-labels li {
   margin: 10px 10px 10px auto;
   padding: 5px 12px 5px 16px !important;
-  background-color: $blueAccentColor;
+  background-color: $blue-accent-color;
   border-radius: 3px;
   color: #fff;
   cursor: default;
@@ -211,6 +207,10 @@ a.original:not(.waves-effect) {
   display: flex;
 }
 
+.card-tag-delete {
+  margin-left: 10px;
+}
+
 .card-tag-labels {
   display: grid;
   grid-template-columns: repeat(auto-fill, minmax(240px, 1fr));
@@ -247,7 +247,7 @@ a.original:not(.waves-effect) {
     }
 
     .chip {
-      background-color: $blueAccentColor;
+      background-color: $blue-accent-color;
       padding: 0 7px;
       margin: auto 1px;
       border-radius: 6px;
@@ -311,10 +311,25 @@ a.original:not(.waves-effect) {
   color: #fff !important;
 }
 
-.settings .div_tabs {
+.settings .tabs-container {
   padding-bottom: 15px;
 }
 
+.settings .settings-checkbox-col {
+  padding: 0;
+}
+
+.settings .settings-checkbox-label {
+  margin-bottom: 20px;
+  height: 3rem;
+}
+
+.settings .settings-range-label {
+  position: absolute;
+  top: -14px;
+  font-size: 0.8rem;
+}
+
 .entries-row {
   display: grid;
   margin: 0.4rem 0 0;

assets/material/css/dark_theme.scss

@@ -1,6 +1,8 @@
 .dark-theme {
-  body,
-  main #content,
+  body {
+    background-color: #101010;
+  }
+
   #article,
   .card,
   .card-panel,
@@ -10,13 +12,11 @@
   .collapsible-header,
   .collection,
   .dropdown-content,
-  .nav-panel-add,
-  .nav-panel-search,
   .side-nav,
   .side-nav .collapsible-body,
   .side-nav.fixed .collapsible-body,
   .tabs {
-    background-color: #121212;
+    background-color: #131716;
   }
 
   table.striped > tbody > tr:nth-child(2n+1),
@@ -50,7 +50,7 @@
     background-color: #272727;
   }
 
-  main #content,
+  #content,
   #article article,
   #article article h1,
   #article article h2,
@@ -59,7 +59,8 @@
   #article article h5,
   #article article h6,
   .dropdown-content li > a,
-  .results a,
+  .nav-panels .input-field input:focus,
+  .results-item,
   .side-nav li > a,
   .side-nav li > a > i.material-icons {
     color: #dfdfdf;
@@ -67,22 +68,24 @@
 
   .cyan,
   .cyan.darken-1,
-  .cyan.darken-2 {
+  .cyan.darken-2,
+  .nav-panel-add,
+  .nav-panel-search {
     background-color: #1d1d1d !important;
   }
 
-  .grey-text.text-darken-4 {
+  .grey-text.text-darken-4,
+  .nav-panel-item .add,
+  .nav-panel-item .search,
+  .nav-panels .close {
     color: #dfdfdf !important;
   }
 
-  #article .chip {
-    background-color: #373737;
-  }
-
   .side-nav li.active {
     background-color: #2f2f2f;
   }
 
+  .mass-action-tags .mass-action-tags-input.mass-action-tags-input,
   .side-nav li:not(.logo) > a:hover,
   .side-nav .collapsible-header:hover,
   .side-nav.fixed .collapsible-header:hover {
@@ -120,11 +123,24 @@
   }
 
   .hljs,
-  #article pre.hljs {
+  #article pre {
     color: #abb2bf;
     background-color: #282c34;
   }
 
+  nav input {
+    color: #abb2bf;
+  }
+
+  input[type="url"]:not(.browser-default):disabled {
+    color: #9e9e9e;
+  }
+
+  .input-field.nav-panel-add.disabled,
+  .input-field.nav-panel-add.disabled input {
+    background-color: transparent;
+  }
+
   @media only screen and (min-width: 992px) {
     #article {
       background-color: #101010;

assets/material/css/entries.scss

@@ -0,0 +1,230 @@
+/* ==========================================================================
+ * Entries
+ * ========================================================================== */
+
+.mass-action-toggle {
+  display: inline-flex;
+  background-color: transparent;
+  border: none;
+  cursor: pointer;
+
+  &:focus {
+    background-color: transparent;
+  }
+}
+
+.mass-action {
+  margin: 20px 5px 10px 20px;
+}
+
+.mass-action-group {
+  display: flex;
+  padding: 3px;
+  align-items: center;
+  gap: 30px;
+}
+
+.mass-action-button {
+  height: 36px;
+  line-height: 36px;
+  padding: 0 0.7rem;
+
+  i {
+    font-size: 1rem;
+  }
+}
+
+.mass-action-button--tags {
+  border-radius: 2px 0 0 2px;
+}
+
+.card-stacked .entry-checkbox {
+  margin: 10px 15px 10px 5px;
+}
+
+.card .entry-checkbox {
+  position: absolute;
+  display: flex;
+  padding: 10px;
+  inset: 0;
+  justify-content: flex-end;
+  align-items: start;
+  background-color: rgb(0 172 193 / 20%);
+  cursor: pointer;
+  z-index: 10;
+}
+
+.entries .entry-checkbox-input,
+.mass-action .entry-checkbox-input {
+  position: relative;
+  width: 20px;
+  min-height: 25px;
+  opacity: initial;
+  cursor: pointer;
+  z-index: 10;
+}
+
+.toggle-checkbox:not(:checked) + .mass-action,
+.toggle-checkbox:not(:checked) + .mass-action-tags,
+.toggle-checkbox:not(:checked) ~ .entries .entry-checkbox,
+.toggle-checkbox:checked ~ .entries .card-preview {
+  display: none;
+}
+
+.mass-action-tags {
+  display: flex;
+  margin-top: 10px;
+
+  .mass-action-tags-input.mass-action-tags-input {
+    margin: 0;
+    padding: 0 5px;
+    height: 34px;
+    background: white;
+    border-bottom: 3px solid #c5ebef;
+  }
+
+  .mass-action-tags-input.mass-action-tags-input.mass-action-tags-input:focus {
+    border-bottom: 3px solid $blue-accent-color;
+    box-shadow: none;
+  }
+}
+
+.entries {
+  list-style: none;
+}
+
+.collection {
+  margin: 5px 15px 0;
+  padding: 0;
+
+  .collection-item {
+    padding: 7px;
+    height: 65px;
+  }
+}
+
+.results {
+  display: flex;
+  margin-bottom: 10px;
+  padding: 1rem 1rem 0;
+  flex-wrap: wrap;
+  justify-content: space-between;
+}
+
+.nb-results {
+  display: inline-flex;
+  margin-bottom: 20px;
+  gap: 30px;
+}
+
+.results-item {
+  color: #444;
+}
+
+.pagination {
+  ul {
+    display: flex;
+    margin: 0;
+    flex-wrap: wrap;
+    justify-content: space-around;
+
+    .prev.disabled,
+    .next.disabled {
+      display: none;
+    }
+  }
+
+  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,
+  a {
+    padding: 0 10px;
+    height: 30px;
+    display: block;
+    line-height: 30px;
+  }
+
+  .disabled {
+    margin-right: 10px;
+    margin-left: 10px;
+  }
+
+  li.active span {
+    padding: 0 10px;
+    height: 30px;
+    display: block;
+    color: #fff;
+  }
+}
+
+.footer-text {
+  margin: 0.7rem 0.5rem;
+}
+
+.hidden {
+  display: none;
+}
+
+.picker__date-display {
+  display: none;
+}
+
+footer {
+  &.page-footer {
+    margin-top: 10px;
+    padding-top: 0;
+  }
+
+  .row {
+    margin-bottom: 10px;
+  }
+}
+
+@media screen and (min-width: 993px) {
+  .results {
+    margin-bottom: 0;
+  }
+
+  .nb-results {
+    margin-bottom: 0;
+    gap: 0;
+  }
+
+  .mass-action-button {
+    height: 24px;
+    line-height: 24px;
+    padding: 0 0.5rem;
+  }
+
+  .mass-action-group {
+    gap: 10px;
+  }
+
+  .mass-action-tags {
+    margin-top: 0;
+    margin-left: 7px;
+    flex-wrap: initial;
+  }
+
+  .mass-action {
+    display: flex;
+    margin-top: 10px;
+    align-items: center;
+
+    .mass-action-tags-input.mass-action-tags-input {
+      height: 21px;
+    }
+  }
+}

assets/material/css/icons.scss

@@ -21,12 +21,13 @@
   word-wrap: normal;
   white-space: nowrap;
   direction: ltr;
+  user-select: none;
 
   /* Support for all WebKit browsers. */
   -webkit-font-smoothing: antialiased;
 
   /* Support for Safari and Chrome. */
-  text-rendering: optimizeLegibility;
+  text-rendering: optimizelegibility;
 
   /* Support for Firefox. */
   -moz-osx-font-smoothing: grayscale;
@@ -123,10 +124,6 @@ a.icon-image {
     margin: 7px 1.5px 0 0;
   }
 
-  &.carrot::before {
-    background: url("../../_global/img/icons/carrot-icon--black.png") no-repeat center/90%;
-  }
-
   &.diaspora::before {
     background: url("../../_global/img/icons/diaspora-icon--black.png") no-repeat center/80%;
   }
@@ -135,6 +132,11 @@ a.icon-image {
     background: url("../../_global/img/icons/unmark-icon--black.png") no-repeat center/80%;
   }
 
+  &.linkding::before {
+    background: url("../../_global/img/icons/linkding.svg") no-repeat center/80%;
+    filter: grayscale(1);
+  }
+
   &.shaarli::before {
     background: url("../../_global/img/icons/shaarli.png") no-repeat center/80%;
   }

assets/material/css/layout.scss

@@ -19,7 +19,7 @@ body {
 }
 
 a {
-  color: $blueAccentColor;
+  color: $blue-accent-color;
 }
 
 main,

assets/material/css/media_queries.scss

@@ -10,7 +10,7 @@
 
 @media only screen and (min-width: 992px) {
   nav,
-  body:not(.entry):not(.login) main,
+  .index main,
   footer {
     padding-left: 240px;
   }
@@ -21,7 +21,7 @@
 }
 
 @media screen and (min-width: 993px) {
-  .entry #content {
+  .entry main div#content {
     padding-left: 70px;
   }
 }

assets/material/css/nav.scss

@@ -70,6 +70,7 @@ nav {
 
   .input-field input {
     display: block;
+    font-size: 1.2rem;
     line-height: inherit;
     height: 3rem;
   }
@@ -79,6 +80,17 @@ nav {
     box-shadow: none;
     color: #444;
   }
+
+  /* materializecss override */
+  .input-field.input-field input {
+    margin-bottom: 0;
+    border-bottom: none;
+  }
+
+  .input-field.input-field input:focus {
+    border-bottom: none;
+    box-shadow: initial;
+  }
 }
 
 .nav-panel-top {
@@ -131,11 +143,11 @@ nav {
   margin: 0 1%;
 }
 
-#button_filters {
+.button-filters {
   display: none;
 }
 
-#button_export {
+.button-export {
   display: none;
 }
 
@@ -161,6 +173,16 @@ nav {
 }
 
 @media (min-width: 993px) {
+  .toggle-add-url-container {
+    flex-grow: 1;
+  }
+
+  .toggle-add-url {
+    display: flex;
+    width: 100%;
+    justify-content: end;
+  }
+
   .button-collapse {
     display: none;
   }

assets/material/css/print.scss

@@ -18,20 +18,16 @@
 
   /* Hide useless blocks */
   body > header,
-  #article_toolbar,
-  #links,
-  #sort,
   body > footer,
-  .top_link,
-  div.tools,
+  .entry-tools,
   header div,
   .messages,
   .entry + .results,
-  #slide-out,
+  .left-bar,
   .progress,
   .hide-on-large-only,
-  #article > aside,
-  #article .mbm a {
+  .entry-info,
+  .title-edit {
     display: none !important;
   }
 
@@ -39,7 +35,7 @@
     padding-left: 0 !important;
   }
 
-  #article {
+  .article {
     margin: inherit !important;
   }
 

assets/material/css/sidenav.scss

@@ -45,6 +45,6 @@
   font-weight: bold;
 }
 
-span.numberItems {
+.items-number {
   float: right;
 }

assets/material/css/variables.scss

@@ -2,4 +2,4 @@
    Variables
    ========================================================================== */
 
-$blueAccentColor: #00acc1;
+$blue-accent-color: #00acc1;

assets/material/css/various.scss

@@ -15,6 +15,13 @@ div.settings div.file-field {
   }
 }
 
+/* override materializecss pointer-event disabled on checkboxes */
+[type="checkbox"]:not(:checked),
+[type="checkbox"]:checked,
+.input-field label {
+  pointer-events: initial;
+}
+
 .input-field label.active {
   font-size: 1rem;
 }