summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | 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
* | | | | | | | Merge pull request #5121 from owncloud/shareapi-syntaxerrorBjörn Schießle2013-10-041-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed array syntax to work with PHP 5.3Vincent Petry2013-10-041-1/+1
* | | | | | | | | Merge pull request #4933 from owncloud/1376-filesappplussigninurlbugVincent Petry2013-10-041-2/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Replace plus sign with space in files app URL #4932Vincent Petry2013-09-201-2/+6
* | | | | | | | | | Merge pull request #5091 from guruz/webdav_connector_use_cache_for_etagMarkus Goetz2013-10-041-1/+8
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | DAV: Use fileinfo_cache for ETagMarkus Goetz2013-10-031-1/+8
* | | | | | | | | | Merge pull request #4689 from owncloud/sharing_mail_notification_masterBjörn Schießle2013-10-0413-30/+263
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-10-0450-413/+1455
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #5107 from owncloud/user_skeletonThomas Müller2013-10-042-0/+35
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | add a real examplefile instead of an .gitignore which is a bit stupid hereFrank Karlitschek2013-10-042-4/+5
| * | | | | | | | | | | ups. remove debugFrank Karlitschek2013-10-041-2/+0
| * | | | | | | | | | | use Filesystem::isIgnoredDirFrank Karlitschek2013-10-041-1/+1
| * | | | | | | | | | | fix typoFrank Karlitschek2013-10-041-1/+1
| * | | | | | | | | | | add public staticFrank Karlitschek2013-10-041-1/+1
| * | | | | | | | | | | make it possible to prepopulate a new user gome with a skeletonFrank Karlitschek2013-10-032-0/+36
* | | | | | | | | | | | Merge pull request #4815 from owncloud/ldap_improve_testingMorris Jobke2013-10-0419-235/+1065
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | remove outdated (thus failing) and anyway insufficient group tests - for nowArthur Schiwon2013-09-271-46/+0
| * | | | | | | | | | | | give test file a proper nameArthur Schiwon2013-09-271-0/+0
| * | | | | | | | | | | | added user_ldap tests via public api callsArthur Schiwon2013-09-271-14/+112
| * | | | | | | | | | | | LDAP: don't throw exceptions in the wrapper, errors are handled in the code. ...Arthur Schiwon2013-09-271-3/+5
| * | | | | | | | | | | | LDAP: coding styleArthur Schiwon2013-09-279-18/+34
| * | | | | | | | | | | | LDAP: simple tests for the user backendArthur Schiwon2013-09-271-0/+313