summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Dont do a cache rename if we cant delete the source fileRobin Appelman2015-01-292-3/+5
* Make sure we delete the file when doing a cross storage trashbin moveRobin Appelman2015-01-291-0/+2
* Detect failed deletes in the trashbinRobin Appelman2015-01-292-3/+41
* Dont remove a file from cache if the delete operation failedRobin Appelman2015-01-292-1/+24
* Merge pull request #13757 from owncloud/issue/13686-scroll-to-file-when-using...Lukas Reschke2015-01-291-1/+1
|\
| * Scroll to file in folder, when using "search in other places" linkJoas Schilling2015-01-291-1/+1
* | Merge pull request #13762 from owncloud/ignore_trailing_slashBjörn Schießle2015-01-291-0/+1
|\ \
| * | remove trailing slashBjoern Schiessle2015-01-291-0/+1
* | | Merge pull request #13752 from owncloud/closecursor1Morris Jobke2015-01-292-0/+4
|\ \ \
| * | | Close cursor early in calculateFolderSizeVincent Petry2014-11-282-0/+4
| | |/ | |/|
* | | Merge pull request #13682 from owncloud/webdav-single-file-putMorris Jobke2015-01-294-4/+45
|\ \ \
| * | | Fix webdav put for single file webdav sharesRobin Appelman2015-01-292-3/+28
| * | | Fix resolving paths for views rooted in a fileRobin Appelman2015-01-292-1/+17
| |/ /
* | | Merge pull request #13746 from owncloud/no-groups-provisioning-apiThomas Müller2015-01-292-1/+5
|\ \ \ | |/ / |/| |
| * | disallow provisioning api to be enabled for groups onlyThomas Müller2015-01-292-1/+5
* | | Merge pull request #13604 from owncloud/encryption-key-migration-as-repair-stepThomas Müller2015-01-293-21/+115
|\ \ \
| * | | user fs must be setup up, so that the real user folder is mounted on the user...Arthur Schiwon2015-01-221-0/+1
| * | | adding console command to migrate encryption keys - refs #13450Thomas Müller2015-01-223-21/+114
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-2948-8/+80
| |/ / |/| |
* | | Merge pull request #13401 from is-apps/amazon_s3_checkboxesThomas Müller2015-01-281-1/+7
|\ \ \
| * | | Align checkbox configuration in external filesRoss Nicoll2015-01-191-1/+7
* | | | Merge pull request #13667 from owncloud/rename-always-update-cacheRobin Appelman2015-01-284-13/+20
|\ \ \ \
| * | | | Fix trash error when deleting files with the same name at the same time (happ...Robin Appelman2015-01-281-0/+3
| * | | | Add unit testRobin Appelman2015-01-281-1/+3
| * | | | Update the cache when renaming even if we dont emit hooksRobin Appelman2015-01-282-12/+14
| | |_|/ | |/| |
* | | | Merge pull request #13730 from owncloud/fix-htaccessMorris Jobke2015-01-283-6/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Reference module with `.c`Lukas Reschke2015-01-283-6/+6
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-2828-50/+224
* | | Merge pull request #13700 from owncloud/dav-objecttree-required-a-collectionMorris Jobke2015-01-281-2/+2
|\ \ \
| * | | let init() take an INode - fixes PHP messageThomas Müller2015-01-271-2/+2
* | | | Merge pull request #13704 from owncloud/issue/13571-indicate-remote-sharee-in...Morris Jobke2015-01-282-3/+6
|\ \ \ \
| * | | | Indicate that the share owner is remote in the filelistJoas Schilling2015-01-272-3/+6
* | | | | Merge pull request #13717 from owncloud/storage-donotwrapnullstorageMorris Jobke2015-01-282-1/+89
|\ \ \ \ \
| * | | | | Prevent wrapping null storageVincent Petry2015-01-272-1/+89
* | | | | | Merge pull request #13525 from owncloud/s2s-fixscanfileforbrokenstorageMorris Jobke2015-01-286-27/+200
|\ \ \ \ \ \
| * | | | | | Add back exit()Vincent Petry2015-01-261-1/+1
| * | | | | | Replace OC_Log::ERROR with OCP\Util::ERRORVincent Petry2015-01-261-1/+1
| * | | | | | Catch storage exception in scanner for remote sharesVincent Petry2015-01-266-27/+200
* | | | | | | Merge pull request #13718 from owncloud/use-proper-namespaceBernhard Posselt2015-01-271-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Use proper namespaceLukas Reschke2015-01-271-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #13561 from owncloud/trash-finaldeletewhencrossstoragefixVincent Petry2015-01-2712-15/+306
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix return type of addStorageWrapper in PHPDocVincent Petry2015-01-271-1/+1
| * | | | | | Fix bogus deletion on copy + unlink through renameVincent Petry2015-01-263-0/+38
| * | | | | | Add trashbin storage wrapper unit test for versionsVincent Petry2015-01-231-6/+76
| * | | | | | Simplify trash storage unit testsVincent Petry2015-01-231-46/+16
| * | | | | | Unregister trashbin storage wrapper at the end of testsVincent Petry2015-01-232-0/+4
| * | | | | | Preserve mtime when doing cross storage moveRobin Appelman2015-01-233-45/+40
| * | | | | | Remove storage wrapper for oc_trashbin in unit testVincent Petry2015-01-231-0/+2
| * | | | | | Only move files from the current user to the trashbinRobin Appelman2015-01-231-4/+5
| * | | | | | Apply wrappers to existing mounts before registering itRobin Appelman2015-01-232-8/+11