Merge pull request #4421 from wallabag/fix/security-two-factor

Upgrade scheb/two-factor-bundle to fix vulnerability

Merge pull request #4433 from wallabag/dependabot/npm_and_yarn/websocket-extensions-0.1.4

Bump websocket-extensions from 0.1.3 to 0.1.4

Bump websocket-extensions from 0.1.3 to 0.1.4

Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4.
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4)

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

Merge pull request #4428 from wallabag/dependabot/composer/j0k3r/graby-2.2.1

Bump j0k3r/graby from 2.2.0 to 2.2.1

Bump j0k3r/graby from 2.2.0 to 2.2.1

Bumps [j0k3r/graby](https://github.com/j0k3r/graby) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/j0k3r/graby/releases)
- [Commits](https://github.com/j0k3r/graby/compare/2.2.0...2.2.1)

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

Upgrade scheb/two-factor-bundle to fix vulnerability

The bundle was locked to a version which contains a security bug.
Jumping to the most recent fix the issue.

But we'll have the `ListenerInterface` issue, again.
So, downgrading sentry-symfony instead.

See https://github.com/wallabag/wallabag/pull/4416/commits/0cf743f6fbfbc449c599ee0271e4e62ece0e47ac

Merge pull request #4425 from wallabag/dependabot/composer/symfony/symfony-3.4.41

Bump symfony/symfony from 3.4.40 to 3.4.41

Merge pull request #4423 from wallabag/dependabot/composer/symfony/maker-bundle-1.19.0

Bump symfony/maker-bundle from 1.18.0 to 1.19.0

Bump symfony/symfony from 3.4.40 to 3.4.41

Bumps [symfony/symfony](https://github.com/symfony/symfony) from 3.4.40 to 3.4.41.
- [Release notes](https://github.com/symfony/symfony/releases)
- [Changelog](https://github.com/symfony/symfony/blob/v3.4.41/CHANGELOG-3.4.md)
- [Commits](https://github.com/symfony/symfony/compare/v3.4.40...v3.4.41)

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

Bump symfony/maker-bundle from 1.18.0 to 1.19.0

Bumps [symfony/maker-bundle](https://github.com/symfony/maker-bundle) from 1.18.0 to 1.19.0.
- [Release notes](https://github.com/symfony/maker-bundle/releases)
- [Changelog](https://github.com/symfony/maker-bundle/blob/master/CHANGELOG.md)
- [Commits](https://github.com/symfony/maker-bundle/compare/v1.18.0...v1.19.0)

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

Merge pull request #4418 from wallabag/dependabot/composer/doctrine/doctrine-bundle-1.12.10

Bump doctrine/doctrine-bundle from 1.12.8 to 1.12.10

Bump doctrine/doctrine-bundle from 1.12.8 to 1.12.10

Bumps [doctrine/doctrine-bundle](https://github.com/doctrine/DoctrineBundle) from 1.12.8 to 1.12.10.
- [Release notes](https://github.com/doctrine/DoctrineBundle/releases)
- [Commits](https://github.com/doctrine/DoctrineBundle/compare/1.12.8...1.12.10)

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

Merge pull request #4416 from wallabag/update-deps

Update deps

Lock scheb/two-factor-bundle to avoid issue with ListenerInterface / TwoFactorListener

- v4.6.0 introduce a fix for "deprecated listener for Symfony < 4.3"
- but sentry-symfony 3.3.0 introduce a bug in the workaround previous fix
- which was fixed in sentry-symfony 3.4.2
- we can't upgrade to that version because it requires sentry/sdk 2.1 which use `php-http/guzzle6-adapter` instead of curl
- as we are using guzzle5, we can't upgrade and fix the listerner issue

Update deps

- Clean Travis config file
  - Only cache deps from composer (avoiding metadata to invalid Travis cache)
  - Update config file to match future version from Travis
  - Remove useless (not so working) `travis_fold`
- Remove `SensioGeneratorBundle` and use `MakerBundle`
  ```
  Package sensio/generator-bundle is abandoned, you should avoid using it. Use symfony/maker-bundle instead.
  ```
- Sort packages in `composer.json`
- Use `laminas/*` package to remove deprecated `zendframework/*` ones:
  ```
  Package zendframework/zend-code is abandoned, you should avoid using it. Use laminas/laminas-code instead.
  Package zendframework/zend-diactoros is abandoned, you should avoid using it. Use laminas/laminas-diactoros instead.
  Package zendframework/zend-eventmanager is abandoned, you should avoid using it. Use laminas/laminas-eventmanager instead.
  ```

Merge pull request #4410 from wallabag/dependabot/composer/friendsofsymfony/jsrouting-bundle-2.6.0

Bump friendsofsymfony/jsrouting-bundle from 2.5.4 to 2.6.0

Fix test

Bump friendsofsymfony/jsrouting-bundle from 2.5.4 to 2.6.0

Bumps [friendsofsymfony/jsrouting-bundle](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle) from 2.5.4 to 2.6.0.
- [Release notes](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle/releases)
- [Changelog](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle/blob/master/CHANGELOG.md)
- [Commits](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle/compare/2.5.4...2.6.0)

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

Merge pull request #4385 from Simounet/feat/side-nav-hidden-mobile-add-tag

Side nav hidden on mobile tag adding

Merge pull request #4392 from wallabag/dependabot/composer/scheb/two-factor-bundle-4.16.0

Bump scheb/two-factor-bundle from 4.15.0 to 4.16.0

Bump scheb/two-factor-bundle from 4.15.0 to 4.16.0

Bumps [scheb/two-factor-bundle](https://github.com/scheb/two-factor-bundle) from 4.15.0 to 4.16.0.
- [Release notes](https://github.com/scheb/two-factor-bundle/releases)
- [Commits](https://github.com/scheb/two-factor-bundle/compare/v4.15.0...v4.16.0)

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

Side nav hidden on mobile tag adding

Merge pull request #4363 from wallabag/piwik-to-matomo

Upgrade Piwik Twig Extension to Matomo

Merge pull request #4370 from wallabag/dependabot/composer/scheb/two-factor-bundle-4.15.0

Bump scheb/two-factor-bundle from 4.14.0 to 4.15.0

Bump scheb/two-factor-bundle from 4.14.0 to 4.15.0

Bumps [scheb/two-factor-bundle](https://github.com/scheb/two-factor-bundle) from 4.14.0 to 4.15.0.
- [Release notes](https://github.com/scheb/two-factor-bundle/releases)
- [Commits](https://github.com/scheb/two-factor-bundle/compare/v4.14.0...v4.15.0)

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

Upgrade Piwik Twig Extension to Matomo

Merge pull request #4366 from AKKED/patch-8

Update Japanese translation (messages.ja.yml)

Update Japanese translation (messages.ja.yml)

Merge pull request #4364 from wallabag/dependabot/composer/symfony/symfony-3.4.40

Bump symfony/symfony from 3.4.39 to 3.4.40

Bump symfony/symfony from 3.4.39 to 3.4.40

Bumps [symfony/symfony](https://github.com/symfony/symfony) from 3.4.39 to 3.4.40.
- [Release notes](https://github.com/symfony/symfony/releases)
- [Changelog](https://github.com/symfony/symfony/blob/v3.4.40/CHANGELOG-3.4.md)
- [Commits](https://github.com/symfony/symfony/compare/v3.4.39...v3.4.40)

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

Merge pull request #4358 from JeanGauthier/master

Update messages.oc.yml

Merge pull request #4360 from wallabag/config-mass-delete

Added confirmation before mass deleting articles

Update messages.oc.yml

Added confirmation before mass deleting articles

Update messages.oc.yml

Merge pull request #4309 from wallabag/fix/php-7.4

Replace wallabag's fork of tcpdf with the original one, PHP 7.4 support

Merge pull request #4343 from wallabag/enhance-material-nav

Enhanced navigation menu in material theme

Update messages.oc.yml

Enhanced navigation menu in material theme

Replace wallabag's fork of tcpdf with the original one, fix notices for PHP 7.4

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>

Merge pull request #4026 from wallabag/3760-ignorelist-db

Move Ignore Origin rules to database

tests: add a NetworkCalls group for tests making network calls

Excluding this group can decrease the run time of tests during
development.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>

views: Add doc and translations on ignore origin rules forms

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>

Add controller, views and translations for ignore origin instance rules

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>

ContentProxy: replace ignoreUrl with new RuleBasedIgnoreOriginProcessor

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>

Add default system-wide ignore origin rules with install support

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>

Add new Helper to process Ignore Origin rules and RulerZ operator

This commits adds a new helper like RuleBasedTagger for processing
ignore origin rules. It also adds a new custom RulerZ operator for the
'~' pattern matching rule.

Renames 'pattern' with '_all' in IgnoreOriginRule entity.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>

Add new Ignore Origin rules tab, update ConfigController

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>

Add IgnoreOriginRule-related entities, db migration, update config

Add IgnoreOriginUserRule for user-defined rules and
IgnoreOriginInstanceRule for system-wide rules. Add an interface for
these two new entities.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>

Merge pull request #4326 from wallabag/mass-actions

Added mass actions for Material design in list view

Added mass actions for Material design in list view

Merge pull request #4353 from wallabag/dependabot/composer/friendsofsymfony/rest-bundle-2.7.4

Bump friendsofsymfony/rest-bundle from 2.7.3 to 2.7.4

Merge pull request #4354 from wallabag/dependabot/composer/doctrine/doctrine-bundle-1.12.8

Bump doctrine/doctrine-bundle from 1.12.7 to 1.12.8

Bump doctrine/doctrine-bundle from 1.12.7 to 1.12.8

Bumps [doctrine/doctrine-bundle](https://github.com/doctrine/DoctrineBundle) from 1.12.7 to 1.12.8.
- [Release notes](https://github.com/doctrine/DoctrineBundle/releases)
- [Commits](https://github.com/doctrine/DoctrineBundle/compare/1.12.7...1.12.8)

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

Bump friendsofsymfony/rest-bundle from 2.7.3 to 2.7.4

Bumps [friendsofsymfony/rest-bundle](https://github.com/FriendsOfSymfony/FOSRestBundle) from 2.7.3 to 2.7.4.
- [Release notes](https://github.com/FriendsOfSymfony/FOSRestBundle/releases)
- [Changelog](https://github.com/FriendsOfSymfony/FOSRestBundle/blob/master/CHANGELOG.md)
- [Commits](https://github.com/FriendsOfSymfony/FOSRestBundle/compare/2.7.3...2.7.4)

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

Merge pull request #4349 from wallabag/dependabot/composer/j0k3r/graby-2.2.0

Bump j0k3r/graby from 2.1.1 to 2.2.0

Bump j0k3r/graby from 2.1.1 to 2.2.0

Bumps [j0k3r/graby](https://github.com/j0k3r/graby) from 2.1.1 to 2.2.0.
- [Release notes](https://github.com/j0k3r/graby/releases)
- [Commits](https://github.com/j0k3r/graby/compare/2.1.1...2.2.0)

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

Merge pull request #4347 from wallabag/article-stats-grey

🎨 Changed visibility for article stats

Fixed unit tests

Changed visibility for article stats

Merge pull request #4346 from wallabag/add-color-coherence

🎨 Added more coherence with color links for material theme

Added more coherence with color links for material theme

Merge pull request #4310 from wallabag/fix/4216

TagController: fix duplicated tags when renaming them

Merge pull request #4136 from wallabag/improve-tags-list

Improved tags list

Improved tags list for material view

Merge pull request #4338 from wallabag/dependabot/composer/html2text/html2text-4.3.1

Bump html2text/html2text from 4.2.1 to 4.3.1

Bump html2text/html2text from 4.2.1 to 4.3.1

Bumps [html2text/html2text](https://github.com/mtibben/html2text) from 4.2.1 to 4.3.1.
- [Release notes](https://github.com/mtibben/html2text/releases)
- [Commits](https://github.com/mtibben/html2text/compare/4.2.1...4.3.1)

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

TagController: support merging labels when renaming one with label of another

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>

TagController: prevent tag deletion when renaming a tag with the same label

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>

TagController: fix duplicated tags when renaming them

The fix relies on a workaround available on TagsAssigner, see the
AssignTagsToEntry() signature for detail.

I replaced the findOneByLabel in the corresponding test to assert that
there is no duplicate.

Fixes #4216

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>

Merge pull request #4336 from wallabag/dependabot/composer/friendsofsymfony/jsrouting-bundle-2.5.4

Bump friendsofsymfony/jsrouting-bundle from 2.5.3 to 2.5.4

Bump friendsofsymfony/jsrouting-bundle from 2.5.3 to 2.5.4

Bumps [friendsofsymfony/jsrouting-bundle](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle) from 2.5.3 to 2.5.4.
- [Release notes](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle/releases)
- [Changelog](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle/blob/master/CHANGELOG.md)
- [Commits](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle/compare/2.5.3...2.5.4)

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

Merge pull request #4335 from wallabag/dependabot/composer/friendsofphp/php-cs-fixer-2.16.3

Bump friendsofphp/php-cs-fixer from 2.16.2 to 2.16.3

Bump friendsofphp/php-cs-fixer from 2.16.2 to 2.16.3

Bumps [friendsofphp/php-cs-fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer) from 2.16.2 to 2.16.3.
- [Release notes](https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases)
- [Changelog](https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/2.16/CHANGELOG.md)
- [Commits](https://github.com/FriendsOfPHP/PHP-CS-Fixer/compare/v2.16.2...v2.16.3)

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

Merge pull request #4329 from wallabag/add-2fa-disable

Added a button to disable 2FA when enabled

Changed color for disable button

Merge pull request #4325 from wallabag/fix-paywall-import-cron

Added authentication during import command for paywalled websites

Added a button to disable 2FA when enabled

Merge pull request #4328 from wallabag/dependabot/composer/doctrine/doctrine-fixtures-bundle-3.3.1

Bump doctrine/doctrine-fixtures-bundle from 3.3.0 to 3.3.1

Merge pull request #4327 from wallabag/dependabot/composer/friendsofphp/php-cs-fixer-2.16.2

Bump friendsofphp/php-cs-fixer from 2.16.1 to 2.16.2

Bump doctrine/doctrine-fixtures-bundle from 3.3.0 to 3.3.1

Bumps [doctrine/doctrine-fixtures-bundle](https://github.com/doctrine/DoctrineFixturesBundle) from 3.3.0 to 3.3.1.
- [Release notes](https://github.com/doctrine/DoctrineFixturesBundle/releases)
- [Changelog](https://github.com/doctrine/DoctrineFixturesBundle/blob/master/CHANGELOG-3.1.md)
- [Commits](https://github.com/doctrine/DoctrineFixturesBundle/compare/3.3.0...3.3.1)

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

Bump friendsofphp/php-cs-fixer from 2.16.1 to 2.16.2

Bumps [friendsofphp/php-cs-fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer) from 2.16.1 to 2.16.2.
- [Release notes](https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases)
- [Changelog](https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/2.16/CHANGELOG.md)
- [Commits](https://github.com/FriendsOfPHP/PHP-CS-Fixer/compare/v2.16.1...v2.16.2)

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

Added authentication during import command for paywalled websites

Merge pull request #4319 from wallabag/feature/token-lifetime-parameters

Add ability to define lifetime token for the API

Add ability to define lifetime token for the API

It'll allow admin of a wallabag instance to define its own lifetime for the refresh token and the access token.
The default value are the recommended one from the wallabag team.

Merge pull request #4318 from wallabag/change-auth-graby

Changed authentication order in GrabySiteConfigBuilder

Changed authentication order in GrabySiteConfigBuilder

Merge pull request #4315 from wallabag/add-published-date-epub

Added publication date on epub export

Merge pull request #4317 from wallabag/enhance-article-display

Enhanced article display

Merge pull request #4316 from wallabag/fix-remove-pictures-api

Fixed bug when we delete entry via API

Enhanced article display
Fixes #4153

Added publication date on epub export

Fixed bug when we delete entry via API
Fixes #4291

Merge pull request #4308 from AKKED/patch-6

update Japanese translation

update Japanese translation

- Some mistranslations have been corrected.
- Some expressions have been updated to make them easier to understand.

Merge pull request #4305 from wallabag/dependabot/composer/symfony/symfony-3.4.39

Bump symfony/symfony from 3.4.38 to 3.4.39

Fix tests

Bump symfony/symfony from 3.4.38 to 3.4.39

Bumps [symfony/symfony](https://github.com/symfony/symfony) from 3.4.38 to 3.4.39.
- [Release notes](https://github.com/symfony/symfony/releases)
- [Changelog](https://github.com/symfony/symfony/blob/v3.4.39/CHANGELOG-3.4.md)
- [Commits](https://github.com/symfony/symfony/compare/v3.4.38...v3.4.39)

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

Merge pull request #4302 from wallabag/9f88d2f8

Replace grandt/phpepub with wallabag version

Merge pull request #4304 from wallabag/dependabot/composer/friendsofsymfony/rest-bundle-2.7.3

Bump friendsofsymfony/rest-bundle from 2.7.2 to 2.7.3