Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3213 from wallabag/fix-internal-settings-form | Nicolas Lœuillet | 2017-06-13 | 1 | -2/+1 |
|\ | |||||
| * | Fixed internal settings form | Nicolas Lœuillet | 2017-06-12 | 1 | -2/+1 |
|/ | |||||
* | Merge pull request #3208 from wallabag/is-public | Nicolas Lœuillet | 2017-06-12 | 19 | -6/+165 |
|\ | |||||
| * | CS | Jeremy Benoist | 2017-06-10 | 1 | -1/+1 |
| * | Few fixes | Jeremy Benoist | 2017-06-10 | 3 | -3/+4 |
| * | Add public filter/field in the API | Jeremy Benoist | 2017-06-10 | 4 | -6/+88 |
| * | Add isPublic filter on entries | Jeremy Benoist | 2017-06-10 | 16 | -0/+76 |
|/ | |||||
* | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-06-10 | 7 | -7/+7 |
|\ | |||||
| * | Merge pull request #3202 from pVesian/master | Jérémy Benoist | 2017-06-10 | 7 | -7/+7 |
| |\ | |||||
| | * | 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 #3206 from wallabag/mruminski-patch-1 | Jérémy Benoist | 2017-06-10 | 1 | -1/+1 |
|\ \ | |||||
| * | | Update validators.pl.yml | Mateusz Rumiński | 2017-06-10 | 1 | -1/+1 |
* | | | Merge pull request #3203 from wallabag/fix-tag-count-baggy | Jérémy Benoist | 2017-06-10 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Fix tags count in tags list on baggy | Jeremy Benoist | 2017-06-10 | 1 | -1/+1 |
* | | | Merge pull request #3173 from wallabag/domain-name-param | Jérémy Benoist | 2017-06-10 | 18 | -20/+60 |
|\ \ \ | |/ / |/| | | |||||
| * | | Promote https | Jeremy Benoist | 2017-06-09 | 2 | -2/+2 |
| * | | Review | Jeremy Benoist | 2017-06-08 | 8 | -9/+5 |
| * | | fix tests | Thomas Citharel | 2017-06-06 | 2 | -1/+2 |
| * | | add migration | Thomas Citharel | 2017-06-06 | 3 | -4/+53 |
| * | | remove craueconfig domain name setting and add a proper one in parameters | Thomas Citharel | 2017-06-06 | 18 | -14/+8 |
* | | | Merge pull request #3192 from wallabag/validate-content-fields | Jérémy Benoist | 2017-06-09 | 5 | -41/+275 |
|\ \ \ | |||||
| * | | | Cleanup test | Jeremy Benoist | 2017-06-09 | 1 | -1/+0 |
| * | | | Convert - to _ in language | Jeremy Benoist | 2017-06-09 | 3 | -5/+13 |
| * | | | Use Locale instead of Language | Jeremy Benoist | 2017-06-09 | 2 | -16/+80 |
| * | | | Fix test | Jeremy Benoist | 2017-06-08 | 2 | -5/+5 |
| * | | | CS | Jeremy Benoist | 2017-06-08 | 1 | -1/+2 |
| * | | | Validate language & preview picture fields | Jeremy Benoist | 2017-06-08 | 3 | -23/+185 |
* | | | | Merge pull request #3195 from wallabag/authentication-error | Jérémy Benoist | 2017-06-09 | 3 | -0/+114 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Use a listener to catch auth failure | Jeremy Benoist | 2017-06-09 | 5 | -68/+111 |
| * | | | CS | Jeremy Benoist | 2017-06-08 | 1 | -2/+2 |
| * | | | Log an error level message when user auth fail | Jeremy Benoist | 2017-06-08 | 3 | -0/+71 |
|/ / / | |||||
* | | | 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 |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| |