summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #13843 from owncloud/fix-files-disabledThomas Müller2015-02-034-0/+59
|\ | | | | Fix disabled files app
| * enabled disabled files app in repair stepMorris Jobke2015-02-034-2/+54
| |
| * Disallow disabling of files appMorris Jobke2015-02-032-0/+7
| |
* | Merge pull request #13791 from owncloud/extstorage-fixdavexceptionsThomas Müller2015-02-031-0/+22
|\ \ | | | | | | Fix DAV exceptions, some will still return false now
| * | Fix DAV exceptions, some will still return false nowVincent Petry2015-01-301-0/+22
| | | | | | | | | | | | | | | | | | Since the Storage interface isn't ready to work directly with exceptions like Forbidden and NotFound, the DAV storage has been adapted to still return false when expected.
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-034-28/+56
| | |
* | | Merge pull request #13822 from owncloud/include-core-version-in-js-version-tagThomas Müller2015-02-021-2/+4
|\ \ \ | |_|/ |/| | include core version into js/css version tag
| * | include core version into js/css version tag - fixes #13702Thomas Müller2015-02-021-2/+4
| | |
* | | Merge pull request #13817 from owncloud/core-apps-dependenciesMorris Jobke2015-02-021-4/+1
|\ \ \ | |/ / |/| | encryption requires openssl and user_ldap requires ldap :speak_no_evil:
| * | add libs which have no version numberThomas Müller2015-02-021-4/+1
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-024-6/+10
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-012-0/+4
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-314-44/+48
|/ /
* | Merge pull request #13508 from owncloud/failed-delete-cacheMorris Jobke2015-01-301-3/+3
|\ \ | |/ |/| Dont remove a file from cache if the delete operation failed
| * Dont do a cache rename if we cant delete the source fileRobin Appelman2015-01-291-2/+2
| |
| * Dont remove a file from cache if the delete operation failedRobin Appelman2015-01-291-1/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-308-6/+12
| |
* | 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-291-9/+27
|\ \ | |/ |/| make sure that we always create a public share key for remote shares
| * make sure that we always create a public share key for remote sharesBjoern Schiessle2015-01-291-9/+27
| |
* | 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
* | | Fix webdav put for single file webdav sharesRobin Appelman2015-01-291-3/+3
| | |
* | | Fix resolving paths for views rooted in a fileRobin Appelman2015-01-291-1/+1
|/ /
* | Merge pull request #13667 from owncloud/rename-always-update-cacheRobin Appelman2015-01-282-12/+14
|\ \ | | | | | | Update the cache when renaming even if we dont emit hooks
| * | Update the cache when renaming even if we dont emit hooksRobin Appelman2015-01-282-12/+14
| |/
* / Reference module with `.c`Lukas Reschke2015-01-281-2/+2
|/ | | | Fixes https://github.com/owncloud/core/issues/13657
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-284-26/+58
|
* 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 #13717 from owncloud/storage-donotwrapnullstorageMorris Jobke2015-01-281-1/+20
|\ \ | | | | | | Prevent wrapping null storage
| * | Prevent wrapping null storageVincent Petry2015-01-271-1/+20
| | | | | | | | | | | | | | | | | | 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-282-2/+56
|\ \ \ | | | | | | | | Catch storage exception in scanner for remote shares
| * | | Replace OC_Log::ERROR with OCP\Util::ERRORVincent Petry2015-01-261-1/+1
| | | |
| * | | Catch storage exception in scanner for remote sharesVincent Petry2015-01-262-2/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-274-10/+52
|\ \ \ \ | |/ / / |/| | | Call final unlink in trash wrapper's storage
| * | | Fix return type of addStorageWrapper in PHPDocVincent Petry2015-01-271-1/+1
| | | |
| * | | Preserve mtime when doing cross storage moveRobin Appelman2015-01-231-3/+10
| | | |
| * | | Apply wrappers to existing mounts before registering itRobin Appelman2015-01-232-8/+11
| | | |
| * | | 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 #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