Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Quick fix in build.xml | Jeremy | 2015-02-10 | 1 | -1/+0 |
| | | | | We don't need to purge the database since it was just re-created | ||||
* | Avoid user to see other entries | Jeremy | 2015-02-10 | 2 | -11/+63 |
| | | | | hehe :) | ||||
* | Add more tests on Entry controller | Jeremy | 2015-02-10 | 5 | -20/+114 |
| | | | | Also add more fixtures | ||||
* | Merge pull request #1069 from wallabag/v2-fix-return-entries | Jeremy | 2015-02-10 | 2 | -3/+3 |
|\ | | | | | GET /api/entries returns object, no more array | ||||
| * | findEntries returns array | Nicolas Lœuillet | 2015-02-10 | 1 | -1/+1 |
| | | |||||
| * | change test if we have no entry in GET /api/entries | Nicolas Lœuillet | 2015-02-10 | 1 | -1/+1 |
| | | |||||
| * | change phpdoc | Nicolas Lœuillet | 2015-02-10 | 1 | -1/+1 |
| | | |||||
| * | GET /api/entries returns object, no more array | Nicolas Lœuillet | 2015-02-10 | 2 | -2/+2 |
| | | |||||
* | | Merge pull request #1068 from wallabag/v2-api-authentication | Jeremy | 2015-02-10 | 11 | -55/+94 |
|\ \ | |/ |/| | V2 api authentication | ||||
| * | move dir check into constructor | Nicolas Lœuillet | 2015-02-10 | 1 | -5/+5 |
| | | |||||
| * | review from @j0k3r | Nicolas Lœuillet | 2015-02-10 | 1 | -2/+1 |
| | | |||||
| * | getSalt method | Nicolas Lœuillet | 2015-02-10 | 3 | -7/+26 |
| | | |||||
| * | replace services.xml into services.yml | Nicolas Lœuillet | 2015-02-09 | 3 | -32/+18 |
| | | |||||
| * | PSR 3 | Nicolas Lœuillet | 2015-02-09 | 1 | -1/+1 |
| | | |||||
| * | fix return on API call and fix id in clear for user | Nicolas Lœuillet | 2015-02-09 | 2 | -7/+4 |
| | | |||||
| * | log for authentication on API | Nicolas Lœuillet | 2015-02-09 | 7 | -19/+44 |
| | | |||||
| * | authentication on API | Nicolas Lœuillet | 2015-02-09 | 2 | -3/+11 |
| | | |||||
* | | Merge pull request #1063 from wallabag/v2-rename-tags-entity | Jeremy | 2015-02-09 | 4 | -27/+22 |
|\ \ | |/ |/| | Rename Tags entity | ||||
| * | change settings for TagsEntries model | Nicolas Lœuillet | 2015-02-09 | 1 | -4/+4 |
| | | |||||
| * | restore TagsEntries | Nicolas Lœuillet | 2015-02-09 | 1 | -0/+93 |
| | | |||||
| * | rename Tags entity | Nicolas Lœuillet | 2015-02-09 | 4 | -116/+18 |
| | | | | | | | | | | | | | | | | why did I delete this file? rename Tags entity rename Tags entity | ||||
* | | Merge pull request #1062 from wallabag/v2-relation-entry-user | Nicolas Lœuillet | 2015-02-09 | 17 | -112/+620 |
|\ \ | |/ |/| | add a real relation between user and entry | ||||
| * | Add some fixtures | Jeremy | 2015-02-08 | 11 | -54/+361 |
| | | | | | | | | | | | | Improve test, so user can login Fix some leftJoin Cleanup EntryController | ||||
| * | Add custom auth encoder & provider | Jeremy | 2015-02-08 | 5 | -33/+215 |
| | | | | | | | | These custom classes allow Wallabag v2 to be compatible with Wallabag v1 salted password | ||||
| * | create an Entry with a User in parameter | Nicolas Lœuillet | 2015-02-08 | 1 | -2/+3 |
| | | |||||
| * | add a real relation between user and entry | Nicolas Lœuillet | 2015-02-08 | 2 | -26/+44 |
|/ | |||||
* | Merge pull request #1066 from wallabag/v2-api-tests-entry | Nicolas Lœuillet | 2015-02-07 | 8 | -8/+91 |
|\ | | | | | V2 api tests entry | ||||
| * | Add some tests on EntryController | Jeremy | 2015-02-07 | 3 | -3/+86 |
| | | | | | | | | Also, create database schema on test initialisation | ||||
| * | Fix #1057 | Jeremy | 2015-02-07 | 1 | -1/+2 |
| | | | | | | | | Unexisting function | ||||
| * | Avoid raw javascript in template | Jeremy | 2015-02-07 | 4 | -4/+3 |
|/ | | | | It kills the Symfony Crawler :) | ||||
* | Update deps | Jeremy | 2015-02-06 | 1 | -21/+129 |
| | |||||
* | Merge pull request #1065 from FabienM/v2-bundles-cleanup | Jeremy | 2015-02-06 | 3 | -3/+0 |
|\ | | | | | Cleanup default assets symlinks | ||||
| * | Cleanup default assets symlinks | Fabien Meurillon | 2015-02-06 | 3 | -3/+0 |
|/ | |||||
* | Do not display download progress in Travis | Jeremy | 2015-02-06 | 1 | -0/+1 |
| | |||||
* | Merge pull request #1061 from wallabag/v2-cleanup-entities | Nicolas Lœuillet | 2015-02-06 | 7 | -824/+0 |
|\ | | | | | Remove temporary entities | ||||
| * | Remove temporary entities | Jeremy | 2015-02-06 | 7 | -824/+0 |
|/ | |||||
* | Merge pull request #1060 from wallabag/api-rename-user | Jeremy | 2015-02-06 | 3 | -14/+60 |
|\ | | | | | rename User entity | ||||
| * | rename User entity | Nicolas Lœuillet | 2015-02-06 | 3 | -14/+60 |
|/ | |||||
* | Merge pull request #1059 from wallabag/rename-entry | Jeremy | 2015-02-06 | 7 | -91/+88 |
|\ | | | | | Rename entry | ||||
| * | rename Entries to Entry | Nicolas Lœuillet | 2015-02-06 | 5 | -61/+58 |
| | | |||||
| * | normalize entries fields | Nicolas Lœuillet | 2015-02-05 | 5 | -34/+34 |
|/ | |||||
* | Merge pull request #1055 from wallabag/v2-api-patch-methid | Jeremy | 2015-02-05 | 2 | -14/+39 |
|\ | | | | | PATCH method, boolean for some parameters and change entity methods name | ||||
| * | remove persist() for PATCH and DELETE | Nicolas Lœuillet | 2015-02-05 | 1 | -2/+0 |
| | | |||||
| * | PATCH method, boolean for some parameters and change entity methods name | Nicolas Lœuillet | 2015-02-05 | 2 | -13/+40 |
| | | |||||
* | | remove unused files | Nicolas Lœuillet | 2015-02-05 | 4 | -242/+0 |
| | | |||||
* | | Merge pull request #1054 from wallabag/v2-api-set-title-post | Jeremy | 2015-02-05 | 1 | -4/+1 |
|\ \ | | | | | | | we can now set a title to the article when we use POST /api/entries | ||||
| * | | simplify code | Nicolas Lœuillet | 2015-02-05 | 1 | -1/+1 |
| | | | |||||
| * | | we can now set a title to the article when we use POST /api/entries | Nicolas Lœuillet | 2015-02-05 | 1 | -4/+1 |
| |/ | |||||
* | | Merge pull request #1048 from wallabag/v2-sort-entries | Jeremy | 2015-02-05 | 1 | -1/+9 |
|\ \ | | | | | | | sort entries in repository | ||||
| * | | sort entries in repository | Nicolas Lœuillet | 2015-02-05 | 1 | -1/+9 |
| | | |