aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4385 from Simounet/feat/side-nav-hidden-mobile-add-tagJérémy Benoist2020-05-132-1/+6
|\ | | | | Side nav hidden on mobile tag adding
| * Side nav hidden on mobile tag addingSimounet2020-05-062-1/+6
| |
* | Merge pull request #4392 from ↵Jérémy Benoist2020-05-111-19/+20
|\ \ | |/ |/| | | | | 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.0dependabot-preview[bot]2020-05-111-19/+20
|/ | | | | | | 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>
* Merge pull request #4363 from wallabag/piwik-to-matomoNicolas Lœuillet2020-04-3022-77/+106
|\ | | | | Upgrade Piwik Twig Extension to Matomo
| * Upgrade Piwik Twig Extension to MatomoNicolas Lœuillet2020-04-2922-77/+106
| |
* | Merge pull request #4370 from ↵Jérémy Benoist2020-04-301-5/+5
|\ \ | | | | | | | | | | | | 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.0dependabot-preview[bot]2020-04-301-5/+5
|/ / | | | | | | | | | | | | 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>
* | Merge pull request #4366 from AKKED/patch-8Jérémy Benoist2020-04-291-4/+49
|\ \ | | | | | | Update Japanese translation (messages.ja.yml)
| * | Update Japanese translation (messages.ja.yml)AKKED2020-04-291-4/+49
|/ /
* | Merge pull request #4364 from ↵Jérémy Benoist2020-04-291-10/+10
|\ \ | | | | | | | | | | | | 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.40dependabot-preview[bot]2020-04-291-10/+10
|/ / | | | | | | | | | | | | | | 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/masterJérémy Benoist2020-04-281-36/+36
|\ \ | |/ |/| Update messages.oc.yml
| * Update messages.oc.ymlProfile moved2020-04-271-1/+1
| |
| * Update messages.oc.ymlProfile moved2020-04-271-1/+1
| |
| * Update messages.oc.ymlProfile moved2020-04-261-36/+36
| |
* | Merge pull request #4360 from wallabag/config-mass-deleteNicolas Lœuillet2020-04-2717-2/+18
|\ \ | | | | | | Added confirmation before mass deleting articles
| * | Added confirmation before mass deleting articlesNicolas Lœuillet2020-04-2717-2/+18
|/ /
* | Merge pull request #4309 from wallabag/fix/php-7.4Nicolas Lœuillet2020-04-274-80/+72
|\ \ | | | | | | Replace wallabag's fork of tcpdf with the original one, PHP 7.4 support
| * | Replace wallabag's fork of tcpdf with the original one, fix notices for PHP 7.4Kevin Decherf2020-04-264-80/+72
| |/ | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #4343 from wallabag/enhance-material-navJérémy Benoist2020-04-2721-40/+59
|\ \ | |/ |/| Enhanced navigation menu in material theme
| * Enhanced navigation menu in material themeNicolas Lœuillet2020-04-2621-40/+59
|/
* 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
|/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 05:28:22 +0000