aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Add IgnoreOriginRule-related entities, db migration, update configKevin Decherf2020-04-2510-1/+302
|/
* Merge pull request #4326 from wallabag/mass-actionsNicolas Lœuillet2020-04-249-2/+191
|\
| * Added mass actions for Material design in list viewNicolas Lœuillet2020-04-249-2/+191
|/
* Merge pull request #4353 from wallabag/dependabot/composer/friendsofsymfony/r...Jérémy Benoist2020-04-241-5/+5
|\
| * Bump friendsofsymfony/rest-bundle from 2.7.3 to 2.7.4dependabot-preview[bot]2020-04-241-5/+5
* | Merge pull request #4354 from wallabag/dependabot/composer/doctrine/doctrine-...Jérémy Benoist2020-04-241-10/+10
|\ \ | |/ |/|
| * Bump doctrine/doctrine-bundle from 1.12.7 to 1.12.8dependabot-preview[bot]2020-04-241-10/+10
|/
* 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.0dependabot-preview[bot]2020-04-231-22/+21
|/
* Merge pull request #4347 from wallabag/article-stats-greyNicolas Lœuillet2020-04-225-18/+21
|\
| * 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 themeNicolas Lœuillet2020-04-214-3/+7
|/
* Merge pull request #4310 from wallabag/fix/4216Kevin Decherf2020-04-202-17/+239
|\
| * TagController: support merging labels when renaming one with label of anotherKevin Decherf2020-04-182-11/+143
| * TagController: prevent tag deletion when renaming a tag with the same labelKevin Decherf2020-04-182-6/+67
| * TagController: fix duplicated tags when renaming themKevin Decherf2020-04-182-8/+37
* | Merge pull request #4136 from wallabag/improve-tags-listNicolas Lœuillet2020-04-2014-31/+28
|\ \
| * | Improved tags list for material viewNicolas Lœuillet2020-04-2014-31/+28
|/ /
* | Merge pull request #4338 from wallabag/dependabot/composer/html2text/html2tex...Jérémy Benoist2020-04-201-5/+5
|\ \ | |/ |/|
| * Bump html2text/html2text from 4.2.1 to 4.3.1dependabot-preview[bot]2020-04-201-5/+5
|/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 20:49:35 +0000