Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3187 from wallabag/api-client-credentials | Jérémy Benoist | 2017-06-08 | 7 | -19/+88 |
|\ | |||||
| * | Add ability to name the client | Jeremy Benoist | 2017-06-08 | 2 | -4/+6 |
| * | CS | Jeremy Benoist | 2017-06-07 | 3 | -8/+6 |
| * | Create a client when creating a user using the api | Jeremy Benoist | 2017-06-07 | 5 | -13/+82 |
* | | Merge pull request #3189 from wallabag/add-discourse | Nicolas Lœuillet | 2017-06-08 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Added link to community in issue template | Nicolas Lœuillet | 2017-06-08 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #3093 from aaa2000/annotation-error-on-save | Nicolas Lœuillet | 2017-06-07 | 23 | -26/+270 |
|\ | |||||
| * | Fix postgresql migration | adev | 2017-06-07 | 1 | -2/+2 |
| * | Displays an error with an annotation with a too long quote | adev | 2017-06-04 | 23 | -26/+270 |
* | | Merge pull request #3181 from wallabag/api-content-patch | Jérémy Benoist | 2017-06-07 | 3 | -76/+87 |
|\ \ | |||||
| * | | Refactorize the way to save an Entry in the API | Jeremy Benoist | 2017-06-07 | 1 | -102/+70 |
| * | | Add ability to patch an entry with more fields | Jeremy Benoist | 2017-06-02 | 3 | -4/+47 |
| |/ | |||||
* | | Merge pull request #3184 from wallabag/better-way-image-extension | Jérémy Benoist | 2017-06-07 | 3 | -5/+70 |
|\ \ | |||||
| * | | Use an alternative way to detect image | Jeremy Benoist | 2017-06-05 | 3 | -5/+70 |
| |/ | |||||
* | | Merge pull request #3179 from wallabag/show-user-command | Jérémy Benoist | 2017-06-07 | 2 | -0/+172 |
|\ \ | |||||
| * | | Fix review | Thomas Citharel | 2017-06-04 | 2 | -4/+4 |
| * | | Add show user command | Thomas Citharel | 2017-06-02 | 2 | -0/+172 |
| |/ | |||||
* | | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-06-06 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge pull request #3167 from wallabag/doc-github-template | Nicolas Lœuillet | 2017-05-31 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Fix link in Github template | Jérémy Benoist | 2017-05-31 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #3177 from wallabag/api-create-user-update | Jérémy Benoist | 2017-06-06 | 23 | -385/+358 |
|\ \ \ | |||||
| * \ \ | Merge pull request #3180 from wallabag/mruminski-patch-1 | Jérémy Benoist | 2017-06-02 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Update PL transation | Mateusz Rumiński | 2017-06-02 | 1 | -1/+1 |
| * | | | | Return 201 on user creation | Jeremy Benoist | 2017-06-02 | 2 | -7/+14 |
| |/ / / | |||||
| * | | | Add :it: translation | Jérémy Benoist | 2017-06-02 | 1 | -1/+1 |
| * | | | Use a dedicated file for wallabag config | Jeremy Benoist | 2017-06-02 | 2 | -165/+165 |
| * | | | Add translation | Jeremy Benoist | 2017-06-02 | 13 | -1/+13 |
| * | | | API user creation behing a toggle | Jeremy Benoist | 2017-06-02 | 10 | -343/+297 |
| | |/ | |/| | |||||
* | | | Merge pull request #3165 from wallabag/it-translation-update | Jérémy Benoist | 2017-06-06 | 1 | -38/+38 |
|\ \ \ | |/ / |/| | | |||||
| * | | Update messages.it.yml | Jérémy Benoist | 2017-06-02 | 1 | -23/+23 |
| * | | Updated :it: translations | Nicolas Lœuillet | 2017-05-31 | 1 | -13/+13 |
| * | | Update :it: translation | Jérémy Benoist | 2017-05-30 | 1 | -2/+2 |
* | | | Merge pull request #2708 from jcharaoui/import-disablecontentupdate | Jérémy Benoist | 2017-06-02 | 20 | -103/+160 |
|\ \ \ | |||||
| * | | | Fix option attributes | Jeremy Benoist | 2017-06-01 | 1 | -3/+3 |
| * | | | We don't need that getter | Jeremy Benoist | 2017-06-01 | 1 | -8/+0 |
| * | | | No need to catch that Exception | Jeremy Benoist | 2017-06-01 | 1 | -9/+2 |
| * | | | Rewrote code & fix tests | Jeremy Benoist | 2017-06-01 | 11 | -101/+71 |
| * | | | CS | Jeremy Benoist | 2017-06-01 | 1 | -3/+3 |
| * | | | Fix tests | Jeremy Benoist | 2017-06-01 | 6 | -35/+57 |
| * | | | CS | Jeremy Benoist | 2017-06-01 | 1 | -2/+1 |
| * | | | Replace Wallabag v1 error strings with v2 strings | Jerome Charaoui | 2017-06-01 | 3 | -4/+27 |
| * | | | Add disableContentUpdate import option | Jerome Charaoui | 2017-06-01 | 11 | -60/+118 |
| * | | | Put default fetching error title in global config | Jerome Charaoui | 2017-06-01 | 5 | -3/+5 |
| * | | | Avoid returning objects passed by reference. | Jerome Charaoui | 2017-06-01 | 11 | -32/+30 |
* | | | | Merge pull request #3176 from wallabag/fix-image-download | Nicolas Lœuillet | 2017-06-02 | 2 | -5/+28 |
|\ \ \ \ | |||||
| * | | | | CS | Jeremy Benoist | 2017-06-01 | 1 | -3/+2 |
| * | | | | Replace images with & | Jeremy Benoist | 2017-06-01 | 2 | -4/+28 |
|/ / / / | |||||
* | | | | Merge pull request #3171 from wallabag/drop-fucking-sqlite | Nicolas Lœuillet | 2017-06-01 | 1 | -5/+6 |
|\ \ \ \ | |||||
| * | | | | Changed default database name | Nicolas Lœuillet | 2017-06-01 | 1 | -1/+1 |
| * | | | | Fixed @tcitworld 's review | Nicolas Lœuillet | 2017-05-31 | 1 | -1/+1 |