mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-23 17:41:01 +00:00
Code Issues Projects Releases Wiki Activity
5092 commits 12 branches 100 tags 170 MiB
Commit graph

5092 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nicolas Lœuillet
4ff1efa418
Added a button to disable 2FA when enabled 2020-04-13 17:00:53 +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
AKKED
7d4176b27b
Add Japanese translation 2020-03-28 16:47:44 +01:00
Jérémy Benoist
d8a40d703e
Merge pull request #4281 from lizyn/zh_translation 
Added language support for Simplified Chinese（简体中文）
 2020-03-28 16:39:17 +01:00
Jérémy Benoist
26467fa6b4
Merge pull request #4299 from wallabag/fix/4133 
Fix createdAt filter on material
 2020-03-28 16:38:12 +01:00
Jérémy Benoist
dcfce54681
Merge pull request #4285 from wallabag/dependabot/composer/symfony/symfony-3.4.38 
Bump symfony/symfony from 3.4.37 to 3.4.38
 2020-03-27 15:55:49 +01:00
Jérémy Benoist
d15be99648
Merge pull request #4295 from wallabag/dependabot/composer/incenteev/composer-parameter-handler-2.1.4 
Bump incenteev/composer-parameter-handler from 2.1.3 to 2.1.4
 2020-03-27 15:52:14 +01:00
Kevin Decherf
8ee7b1603d Fix createdAt date range filter 
- 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>
 2020-03-22 17:01:39 +01:00
Kevin Decherf
ef81e3c89b tests: replace baggy theme used in EntryController tests 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2020-03-22 17:01:39 +01:00
Kevin Decherf
7fc38f667b misc: reindent EntryFilterType 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2020-03-21 00:43:01 +01:00
dependabot-preview[bot]
91c318e870
Bump incenteev/composer-parameter-handler from 2.1.3 to 2.1.4 
Bumps [incenteev/composer-parameter-handler](https://github.com/Incenteev/ParameterHandler) from 2.1.3 to 2.1.4.
- [Release notes](https://github.com/Incenteev/ParameterHandler/releases)
- [Changelog](https://github.com/Incenteev/ParameterHandler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Incenteev/ParameterHandler/compare/v2.1.3...v2.1.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-18 03:54:46 +00:00
Kevin Decherf
f3b1ec121d
Merge pull request #4293 from wallabag/dependabot/composer/friendsofsymfony/oauth2-php-1.3.0 
[Security] Bump friendsofsymfony/oauth2-php from 1.2.3 to 1.3.0
 2020-03-15 16:51:37 +01:00
Kevin Decherf
2226c81340
Merge pull request #4290 from wallabag/ab0c5ef1 
Remove capistrano-related files
 2020-03-15 13:55:14 +01:00
Kevin Decherf
f38b8f0d86
Merge pull request #4278 from wallabag/fix/4240 
Fix entries export from search view
 2020-03-15 13:54:44 +01:00
dependabot-preview[bot]
f3db257902
[Security] Bump friendsofsymfony/oauth2-php from 1.2.3 to 1.3.0 
Bumps [friendsofsymfony/oauth2-php](https://github.com/FriendsOfSymfony/oauth2-php) from 1.2.3 to 1.3.0. **This update includes a security fix.**
- [Release notes](https://github.com/FriendsOfSymfony/oauth2-php/releases)
- [Changelog](https://github.com/FriendsOfSymfony/oauth2-php/blob/master/CHANGELOG.txt)
- [Commits](https://github.com/FriendsOfSymfony/oauth2-php/compare/1.2.3...1.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-15 11:27:16 +00:00
Kevin Decherf
899ab0d04f Remove capistrano-related files 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2020-03-08 17:00:51 +01:00
Kevin Decherf
ba820b12b6
Merge pull request #4287 from wallabag/dependabot/composer/friendsofsymfony/rest-bundle-2.7.2 
Bump friendsofsymfony/rest-bundle from 2.7.1 to 2.7.2
 2020-03-06 16:52:04 +01:00
dependabot-preview[bot]
552957bbf1
Bump friendsofsymfony/rest-bundle from 2.7.1 to 2.7.2 
Bumps [friendsofsymfony/rest-bundle](https://github.com/FriendsOfSymfony/FOSRestBundle) from 2.7.1 to 2.7.2.
- [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.1...2.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-05 03:49:44 +00:00
dependabot-preview[bot]
ec37106f32
Bump symfony/symfony from 3.4.37 to 3.4.38 
Bumps [symfony/symfony](https://github.com/symfony/symfony) from 3.4.37 to 3.4.38.
- [Release notes](https://github.com/symfony/symfony/releases)
- [Changelog](https://github.com/symfony/symfony/blob/v3.4.38/CHANGELOG-3.4.md)
- [Commits](https://github.com/symfony/symfony/compare/v3.4.37...v3.4.38)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-02 03:30:42 +00:00
Kevin Decherf
a167f002bb
Merge pull request #4282 from wallabag/dependabot/composer/friendsofsymfony/rest-bundle-2.7.1 
Bump friendsofsymfony/rest-bundle from 2.7.0 to 2.7.1
 2020-02-29 12:20:33 +01:00
dependabot-preview[bot]
d3c8bf87c2
Bump friendsofsymfony/rest-bundle from 2.7.0 to 2.7.1 
Bumps [friendsofsymfony/rest-bundle](https://github.com/FriendsOfSymfony/FOSRestBundle) from 2.7.0 to 2.7.1.
- [Release notes](https://github.com/FriendsOfSymfony/FOSRestBundle/releases)
- [Changelog](https://github.com/FriendsOfSymfony/FOSRestBundle/blob/2.7.1/CHANGELOG.md)
- [Commits](https://github.com/FriendsOfSymfony/FOSRestBundle/compare/2.7.0...2.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-25 04:01:53 +00:00
lizyn
9ce18f06c3 Added Simplified Chinese as a language option 2020-02-25 00:19:04 +08:00
lizyn
4a654ae49a Added translation in Simplified Chinese（简体中文） 2020-02-25 00:13:26 +08:00
lizyn
b19df31d78
Merge pull request #1 from wallabag/master 
Keep up with the master again
 2020-02-24 10:04:13 +08:00
Kevin Decherf
80609790ca travis: remove double triggers for PR, remove nightly 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2020-02-23 00:43:26 +01:00
Kevin Decherf
93c5b47e88 ExportController: fix entries export from search view 
Fixes #4240

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2020-02-23 00:43:21 +01:00
Kevin Decherf
04d918cae0
Merge pull request #4280 from wallabag/dependabot/composer/scheb/two-factor-bundle-4.14.0 
Bump scheb/two-factor-bundle from 4.13.0 to 4.14.0
 2020-02-19 21:35:16 +01:00
dependabot-preview[bot]
de166a37d4
Bump scheb/two-factor-bundle from 4.13.0 to 4.14.0 
Bumps [scheb/two-factor-bundle](https://github.com/scheb/two-factor-bundle) from 4.13.0 to 4.14.0.
- [Release notes](https://github.com/scheb/two-factor-bundle/releases)
- [Commits](https://github.com/scheb/two-factor-bundle/compare/v4.13.0...v4.14.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-17 04:06:40 +00:00