Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #13843 from owncloud/fix-files-disabled | Thomas Müller | 2015-02-03 | 4 | -0/+59 |
|\ | | | | | Fix disabled files app | ||||
| * | enabled disabled files app in repair step | Morris Jobke | 2015-02-03 | 4 | -2/+54 |
| | | |||||
| * | Disallow disabling of files app | Morris Jobke | 2015-02-03 | 2 | -0/+7 |
| | | |||||
* | | Merge pull request #13791 from owncloud/extstorage-fixdavexceptions | Thomas Müller | 2015-02-03 | 1 | -0/+22 |
|\ \ | | | | | | | Fix DAV exceptions, some will still return false now | ||||
| * | | Fix DAV exceptions, some will still return false now | Vincent Petry | 2015-01-30 | 1 | -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 transifex | Jenkins for ownCloud | 2015-02-03 | 4 | -28/+56 |
| | | | |||||
* | | | Merge pull request #13822 from owncloud/include-core-version-in-js-version-tag | Thomas Müller | 2015-02-02 | 1 | -2/+4 |
|\ \ \ | |_|/ |/| | | include core version into js/css version tag | ||||
| * | | include core version into js/css version tag - fixes #13702 | Thomas Müller | 2015-02-02 | 1 | -2/+4 |
| | | | |||||
* | | | Merge pull request #13817 from owncloud/core-apps-dependencies | Morris Jobke | 2015-02-02 | 1 | -4/+1 |
|\ \ \ | |/ / |/| | | encryption requires openssl and user_ldap requires ldap :speak_no_evil: | ||||
| * | | add libs which have no version number | Thomas Müller | 2015-02-02 | 1 | -4/+1 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-02 | 4 | -6/+10 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-01 | 2 | -0/+4 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-31 | 4 | -44/+48 |
|/ / | |||||
* | | Merge pull request #13508 from owncloud/failed-delete-cache | Morris Jobke | 2015-01-30 | 1 | -3/+3 |
|\ \ | |/ |/| | Dont remove a file from cache if the delete operation failed | ||||
| * | Dont do a cache rename if we cant delete the source file | Robin Appelman | 2015-01-29 | 1 | -2/+2 |
| | | |||||
| * | Dont remove a file from cache if the delete operation failed | Robin Appelman | 2015-01-29 | 1 | -1/+1 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-30 | 8 | -6/+12 |
| | | |||||
* | | Merge pull request #13772 from owncloud/closecursor-allconfig | Vincent Petry | 2015-01-29 | 1 | -0/+1 |
|\ \ | | | | | | | Close cursor after checking for existing config values | ||||
| * | | Close cursor after checking for existing config values | Vincent Petry | 2014-11-28 | 1 | -0/+1 |
| |/ | |||||
* | | Merge pull request #13760 from owncloud/create_enc_key_for_remote_shares | Morris Jobke | 2015-01-29 | 1 | -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 shares | Bjoern Schiessle | 2015-01-29 | 1 | -9/+27 |
| | | |||||
* | | Merge pull request #13757 from ↵ | Lukas Reschke | 2015-01-29 | 1 | -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" link | Joas Schilling | 2015-01-29 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #13762 from owncloud/ignore_trailing_slash | Björn Schießle | 2015-01-29 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | ignore trailing slash for remote URL | ||||
| * | | | remove trailing slash | Bjoern Schiessle | 2015-01-29 | 1 | -0/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #13752 from owncloud/closecursor1 | Morris Jobke | 2015-01-29 | 2 | -0/+4 |
|\ \ \ | | | | | | | | | Close cursor early in calculateFolderSize | ||||
| * | | | Close cursor early in calculateFolderSize | Vincent Petry | 2014-11-28 | 2 | -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 shares | Robin Appelman | 2015-01-29 | 1 | -3/+3 |
| | | | |||||
* | | | Fix resolving paths for views rooted in a file | Robin Appelman | 2015-01-29 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #13667 from owncloud/rename-always-update-cache | Robin Appelman | 2015-01-28 | 2 | -12/+14 |
|\ \ | | | | | | | Update the cache when renaming even if we dont emit hooks | ||||
| * | | Update the cache when renaming even if we dont emit hooks | Robin Appelman | 2015-01-28 | 2 | -12/+14 |
| |/ | |||||
* / | Reference module with `.c` | Lukas Reschke | 2015-01-28 | 1 | -2/+2 |
|/ | | | | Fixes https://github.com/owncloud/core/issues/13657 | ||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-28 | 4 | -26/+58 |
| | |||||
* | Merge pull request #13700 from owncloud/dav-objecttree-required-a-collection | Morris Jobke | 2015-01-28 | 1 | -2/+2 |
|\ | | | | | let init() take a ICollection or an INode - fixes PHP message | ||||
| * | let init() take an INode - fixes PHP message | Thomas Müller | 2015-01-27 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #13717 from owncloud/storage-donotwrapnullstorage | Morris Jobke | 2015-01-28 | 1 | -1/+20 |
|\ \ | | | | | | | Prevent wrapping null storage | ||||
| * | | Prevent wrapping null storage | Vincent Petry | 2015-01-27 | 1 | -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-fixscanfileforbrokenstorage | Morris Jobke | 2015-01-28 | 2 | -2/+56 |
|\ \ \ | | | | | | | | | Catch storage exception in scanner for remote shares | ||||
| * | | | Replace OC_Log::ERROR with OCP\Util::ERROR | Vincent Petry | 2015-01-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | Catch storage exception in scanner for remote shares | Vincent Petry | 2015-01-26 | 2 | -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-namespace | Bernhard Posselt | 2015-01-27 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Use proper namespace | ||||
| * | | | | Use proper namespace | Lukas Reschke | 2015-01-27 | 1 | -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-finaldeletewhencrossstoragefix | Vincent Petry | 2015-01-27 | 4 | -10/+52 |
|\ \ \ \ | |/ / / |/| | | | Call final unlink in trash wrapper's storage | ||||
| * | | | Fix return type of addStorageWrapper in PHPDoc | Vincent Petry | 2015-01-27 | 1 | -1/+1 |
| | | | | |||||
| * | | | Preserve mtime when doing cross storage move | Robin Appelman | 2015-01-23 | 1 | -3/+10 |
| | | | | |||||
| * | | | Apply wrappers to existing mounts before registering it | Robin Appelman | 2015-01-23 | 2 | -8/+11 |
| | | | | |||||
| * | | | removeStorageWrapper to unregister a storage wrapper | Vincent Petry | 2015-01-23 | 2 | -3/+24 |
| | | | | |||||
| * | | | Do not call wrapStorage if storate with same name added twice | Vincent Petry | 2015-01-22 | 3 | -1/+12 |
| | | | | |||||
* | | | | Merge pull request #13699 from owncloud/check-if-file-exists | Morris Jobke | 2015-01-27 | 1 | -1/+3 |
|\ \ \ \ | | | | | | | | | | | Use `file_exists` to verify that config file exists | ||||
| * | | | | Use `file_exists` to verify that config file exists | Lukas Reschke | 2015-01-27 | 1 | -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 |