aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
Commit message (Expand)AuthorAgeFilesLines
* bring annotations to APIThomas Citharel2016-10-222-22/+138
* CSJeremy Benoist2016-10-151-1/+0
* ApiDoc & Route annotation were conflictedJeremy Benoist2016-10-151-2/+0
* Update messages.pl.ymlMateusz Rumiński2016-10-121-4/+4
* Merge pull request #2372 from pmartin/api-get-entry-as-epubJeremy Benoist2016-10-122-6/+31
|\
| * Add entry export in APIJeremy Benoist2016-10-082-16/+32
| * API: getEntry can return EPUBPascal MARTIN2016-10-081-1/+8
| * Routing: epub format is allowed for APIPascal MARTIN2016-10-081-0/+2
* | Merge remote-tracking branch 'origin/master' into 2.2Jeremy Benoist2016-10-1131-48/+170
|\ \
| * | Fixed Twitter Cards by adding a description tagNicolas Lœuillet2016-10-101-0/+1
| * | Added support of Twitter Cards for public articlesNicolas Lœuillet2016-10-101-3/+7
| * | Merge pull request #2411 from wallabag/fix-entitiesNicolas Lœuillet2016-10-102-2/+2
| |\ \
| | * | Fix entities definitionJeremy Benoist2016-10-092-2/+2
| * | | Merge pull request #2414 from szafranek/bugfix-bookmarkletJeremy Benoist2016-10-101-1/+1
| |\ \ \
| | * | | Remove automatic closing of the window from bookmarkletKrzysztof Szafranek2016-10-091-1/+1
| | |/ /
| * | | When a sub command fail, display error messageJeremy Benoist2016-10-091-7/+10
| * | | Optimize the way tag list is renderedJeremy Benoist2016-10-096-12/+58
| * | | Avoid tag duplication when tagging all articlesJeremy Benoist2016-10-091-1/+7
| * | | Add more log to tag:allJeremy Benoist2016-10-091-1/+4
| |/ /
| * | Merge pull request #2406 from szafranek/bugfix-number-of-annotationsJeremy Benoist2016-10-0911-11/+10
| |\ \
| | * | Show number of annotations instead of nbAnnotations placeholderKrzysztof Szafranek2016-10-0911-11/+10
| * | | Fix few invalid HTML tagsKrzysztof Szafranek2016-10-093-3/+3
| |/ /
| * | Merge pull request #2351 from wallabag/fix-api-client-deletionNicolas Lœuillet2016-10-083-3/+13
| |\ \
| | * | Ensure access_token are removedJeremy Benoist2016-10-083-3/+8
| | * | Changed relation between API client and refresh tokenNicolas Lœuillet2016-10-031-0/+5
| * | | Merge pull request #2393 from wallabag/api-urls-existNicolas Lœuillet2016-10-081-1/+21
| |\ \ \
| | * | | Ability to check multiple urls in APIJeremy Benoist2016-10-071-1/+21
| * | | | Ensure orphan tag are remove in APIJeremy Benoist2016-10-073-3/+33
| | |_|/ | |/| |
* | | | Merge pull request #2409 from wallabag/Quent-in-patch-1Jeremy Benoist2016-10-111-39/+39
|\ \ \ \
| * | | | Update messages.oc.ymlQuent-in2016-10-101-1/+1
| * | | | Fixed reviewNicolas Lœuillet2016-10-101-1/+2
| * | | | Occitan version updateQuent-in2016-10-091-39/+38
| |/ / /
* | | | Remove unnecessary user serializationJeremy Benoist2016-10-081-11/+1
* | | | CSJeremy Benoist2016-10-081-11/+11
* | | | Bonus: display driver in install commandJeremy Benoist2016-10-081-2/+2
* | | | Fix PostgreSQL queryJeremy Benoist2016-10-081-1/+1
* | | | Better display and descriptionJeremy Benoist2016-10-0813-51/+68
* | | | Logout user before deleting itJeremy Benoist2016-10-082-21/+32
* | | | Changed testsNicolas Lœuillet2016-10-082-2/+2
* | | | Added check if there is only one userNicolas Lœuillet2016-10-0815-1/+46
* | | | CSThomas Citharel2016-10-082-13/+13
* | | | workThomas Citharel2016-10-0814-1/+65
|/ / /
* | | Merge pull request #2396 from wallabag/mruminski-patch-1Nicolas Lœuillet2016-10-071-1/+1
|\ \ \
| * | | Update messages.pl.ymlMateusz Rumiński2016-10-071-1/+1
| |/ /
* / / Add ability to use socketJeremy Benoist2016-10-071-1/+2
|/ /
* | Merge pull request #2389 from wallabag/add-info-publich-articlesNicolas Lœuillet2016-10-071-0/+2
|\ \
| * | Added default picture if preview picture is nullNicolas Lœuillet2016-10-071-0/+2
* | | Fixed two-factor checkbox display in user admin panelNicolas Lœuillet2016-10-071-1/+1
* | | Merge pull request #2383 from wallabag/add-info-publich-articlesNicolas Lœuillet2016-10-0712-2/+31
|\| |
| * | Fixed reviewNicolas Lœuillet2016-10-0712-21/+21