summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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-1228-277/+311
|
* this is now 6.0 pre alphaFrank Karlitschek2013-03-091-2/+2
|
* 5.0.0v5.0.0Frank Karlitschek2013-03-091-2/+2
|
* Merge pull request #2236 from owncloud/fix-migrationBernhard Posselt2013-03-111-0/+9
|\ | | | | Check if username is valid and remove slashes from filename
| * Check if username is valid and remove slashes from filenameLukas Reschke2013-03-111-0/+9
|/
* Merge pull request #2183 from owncloud/fix-shared-statuses-againBernhard Posselt2013-03-112-62/+51
|\ | | | | Fix #2080 and fix #2141
| * Update share.jsBernhard Posselt2013-03-081-2/+2
| | | | | | Added HTML escaping
| * Fix #2080 and fix #2141Michael Gapczynski2013-03-072-62/+51
| |
* | Merge pull request #2218 from owncloud/fix-mounting-allBernhard Posselt2013-03-111-1/+1
|\ \ | | | | | | Fix variable for mounting for all users, fix #357
| * | Fix variable for mounting for all users, fix #357Michael Gapczynski2013-03-091-1/+1
| | |
* | | Merge pull request #1786 from owncloud/shared-folder-etagsBernhard Posselt2013-03-116-53/+219
|\ \ \ | | | | | | | | Include etags for the root of the shared folder
| * | | 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 ↵Björn Schießle2013-03-082-1/+2
| | | | | | | | | | | | | | | | that we have no chance to determine which folder has to be updated
| * | | Merge branch 'master' into shared-folder-etagsMichael Gapczynski2013-03-0761-456/+632
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: apps/files_sharing/lib/sharedstorage.php
| * | | 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-05540-7851/+9785
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_sharing/appinfo/app.php
| * | | | Fix group post_shared hookMichael Gapczynski2013-03-041-14/+14
| | | | |
| * | | | 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-28857-16126/+24650
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_sharing/lib/sharedstorage.php
| * | | | | 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-265-2/+106
| | | | | |
| * | | | | Fix variableMichael Gapczynski2013-02-231-1/+1
| | | | | |
| * | | | | Return unknown free space for shared root folder so we can still upload ↵Michael Gapczynski2013-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | partial files
| * | | | | 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
| | | | | |
* | | | | | Merge pull request #2184 from tripflex/masterBernhard Posselt2013-03-101-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove php_value from .htaccess causing 500 errors, fixes #2176
| * | | | | | remove php_valueMyles McNamara2013-03-071-1/+0
| | | | | | | | | | | | | | | | | | | | | php_value can only be used with mod_php, using it with FCGI will cause 500 Internal Server errors.  This needs to be set in php.ini manually or set using ini_set().
* | | | | | | Merge pull request #2224 from owncloud/ldap_version_bumpMichael Gapczynski2013-03-101-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | LDAP: fancy version for release, no code change
| * | | | | | | LDAP: fancy version for release, no code changeArthur Schiwon2013-03-101-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #2217 from owncloud/mountconfig-locationLukas Reschke2013-03-102-5/+12
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Store the global mount configuration file in the datadir
| * | | | | | Store the global mount configuration file in the datadirRobin Appelman2013-03-102-5/+12
| | | | | | |
* | | | | | | Merge pull request #1584 from owncloud/ocs_multiple_methodsTom Needham2013-03-0913-94/+264
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Allow registering of multiple methods on each api route. Add /cloud/capabilities route.
| * \ \ \ \ \ \ Merge in masterTom Needham2013-03-09231-1636/+2339
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Rebase to current masterTom Needham2013-03-051389-33246/+89446
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Add further capabilities to /cloud/capabilitites api callTom Needham2013-02-106-1/+63
| | | | | | | | | |
| * | | | | | | | | more code styleTom Needham2013-02-101-1/+1
| | | | | | | | | |
| * | | | | | | | | Code style and remove OAuth codeTom Needham2013-02-101-11/+3
| | | | | | | | | |
| * | | | | | | | | Change capabilities exposure for files_versions since it extends filesTom Needham2013-02-101-3/+2
| | | | | | | | | |
| * | | | | | | | | Remove debug call, correct app identifierTom Needham2013-02-102-3/+1
| | | | | | | | | |
| * | | | | | | | | Fix api result merging.Tom Needham2013-02-095-9/+10
| | | | | | | | | |
| * | | | | | | | | Merge in masterTom Needham2013-02-09838-10671/+20944
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use OC_User::isAdminUser() in lib/api.phpTom Needham2013-02-091-2/+2
| | | | | | | | | | |