summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* increase version number to trigger db updateBjoern Schiessle2013-10-041-1/+1
* Merge pull request #4877 from owncloud/ocs_share_apiBjörn Schießle2013-10-046-2/+1037
|\
| * update testsBjoern Schiessle2013-10-041-3/+3
| * use true/false instead of yes/no for publicUpload and subfiles parameterBjoern Schiessle2013-10-041-4/+4
| * use always path as parameter to specify a file/folderBjoern Schiessle2013-10-041-3/+3
| * also return success if no shares are found.Bjoern Schiessle2013-09-301-3/+4
| * add testUpdateShareUpload()Bjoern Schiessle2013-09-301-3/+62
| * add getShareFromFolder() testBjoern Schiessle2013-09-301-0/+37
| * Make sure that testDeleteShare() has some shares to deleteBjoern Schiessle2013-09-302-15/+39
| |\
| | * flipping arguments on assertEquals() - first argument contains the expected v...Thomas Müller2013-09-291-4/+4
| | * - adding unit test testGetShareFromUnknownId()Thomas Müller2013-09-292-11/+23
| * | add some commentsBjoern Schiessle2013-09-271-2/+3
| |/
| * add test getShareFromIdBjoern Schiessle2013-09-271-1/+36
| * check if encryption app is enabled before trying to calculate file sizeBjoern Schiessle2013-09-261-1/+1
| * Merge branch 'master' into ocs_share_apiBjoern Schiessle2013-09-261081-16425/+51927
| |\
| * | fix check if app is enabledBjoern Schiessle2013-09-261-1/+2
| * | check if key exists before reading itBjoern Schiessle2013-09-261-1/+4
| * | add some additional assertions to the testsBjoern Schiessle2013-09-251-2/+11
| * | add error message to the assertThomas Müller2013-09-251-2/+2
| * | remove debug outputBjoern Schiessle2013-09-231-1/+0
| * | make sure that files are shared correctly before each test and unshared again...Bjoern Schiessle2013-09-201-2/+43
| * | disable encrpytion app before performing testsBjoern Schiessle2013-09-201-11/+14
| * | check if encryption app is enabledBjoern Schiessle2013-09-201-4/+3
| * | disable encryption app for share API testsBjoern Schiessle2013-09-191-0/+14
| * | set share id to 'unknown' if we can't retrive oneBjoern Schiessle2013-09-191-7/+6
| * | extend API to get the shares from all files in a given folderBjoern Schiessle2013-09-191-0/+32
| * | remove some unused variablesBjoern Schiessle2013-09-191-6/+0
| * | some unit test for the new ocs share apiBjoern Schiessle2013-09-194-6/+326
| * | return error if wrong shareType is givenBjoern Schiessle2013-09-191-0/+2
| * | remove debug outputBjoern Schiessle2013-09-181-1/+1
| * | use share ID as REST resourceBjoern Schiessle2013-09-172-88/+168
| * | more rest-style APIBjoern Schiessle2013-09-172-52/+133
| * | return error if public upload is disabledBjoern Schiessle2013-09-161-19/+10
| * | allow to set a different permission during initial share operationBjoern Schiessle2013-09-161-3/+3
| * | ocs api for file sharingBjoern Schiessle2013-09-162-61/+84
| * | some more OCS calls for sharingBjoern Schiessle2013-09-062-22/+118
| * | intermediate result ocs apiBjoern Schiessle2013-09-062-8/+116
| * | intermediate results, share apiBjoern Schiessle2013-09-042-14/+48
| * | initial commit, start implementing the ocs share apiBjoern Schiessle2013-09-042-1/+53
* | | Merge pull request #5085 from owncloud/versioning_previewBjörn Schießle2013-10-045-3/+65
|\ \ \
| * | | remove hover effect from preview imageBjoern Schiessle2013-10-041-0/+1
| * | | vertical align versions textMorris Jobke2013-10-041-1/+7
| * | | maxX and maxY should be a integerBjoern Schiessle2013-10-022-4/+4
| * | | add previews to versions dialogBjoern Schiessle2013-10-025-2/+57
* | | | Merge pull request #5087 from owncloud/templatefunction-relativedateVincent Petry2013-10-043-11/+228
|\ \ \ \
| * | | | Removed $fromTime argument from public template APIVincent Petry2013-10-041-2/+2
| * | | | Fixed missing default valuesVincent Petry2013-10-032-3/+3
| * | | | Added unit tests for relative_modified_date, changed method signatureVincent Petry2013-10-033-10/+204
| * | | | Removed stray debug log writeVincent Petry2013-10-021-1/+0
| * | | | Added dateOnly argument to relative_modified_dateVincent Petry2013-10-022-10/+34