aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3123 from X-dark/masterJérémy Benoist2017-05-161-1/+1
|\ | | | | reorder contrib strings in about page
| * reorder contrib strings in about pageCedric Girard2017-05-161-1/+1
|/ | | | this fixes #2891
* Merge pull request #3095 from aaa2000/api-error-on-fail-fetch-contentThomas Citharel2017-05-102-4/+47
|\ | | | | Create a new entry via API even when its content can't be retrieved
| * Remove the created entry to avoid side effects on other testsadev2017-05-091-8/+18
| |
| * Create a new entry via API even when its content can't be retrievedadev2017-05-082-4/+37
| | | | | | | | Fix #2988
* | Merge pull request #3076 from wallabag/hotfix/2979Nicolas Lœuillet2017-05-092-1/+30
|\ \ | | | | | | Disable negative numbers in filters
| * | Add some testsJeremy Benoist2017-05-092-3/+29
| | |
| * | Disable negative numbers in filtersMaxime Marinel2017-05-031-0/+3
| | |
* | | Merge pull request #3097 from wallabag/update-licenseJérémy Benoist2017-05-091-2/+2
|\ \ \ | | | | | | | | Update graby* licenses
| * | | Update graby* licensesJérémy Benoist2017-05-091-2/+2
|/ / /
* | | Merge pull request #3096 from aaa2000/fix-api-entries-pagination-with-perpageJérémy Benoist2017-05-092-1/+18
|\ \ \ | |_|/ |/| | Fix API pagination is broken if perPage is custom value
| * | Fix API pagination is broken if perPage is custom valueadev2017-05-082-1/+18
|/ / | | | | | | Fix #2720
* | Merge pull request #3090 from aaa2000/translate-login-page-errorNicolas Lœuillet2017-05-071-1/+1
|\ \ | | | | | | Translate error message in login page
| * | Translate error message in login pageadev2017-05-061-1/+1
|/ / | | | | | | Fix #2933
* | Merge pull request #3082 from aaa2000/fix-form-errors-displayJérémy Benoist2017-05-054-1/+11
|\ \ | |/ |/| Fix display the form errors correctly
| * Fix display the form errors correctlyadev2017-05-054-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/3061Nicolas Lœuillet2017-05-026-6/+6
|\ \ | |/ |/| Small typo in documentation fix #3061
| * Small typo in documentation fix #3061Maxime Marinel2017-05-026-6/+6
|/
* Merge pull request #3066 from wallabag/ignore-tests-exported-filesJérémy Benoist2017-04-291-0/+4
|\ | | | | Ignore tests exported files
| * Ignore tests exported filesThomas Citharel2017-04-291-0/+4
|/
* Merge pull request #3064 from gileri/masterJérémy Benoist2017-04-291-1/+1
|\ | | | | Correct create_application en string
| * Correct create_application en stringÉric Gillet2017-04-291-1/+1
|/
* Merge pull request #3052 from shtrom/fix-relative-symlinksJérémy Benoist2017-04-251-1/+1
|\ | | | | Make symfony-assets-install use `relative` symlinks
| * Make symfony-assets-install use `relative` symlinksOlivier Mehani2017-04-221-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-endJérémy Benoist2017-04-051-2/+2
|\ | | | | Add export notice at the end of the epub
| * Add export notice at the end of the epubMartin Trigaux2017-04-051-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-alphaJérémy Benoist2017-03-301-0/+2
|\ | | | | Save alpha channel when downloading PNG images
| * Save alpha channel when downloading PNG imagesKevin Decherf2017-03-291-0/+2
|/ | | | | | Fixes #2805 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* Merge pull request #2985 from etiess/patch-2Nicolas Lœuillet2017-03-231-3/+12
|\ | | | | Update paywall.rst (more details and clear cache)
| * Update paywall.rst (more details and clear cache)etiess2017-02-221-3/+12
| |
* | Merge pull request #2968 from chrido/masterNicolas Lœuillet2017-03-131-1/+1
|\ \ | | | | | | remove language on html tag
| * | remove language on html-tagChristoph Doblander2017-03-061-1/+1
| | |
* | | Merge pull request #2971 from etiess/patch-3Jérémy Benoist2017-03-091-3/+12
|\ \ \ | |/ / |/| | Update paywall.rst (EN) with details + clear cache
| * | Update paywall.rst (EN) with details + clear cacheetiess2017-02-231-3/+12
| |/
* | Merge pull request #2954 from wallabag/update-versionNicolas Lœuillet2017-03-021-1/+1
|\ \ | | | | | | Changed wallabag version
| * | Changed wallabag versionNicolas Lœuillet2017-03-021-1/+1
|/ /
* | Merge pull request #2916 from wallabag/update-changelogNicolas Lœuillet2017-03-021-0/+21
|\ \ | | | | | | Updated CHANGELOG with latest changes
| * | Updated CHANGELOG with latest changesNicolas Lœuillet2017-03-021-0/+21
|/ /
* | Merge pull request #2950 from wallabag/fix-symlinksNicolas Lœuillet2017-03-021-0/+1
|\ \ | | | | | | Fixed symlinks issue during release creation
| * | Fixed symlinks issue during release creationNicolas Lœuillet2017-03-011-0/+1
| | |
* | | Merge pull request #2926 from qtheuret/masterNicolas Lœuillet2017-03-014-0/+24
|\ \ \ | |/ / |/| | Add activation of 'rewrite' mod of Apache
| * | Added german and italian translationNicolas Lœuillet2017-02-282-0/+12
| | |
| * | Activate 'rewrite' mod of ApacheQuentin THEURET2017-02-231-0/+6
| | |
| * | Ajout du mod 'rewrite' de ApacheQuentin THEURET2017-02-231-0/+6
| |/
* | Merge pull request #2932 from wallabag/mruminski-patch-1Nicolas Lœuillet2017-02-251-4/+4
|\ \ | | | | | | Update Polish translation
| * | Update Polish translationMateusz Rumiński2017-02-241-4/+4
|/ / | | | | add missing translation
* | Merge pull request #2931 from wallabag/php-7.1Jeremy Benoist2017-02-242-2/+1
|\ \ | |/ |/| Use wallabag/tcpdf
| * Use wallabag/tcpdfJeremy Benoist2017-02-242-2/+1
|/ | | | It should restore the PHP 7.1 compatibility
* Merge pull request #2917 from ngosang/feature/es_translation_2Jeremy Benoist2017-02-201-161/+161
|\ | | | | Update Spanish translation
| * Update Spanish translationngosang2017-02-201-161/+161
|/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 15:55:23 +0000