Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3076 from wallabag/hotfix/2979 | Nicolas Lœuillet | 2017-05-09 | 2 | -1/+30 |
|\ | | | | | Disable negative numbers in filters | ||||
| * | Add some tests | Jeremy Benoist | 2017-05-09 | 2 | -3/+29 |
| | | |||||
| * | Disable negative numbers in filters | Maxime Marinel | 2017-05-03 | 1 | -0/+3 |
| | | |||||
* | | Merge pull request #3097 from wallabag/update-license | Jérémy Benoist | 2017-05-09 | 1 | -2/+2 |
|\ \ | | | | | | | Update graby* licenses | ||||
| * | | Update graby* licenses | Jérémy Benoist | 2017-05-09 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #3096 from aaa2000/fix-api-entries-pagination-with-perpage | Jérémy Benoist | 2017-05-09 | 2 | -1/+18 |
|\ \ | | | | | | | Fix API pagination is broken if perPage is custom value | ||||
| * | | Fix API pagination is broken if perPage is custom value | adev | 2017-05-08 | 2 | -1/+18 |
|/ / | | | | | | | Fix #2720 | ||||
* | | Merge pull request #3090 from aaa2000/translate-login-page-error | Nicolas Lœuillet | 2017-05-07 | 1 | -1/+1 |
|\ \ | | | | | | | Translate error message in login page | ||||
| * | | Translate error message in login page | adev | 2017-05-06 | 1 | -1/+1 |
|/ / | | | | | | | Fix #2933 | ||||
* | | Merge pull request #3082 from aaa2000/fix-form-errors-display | Jérémy Benoist | 2017-05-05 | 4 | -1/+11 |
|\ \ | |/ |/| | Fix display the form errors correctly | ||||
| * | Fix display the form errors correctly | adev | 2017-05-05 | 4 | -1/+11 |
| | | | | | | | | | | | | | | | | | | Use `property_path` form option to map underscored form fields to object properties @see https://github.com/symfony/symfony/issues/9162#issuecomment-25431148 Fix #3067 | ||||
* | | Merge pull request #3072 from wallabag/hotfix/3061 | Nicolas Lœuillet | 2017-05-02 | 6 | -6/+6 |
|\ \ | |/ |/| | Small typo in documentation fix #3061 | ||||
| * | Small typo in documentation fix #3061 | Maxime Marinel | 2017-05-02 | 6 | -6/+6 |
|/ | |||||
* | Merge pull request #3066 from wallabag/ignore-tests-exported-files | Jérémy Benoist | 2017-04-29 | 1 | -0/+4 |
|\ | | | | | Ignore tests exported files | ||||
| * | Ignore tests exported files | Thomas Citharel | 2017-04-29 | 1 | -0/+4 |
|/ | |||||
* | Merge pull request #3064 from gileri/master | Jérémy Benoist | 2017-04-29 | 1 | -1/+1 |
|\ | | | | | Correct create_application en string | ||||
| * | Correct create_application en string | Éric Gillet | 2017-04-29 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #3052 from shtrom/fix-relative-symlinks | Jérémy Benoist | 2017-04-25 | 1 | -1/+1 |
|\ | | | | | Make symfony-assets-install use `relative` symlinks | ||||
| * | Make symfony-assets-install use `relative` symlinks | Olivier Mehani | 2017-04-22 | 1 | -1/+1 |
|/ | | | | | | | This facilitates packaging, when installing in a different work PREFIX than the final install location. Signed-off-by: Olivier Mehani <shtrom@ssji.net> | ||||
* | Merge pull request #3023 from mart-e/epub-notice-at-the-end | Jérémy Benoist | 2017-04-05 | 1 | -2/+2 |
|\ | | | | | Add export notice at the end of the epub | ||||
| * | Add export notice at the end of the epub | Martin Trigaux | 2017-04-05 | 1 | -2/+2 |
|/ | | | | | | | | | The text "Produced by wallabag with PHPePub" is the first page of any epub. On ebooks reader, it is common (e.g. kobo) to use the first page as the cover of unread books, which makes it more difficult to differentiate the books. Move the Notices chapter at the end of the book. | ||||
* | Merge pull request #3017 from Kdecherf/local-image-alpha | Jérémy Benoist | 2017-03-30 | 1 | -0/+2 |
|\ | | | | | Save alpha channel when downloading PNG images | ||||
| * | Save alpha channel when downloading PNG images | Kevin Decherf | 2017-03-29 | 1 | -0/+2 |
|/ | | | | | | Fixes #2805 Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | Merge pull request #2985 from etiess/patch-2 | Nicolas Lœuillet | 2017-03-23 | 1 | -3/+12 |
|\ | | | | | Update paywall.rst (more details and clear cache) | ||||
| * | Update paywall.rst (more details and clear cache) | etiess | 2017-02-22 | 1 | -3/+12 |
| | | |||||
* | | Merge pull request #2968 from chrido/master | Nicolas Lœuillet | 2017-03-13 | 1 | -1/+1 |
|\ \ | | | | | | | remove language on html tag | ||||
| * | | remove language on html-tag | Christoph Doblander | 2017-03-06 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #2971 from etiess/patch-3 | Jérémy Benoist | 2017-03-09 | 1 | -3/+12 |
|\ \ \ | |/ / |/| | | Update paywall.rst (EN) with details + clear cache | ||||
| * | | Update paywall.rst (EN) with details + clear cache | etiess | 2017-02-23 | 1 | -3/+12 |
| |/ | |||||
* | | Merge pull request #2954 from wallabag/update-version | Nicolas Lœuillet | 2017-03-02 | 1 | -1/+1 |
|\ \ | | | | | | | Changed wallabag version | ||||
| * | | Changed wallabag version | Nicolas Lœuillet | 2017-03-02 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #2916 from wallabag/update-changelog | Nicolas Lœuillet | 2017-03-02 | 1 | -0/+21 |
|\ \ | | | | | | | Updated CHANGELOG with latest changes | ||||
| * | | Updated CHANGELOG with latest changes | Nicolas Lœuillet | 2017-03-02 | 1 | -0/+21 |
|/ / | |||||
* | | Merge pull request #2950 from wallabag/fix-symlinks | Nicolas Lœuillet | 2017-03-02 | 1 | -0/+1 |
|\ \ | | | | | | | Fixed symlinks issue during release creation | ||||
| * | | Fixed symlinks issue during release creation | Nicolas Lœuillet | 2017-03-01 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #2926 from qtheuret/master | Nicolas Lœuillet | 2017-03-01 | 4 | -0/+24 |
|\ \ \ | |/ / |/| | | Add activation of 'rewrite' mod of Apache | ||||
| * | | Added german and italian translation | Nicolas Lœuillet | 2017-02-28 | 2 | -0/+12 |
| | | | |||||
| * | | Activate 'rewrite' mod of Apache | Quentin THEURET | 2017-02-23 | 1 | -0/+6 |
| | | | |||||
| * | | Ajout du mod 'rewrite' de Apache | Quentin THEURET | 2017-02-23 | 1 | -0/+6 |
| |/ | |||||
* | | Merge pull request #2932 from wallabag/mruminski-patch-1 | Nicolas Lœuillet | 2017-02-25 | 1 | -4/+4 |
|\ \ | | | | | | | Update Polish translation | ||||
| * | | Update Polish translation | Mateusz Rumiński | 2017-02-24 | 1 | -4/+4 |
|/ / | | | | | add missing translation | ||||
* | | Merge pull request #2931 from wallabag/php-7.1 | Jeremy Benoist | 2017-02-24 | 2 | -2/+1 |
|\ \ | |/ |/| | Use wallabag/tcpdf | ||||
| * | Use wallabag/tcpdf | Jeremy Benoist | 2017-02-24 | 2 | -2/+1 |
|/ | | | | It should restore the PHP 7.1 compatibility | ||||
* | Merge pull request #2917 from ngosang/feature/es_translation_2 | Jeremy Benoist | 2017-02-20 | 1 | -161/+161 |
|\ | | | | | Update Spanish translation | ||||
| * | Update Spanish translation | ngosang | 2017-02-20 | 1 | -161/+161 |
|/ | |||||
* | Merge pull request #2915 from wallabag/import-drop-msg-user-null | Nicolas Lœuillet | 2017-02-20 | 3 | -3/+6 |
|\ | | | | | Import: we now skip messages when user is null | ||||
| * | Import: we now skip messages when user is null | Nicolas Lœuillet | 2017-02-20 | 3 | -3/+6 |
|/ | |||||
* | Merge pull request #2905 from nicofrand/patch-1 | Nicolas Lœuillet | 2017-02-20 | 4 | -9/+14 |
|\ | | | | | Alert that 2FA must be authorized in app/config/parameters.yml | ||||
| * | Alert that 2FA must be authorized in app/config/parameters.yml | Nicolas Frandeboeuf | 2017-02-20 | 4 | -9/+14 |
| | | |||||
* | | Merge pull request #2913 from wallabag/add-wllbgit-readme | Nicolas Lœuillet | 2017-02-20 | 1 | -0/+2 |
|\ \ | |/ |/| | Added wallabag.it link in README |