aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* 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
| * | | | | Bump symfony/symfony from 3.4.37 to 3.4.38dependabot-preview[bot]2020-03-021-52/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | Merge pull request #4295 from ↵Jérémy Benoist2020-03-271-8/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | wallabag/dependabot/composer/incenteev/composer-parameter-handler-2.1.4 Bump incenteev/composer-parameter-handler from 2.1.3 to 2.1.4
| * | | | | | Bump incenteev/composer-parameter-handler from 2.1.3 to 2.1.4dependabot-preview[bot]2020-03-181-8/+8
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | Merge pull request #4293 from ↵Kevin Decherf2020-03-151-9/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | wallabag/dependabot/composer/friendsofsymfony/oauth2-php-1.3.0 [Security] Bump friendsofsymfony/oauth2-php from 1.2.3 to 1.3.0
| * | | | | | [Security] Bump friendsofsymfony/oauth2-php from 1.2.3 to 1.3.0dependabot-preview[bot]2020-03-151-9/+12
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | Merge pull request #4290 from wallabag/ab0c5ef1Kevin Decherf2020-03-156-79/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove capistrano-related files
| * | | | | | Remove capistrano-related filesKevin Decherf2020-03-086-79/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | | | | | Merge pull request #4278 from wallabag/fix/4240Kevin Decherf2020-03-155-17/+104
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix entries export from search view
| * | | | | travis: remove double triggers for PR, remove nightlyKevin Decherf2020-02-231-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | | | | ExportController: fix entries export from search viewKevin Decherf2020-02-234-14/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4240 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | | | | | Merge pull request #4287 from ↵Kevin Decherf2020-03-061-5/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | wallabag/dependabot/composer/friendsofsymfony/rest-bundle-2.7.2 Bump friendsofsymfony/rest-bundle from 2.7.1 to 2.7.2
| * | | | | Bump friendsofsymfony/rest-bundle from 2.7.1 to 2.7.2dependabot-preview[bot]2020-03-051-5/+5
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Merge pull request #4282 from ↵Kevin Decherf2020-02-291-5/+5
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | wallabag/dependabot/composer/friendsofsymfony/rest-bundle-2.7.1 Bump friendsofsymfony/rest-bundle from 2.7.0 to 2.7.1
| * | | | Bump friendsofsymfony/rest-bundle from 2.7.0 to 2.7.1dependabot-preview[bot]2020-02-251-5/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge pull request #4280 from ↵Kevin Decherf2020-02-191-6/+6
|\ \ \ \ | |/ / / |/| | | | | | | | | | | wallabag/dependabot/composer/scheb/two-factor-bundle-4.14.0 Bump scheb/two-factor-bundle from 4.13.0 to 4.14.0
| * | | Bump scheb/two-factor-bundle from 4.13.0 to 4.14.0dependabot-preview[bot]2020-02-171-6/+6
|/ / / | | | | | | | | | | | | | | | | | | 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>
* | | Merge pull request #4277 from ↵Jérémy Benoist2020-02-031-5/+5
|\ \ \ | | | | | | | | | | | | | | | | wallabag/dependabot/composer/symfony/phpunit-bridge-4.3.11 Bump symfony/phpunit-bridge from 4.3.10 to 4.3.11
| * | | Bump symfony/phpunit-bridge from 4.3.10 to 4.3.11dependabot-preview[bot]2020-02-031-5/+7
| | |/ | |/| | | | | | | | | | | | | | | | | | | Bumps [symfony/phpunit-bridge](https://github.com/symfony/phpunit-bridge) from 4.3.10 to 4.3.11. - [Release notes](https://github.com/symfony/phpunit-bridge/releases) - [Changelog](https://github.com/symfony/phpunit-bridge/blob/master/CHANGELOG.md) - [Commits](https://github.com/symfony/phpunit-bridge/compare/v4.3.10...v4.3.11) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | Merge pull request #4276 from ↵Jérémy Benoist2020-02-031-5/+5
|\ \ \ | | | | | | | | | | | | | | | | wallabag/dependabot/composer/scheb/two-factor-bundle-4.13.0 Bump scheb/two-factor-bundle from 4.12.0 to 4.13.0
| * | | Bump scheb/two-factor-bundle from 4.12.0 to 4.13.0dependabot-preview[bot]2020-02-031-5/+7
| |/ / | | | | | | | | | | | | | | | | | | Bumps [scheb/two-factor-bundle](https://github.com/scheb/two-factor-bundle) from 4.12.0 to 4.13.0. - [Release notes](https://github.com/scheb/two-factor-bundle/releases) - [Commits](https://github.com/scheb/two-factor-bundle/compare/v4.12.0...v4.13.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | Merge pull request #4275 from ↵Jérémy Benoist2020-02-031-7/+10
|\ \ \ | |/ / |/| | | | | | | | wallabag/dependabot/composer/friendsofsymfony/rest-bundle-2.7.0 Bump friendsofsymfony/rest-bundle from 2.6.0 to 2.7.0
| * | Bump friendsofsymfony/rest-bundle from 2.6.0 to 2.7.0dependabot-preview[bot]2020-02-031-7/+10
|/ / | | | | | | | | | | | | | | Bumps [friendsofsymfony/rest-bundle](https://github.com/FriendsOfSymfony/FOSRestBundle) from 2.6.0 to 2.7.0. - [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.6.0...2.7.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | Merge pull request #4264 from herrriehm/masterJérémy Benoist2020-01-2816-19/+19
|\ \ | | | | | | cosmetic changes
| * | Update messages.es.ymlSebastian Riehm2020-01-271-1/+1
| | |
| * | fixed annoying typoSebastian Riehm2020-01-261-3/+3
| | |
| * | Update wallabag.ymlSebastian Riehm2020-01-261-3/+3
| | | | | | | | | reverted generic urls
| * | cosmetic changes:Sebastian Riehm2020-01-2516-19/+19
| | | | | | | | | | | | | | | | | | - http to https - replaced generic .com by specific TLD - updated some dead urls
* | | Merge pull request #4257 from Simounet/feat/lang-attributeJérémy Benoist2020-01-285-9/+51
|\ \ \ | | | | | | | | Use lang attribute
| * | | Use lang attributeSimounet2020-01-235-9/+51
| | | |
* | | | Merge pull request #4263 from wallabag/4251-firefox-printJérémy Benoist2020-01-274-2/+14
|\ \ \ \ | |_|/ / |/| | | Fix print of long pages
| * | | baggy: remove logo from printed pagesKevin Decherf2020-01-252-1/+7
| | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 16:17:39 +0000