summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | [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
| * | | | | | Call final unlink in trash wrapper's storageVincent Petry2015-01-234-2/+178
| * | | | | | removeStorageWrapper to unregister a storage wrapperVincent Petry2015-01-232-3/+24
| * | | | | | Do not call wrapStorage if storate with same name added twiceVincent Petry2015-01-223-1/+12
* | | | | | | Merge pull request #13707 from owncloud/extstorage-fixincompletestorageconfigVincent Petry2015-01-272-9/+96
|\ \ \ \ \ \ \
| * | | | | | | Allow saving incomplete external storage configVincent Petry2015-01-272-2/+67
| * | | | | | | Fix mount config unit test failuresVincent Petry2015-01-271-7/+29
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #13699 from owncloud/check-if-file-existsMorris Jobke2015-01-271-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Use `file_exists` to verify that config file existsLukas Reschke2015-01-271-1/+3
* | | | | | | | Merge pull request #13636 from owncloud/add-warning-if-restore-of-data-is-not...Lukas Reschke2015-01-275-36/+235
|\ \ \ \ \ \ \ \
| * | | | | | | | Add value if restore of data is possible for a userMorris Jobke2015-01-275-36/+235
| |/ / / / / / /
* | | | | | | | Merge pull request #13701 from owncloud/disable-appcode-checkerLukas Reschke2015-01-271-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | disable the app code checker - some previous shipped apps cannot be installed...Thomas Müller2015-01-271-1/+1
* | | | | | | | Merge pull request #13676 from owncloud/fix-node-ifaceThomas Müller2015-01-272-3/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | fix node interfaceBernhard Posselt2015-01-262-3/+2
* | | | | | | | | Merge pull request #13679 from owncloud/public-disablesharejspluginThomas Müller2015-01-273-3/+30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Do not disclose share owner in public file listVincent Petry2015-01-261-1/+4
| * | | | | | | | | Disable JS plugin for sharing in public modeVincent Petry2015-01-262-2/+26
* | | | | | | | | | Merge pull request #13691 from owncloud/s2s-acceptsinglefileThomas Müller2015-01-272-4/+124
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |