Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-11-03 | 5 | -838/+856 |
|\ | |||||
| * | Fix tests | Jeremy Benoist | 2016-10-30 | 1 | -10/+2 |
| | | |||||
| * | Added test for export by filtering with tag | Nicolas Lœuillet | 2016-10-29 | 1 | -0/+11 |
| | | |||||
| * | Exploded WallabagRestController into many controllers | Nicolas Lœuillet | 2016-10-28 | 3 | -820/+835 |
| | | | | | | | | Fix #2503 | ||||
* | | Add entry.saved event to import & rest | Jeremy Benoist | 2016-11-02 | 9 | -39/+146 |
| | | |||||
* | | Use custom event instead of Doctrine ones | Jeremy Benoist | 2016-11-01 | 2 | -18/+37 |
| | | | | | | | | This give us ability to use Entry ID to determine where to store images and it’s then more easy to remove them when we remove the entry. | ||||
* | | Ability to enable/disable downloading images | Jeremy Benoist | 2016-10-30 | 1 | -0/+40 |
| | | | | | | | | | | This will speed up the test suite because it won’t download everything when we add new entry… Add a custom test with downloading image enabled | ||||
* | | Add instance url to the downloaded images | Jeremy Benoist | 2016-10-30 | 1 | -1/+3 |
| | | |||||
* | | Fixing tests | Jeremy Benoist | 2016-10-30 | 4 | -6/+25 |
| | | |||||
* | | Use doctrine event to download images | Jeremy Benoist | 2016-10-30 | 2 | -0/+123 |
| | | |||||
* | | 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 |
| |\ | | | | | | | Some fixes | ||||
| | * | 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 |
| |/ | | | | | | | In case user wants a fresh version of the current one and the website isn’t available, don’t erase it with a boring message saying wallabag wasn’t able to refresh the content. | ||||
* | | Merge pull request #2401 from wallabag/reset-account | Jeremy Benoist | 2016-10-24 | 1 | -0/+145 |
|\ \ | | | | | | | Reset account | ||||
| * | | Add ability to reset some datas | Jeremy Benoist | 2016-10-22 | 1 | -0/+145 |
| | | | | | | | | | | | | | | | | | | - annotations - tags - entries | ||||
* | | | Add test on /api/annotations | Jeremy Benoist | 2016-10-22 | 1 | -37/+99 |
| | | | | | | | | | | | | | | | | | | | | | Fix controller forward in WallabagRestController. Update PHPDoc so it is sorted the same way as others one Duplicate all annotations test to use both api & normal way Also, make annotation tests independent to each other | ||||
* | | | 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 |
|\ \ | | | | | | | API: ability to export entry in all available format (epub, pdf, etc...) | ||||
| * | | Add entry export in API | Jeremy Benoist | 2016-10-08 | 1 | -48/+56 |
| | | | | | | | | | | | | | | | Export isn't available for json & xml because user can use the default entry endpoint instead. | ||||
* | | | 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 |
| | | | | | | | | | | | | | | | We’ll wait until the final release will be out and other related project will be update to support it. Meanwhile we can safely lock to a previous version. | ||||
| * | | 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 |
| |\ \ | | | | | | | | | Changed relation between API client and refresh token | ||||
| | * | | Ensure access_token are removed | Jeremy Benoist | 2016-10-08 | 1 | -1/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we remove the client, we should ensure that access_token are also removed. To ensure that, I created a test that generated an access_token. So when we remove the client, this association should be cascaded and shouldn’t generate an error. Also I moved some Api related stuff to the ApiBundle (like the developer controler and ClientType form) | ||||
| * | | | 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 | ||||
| | * | | | 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 |
| |/ / | | | | | | | | | | | | | | | | When the association between a tag and an entry is removed, if the tag doesn’t have other entries, we can remove it. Also add more tests for that part and ensure TagControllerTest is isolated from the rest of the test suite (finally!) | ||||
* | | | Better display and description | Jeremy Benoist | 2016-10-08 | 1 | -3/+4 |
| | | | | | | | | | | | | Confirmation message isn’t required since it is written in the delete description | ||||
* | | | 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 | ||||
| * | | 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 |
| | | | | | | | | | | | | Fix #2380 | ||||
* | | | Merge pull request #2383 from wallabag/add-info-publich-articles | Nicolas Lœuillet | 2016-10-07 | 1 | -1/+4 |
|\| | | | | | | | | Added OpenGraph support for public articles | ||||
| * | | 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 |
|/ / | | | | | | | | | Tags & Annotations weren’t really well exported. This is now fixed (+ tests) | ||||
* | | 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 |
|/ | | | | | When a user register itself AND the wallabag instance is configured to send a confirmation email, the user is disabled when the listener (which create the config) receive the event. There were a check (don't know why) if the user is enabled we create the config. But the user is disabled when confirmation email is actived. | ||||
* | Fix parameters in API _links | Jeremy Benoist | 2016-10-02 | 1 | -1/+99 |
| | | | | We forgot to pass them to the factory | ||||
* | Merge pull request #2327 from wallabag/user-management | Jeremy Benoist | 2016-10-02 | 2 | -114/+82 |
|\ | | | | | Add users management UI | ||||
| * | Disabled delete button for the logged user | Jeremy Benoist | 2016-10-02 | 1 | -0/+11 |
| | | | | | | | | To avoid some bad things to happen… | ||||
| * | 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 |
| | | | | | | | | | | | | - remove the “add a user” from the config page - add a CRUD on user - fix some missing translations (+ bad indentation) |