Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed migration and added tests | Nicolas Lœuillet | 2016-10-28 | 2 | -4/+17 |
* | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-10-24 | 2 | -2/+40 |
|\ | |||||
| * | Merge pull request #2481 from wallabag/some-fixes | Nicolas Lœuillet | 2016-10-21 | 1 | -1/+1 |
| |\ | |||||
| | * | Fix test | Jeremy Benoist | 2016-10-20 | 1 | -1/+1 |
| * | | This test doesn’t require an internet connection | Jeremy Benoist | 2016-10-20 | 1 | -2/+0 |
| * | | If reload content failed, don’t update it | Jeremy Benoist | 2016-10-20 | 1 | -1/+41 |
| |/ | |||||
* | | Merge pull request #2401 from wallabag/reset-account | Jeremy Benoist | 2016-10-24 | 1 | -0/+145 |
|\ \ | |||||
| * | | Add ability to reset some datas | Jeremy Benoist | 2016-10-22 | 1 | -0/+145 |
* | | | Add test on /api/annotations | Jeremy Benoist | 2016-10-22 | 1 | -37/+99 |
* | | | PHP CS | Nicolas Lœuillet | 2016-10-22 | 1 | -4/+4 |
* | | | fix cs and phpdoc | Thomas Citharel | 2016-10-22 | 2 | -7/+27 |
|/ / | |||||
* | | Merge pull request #2372 from pmartin/api-get-entry-as-epub | Jeremy Benoist | 2016-10-12 | 1 | -48/+56 |
|\ \ | |||||
| * | | Add entry export in API | Jeremy Benoist | 2016-10-08 | 1 | -48/+56 |
* | | | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-10-11 | 7 | -28/+91 |
|\ \ \ | | |/ | |/| | |||||
| * | | Lock deps for FOSUser | Jeremy Benoist | 2016-10-11 | 1 | -3/+1 |
| * | | Avoid error when Redis isn't here in tests | Jeremy Benoist | 2016-10-10 | 2 | -0/+2 |
| * | | Merge pull request #2351 from wallabag/fix-api-client-deletion | Nicolas Lœuillet | 2016-10-08 | 1 | -1/+27 |
| |\ \ | |||||
| | * | | Ensure access_token are removed | Jeremy Benoist | 2016-10-08 | 1 | -1/+27 |
| * | | | Merge pull request #2393 from wallabag/api-urls-exist | Nicolas Lœuillet | 2016-10-08 | 1 | -0/+16 |
| |\ \ \ | |||||
| | * | | | Ability to check multiple urls in API | Jeremy Benoist | 2016-10-07 | 1 | -0/+16 |
| | | |/ | | |/| | |||||
| * / | | Ensure orphan tag are remove in API | Jeremy Benoist | 2016-10-07 | 3 | -24/+45 |
| |/ / | |||||
* | | | Better display and description | Jeremy Benoist | 2016-10-08 | 1 | -3/+4 |
* | | | Fix some tests | Jeremy Benoist | 2016-10-08 | 1 | -13/+26 |
* | | | Added a test to check if entries are also deleted | Nicolas Lœuillet | 2016-10-08 | 1 | -0/+21 |
* | | | Changed tests | Nicolas Lœuillet | 2016-10-08 | 1 | -2/+2 |
* | | | Added tests | Nicolas Lœuillet | 2016-10-08 | 1 | -0/+85 |
|/ / | |||||
* | | Merge pull request #2389 from wallabag/add-info-publich-articles | Nicolas Lœuillet | 2016-10-07 | 1 | -0/+1 |
|\ \ | |||||
| * | | Added default picture if preview picture is null | Nicolas Lœuillet | 2016-10-07 | 1 | -0/+1 |
* | | | 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 | 1 | -1/+4 |
|\| | | |||||
| * | | Added test for OpenGraph | Nicolas Lœuillet | 2016-10-07 | 1 | -1/+4 |
* | | | Fix tag test | Jeremy Benoist | 2016-10-07 | 2 | -12/+16 |
* | | | Fix relations export for Entry | Jeremy Benoist | 2016-10-07 | 1 | -9/+28 |
|/ / | |||||
* | | Fix typo & add test | Jeremy Benoist | 2016-10-05 | 1 | -0/+7 |
* | | Create config even if user is disabled | Jeremy Benoist | 2016-10-04 | 1 | -20/+0 |
|/ | |||||
* | Fix parameters in API _links | Jeremy Benoist | 2016-10-02 | 1 | -1/+99 |
* | Merge pull request #2327 from wallabag/user-management | Jeremy Benoist | 2016-10-02 | 2 | -114/+82 |
|\ | |||||
| * | Disabled delete button for the logged user | Jeremy Benoist | 2016-10-02 | 1 | -0/+11 |
| * | Remove NewUser test from Config | Jeremy Benoist | 2016-10-02 | 1 | -114/+0 |
| * | Add users management UI | Jeremy Benoist | 2016-10-02 | 1 | -0/+71 |
* | | Merge pull request #2325 from wallabag/api-entries-exists | Nicolas Lœuillet | 2016-10-02 | 1 | -0/+22 |
|\ \ | |||||
| * | | Add test when url doesn’t exist | Jeremy Benoist | 2016-10-01 | 1 | -0/+11 |
| * | | Add an exists endpoint in API | Jeremy Benoist | 2016-10-01 | 1 | -0/+11 |
* | | | Merge pull request #2328 from wallabag/avoid-duplicate-url | Nicolas Lœuillet | 2016-10-02 | 1 | -0/+44 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Remove additional entry | Jeremy Benoist | 2016-10-02 | 1 | -0/+9 |
| * | | Avoid duplicate url with accents | Jeremy Benoist | 2016-10-01 | 1 | -0/+35 |
| |/ | |||||
* | | Merge pull request #2326 from wallabag/update-quickstart | Jeremy Benoist | 2016-10-02 | 1 | -1/+1 |
|\ \ | |||||
| * | | Update test | Jeremy Benoist | 2016-10-02 | 1 | -1/+1 |
* | | | Merge pull request #2324 from wallabag/edit-tagging-rule | Jeremy Benoist | 2016-10-02 | 1 | -13/+48 |
|\ \ \ | |||||
| * | | | Add ability to edit a tagging rule | Jeremy Benoist | 2016-10-01 | 1 | -13/+48 |
| | |/ | |/| |