| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #4309 from wallabag/fix/php-7.4 | Nicolas Lœuillet | 2020-04-27 | 4 | -80/+72 |
|\ |
|
| * | Replace wallabag's fork of tcpdf with the original one, fix notices for PHP 7.4 | Kevin Decherf | 2020-04-26 | 4 | -80/+72 |
* | | Merge pull request #4343 from wallabag/enhance-material-nav | Jérémy Benoist | 2020-04-27 | 21 | -40/+59 |
|\ \
| |/
|/| |
|
| * | Enhanced navigation menu in material theme | Nicolas Lœuillet | 2020-04-26 | 21 | -40/+59 |
|/ |
|
* | Merge pull request #4026 from wallabag/3760-ignorelist-db | Kevin Decherf | 2020-04-26 | 54 | -80/+2384 |
|\ |
|
| * | tests: add a NetworkCalls group for tests making network calls | Kevin Decherf | 2020-04-25 | 3 | -5/+30 |
| * | views: Add doc and translations on ignore origin rules forms | Kevin Decherf | 2020-04-25 | 20 | -0/+512 |
| * | Add controller, views and translations for ignore origin instance rules | Kevin Decherf | 2020-04-25 | 26 | -4/+673 |
| * | ContentProxy: replace ignoreUrl with new RuleBasedIgnoreOriginProcessor | Kevin Decherf | 2020-04-25 | 2 | -60/+108 |
| * | Add default system-wide ignore origin rules with install support | Kevin Decherf | 2020-04-25 | 5 | -0/+60 |
| * | Add new Helper to process Ignore Origin rules and RulerZ operator | Kevin Decherf | 2020-04-25 | 6 | -4/+300 |
| * | Add new Ignore Origin rules tab, update ConfigController | Kevin Decherf | 2020-04-25 | 20 | -13/+406 |
| * | Add IgnoreOriginRule-related entities, db migration, update config | Kevin Decherf | 2020-04-25 | 10 | -1/+302 |
|/ |
|
* | Merge pull request #4326 from wallabag/mass-actions | Nicolas Lœuillet | 2020-04-24 | 9 | -2/+191 |
|\ |
|
| * | Added mass actions for Material design in list view | Nicolas Lœuillet | 2020-04-24 | 9 | -2/+191 |
|/ |
|
* | Merge pull request #4353 from wallabag/dependabot/composer/friendsofsymfony/r... | Jérémy Benoist | 2020-04-24 | 1 | -5/+5 |
|\ |
|
| * | Bump friendsofsymfony/rest-bundle from 2.7.3 to 2.7.4 | dependabot-preview[bot] | 2020-04-24 | 1 | -5/+5 |
* | | Merge pull request #4354 from wallabag/dependabot/composer/doctrine/doctrine-... | Jérémy Benoist | 2020-04-24 | 1 | -10/+10 |
|\ \
| |/
|/| |
|
| * | Bump doctrine/doctrine-bundle from 1.12.7 to 1.12.8 | dependabot-preview[bot] | 2020-04-24 | 1 | -10/+10 |
|/ |
|
* | Merge pull request #4349 from wallabag/dependabot/composer/j0k3r/graby-2.2.0 | Jérémy Benoist | 2020-04-23 | 1 | -22/+21 |
|\ |
|
| * | Bump j0k3r/graby from 2.1.1 to 2.2.0 | dependabot-preview[bot] | 2020-04-23 | 1 | -22/+21 |
|/ |
|
* | Merge pull request #4347 from wallabag/article-stats-grey | Nicolas Lœuillet | 2020-04-22 | 5 | -18/+21 |
|\ |
|
| * | Fixed unit tests | Nicolas Lœuillet | 2020-04-22 | 1 | -2/+2 |
| * | Changed visibility for article stats | Nicolas Lœuillet | 2020-04-22 | 4 | -16/+19 |
|/ |
|
* | Merge pull request #4346 from wallabag/add-color-coherence | Nicolas Lœuillet | 2020-04-22 | 4 | -3/+7 |
|\ |
|
| * | Added more coherence with color links for material theme | Nicolas Lœuillet | 2020-04-21 | 4 | -3/+7 |
|/ |
|
* | Merge pull request #4310 from wallabag/fix/4216 | Kevin Decherf | 2020-04-20 | 2 | -17/+239 |
|\ |
|
| * | TagController: support merging labels when renaming one with label of another | Kevin Decherf | 2020-04-18 | 2 | -11/+143 |
| * | TagController: prevent tag deletion when renaming a tag with the same label | Kevin Decherf | 2020-04-18 | 2 | -6/+67 |
| * | TagController: fix duplicated tags when renaming them | Kevin Decherf | 2020-04-18 | 2 | -8/+37 |
* | | Merge pull request #4136 from wallabag/improve-tags-list | Nicolas Lœuillet | 2020-04-20 | 14 | -31/+28 |
|\ \ |
|
| * | | Improved tags list for material view | Nicolas Lœuillet | 2020-04-20 | 14 | -31/+28 |
|/ / |
|
* | | Merge pull request #4338 from wallabag/dependabot/composer/html2text/html2tex... | Jérémy Benoist | 2020-04-20 | 1 | -5/+5 |
|\ \
| |/
|/| |
|
| * | Bump html2text/html2text from 4.2.1 to 4.3.1 | dependabot-preview[bot] | 2020-04-20 | 1 | -5/+5 |
|/ |
|
* | Merge pull request #4336 from wallabag/dependabot/composer/friendsofsymfony/j... | Jérémy Benoist | 2020-04-16 | 1 | -5/+5 |
|\ |
|
| * | Bump friendsofsymfony/jsrouting-bundle from 2.5.3 to 2.5.4 | dependabot-preview[bot] | 2020-04-16 | 1 | -5/+5 |
* | | Merge pull request #4335 from wallabag/dependabot/composer/friendsofphp/php-c... | Jérémy Benoist | 2020-04-16 | 1 | -5/+5 |
|\ \
| |/
|/| |
|
| * | Bump friendsofphp/php-cs-fixer from 2.16.2 to 2.16.3 | dependabot-preview[bot] | 2020-04-16 | 1 | -5/+5 |
|/ |
|
* | Merge pull request #4329 from wallabag/add-2fa-disable | Nicolas Lœuillet | 2020-04-14 | 20 | -4/+122 |
|\ |
|
| * | Changed color for disable button | Nicolas Lœuillet | 2020-04-14 | 1 | -2/+2 |
| * | Added a button to disable 2FA when enabled | Nicolas Lœuillet | 2020-04-13 | 20 | -4/+122 |
* | | Merge pull request #4325 from wallabag/fix-paywall-import-cron | Kevin Decherf | 2020-04-13 | 1 | -3/+14 |
|\ \ |
|
| * | | Added authentication during import command for paywalled websites | Nicolas Lœuillet | 2020-04-12 | 1 | -3/+14 |
| |/ |
|
* | | Merge pull request #4328 from wallabag/dependabot/composer/doctrine/doctrine-... | Jérémy Benoist | 2020-04-13 | 1 | -5/+6 |
|\ \ |
|
| * | | Bump doctrine/doctrine-fixtures-bundle from 3.3.0 to 3.3.1 | dependabot-preview[bot] | 2020-04-13 | 1 | -11/+13 |
| |/ |
|
* | | Merge pull request #4327 from wallabag/dependabot/composer/friendsofphp/php-c... | Jérémy Benoist | 2020-04-13 | 1 | -29/+31 |
|\ \
| |/
|/| |
|
| * | Bump friendsofphp/php-cs-fixer from 2.16.1 to 2.16.2 | dependabot-preview[bot] | 2020-04-13 | 1 | -29/+31 |
|/ |
|
* | Merge pull request #4319 from wallabag/feature/token-lifetime-parameters | Jérémy Benoist | 2020-04-08 | 2 | -1/+7 |
|\ |
|
| * | Add ability to define lifetime token for the API | Jeremy Benoist | 2020-04-08 | 2 | -1/+7 |
|/ |
|
* | Merge pull request #4318 from wallabag/change-auth-graby | Nicolas Lœuillet | 2020-04-07 | 1 | -9/+16 |
|\ |
|