Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3395 from wallabag/issue-3393 | Kevin Decherf | 2017-11-01 | 1 | -1/+1 |
|\ | | | | | views/config: fix overlaying drop down menu | ||||
| * | views/config: fix overlaying drop down menu | Kevin Decherf | 2017-10-31 | 1 | -1/+1 |
|/ | | | | Fixes #3393 | ||||
* | Merge pull request #3392 from mart-e/add-title-page-epub | Jérémy Benoist | 2017-10-31 | 1 | -3/+3 |
|\ | | | | | add the title of article on the epub export | ||||
| * | Properly run php-cs-fixer | Jeremy Benoist | 2017-10-28 | 1 | -23/+23 |
| | | |||||
| * | php-cs-fixer | Martin Trigaux | 2017-10-28 | 1 | -24/+24 |
| | | | | | | | | php bin/php-cs-fixer fix src/Wallabag/CoreBundle/Helper/EntriesExport.php | ||||
| * | Set the title in a separated chapter | Martin Trigaux | 2017-10-28 | 1 | -5/+4 |
| | | | | | | | | | | Set the export option on the same page, same as done in producePdf Move the ToC at the end of the book so the title page is the first one | ||||
| * | add a title page | Martin Trigaux | 2017-10-28 | 1 | -1/+2 |
|/ | | | | The first page of the book is the title | ||||
* | Merge pull request #3011 from wallabag/2.3 | Jérémy Benoist | 2017-10-23 | 666 | -147616/+21014 |
|\ | | | | | wallabag 2.3.0 | ||||
| * | Merge pull request #3385 from wallabag/prepare-23 | Nicolas Lœuillet | 2017-10-20 | 3 | -185/+84 |
| |\ | | | | | | | Prepare wallabag 2.3.0 | ||||
| | * | Prepare wallabag 2.3.0 | Nicolas Lœuillet | 2017-10-20 | 3 | -185/+84 |
| | | | |||||
| * | | Merge pull request #3384 from wallabag/mruminski-patch-1 | Nicolas Lœuillet | 2017-10-19 | 1 | -2/+2 |
| |\ \ | | |/ | |/| | Update messages.pl.yml | ||||
| | * | Update messages.pl.yml | Mateusz Rumiński | 2017-10-19 | 1 | -2/+2 |
| |/ | | | | | add polish translation for export footer_template | ||||
| * | Merge pull request #3373 from wallabag/change-readingtime-notnull | Nicolas Lœuillet | 2017-10-18 | 2 | -2/+66 |
| |\ | | | | | | | Changed reading_time field to prevent null values | ||||
| | * | Fixed @Kdecherf's review | Nicolas Lœuillet | 2017-10-13 | 1 | -0/+1 |
| | | | |||||
| | * | CS | Jeremy Benoist | 2017-10-13 | 1 | -3/+3 |
| | | | |||||
| | * | Changed reading_time field to prevent null values | Nicolas Lœuillet | 2017-10-13 | 2 | -2/+65 |
| | | | |||||
| * | | Merge pull request #3362 from sviande/fix_3361_api_warning | Jérémy Benoist | 2017-10-18 | 3 | -2/+9 |
| |\ \ | | | | | | | | | Fix #3361 check type for tags in entry repository | ||||
| | * | | Fix #3361 Entry Rest controller getEntries cast tags params to string | Sébastien Viande | 2017-10-13 | 1 | -1/+1 |
| | | | | |||||
| | * | | CS | Jeremy Benoist | 2017-10-12 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fix #3361 add test | Sébastien Viande | 2017-10-12 | 1 | -0/+7 |
| | | | | |||||
| | * | | Fix #3361 check type for tags in entry repository | Sébastien Viande | 2017-10-12 | 1 | -1/+1 |
| | |/ | | | | | | | | | | Check is $tags is a string before explode | ||||
| * | | Merge pull request #3383 from Kdecherf/fix-webpack-and-login | Nicolas Lœuillet | 2017-10-16 | 35 | -20/+682 |
| |\ \ | | | | | | | | | Fix webpack and login screen | ||||
| | * | | Update prod assets | Kevin Decherf | 2017-10-16 | 32 | -18/+665 |
| | | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| | * | | webpack: handle _global img folder | Kevin Decherf | 2017-10-16 | 2 | -1/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes missing image files after composer cleaning assets Source of requireAll(): https://stackoverflow.com/a/30652110 Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| | * | | Fix non-centered login form | Kevin Decherf | 2017-10-16 | 1 | -1/+1 |
| |/ / | | | | | | | | | | | | | | | | Fixes #3343 Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | | Merge pull request #3382 from nclsHart/replace-kernel-rootdir | Jérémy Benoist | 2017-10-15 | 11 | -20/+15 |
| |\ \ | | | | | | | | | Replace kernel.root_dir by kernel.project_dir | ||||
| | * | | Replace kernel.root_dir by kernel.project_dir | Nicolas Hart | 2017-10-14 | 11 | -20/+15 |
| | |/ | | | | | | | | | | | | | kernel.root_dir and Kernel::getRootDir() are deprecated since Symfony 3.3. See https://symfony.com/blog/new-in-symfony-3-3-a-simpler-way-to-get-the-project-root-directory and https://github.com/symfony/symfony/blob/3.3/UPGRADE-3.3.md#httpkernel for more information. | ||||
| * | | Merge pull request #3381 from nclsHart/webserverbundle | Jérémy Benoist | 2017-10-15 | 1 | -0/+1 |
| |\ \ | | |/ | |/| | Enable WebServerBundle in dev environment | ||||
| | * | Enable WebServerBundle in dev environment | Nicolas Hart | 2017-10-13 | 1 | -0/+1 |
| |/ | | | | | | | Since #3376, the web server console commands were not available. | ||||
| * | Merge pull request #3372 from wallabag/translate-export-page | Nicolas Lœuillet | 2017-10-11 | 14 | -8/+47 |
| |\ | | | | | | | Translated first page of exported article | ||||
| | * | CS | Jeremy Benoist | 2017-10-11 | 1 | -3/+3 |
| | | | |||||
| | * | Fixed @j0k3r's review | Nicolas Lœuillet | 2017-10-11 | 1 | -0/+1 |
| | | | |||||
| | * | Fixed @tcitworld's review | Nicolas Lœuillet | 2017-10-11 | 2 | -7/+3 |
| | | | |||||
| | * | Translated first page of exported article | Nicolas Lœuillet | 2017-10-11 | 14 | -2/+44 |
| |/ | |||||
| * | Merge pull request #3376 from wallabag/symfony-3.3 | Jérémy Benoist | 2017-10-11 | 44 | -68/+90 |
| |\ | | | | | | | Symfony 3.3 | ||||
| | * | Fix MondeDiplo https url | Jeremy Benoist | 2017-10-10 | 1 | -1/+1 |
| | | | |||||
| | * | CS | Jeremy Benoist | 2017-10-09 | 27 | -37/+37 |
| | | | |||||
| | * | Jump to Symfony 3.3 & update others deps | Jeremy Benoist | 2017-10-09 | 18 | -30/+52 |
| | | | | | | | | | | | | Also update tests urls | ||||
| * | | Merge pull request #3378 from wallabag/2.3-ru | Jérémy Benoist | 2017-10-10 | 5 | -0/+617 |
| |\ \ | | |/ | |/| | Add Russian language | ||||
| | * | update Russian language | Олег | 2017-10-10 | 3 | -90/+96 |
| | | | |||||
| | * | add Russian language | Олег | 2017-10-10 | 2 | -0/+12 |
| | | | |||||
| | * | Add Russian language in CoreBundle Resources and CraueConfigBundle | Олег | 2017-10-10 | 2 | -0/+599 |
| |/ | |||||
| * | Merge pull request #3347 from Kdecherf/entry-stats | Nicolas Lœuillet | 2017-09-16 | 1 | -2/+7 |
| |\ | | | | | | | Entry view: update .stats margins and color | ||||
| | * | Entry view: update .stats margins and color | Kevin Decherf | 2017-09-09 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | Decreasing margin of .stats, increasing vertical margin of .stats li, increasing right margin of material icons and reducing contrast of material icons. Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | | Merge pull request #3345 from wallabag/Quent-in-patch-1 | Jérémy Benoist | 2017-09-09 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Update messages.oc.yml | ||||
| | * | | Update messages.oc.yml | Quent-in | 2017-09-09 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #3340 from Kdecherf/fix-webpack | Jérémy Benoist | 2017-09-07 | 2 | -2/+2 |
| |\ \ | | | | | | | | | Fix webpack error on comments | ||||
| | * | | Fix webpack error on comments | Kevin Decherf | 2017-09-06 | 2 | -2/+2 |
| | |/ | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | | Merge pull request #3309 from wallabag/fix-multiple-tag-search | Jérémy Benoist | 2017-09-07 | 5 | -10/+36 |
| |\ \ | | | | | | | | | Multiple tag search, which was broken from API | ||||
| | * | | Remove unused function | Jeremy Benoist | 2017-09-06 | 1 | -20/+0 |
| | | | | | | | | | | | | | | | | Introduce after the rebase I guess |