aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4438 from wallabag/dependabot/composer/scheb/two-factor-b...HEADmasterJérémy Benoist2020-06-131-327/+11
|\
| * Bump scheb/two-factor-bundle from 4.16.0 to 4.18.0dependabot-preview[bot]2020-06-131-327/+11
|/
* Merge pull request #4421 from wallabag/fix/security-two-factorJérémy Benoist2020-06-132-119/+448
|\
| * Upgrade scheb/two-factor-bundle to fix vulnerabilityJeremy Benoist2020-06-022-119/+448
* | Merge pull request #4433 from wallabag/dependabot/npm_and_yarn/websocket-exte...Jérémy Benoist2020-06-081-3/+3
|\ \
| * | Bump websocket-extensions from 0.1.3 to 0.1.4dependabot[bot]2020-06-061-3/+3
|/ /
* | Merge pull request #4428 from wallabag/dependabot/composer/j0k3r/graby-2.2.1Jérémy Benoist2020-06-041-34/+34
|\ \ | |/ |/|
| * Bump j0k3r/graby from 2.2.0 to 2.2.1dependabot-preview[bot]2020-06-041-34/+34
|/
* Merge pull request #4425 from wallabag/dependabot/composer/symfony/symfony-3....Jérémy Benoist2020-06-021-17/+17
|\
| * Bump symfony/symfony from 3.4.40 to 3.4.41dependabot-preview[bot]2020-06-011-17/+17
* | Merge pull request #4423 from wallabag/dependabot/composer/symfony/maker-bund...Jérémy Benoist2020-06-021-5/+5
|\ \ | |/ |/|
| * Bump symfony/maker-bundle from 1.18.0 to 1.19.0dependabot-preview[bot]2020-06-011-5/+5
|/
* Merge pull request #4418 from wallabag/dependabot/composer/doctrine/doctrine-...Jérémy Benoist2020-05-261-374/+20
|\
| * Bump doctrine/doctrine-bundle from 1.12.8 to 1.12.10dependabot-preview[bot]2020-05-261-374/+20
|/
* Merge pull request #4416 from wallabag/update-depsJérémy Benoist2020-05-254-656/+1069
|\
| * Lock scheb/two-factor-bundle to avoid issue with ListenerInterface / TwoFacto...Jeremy Benoist2020-05-252-32/+94
| * Update depsJeremy Benoist2020-05-254-634/+985
|/
* Merge pull request #4410 from wallabag/dependabot/composer/friendsofsymfony/j...Jérémy Benoist2020-05-252-6/+6
|\
| * Fix testJeremy Benoist2020-05-251-1/+1
| * Bump friendsofsymfony/jsrouting-bundle from 2.5.4 to 2.6.0dependabot-preview[bot]2020-05-211-5/+5
|/
* 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 addingSimounet2020-05-062-1/+6
* | Merge pull request #4392 from wallabag/dependabot/composer/scheb/two-factor-b...Jérémy Benoist2020-05-111-19/+20
|\ \ | |/ |/|
| * Bump scheb/two-factor-bundle from 4.15.0 to 4.16.0dependabot-preview[bot]2020-05-111-19/+20
|/
* Merge pull request #4363 from wallabag/piwik-to-matomoNicolas Lœuillet2020-04-3022-77/+106
|\
| * Upgrade Piwik Twig Extension to MatomoNicolas Lœuillet2020-04-2922-77/+106
* | Merge pull request #4370 from wallabag/dependabot/composer/scheb/two-factor-b...Jérémy Benoist2020-04-301-5/+5
|\ \
| * | Bump scheb/two-factor-bundle from 4.14.0 to 4.15.0dependabot-preview[bot]2020-04-301-5/+5
|/ /
* | Merge pull request #4366 from AKKED/patch-8Jérémy Benoist2020-04-291-4/+49
|\ \
| * | Update Japanese translation (messages.ja.yml)AKKED2020-04-291-4/+49
|/ /
* | Merge pull request #4364 from wallabag/dependabot/composer/symfony/symfony-3....Jérémy Benoist2020-04-291-10/+10
|\ \
| * | Bump symfony/symfony from 3.4.39 to 3.4.40dependabot-preview[bot]2020-04-291-10/+10
|/ /
* | Merge pull request #4358 from JeanGauthier/masterJérémy Benoist2020-04-281-36/+36
|\ \ | |/ |/|
| * 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 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, fix notices for PHP 7.4Kevin Decherf2020-04-264-80/+72
| |/
* | Merge pull request #4343 from wallabag/enhance-material-navJérémy Benoist2020-04-2721-40/+59
|\ \ | |/ |/|
| * 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
|\
| * tests: add a NetworkCalls group for tests making network callsKevin Decherf2020-04-253-5/+30
| * views: Add doc and translations on ignore origin rules formsKevin Decherf2020-04-2520-0/+512
| * Add controller, views and translations for ignore origin instance rulesKevin Decherf2020-04-2526-4/+673
| * ContentProxy: replace ignoreUrl with new RuleBasedIgnoreOriginProcessorKevin Decherf2020-04-252-60/+108
| * Add default system-wide ignore origin rules with install supportKevin Decherf2020-04-255-0/+60
| * Add new Helper to process Ignore Origin rules and RulerZ operatorKevin Decherf2020-04-256-4/+300
| * Add new Ignore Origin rules tab, update ConfigControllerKevin Decherf2020-04-2520-13/+406