summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #13752 from owncloud/closecursor1Morris Jobke2015-01-292-0/+4
|\ \ \ | | | | | | | | Close cursor early in calculateFolderSize
| * | | Close cursor early in calculateFolderSizeVincent Petry2014-11-282-0/+4
| | |/ | |/| | | | | | | | | | This method triggers additional queries in $this->update() so to avoid potential database locks or delays, we close the cursor as soon as it is not needed any more
* | | Merge pull request #13682 from owncloud/webdav-single-file-putMorris Jobke2015-01-294-4/+45
|\ \ \ | | | | | | | | Fix WebDAV put for single file shares
| * | | 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 only
| * | 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
|\ \ \ | | | | | | | | adding console command to migrate encryption keys - refs #13450
| * | | user fs must be setup up, so that the real user folder is mounted on the ↵Arthur Schiwon2015-01-221-0/+1
| | | | | | | | | | | | | | | | username based path
| * | | 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
|\ \ \ | | | | | | | | Tidy formatting of Amazon S3 checkboxes
| * | | Align checkbox configuration in external filesRoss Nicoll2015-01-191-1/+7
| | | | | | | | | | | | | | | | | | | | Modified CSS for files_external application to render labels around checkboxes at the same width as other input elements, aligning them with other elements on the same page.
* | | | Merge pull request #13667 from owncloud/rename-always-update-cacheRobin Appelman2015-01-284-13/+20
|\ \ \ \ | | | | | | | | | | Update the cache when renaming even if we dont emit hooks
| * | | | Fix trash error when deleting files with the same name at the same time ↵Robin Appelman2015-01-281-0/+3
| | | | | | | | | | | | | | | | | | | | (happens in unit tests)
| * | | | 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`
| * | | Reference module with `.c`Lukas Reschke2015-01-283-6/+6
|/ / / | | | | | | | | | Fixes https://github.com/owncloud/core/issues/13657
* | | [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 a ICollection or an INode - fixes PHP message
| * | | let init() take an INode - fixes PHP messageThomas Müller2015-01-271-2/+2
| | | |
* | | | Merge pull request #13704 from ↵Morris Jobke2015-01-282-3/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/issue/13571-indicate-remote-sharee-in-filelist Indicate that the share owner is remote in the filelist
| * | | | 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 storage
| * | | | | Prevent wrapping null storageVincent Petry2015-01-272-1/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Can happen when trying to instantiate external storages that have incomplete config, where the constructor throws an exception (the exception is caught in createStorage())
* | | | | | Merge pull request #13525 from owncloud/s2s-fixscanfileforbrokenstorageMorris Jobke2015-01-286-27/+200
|\ \ \ \ \ \ | | | | | | | | | | | | | | Catch storage exception in scanner for remote shares
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever an exception occurs during scan of a remote share, the share is checked for availability. If the storage is gone, it will be removed automatically. Also, getDirectoryContent() will now skip unavailable storages.
* | | | | | | Merge pull request #13718 from owncloud/use-proper-namespaceBernhard Posselt2015-01-271-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use proper namespace
| * | | | | | | Use proper namespaceLukas Reschke2015-01-271-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IAppManager lives in OCP\App and not in OCP. Fixes https://github.com/owncloud/core/issues/13710
* | | | | | | Merge pull request #13561 from owncloud/trash-finaldeletewhencrossstoragefixVincent Petry2015-01-2712-15/+306
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Call final unlink in trash wrapper's storage
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cross-storage rename would cause copy + unlink. That unlink operation must not trigger the trashbin.
| * | | | | | Add trashbin storage wrapper unit test for versionsVincent Petry2015-01-231-6/+76
| | | | | | |
| * | | | | | Simplify trash storage unit testsVincent Petry2015-01-231-46/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed to make it properly init the mount points
| * | | | | | Unregister trashbin storage wrapper at the end of testsVincent Petry2015-01-232-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Some more tests that uses the storage wrapper now remove it afterwards
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of cross-storage delete, the files are copied to the trash, then deleted. The final delete on the source storage would still reach the trash wrapper. This fix makes forwards that second call to the wrapped storage to make the final delete work. It fixes the issue with remote shares, local shares and external storage. Also, it uses a new function "renameRecursive" that renames the files and preserves the mtimes (like "copy_recursive" did in the past))
| * | | | | | 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 config
| * | | | | | | Allow saving incomplete external storage configVincent Petry2015-01-272-2/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed for Dropbox and others that need a token.
| * | | | | | | Fix mount config unit test failuresVincent Petry2015-01-271-7/+29
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because setStorageId now instantiates storages, they might throw exceptions if arguments are missing. This fixes the unit test to not throw exceptions and have their default config arguments set.
* | | | | | | Merge pull request #13699 from owncloud/check-if-file-existsMorris Jobke2015-01-271-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use `file_exists` to verify that config file exists
| * | | | | | | Use `file_exists` to verify that config file existsLukas Reschke2015-01-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There might be the case that `fopen($file, 'r')` returns false and thus ownCloud might believe that the config file is empty and thus potentially leading to an overwrite of the config file. This changeset introduces `file_exists` again which was used in ownCloud 5 where no such problems where reported and should not be affected by such problems. Ref https://github.com/owncloud/core/issues/12785#issuecomment-71548720