aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* 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 existsSimounet2020-02-075-10/+18
* | Merge pull request #4281 from lizyn/zh_translationJérémy Benoist2020-03-285-0/+716
|\ \
| * | 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
| |\ \
* | \ \ Merge pull request #4299 from wallabag/fix/4133Jérémy Benoist2020-03-287-73/+71
|\ \ \ \
| * | | | Fix createdAt date range filterKevin Decherf2020-03-226-16/+28
| * | | | tests: replace baggy theme used in EntryController testsKevin Decherf2020-03-222-46/+33
| * | | | misc: reindent EntryFilterTypeKevin Decherf2020-03-211-15/+14
* | | | | Merge pull request #4285 from wallabag/dependabot/composer/symfony/symfony-3....Jérémy Benoist2020-03-271-52/+52
|\ \ \ \ \
| * | | | | Bump symfony/symfony from 3.4.37 to 3.4.38dependabot-preview[bot]2020-03-021-52/+52
* | | | | | Merge pull request #4295 from wallabag/dependabot/composer/incenteev/composer...Jérémy Benoist2020-03-271-8/+8
|\ \ \ \ \ \
| * | | | | | Bump incenteev/composer-parameter-handler from 2.1.3 to 2.1.4dependabot-preview[bot]2020-03-181-8/+8
|/ / / / / /
* | | | | | Merge pull request #4293 from wallabag/dependabot/composer/friendsofsymfony/o...Kevin Decherf2020-03-151-9/+12
|\ \ \ \ \ \
| * | | | | | [Security] Bump friendsofsymfony/oauth2-php from 1.2.3 to 1.3.0dependabot-preview[bot]2020-03-151-9/+12
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #4290 from wallabag/ab0c5ef1Kevin Decherf2020-03-156-79/+0
|\ \ \ \ \ \
| * | | | | | Remove capistrano-related filesKevin Decherf2020-03-086-79/+0
| |/ / / / /
* | | | | | Merge pull request #4278 from wallabag/fix/4240Kevin Decherf2020-03-155-17/+104
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | travis: remove double triggers for PR, remove nightlyKevin Decherf2020-02-231-3/+5
| * | | | | ExportController: fix entries export from search viewKevin Decherf2020-02-234-14/+99
* | | | | | Merge pull request #4287 from wallabag/dependabot/composer/friendsofsymfony/r...Kevin Decherf2020-03-061-5/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Bump friendsofsymfony/rest-bundle from 2.7.1 to 2.7.2dependabot-preview[bot]2020-03-051-5/+5
|/ / / / /
* | | | | Merge pull request #4282 from wallabag/dependabot/composer/friendsofsymfony/r...Kevin Decherf2020-02-291-5/+5
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Bump friendsofsymfony/rest-bundle from 2.7.0 to 2.7.1dependabot-preview[bot]2020-02-251-5/+5
|/ / / /
* | | | Merge pull request #4280 from wallabag/dependabot/composer/scheb/two-factor-b...Kevin Decherf2020-02-191-6/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Bump scheb/two-factor-bundle from 4.13.0 to 4.14.0dependabot-preview[bot]2020-02-171-6/+6
|/ / /
* | | Merge pull request #4277 from wallabag/dependabot/composer/symfony/phpunit-br...Jérémy Benoist2020-02-031-5/+5
|\ \ \
| * | | Bump symfony/phpunit-bridge from 4.3.10 to 4.3.11dependabot-preview[bot]2020-02-031-5/+7
| | |/ | |/|
* | | Merge pull request #4276 from wallabag/dependabot/composer/scheb/two-factor-b...Jérémy Benoist2020-02-031-5/+5
|\ \ \
| * | | Bump scheb/two-factor-bundle from 4.12.0 to 4.13.0dependabot-preview[bot]2020-02-031-5/+7
| |/ /
* | | Merge pull request #4275 from wallabag/dependabot/composer/friendsofsymfony/r...Jérémy Benoist2020-02-031-7/+10
|\ \ \ | |/ / |/| |
| * | Bump friendsofsymfony/rest-bundle from 2.6.0 to 2.7.0dependabot-preview[bot]2020-02-031-7/+10
|/ /
* | Merge pull request #4264 from herrriehm/masterJérémy Benoist2020-01-2816-19/+19
|\ \
| * | 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
| * | cosmetic changes:Sebastian Riehm2020-01-2516-19/+19
* | | Merge pull request #4257 from Simounet/feat/lang-attributeJérémy Benoist2020-01-285-9/+51
|\ \ \
| * | | Use lang attributeSimounet2020-01-235-9/+51
* | | | Merge pull request #4263 from wallabag/4251-firefox-printJérémy Benoist2020-01-274-2/+14
|\ \ \ \ | |_|/ / |/| | |
| * | | baggy: remove logo from printed pagesKevin Decherf2020-01-252-1/+7
| * | | material: replace display: flex with block in print modeKevin Decherf2020-01-252-1/+7
|/ / /
* | | Merge pull request #4261 from wallabag/dependabot/composer/j0k3r/graby-2.1.1Jérémy Benoist2020-01-241-25/+20
|\ \ \
| * | | Bump j0k3r/graby from 2.1.0 to 2.1.1dependabot-preview[bot]2020-01-241-25/+20
|/ / /
* | | Merge pull request #4260 from wallabag/dependabot/composer/symfony/symfony-3....Jérémy Benoist2020-01-231-18/+17
|\ \ \
| * | | Bump symfony/symfony from 3.4.36 to 3.4.37dependabot-preview[bot]2020-01-231-18/+17
|/ / /
* | | Merge pull request #4258 from wallabag/dependabot/composer/symfony/phpunit-br...Jérémy Benoist2020-01-221-5/+5
|\ \ \ | |/ / |/| |
| * | Bump symfony/phpunit-bridge from 4.3.9 to 4.3.10dependabot-preview[bot]2020-01-221-5/+5
|/ /
* | Merge pull request #4255 from Simounet/feat/actions-from-sticky-btnJérémy Benoist2020-01-216-13/+43
|\ \