mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-27 11:31:05 +00:00
Code Issues Projects Releases Wiki Activity
5456 commits 12 branches 100 tags 170 MiB
Commit graph

5456 commits

This branch
This branch
All branches
Author SHA1 Message Date
dependabot-preview[bot]
692501f23e
Bump j0k3r/graby from 2.1.1 to 2.2.0 
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>
 2020-04-23 02:15:52 +00:00
Nicolas Lœuillet
6bd8f626e4
Merge pull request #4347 from wallabag/article-stats-grey 
🎨 Changed visibility for article stats
 2020-04-22 15:12:37 +02:00
Nicolas Lœuillet
01f8a776a4
Fixed unit tests 2020-04-22 14:58:37 +02:00
Nicolas Lœuillet
a6b5b8f7a9
Changed visibility for article stats 2020-04-22 14:58:24 +02:00
Nicolas Lœuillet
b367534991
Merge pull request #4346 from wallabag/add-color-coherence 
🎨 Added more coherence with color links for material theme
 2020-04-22 12:25:26 +02:00
Nicolas Lœuillet
558651783a
Added more coherence with color links for material theme 2020-04-21 17:30:39 +02:00
Kevin Decherf
2ca2ed39fd
Merge pull request #4310 from wallabag/fix/4216 
TagController: fix duplicated tags when renaming them
 2020-04-20 18:02:31 +02:00
Nicolas Lœuillet
7443da479f
Merge pull request #4136 from wallabag/improve-tags-list 
Improved tags list
 2020-04-20 12:14:54 +02:00
Nicolas Lœuillet
5434577883
Improved tags list for material view 2020-04-20 11:39:35 +02:00
Jérémy Benoist
361aa02e2a
Merge pull request #4338 from wallabag/dependabot/composer/html2text/html2text-4.3.1 
Bump html2text/html2text from 4.2.1 to 4.3.1
 2020-04-20 05:20:49 +02:00
dependabot-preview[bot]
ca7e0756db
Bump html2text/html2text from 4.2.1 to 4.3.1 
Bumps [html2text/html2text](https://github.com/mtibben/html2text) from 4.2.1 to 4.3.1.
- [Release notes](https://github.com/mtibben/html2text/releases)
- [Commits](https://github.com/mtibben/html2text/compare/4.2.1...4.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-20 02:41:47 +00:00
Kevin Decherf
48f9a9632d TagController: support merging labels when renaming one with label of another 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2020-04-18 18:12:33 +02:00
Kevin Decherf
a19caf8a37 TagController: prevent tag deletion when renaming a tag with the same label 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2020-04-18 18:09:07 +02:00
Kevin Decherf
39133eb796 TagController: fix duplicated tags when renaming them 
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>
 2020-04-18 18:09:07 +02:00
Jérémy Benoist
f3565ea2bf
Merge pull request #4336 from wallabag/dependabot/composer/friendsofsymfony/jsrouting-bundle-2.5.4 
Bump friendsofsymfony/jsrouting-bundle from 2.5.3 to 2.5.4
 2020-04-16 05:05:19 +02:00
dependabot-preview[bot]
395e6bfcee
Bump friendsofsymfony/jsrouting-bundle from 2.5.3 to 2.5.4 
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>
 2020-04-16 02:36:24 +00:00
Jérémy Benoist
7b948005be
Merge pull request #4335 from wallabag/dependabot/composer/friendsofphp/php-cs-fixer-2.16.3 
Bump friendsofphp/php-cs-fixer from 2.16.2 to 2.16.3
 2020-04-16 04:36:09 +02:00
dependabot-preview[bot]
facf7511ca
Bump friendsofphp/php-cs-fixer from 2.16.2 to 2.16.3 
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>
 2020-04-16 02:21:51 +00:00
Nicolas Lœuillet
35359a23c1
Merge pull request #4329 from wallabag/add-2fa-disable 
Added a button to disable 2FA when enabled
 2020-04-14 19:59:54 +02:00
Nicolas Lœuillet
e349c879fa
Changed color for disable button 2020-04-14 16:12:55 +02:00
Kevin Decherf
2b21cc8869
Merge pull request #4325 from wallabag/fix-paywall-import-cron 
Added authentication during import command for paywalled websites
 2020-04-13 18:27:52 +02:00
Nicolas Lœuillet
4ff1efa418
Added a button to disable 2FA when enabled 2020-04-13 17:00:53 +02:00
Jérémy Benoist
b4ecbf2bb2
Merge pull request #4328 from wallabag/dependabot/composer/doctrine/doctrine-fixtures-bundle-3.3.1 
Bump doctrine/doctrine-fixtures-bundle from 3.3.0 to 3.3.1
 2020-04-13 05:36:53 +02:00
Jérémy Benoist
fc096bdc32
Merge pull request #4327 from wallabag/dependabot/composer/friendsofphp/php-cs-fixer-2.16.2 
Bump friendsofphp/php-cs-fixer from 2.16.1 to 2.16.2
 2020-04-13 05:36:22 +02:00
dependabot-preview[bot]
20a99c772a
Bump doctrine/doctrine-fixtures-bundle from 3.3.0 to 3.3.1 
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>
 2020-04-13 02:32:39 +00:00
dependabot-preview[bot]
78eae449aa
Bump friendsofphp/php-cs-fixer from 2.16.1 to 2.16.2 
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>
 2020-04-13 02:18:53 +00:00
Nicolas Lœuillet
607e1a1a13
Added authentication during import command for paywalled websites 2020-04-12 15:35:00 +02:00
Jérémy Benoist
365b3dd21f
Merge pull request #4319 from wallabag/feature/token-lifetime-parameters 
Add ability to define lifetime token for the API
 2020-04-08 15:18:21 +02:00
Jeremy Benoist
d20a8c5fb4
Add ability to define lifetime token for the API 
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.
 2020-04-08 09:18:17 +02:00
Nicolas Lœuillet
023c8117ec
Merge pull request #4318 from wallabag/change-auth-graby 
Changed authentication order in GrabySiteConfigBuilder
 2020-04-07 17:23:20 +02:00
Nicolas Lœuillet
de9b5b5f4c
Changed authentication order in GrabySiteConfigBuilder 2020-04-07 17:12:19 +02:00
Nicolas Lœuillet
b283ee0d6d
Merge pull request #4315 from wallabag/add-published-date-epub 
Added publication date on epub export
 2020-04-06 19:58:33 +02:00
Nicolas Lœuillet
4d3478ec53
Merge pull request #4317 from wallabag/enhance-article-display 
Enhanced article display
 2020-04-06 18:00:36 +02:00
Kevin Decherf
a0cb41c509
Merge pull request #4316 from wallabag/fix-remove-pictures-api 
Fixed bug when we delete entry via API
 2020-04-06 17:59:58 +02:00
Nicolas Lœuillet
1598d13248
Enhanced article display 
Fixes #4153
 2020-04-06 16:32:09 +02:00
Nicolas Lœuillet
0bddd34847
Added publication date on epub export 2020-04-06 16:14:36 +02:00
Nicolas Lœuillet
a07872238b
Fixed bug when we delete entry via API 
Fixes #4291
 2020-04-06 16:11:05 +02:00
Jérémy Benoist
fbfeb20062
Merge pull request #4308 from AKKED/patch-6 
update Japanese translation
 2020-04-03 23:39:26 +02:00
AKKED
f547e4a7d4
update Japanese translation 
- Some mistranslations have been corrected.
- Some expressions have been updated to make them easier to understand.
 2020-04-04 04:31:05 +09:00
Jérémy Benoist
8b165a9a50
Merge pull request #4305 from wallabag/dependabot/composer/symfony/symfony-3.4.39 
Bump symfony/symfony from 3.4.38 to 3.4.39
 2020-03-31 16:11:28 +02:00
Jeremy Benoist
3cd659fc34
Fix tests 2020-03-31 15:56:48 +02:00
dependabot-preview[bot]
fdf90f8411
Bump symfony/symfony from 3.4.38 to 3.4.39 
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>
 2020-03-31 02:28:49 +00:00
Jérémy Benoist
d31f70bfac
Merge pull request #4302 from wallabag/9f88d2f8 
Replace grandt/phpepub with wallabag version
 2020-03-30 10:14:19 +02:00
Jérémy Benoist
bbf909ae6e
Merge pull request #4304 from wallabag/dependabot/composer/friendsofsymfony/rest-bundle-2.7.3 
Bump friendsofsymfony/rest-bundle from 2.7.2 to 2.7.3
 2020-03-30 05:48:32 +02:00
dependabot-preview[bot]
ff6272204e
Bump friendsofsymfony/rest-bundle from 2.7.2 to 2.7.3 
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>
 2020-03-30 02:39:21 +00:00
Kevin Decherf
9d196fcc15 composer: replace grandt/phpepub with wallabag version 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2020-03-29 16:27:31 +02:00
Kevin Decherf
6277578d4f
Merge pull request #4303 from wallabag/fix/cleanup-cookie 
Cleanup cookie jar
 2020-03-29 15:30:13 +02:00
Jeremy Benoist
b12e23ad8a
Cleanup cookie jar 
As of latest Guzzle release, it's fixed so we can removed that code.
 2020-03-29 11:39:49 +02:00
Jérémy Benoist
c9b83a13c0
Merge pull request #4274 from AKKED/add_ja 
add Japanese translation
 2020-03-28 17:16:37 +01:00
Jérémy Benoist
11079d204d
Merge pull request #4272 from Simounet/feat/load-custom-css-only-if-exists 
Load custom.css only if exists
 2020-03-28 16:49:29 +01:00