aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1072 from wallabag/v2-entry-testNicolas Lœuillet2015-02-117-32/+177
|\
| * Quick fix in build.xmlJeremy2015-02-101-1/+0
| * Avoid user to see other entriesJeremy2015-02-102-11/+63
| * Add more tests on Entry controllerJeremy2015-02-105-20/+114
|/
* Merge pull request #1069 from wallabag/v2-fix-return-entriesJeremy2015-02-102-3/+3
|\
| * findEntries returns arrayNicolas Lœuillet2015-02-101-1/+1
| * change test if we have no entry in GET /api/entriesNicolas Lœuillet2015-02-101-1/+1
| * change phpdocNicolas Lœuillet2015-02-101-1/+1
| * GET /api/entries returns object, no more arrayNicolas Lœuillet2015-02-102-2/+2
* | Merge pull request #1068 from wallabag/v2-api-authenticationJeremy2015-02-1011-55/+94
|\ \ | |/ |/|
| * move dir check into constructorNicolas Lœuillet2015-02-101-5/+5
| * review from @j0k3rNicolas Lœuillet2015-02-101-2/+1
| * getSalt methodNicolas Lœuillet2015-02-103-7/+26
| * replace services.xml into services.ymlNicolas Lœuillet2015-02-093-32/+18
| * PSR 3Nicolas Lœuillet2015-02-091-1/+1
| * fix return on API call and fix id in clear for userNicolas Lœuillet2015-02-092-7/+4
| * log for authentication on APINicolas Lœuillet2015-02-097-19/+44
| * authentication on APINicolas Lœuillet2015-02-092-3/+11
* | Merge pull request #1063 from wallabag/v2-rename-tags-entityJeremy2015-02-094-27/+22
|\ \ | |/ |/|
| * change settings for TagsEntries modelNicolas Lœuillet2015-02-091-4/+4
| * restore TagsEntriesNicolas Lœuillet2015-02-091-0/+93
| * rename Tags entityNicolas Lœuillet2015-02-094-116/+18
* | Merge pull request #1062 from wallabag/v2-relation-entry-userNicolas Lœuillet2015-02-0917-112/+620
|\ \ | |/ |/|
| * Add some fixturesJeremy2015-02-0811-54/+361
| * Add custom auth encoder & providerJeremy2015-02-085-33/+215
| * create an Entry with a User in parameterNicolas Lœuillet2015-02-081-2/+3
| * add a real relation between user and entryNicolas Lœuillet2015-02-082-26/+44
|/
* Merge pull request #1066 from wallabag/v2-api-tests-entryNicolas Lœuillet2015-02-078-8/+91
|\
| * Add some tests on EntryControllerJeremy2015-02-073-3/+86
| * Fix #1057Jeremy2015-02-071-1/+2
| * Avoid raw javascript in templateJeremy2015-02-074-4/+3
|/
* Update depsJeremy2015-02-061-21/+129
* Merge pull request #1065 from FabienM/v2-bundles-cleanupJeremy2015-02-063-3/+0
|\
| * Cleanup default assets symlinksFabien Meurillon2015-02-063-3/+0
|/
* Do not display download progress in TravisJeremy2015-02-061-0/+1
* Merge pull request #1061 from wallabag/v2-cleanup-entitiesNicolas Lœuillet2015-02-067-824/+0
|\
| * Remove temporary entitiesJeremy2015-02-067-824/+0
|/
* Merge pull request #1060 from wallabag/api-rename-userJeremy2015-02-063-14/+60
|\
| * rename User entityNicolas Lœuillet2015-02-063-14/+60
|/
* Merge pull request #1059 from wallabag/rename-entryJeremy2015-02-067-91/+88
|\
| * rename Entries to EntryNicolas Lœuillet2015-02-065-61/+58
| * normalize entries fieldsNicolas Lœuillet2015-02-055-34/+34
|/
* Merge pull request #1055 from wallabag/v2-api-patch-methidJeremy2015-02-052-14/+39
|\
| * remove persist() for PATCH and DELETENicolas Lœuillet2015-02-051-2/+0
| * PATCH method, boolean for some parameters and change entity methods nameNicolas Lœuillet2015-02-052-13/+40
* | remove unused filesNicolas Lœuillet2015-02-054-242/+0
* | Merge pull request #1054 from wallabag/v2-api-set-title-postJeremy2015-02-051-4/+1
|\ \
| * | simplify codeNicolas Lœuillet2015-02-051-1/+1
| * | we can now set a title to the article when we use POST /api/entriesNicolas Lœuillet2015-02-051-4/+1
| |/
* | Merge pull request #1048 from wallabag/v2-sort-entriesJeremy2015-02-051-1/+9
|\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 06:40:35 +0000