Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3237 from matteocoder/master | Jérémy Benoist | 2017-06-26 | 1 | -156/+160 |
|\ | | | | | Revised messages.it.yml file | ||||
| * | Fixed broken lines and added new lines | matteocoder | 2017-06-24 | 1 | -5/+7 |
| | | | | | | In addition to fixing broken lines, I've also added a couple of lines from recent PRs. | ||||
| * | Merge pull request #1 from matteocoder/matteocoder-messages.it | matteocoder | 2017-06-17 | 1 | -154/+156 |
|/| | | | | | revised messages.it | ||||
| * | revised messages.it | matteocoder | 2017-06-17 | 1 | -154/+156 |
|/ | |||||
* | Merge pull request #3202 from pVesian/master | Jérémy Benoist | 2017-06-10 | 7 | -7/+7 |
|\ | | | | | Config label improvement #3199 | ||||
| * | Update translations | Jeremy Benoist | 2017-06-10 | 2 | -2/+2 |
| | | |||||
| * | Config label improvement #3199 | Pierre de Vésian | 2017-06-09 | 7 | -7/+7 |
|/ | |||||
* | Merge pull request #3167 from wallabag/doc-github-template | Nicolas Lœuillet | 2017-05-31 | 1 | -1/+1 |
|\ | | | | | Fix link in Github template | ||||
| * | Fix link in Github template | Jérémy Benoist | 2017-05-31 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #3146 from DamienCassou/fix-doc-url | Jérémy Benoist | 2017-05-24 | 2 | -2/+2 |
|\ | | | | | Fix documentation URL for "How can I help to fix that?" | ||||
| * | Fix documentation URL for "How can I help to fix that?" | Damien Cassou | 2017-05-24 | 2 | -2/+2 |
|/ | |||||
* | Merge pull request #3130 from X-dark/master | Jérémy Benoist | 2017-05-19 | 13 | -13/+13 |
|\ | | | | | unify Download/Export wording. | ||||
| * | modify key name as well | Cedric Girard | 2017-05-18 | 13 | -13/+13 |
| | | |||||
| * | unify Download/Export wording. | Cedric Girard | 2017-05-18 | 9 | -9/+9 |
|/ | | | | This fixes #2967 | ||||
* | Merge pull request #3125 from wallabag/prepare-222 | Jérémy Benoist | 2017-05-17 | 2 | -601/+651 |
|\ | | | | | Prepare wallabag 2.2.3 | ||||
| * | Prepare wallabag 2.2.3 | Nicolas Lœuillet | 2017-05-17 | 2 | -601/+651 |
|/ | |||||
* | Merge pull request #3117 from wallabag/fix-doc | Nicolas Lœuillet | 2017-05-17 | 3 | -9/+10 |
|\ | | | | | Fixed documentation URL | ||||
| * | Fixed documentation URL | Nicolas Lœuillet | 2017-05-17 | 3 | -9/+10 |
|/ | |||||
* | Merge pull request #3124 from wallabag/lock-guzzle-auth | Nicolas Lœuillet | 2017-05-17 | 2 | -7/+1 |
|\ | | | | | Lock guzzle-site-authenticator to avoid errors | ||||
| * | Lock guzzle-site-authenticator to avoid error | Jeremy Benoist | 2017-05-16 | 2 | -7/+1 |
|/ | |||||
* | Merge pull request #3123 from X-dark/master | Jérémy Benoist | 2017-05-16 | 1 | -1/+1 |
|\ | | | | | reorder contrib strings in about page | ||||
| * | reorder contrib strings in about page | Cedric Girard | 2017-05-16 | 1 | -1/+1 |
|/ | | | | this fixes #2891 | ||||
* | Merge pull request #3095 from aaa2000/api-error-on-fail-fetch-content | Thomas Citharel | 2017-05-10 | 2 | -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 tests | adev | 2017-05-09 | 1 | -8/+18 |
| | | |||||
| * | Create a new entry via API even when its content can't be retrieved | adev | 2017-05-08 | 2 | -4/+37 |
| | | | | | | | | Fix #2988 | ||||
* | | 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 |
| | |