summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #13774 from owncloud/fix-exception-cssRobin McCorkell2015-01-291-0/+2
|\ | | | | add CSS to exception page - fixes #13747
| * add CSS to exception page - fixes #13747Morris Jobke2015-01-291-0/+2
| |
* | Merge pull request #13772 from owncloud/closecursor-allconfigVincent Petry2015-01-291-0/+1
|\ \ | |/ |/| Close cursor after checking for existing config values
| * Close cursor after checking for existing config valuesVincent Petry2014-11-281-0/+1
| |
* | Merge pull request #13760 from owncloud/create_enc_key_for_remote_sharesMorris Jobke2015-01-293-66/+145
|\ \ | |/ |/| make sure that we always create a public share key for remote shares
| * Fix intendationJoas Schilling2015-01-291-3/+3
| |
| * Fix more assertionsJoas Schilling2015-01-291-26/+26
| |
| * Fix 2 assertionsJoas Schilling2015-01-291-3/+3
| |
| * make sure that we always create a public share key for remote sharesBjoern Schiessle2015-01-293-41/+120
| |
* | Merge pull request #13728 from owncloud/federated_cloudThomas Müller2015-01-292-5/+5
|\ \ | | | | | | rename 'server-to-server sharing' to 'federated cloud'
| * | rename 'server-to-server sharing' to 'federated cloud'Bjoern Schiessle2015-01-292-5/+5
| |/
* | Merge pull request #13757 from ↵Lukas Reschke2015-01-291-1/+1
|\ \ | | | | | | | | | | | | owncloud/issue/13686-scroll-to-file-when-using-searchotherplaces Scroll to file in folder, when using "search in other places" link
| * | 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
|\ \ \ | | | | | | | | ignore trailing slash for remote URL
| * | | remove trailing slashBjoern Schiessle2015-01-291-0/+1
| | |/ | |/|
* | | 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.
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 04:04:49 +0000