aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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
| * | Enhanced article displayNicolas Lœuillet2020-04-064-4/+6
| |/ | | | | | | Fixes #4153
* | Merge pull request #4316 from wallabag/fix-remove-pictures-apiKevin Decherf2020-04-061-6/+6
|\ \ | |/ |/| Fixed bug when we delete entry via API
| * Fixed bug when we delete entry via APINicolas Lœuillet2020-04-061-6/+6
|/ | | | Fixes #4291
* Merge pull request #4308 from AKKED/patch-6Jérémy Benoist2020-04-031-4/+4
|\ | | | | update Japanese translation
| * update Japanese translationAKKED2020-04-041-4/+4
|/ | | | - Some mistranslations have been corrected. - Some expressions have been updated to make them easier to understand.
* Merge pull request #4305 from ↵Jérémy Benoist2020-03-312-65/+65
|\ | | | | | | | | wallabag/dependabot/composer/symfony/symfony-3.4.39 Bump symfony/symfony from 3.4.38 to 3.4.39
| * Fix testsJeremy Benoist2020-03-311-1/+1
| |
| * Bump symfony/symfony from 3.4.38 to 3.4.39dependabot-preview[bot]2020-03-311-64/+64
|/ | | | | | | | Bumps [symfony/symfony](https://github.com/symfony/symfony) from 3.4.38 to 3.4.39. - [Release notes](https://github.com/symfony/symfony/releases) - [Changelog](https://github.com/symfony/symfony/blob/v3.4.39/CHANGELOG-3.4.md) - [Commits](https://github.com/symfony/symfony/compare/v3.4.38...v3.4.39) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Merge pull request #4302 from wallabag/9f88d2f8Jérémy Benoist2020-03-302-79/+74
|\ | | | | Replace grandt/phpepub with wallabag version
| * composer: replace grandt/phpepub with wallabag versionKevin Decherf2020-03-292-79/+74
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #4304 from ↵Jérémy Benoist2020-03-301-10/+11
|\ \ | |/ |/| | | | | wallabag/dependabot/composer/friendsofsymfony/rest-bundle-2.7.3 Bump friendsofsymfony/rest-bundle from 2.7.2 to 2.7.3
| * Bump friendsofsymfony/rest-bundle from 2.7.2 to 2.7.3dependabot-preview[bot]2020-03-301-10/+11
|/ | | | | | | | Bumps [friendsofsymfony/rest-bundle](https://github.com/FriendsOfSymfony/FOSRestBundle) from 2.7.2 to 2.7.3. - [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.2...2.7.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Merge pull request #4303 from wallabag/fix/cleanup-cookieKevin Decherf2020-03-291-24/+0
|\ | | | | Cleanup cookie jar
| * Cleanup cookie jarJeremy Benoist2020-03-291-24/+0
|/ | | | As of latest Guzzle release, it's fixed so we can removed that code.
* Merge pull request #4274 from AKKED/add_jaJérémy Benoist2020-03-285-0/+716
|\ | | | | add Japanese translation
| * Add Japanese translationAKKED2020-03-285-0/+716
| |
* | Merge pull request #4272 from Simounet/feat/load-custom-css-only-if-existsJérémy Benoist2020-03-285-10/+18
|\ \ | |/ |/| Load custom.css only if exists
| * Load custom.css only if existsSimounet2020-02-075-10/+18
| |
* | Merge pull request #4281 from lizyn/zh_translationJérémy Benoist2020-03-285-0/+716
|\ \ | | | | | | Added language support for Simplified Chinese（简体中文）
| * | Added Simplified Chinese as a language optionlizyn2020-02-251-0/+1
| | |
| * | Added translation in Simplified Chinese（简体中文）lizyn2020-02-254-0/+715
| | |
| * | Merge pull request #1 from wallabag/masterlizyn2020-02-24345-3355/+20131
| |\ \ | | | | | | | | Keep up with the master again
* | \ \ Merge pull request #4299 from wallabag/fix/4133Jérémy Benoist2020-03-287-73/+71
|\ \ \ \ | | | | | | | | | | Fix createdAt filter on material
| * | | | Fix createdAt date range filterKevin Decherf2020-03-226-16/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - hiddenName has been disabled in order to fix the missing date range values when using the material theme - data format has been changed to 'Y-m-d' in order to comply with the browser date input default format - tests: date() and strtotime have been replaced with DateTime-related objects Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | | | tests: replace baggy theme used in EntryController testsKevin Decherf2020-03-222-46/+33
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | | | misc: reindent EntryFilterTypeKevin Decherf2020-03-211-15/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | | | | Merge pull request #4285 from ↵Jérémy Benoist2020-03-271-52/+52
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | wallabag/dependabot/composer/symfony/symfony-3.4.38 Bump symfony/symfony from 3.4.37 to 3.4.38
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 10:17:18 +0000