aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4026 from wallabag/3760-ignorelist-dbKevin Decherf2020-04-2654-80/+2384
|\ | | | | Move Ignore Origin rules to database
| * tests: add a NetworkCalls group for tests making network callsKevin Decherf2020-04-253-5/+30
| | | | | | | | | | | | | | 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 formsKevin Decherf2020-04-2520-0/+512
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * Add controller, views and translations for ignore origin instance rulesKevin Decherf2020-04-2526-4/+673
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * ContentProxy: replace ignoreUrl with new RuleBasedIgnoreOriginProcessorKevin Decherf2020-04-252-60/+108
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * Add default system-wide ignore origin rules with install supportKevin Decherf2020-04-255-0/+60
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * Add new Helper to process Ignore Origin rules and RulerZ operatorKevin Decherf2020-04-256-4/+300
| | | | | | | | | | | | | | | | | | | | 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 ConfigControllerKevin Decherf2020-04-2520-13/+406
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * Add IgnoreOriginRule-related entities, db migration, update configKevin Decherf2020-04-2510-1/+302
|/ | | | | | | | 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-actionsNicolas Lœuillet2020-04-249-2/+191
|\ | | | | Added mass actions for Material design in list view
| * Added mass actions for Material design in list viewNicolas Lœuillet2020-04-249-2/+191
|/
* Merge pull request #4353 from ↵Jérémy Benoist2020-04-241-5/+5
|\ | | | | | | | | wallabag/dependabot/composer/friendsofsymfony/rest-bundle-2.7.4 Bump friendsofsymfony/rest-bundle from 2.7.3 to 2.7.4
| * Bump friendsofsymfony/rest-bundle from 2.7.3 to 2.7.4dependabot-preview[bot]2020-04-241-5/+5
| | | | | | | | | | | | | | | | 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 #4354 from ↵Jérémy Benoist2020-04-241-10/+10
|\ \ | |/ |/| | | | | 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.8dependabot-preview[bot]2020-04-241-10/+10
|/ | | | | | | 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>
* Merge pull request #4349 from wallabag/dependabot/composer/j0k3r/graby-2.2.0Jérémy Benoist2020-04-231-22/+21
|\ | | | | Bump j0k3r/graby from 2.1.1 to 2.2.0
| * Bump j0k3r/graby from 2.1.1 to 2.2.0dependabot-preview[bot]2020-04-231-22/+21
|/ | | | | | | 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-greyNicolas Lœuillet2020-04-225-18/+21
|\ | | | | 🎨 Changed visibility for article stats
| * Fixed unit testsNicolas Lœuillet2020-04-221-2/+2
| |
| * Changed visibility for article statsNicolas Lœuillet2020-04-224-16/+19
|/
* Merge pull request #4346 from wallabag/add-color-coherenceNicolas Lœuillet2020-04-224-3/+7
|\ | | | | 🎨 Added more coherence with color links for material theme
| * Added more coherence with color links for material themeNicolas Lœuillet2020-04-214-3/+7
|/
* Merge pull request #4310 from wallabag/fix/4216Kevin Decherf2020-04-202-17/+239
|\ | | | | TagController: fix duplicated tags when renaming them
| * TagController: support merging labels when renaming one with label of anotherKevin Decherf2020-04-182-11/+143
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * TagController: prevent tag deletion when renaming a tag with the same labelKevin Decherf2020-04-182-6/+67
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * TagController: fix duplicated tags when renaming themKevin Decherf2020-04-182-8/+37
| | | | | | | | | | | | | | | | | | | | | | | | 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 #4136 from wallabag/improve-tags-listNicolas Lœuillet2020-04-2014-31/+28
|\ \ | | | | | | Improved tags list
| * | Improved tags list for material viewNicolas Lœuillet2020-04-2014-31/+28
|/ /
* | Merge pull request #4338 from ↵Jérémy Benoist2020-04-201-5/+5
|\ \ | |/ |/| | | | | 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.1dependabot-preview[bot]2020-04-201-5/+5
|/ | | | | | | 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>
* Merge pull request #4336 from ↵Jérémy Benoist2020-04-161-5/+5
|\ | | | | | | | | 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.4dependabot-preview[bot]2020-04-161-5/+5
| | | | | | | | | | | | | | | | 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 ↵Jérémy Benoist2020-04-161-5/+5
|\ \ | |/ |/| | | | | 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.3dependabot-preview[bot]2020-04-161-5/+5
|/ | | | | | | | 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-disableNicolas Lœuillet2020-04-1420-4/+122
|\ | | | | Added a button to disable 2FA when enabled
| * Changed color for disable buttonNicolas Lœuillet2020-04-141-2/+2
| |
| * Added a button to disable 2FA when enabledNicolas Lœuillet2020-04-1320-4/+122
| |
* | Merge pull request #4325 from wallabag/fix-paywall-import-cronKevin Decherf2020-04-131-3/+14
|\ \ | | | | | | Added authentication during import command for paywalled websites
| * | Added authentication during import command for paywalled websitesNicolas Lœuillet2020-04-121-3/+14
| |/
* | Merge pull request #4328 from ↵Jérémy Benoist2020-04-131-5/+6
|\ \ | | | | | | | | | | | | wallabag/dependabot/composer/doctrine/doctrine-fixtures-bundle-3.3.1 Bump doctrine/doctrine-fixtures-bundle from 3.3.0 to 3.3.1
| * | Bump doctrine/doctrine-fixtures-bundle from 3.3.0 to 3.3.1dependabot-preview[bot]2020-04-131-11/+13
| |/ | | | | | | | | | | | | | | 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>
* | Merge pull request #4327 from ↵Jérémy Benoist2020-04-131-29/+31
|\ \ | |/ |/| | | | | wallabag/dependabot/composer/friendsofphp/php-cs-fixer-2.16.2 Bump friendsofphp/php-cs-fixer from 2.16.1 to 2.16.2
| * Bump friendsofphp/php-cs-fixer from 2.16.1 to 2.16.2dependabot-preview[bot]2020-04-131-29/+31
|/ | | | | | | | 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>
* Merge pull request #4319 from wallabag/feature/token-lifetime-parametersJérémy Benoist2020-04-082-1/+7
|\ | | | | Add ability to define lifetime token for the API
| * Add ability to define lifetime token for the APIJeremy Benoist2020-04-082-1/+7
|/ | | | | 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-grabyNicolas Lœuillet2020-04-071-9/+16
|\ | | | | Changed authentication order in GrabySiteConfigBuilder
| * Changed authentication order in GrabySiteConfigBuilderNicolas Lœuillet2020-04-071-9/+16
|/
* Merge pull request #4315 from wallabag/add-published-date-epubNicolas Lœuillet2020-04-0617-0/+23
|\ | | | | Added publication date on epub export
| * Added publication date on epub exportNicolas Lœuillet2020-04-0617-0/+23
| |
* | Merge pull request #4317 from wallabag/enhance-article-displayNicolas Lœuillet2020-04-064-4/+6
|\ \ | | | | | | Enhanced article display