| Commit message (Expand) | Author | Age | Files | Lines |
* | ApiDoc & Route annotation were conflicted | Jeremy Benoist | 2016-10-15 | 1 | -2/+0 |
* | Update messages.pl.yml | Mateusz Rumiński | 2016-10-12 | 1 | -4/+4 |
* | Merge pull request #2372 from pmartin/api-get-entry-as-epub | Jeremy Benoist | 2016-10-12 | 2 | -6/+31 |
|\ |
|
| * | Add entry export in API | Jeremy Benoist | 2016-10-08 | 2 | -16/+32 |
| * | API: getEntry can return EPUB | Pascal MARTIN | 2016-10-08 | 1 | -1/+8 |
| * | Routing: epub format is allowed for API | Pascal MARTIN | 2016-10-08 | 1 | -0/+2 |
* | | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-10-11 | 31 | -48/+170 |
|\ \ |
|
| * | | Fixed Twitter Cards by adding a description tag | Nicolas Lœuillet | 2016-10-10 | 1 | -0/+1 |
| * | | Added support of Twitter Cards for public articles | Nicolas Lœuillet | 2016-10-10 | 1 | -3/+7 |
| * | | Merge pull request #2411 from wallabag/fix-entities | Nicolas Lœuillet | 2016-10-10 | 2 | -2/+2 |
| |\ \ |
|
| | * | | Fix entities definition | Jeremy Benoist | 2016-10-09 | 2 | -2/+2 |
| * | | | Merge pull request #2414 from szafranek/bugfix-bookmarklet | Jeremy Benoist | 2016-10-10 | 1 | -1/+1 |
| |\ \ \ |
|
| | * | | | Remove automatic closing of the window from bookmarklet | Krzysztof Szafranek | 2016-10-09 | 1 | -1/+1 |
| | |/ / |
|
| * | | | When a sub command fail, display error message | Jeremy Benoist | 2016-10-09 | 1 | -7/+10 |
| * | | | Optimize the way tag list is rendered | Jeremy Benoist | 2016-10-09 | 6 | -12/+58 |
| * | | | Avoid tag duplication when tagging all articles | Jeremy Benoist | 2016-10-09 | 1 | -1/+7 |
| * | | | Add more log to tag:all | Jeremy Benoist | 2016-10-09 | 1 | -1/+4 |
| |/ / |
|
| * | | Merge pull request #2406 from szafranek/bugfix-number-of-annotations | Jeremy Benoist | 2016-10-09 | 11 | -11/+10 |
| |\ \ |
|
| | * | | Show number of annotations instead of nbAnnotations placeholder | Krzysztof Szafranek | 2016-10-09 | 11 | -11/+10 |
| * | | | Fix few invalid HTML tags | Krzysztof Szafranek | 2016-10-09 | 3 | -3/+3 |
| |/ / |
|
| * | | Merge pull request #2351 from wallabag/fix-api-client-deletion | Nicolas Lœuillet | 2016-10-08 | 3 | -3/+13 |
| |\ \ |
|
| | * | | Ensure access_token are removed | Jeremy Benoist | 2016-10-08 | 3 | -3/+8 |
| | * | | Changed relation between API client and refresh token | Nicolas Lœuillet | 2016-10-03 | 1 | -0/+5 |
| * | | | Merge pull request #2393 from wallabag/api-urls-exist | Nicolas Lœuillet | 2016-10-08 | 1 | -1/+21 |
| |\ \ \ |
|
| | * | | | Ability to check multiple urls in API | Jeremy Benoist | 2016-10-07 | 1 | -1/+21 |
| * | | | | Ensure orphan tag are remove in API | Jeremy Benoist | 2016-10-07 | 3 | -3/+33 |
| | |_|/
| |/| | |
|
* | | | | Merge pull request #2409 from wallabag/Quent-in-patch-1 | Jeremy Benoist | 2016-10-11 | 1 | -39/+39 |
|\ \ \ \ |
|
| * | | | | Update messages.oc.yml | Quent-in | 2016-10-10 | 1 | -1/+1 |
| * | | | | Fixed review | Nicolas Lœuillet | 2016-10-10 | 1 | -1/+2 |
| * | | | | Occitan version update | Quent-in | 2016-10-09 | 1 | -39/+38 |
| |/ / / |
|
* | | | | Remove unnecessary user serialization | Jeremy Benoist | 2016-10-08 | 1 | -11/+1 |
* | | | | CS | Jeremy Benoist | 2016-10-08 | 1 | -11/+11 |
* | | | | Bonus: display driver in install command | Jeremy Benoist | 2016-10-08 | 1 | -2/+2 |
* | | | | Fix PostgreSQL query | Jeremy Benoist | 2016-10-08 | 1 | -1/+1 |
* | | | | Better display and description | Jeremy Benoist | 2016-10-08 | 13 | -51/+68 |
* | | | | Logout user before deleting it | Jeremy Benoist | 2016-10-08 | 2 | -21/+32 |
* | | | | Changed tests | Nicolas Lœuillet | 2016-10-08 | 2 | -2/+2 |
* | | | | Added check if there is only one user | Nicolas Lœuillet | 2016-10-08 | 15 | -1/+46 |
* | | | | CS | Thomas Citharel | 2016-10-08 | 2 | -13/+13 |
* | | | | work | Thomas Citharel | 2016-10-08 | 14 | -1/+65 |
|/ / / |
|
* | | | Merge pull request #2396 from wallabag/mruminski-patch-1 | Nicolas Lœuillet | 2016-10-07 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | Update messages.pl.yml | Mateusz Rumiński | 2016-10-07 | 1 | -1/+1 |
| |/ / |
|
* / / | Add ability to use socket | Jeremy Benoist | 2016-10-07 | 1 | -1/+2 |
|/ / |
|
* | | Merge pull request #2389 from wallabag/add-info-publich-articles | Nicolas Lœuillet | 2016-10-07 | 1 | -0/+2 |
|\ \ |
|
| * | | Added default picture if preview picture is null | Nicolas Lœuillet | 2016-10-07 | 1 | -0/+2 |
* | | | Fixed two-factor checkbox display in user admin panel | Nicolas Lœuillet | 2016-10-07 | 1 | -1/+1 |
* | | | Merge pull request #2383 from wallabag/add-info-publich-articles | Nicolas Lœuillet | 2016-10-07 | 12 | -2/+31 |
|\| | |
|
| * | | Fixed review | Nicolas Lœuillet | 2016-10-07 | 12 | -21/+21 |
| * | | Added OpenGraph support for public articles | Nicolas Lœuillet | 2016-10-07 | 12 | -2/+31 |
* | | | Fix tag test | Jeremy Benoist | 2016-10-07 | 1 | -1/+0 |