Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #23424 from owncloud/fix-cachewrapper-doc-issue | Thomas Müller | 2016-03-21 | 1 | -1/+1 |
|\ | | | | | Fix doc issue of cache wrapper | ||||
| * | Fix doc issue of cache wrapper | Joas Schilling | 2016-03-21 | 1 | -1/+1 |
| | | |||||
* | | Do not fire pre/post hooks twice on chunk upload | Vincent Petry | 2016-03-21 | 1 | -43/+5 |
|/ | |||||
* | Merge pull request #23349 from owncloud/hardenings | Thomas Müller | 2016-03-21 | 2 | -29/+4 |
|\ | | | | | Hardenings | ||||
| * | Remove unused code | Lukas Reschke | 2016-03-17 | 1 | -29/+0 |
| | | | | | | | | This code is not used anymore. | ||||
| * | Escape App ID | Lukas Reschke | 2016-03-17 | 1 | -0/+4 |
| | | | | | | | | While all callers do this as well this prevents a misuse of the API by mistake. | ||||
* | | Merge pull request #23369 from owncloud/use-raw-path | Thomas Müller | 2016-03-21 | 1 | -1/+1 |
|\ \ | | | | | | | Use raw PATH_INFO | ||||
| * | | Use raw PATH_INFO | Lukas Reschke | 2016-03-17 | 1 | -1/+1 |
| |/ | | | | | | | | | | | PATH_INFO will be empty at this point and thus the logic in base.php did not catch this. Changing this to "getRawPathInfo" will ensure that the path info is properly read. Fixes https://github.com/owncloud/core/issues/23199 | ||||
* | | Merge pull request #23374 from owncloud/fix-htaccess-issues | Thomas Müller | 2016-03-21 | 1 | -20/+20 |
|\ \ | | | | | | | Write .htaccess update only if not already written | ||||
| * | | Write .htaccess update only if not already written | Lukas Reschke | 2016-03-17 | 1 | -20/+20 |
| |/ | | | | | | | | | | | | | | | The ownCloud update routine also runs the "updateHtaccess" code in case only an application gets updated. This leads to having entries multiple time in the .htaccess file leading to unpredictable behaviour. With 9.0 we added the "#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####" entry to the .htaccess file, this change uses it to ensure that only to the .htaccess gets written if the file has not been modified already. Since the .htaccess modifications are optional this is not a big deal. Without this change updates of applications can break the rewrite rules (ending in endless redirects) as well as breaking the code integrity checker. | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-21 | 2 | -0/+6 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-20 | 4 | -0/+12 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-19 | 8 | -0/+16 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-18 | 8 | -0/+16 |
|/ | |||||
* | Update oci.php | Manish Bisht | 2016-03-16 | 2 | -6/+8 |
| | | | | | | | | Error Fixed combined the database errors Merged Database Errors | ||||
* | Merge pull request #23108 from owncloud/set-encrypted-version-at-least-to-1 | Thomas Müller | 2016-03-16 | 1 | -1/+12 |
|\ | | | | | Ensure that stored version is at least 1 for cross-storage copy | ||||
| * | Ensure that stored version is at least 1 for cross-storage copy | Lukas Reschke | 2016-03-16 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | | | In case of a move operation from an unencrypted to an encrypted storage the old encrypted version would stay with "0" while the correct value would be "1". Thus we manually set the value to "1" for those cases. See also https://github.com/owncloud/core/issues/23078 | ||||
* | | Merge pull request #23189 from owncloud/require-at-least-libxml-2-7-0 | Thomas Müller | 2016-03-16 | 1 | -0/+8 |
|\ \ | |/ |/| | Require at least libxml 2.7.0 | ||||
| * | Require at least libxml 2.7.0 | Lukas Reschke | 2016-03-12 | 1 | -0/+8 |
| | | | | | | | | Fixes https://github.com/owncloud/core/issues/23168 | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-16 | 2 | -0/+8 |
| | | |||||
* | | Merge pull request #23157 from owncloud/remove-share-prop-entries | Thomas Müller | 2016-03-15 | 2 | -0/+54 |
|\ \ | | | | | | | remove old share propagation entries from appconfig | ||||
| * | | remove old share propagation entries from appconfig | Robin Appelman | 2016-03-15 | 2 | -0/+54 |
| | | | |||||
* | | | Merge pull request #23164 from owncloud/db-connection-precondition-fix | Thomas Müller | 2016-03-15 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Prevent certain DBs throwing exceptions on same-value updates | ||||
| * | | | Prevent certain DBs throwing exceptions on same-value updates | Robin McCorkell | 2016-03-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | A PreconditionNotMetException must only be thrown if explicit preconditions are specified for setValues(), not if the value is merely the same as was already in the DB. | ||||
* | | | | Merge pull request #23250 from owncloud/fix-support-for-php7-in-htaccess | Thomas Müller | 2016-03-15 | 3 | -4/+44 |
|\ \ \ \ | |/ / / |/| | | | Fix several .htaccess and .user.ini related problems | ||||
| * | | | Add support for custom values in integrity checker | Lukas Reschke | 2016-03-15 | 2 | -3/+43 |
| | | | | |||||
| * | | | Replace all required values | Lukas Reschke | 2016-03-15 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #23226 from owncloud/fix_23190 | Thomas Müller | 2016-03-15 | 1 | -2/+11 |
|\ \ \ \ | |_|/ / |/| | | | Generate a valid URL for link notification | ||||
| * | | | Generate a valid URL for link notification | Roeland Jago Douma | 2016-03-15 | 1 | -2/+11 |
| |/ / | | | | | | | | | | | | | | | | fixes #23197 * Updated unit test | ||||
* | | | Merge pull request #23039 from owncloud/invalid-share-storage | Thomas Müller | 2016-03-15 | 2 | -0/+357 |
|\ \ \ | | | | | | | | | dont break when there is an invalid share | ||||
| * | | | move failedstorage to core | Robin Appelman | 2016-03-11 | 2 | -0/+357 |
| | | | | |||||
* | | | | Merge pull request #23074 from ↵ | Thomas Müller | 2016-03-15 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | owncloud/issue-22835-correctly-use-querybuilder-api Correctly escape join statements and use selectAlias | ||||
| * | | | Correctly escape join statements and use selectAlias | Joas Schilling | 2016-03-10 | 1 | -1/+1 |
| | | | | |||||
* | | | | Revert "Removed unnecessary check 'installed' system value' call." | Lukas Reschke | 2016-03-15 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #23171 from maxolasersquad/master | Thomas Müller | 2016-03-14 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Removed unnecessary check 'installed' system value' call. | ||||
| * | | | | Removed unnecessary check 'installed' system value' call. | David Baucum | 2016-03-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | OC_Utils::checkServer makes an unnecessary call to $config->getSystemValue('installed', false), which replicates the call made immediately before it during the call to needUpgrade. | ||||
* | | | | | Merge pull request #23225 from owncloud/Phiber2000-fix_logtimezone | Thomas Müller | 2016-03-14 | 1 | -3/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | fix broken logtimezone | ||||
| * | | | | | fix broken logtimezone | Phiber2000 | 2016-03-14 | 1 | -3/+5 |
| | | | | | | |||||
* | | | | | | Merge pull request #22901 from owncloud/add-dav-authenticated | Thomas Müller | 2016-03-14 | 2 | -1/+26 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add DAV authenticated also to other scopes | ||||
| * | | | | | | Add DAV authenticated also to other scopes | Lukas Reschke | 2016-03-07 | 2 | -1/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/22893 | ||||
* | | | | | | | Merge pull request #23124 from owncloud/improved-rewrite-rule | Thomas Müller | 2016-03-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Improved rewrite rule | ||||
| * | | | | | | | Improved rewrite rule | Lukas Reschke | 2016-03-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per https://github.com/owncloud/core/issues/23098 and https://github.com/owncloud/core/issues/23117 | ||||
* | | | | | | | | Merge pull request #23190 from owncloud/use-proper-url-for-search-results | Thomas Müller | 2016-03-14 | 1 | -4/+6 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Use proper URLs for search results | ||||
| * | | | | | | | | Use proper URLs for search results | Lukas Reschke | 2016-03-12 | 1 | -4/+6 |
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/23136 | ||||
* | | | | | | | | Merge pull request #23191 from owncloud/fix-external-dav-storage | Thomas Müller | 2016-03-14 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Verify the getResponse returns a ResponseInterface | ||||
| * | | | | | | | | Verify the getResponse returns a ResponseInterface | Lukas Reschke | 2016-03-12 | 1 | -1/+3 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Can also return `null` as per PHPDoc. Regression added by https://github.com/owncloud/core/commit/97f5c095f4018119e15d7c612a685da1dc91a340 Fixes https://github.com/owncloud/core/issues/23145 | ||||
* | | | | | | | | Merge pull request #23208 from owncloud/reduce-unneeded-methods | Thomas Müller | 2016-03-14 | 2 | -11/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Replace unneded OC::needUpgrade with OCP method | ||||
| * | | | | | | | | Replace unneded OC::needUpgrade with OCP method | Morris Jobke | 2016-03-14 | 2 | -11/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #23218 from ↵ | Thomas Müller | 2016-03-14 | 1 | -4/+17 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/memcached-not-found-on-remove-means-success Fix errors in memcached implementation | ||||
| * | | | | | | | | Fix errors in memcached implementation | Joas Schilling | 2016-03-14 | 1 | -4/+17 |
| |/ / / / / / / |