aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-03-1511-4/+39
* [tx-robot] updated from transifexJenkins for ownCloud2013-03-147-0/+31
* Merge pull request #2277 from owncloud/fix_sharing_hooksBernhard Posselt2013-03-131-1/+1
|\
| * we need to listen to the pre delete hook, otherwise the file is already goneBjörn Schießle2013-03-131-1/+1
* | Merge pull request #2265 from owncloud/no_share_option_for_shared_folderBjörn Schießle2013-03-131-1/+1
|\ \ | |/ |/|
| * only prevent shared action for the Shared folder in the root dirBjörn Schießle2013-03-131-1/+1
| * don't add share action to the Shared folderBjörn Schießle2013-03-121-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2013-03-137-3/+13
* | Merge pull request #2234 from owncloud/fix_ldap_edirectoryFrank Karlitschek2013-03-121-2/+2
|\ \ | |/ |/|
| * LDAP: compatibility with Novell eDirectory UUIDArthur Schiwon2013-03-111-2/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2013-03-125-13/+42
|/
* Merge pull request #1786 from owncloud/shared-folder-etagsBernhard Posselt2013-03-115-39/+181
|\
| * Fix correctFolders and retrieve the correct storage cacheMichael Gapczynski2013-03-082-17/+17
| * not only files can be reshared but also foldersBjörn Schießle2013-03-081-1/+1
| * Fix share hook for updaterMichael Gapczynski2013-03-081-2/+14
| * use pre_unshare hook, otherwise the share is already removed. Which means tha...Björn Schießle2013-03-081-1/+1
| * Merge branch 'master' into shared-folder-etagsMichael Gapczynski2013-03-0719-32/+140
| |\
| * | itemSource parameter should be fileSourceMichael Gapczynski2013-03-071-2/+2
| * | Update Shared folders ETags of users with resharesMichael Gapczynski2013-03-061-5/+11
| * | Move hook connectors from shared storage to app.php, add post_unshare hookMichael Gapczynski2013-03-052-4/+5
| * | Merge branch 'master' into shared-folder-etagsMichael Gapczynski2013-03-05172-522/+696
| |\ \
| * | | Fix variable name in Shared_UpdaterMichael Gapczynski2013-03-021-1/+1
| * | | Update ETag when file is sharedMichael Gapczynski2013-03-022-0/+11
| * | | Merge branch 'master' into shared-folder-etagsMichael Gapczynski2013-02-28230-1122/+1681
| |\ \ \
| * | | | Fix target path and reuse mtimeMichael Gapczynski2013-02-261-4/+4
| * | | | Correct parent folders' ETags for all users with access to a shared fileMichael Gapczynski2013-02-264-2/+83
| * | | | Fix variableMichael Gapczynski2013-02-231-1/+1
| * | | | Return unknown free space for shared root folder so we can still upload parti...Michael Gapczynski2013-02-231-1/+1
| * | | | Fix WebDAV uploading of partial shared filesMichael Gapczynski2013-02-231-27/+46
| * | | | Include etag field for folder contentsMichael Gapczynski2013-02-231-0/+1
| * | | | Include etags for the root of the shared folderMichael Gapczynski2013-02-191-3/+13
* | | | | LDAP: fancy version for release, no code changeArthur Schiwon2013-03-101-1/+1
* | | | | Merge pull request #2217 from owncloud/mountconfig-locationLukas Reschke2013-03-101-2/+4
|\ \ \ \ \
| * | | | | Store the global mount configuration file in the datadirRobin Appelman2013-03-101-2/+4
* | | | | | Merge pull request #1584 from owncloud/ocs_multiple_methodsTom Needham2013-03-099-1/+96
|\ \ \ \ \ \
| * \ \ \ \ \ Merge in masterTom Needham2013-03-0959-102/+343
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Rebase to current masterTom Needham2013-03-05413-3146/+30490
| |\ \ \ \ \ \ \
| * | | | | | | | Add further capabilities to /cloud/capabilitites api callTom Needham2013-02-106-1/+63
| * | | | | | | | Change capabilities exposure for files_versions since it extends filesTom Needham2013-02-101-3/+2
| * | | | | | | | Remove debug call, correct app identifierTom Needham2013-02-101-1/+1
| * | | | | | | | Fix api result merging.Tom Needham2013-02-093-5/+6
| * | | | | | | | Merge in masterTom Needham2013-02-09200-841/+1475
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Add capabilities exposure to the versioning appTom Needham2013-02-093-0/+32
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-107-21/+57
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-0934-33/+89
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge pull request #2165 from owncloud/fix_2155Lukas Reschke2013-03-081-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Offer download of whole shared dir only if it does not exceed zip input limitArthur Schiwon2013-03-071-1/+5
* | | | | | | | | Merge pull request #2189 from owncloud/versioning_sync_clientBernhard Posselt2013-03-081-1/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remove some debug output; move code to the right functionBjörn Schießle2013-03-082-6/+8
| * | | | | | | | | remove debug outputBjörn Schießle2013-03-081-2/+1