summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Add config to sharemanagerRoeland Jago Douma2016-03-222-0/+14
|
* Merge pull request #23437 from owncloud/save-query-when-the-list-is-emptyThomas Müller2016-03-221-0/+2
|\ | | | | Save the query when we get tags for no objects
| * Save the query when we get tags for no objectsJoas Schilling2016-03-221-0/+2
| |
* | Merge pull request #23461 from ↵Thomas Müller2016-03-221-2/+2
|\ \ | | | | | | | | | | | | owncloud/activity-491-autoloading-issue-without-sharing Fix "AutoloadNotAllowedException" when files_sharing is disabled
| * | Fix "AutoloadNotAllowedException" when files_sharing is disabledJoas Schilling2016-03-221-2/+2
| | |
* | | Merge pull request #23411 from owncloud/new_sharing_to_composerThomas Müller2016-03-227-0/+0
|\ \ \ | |_|/ |/| | Move sharing 2.0 to composer autoloader
| * | Move (new) sharing over to composer autoloaderRoeland Jago Douma2016-03-207-0/+0
| | |
* | | Merge pull request #23448 from ↵Thomas Müller2016-03-222-3/+23
|\ \ \ | | | | | | | | | | | | | | | | owncloud/issue-22993-soften-exception-on-enable-default-app Do not abort with an exception when a default app can not be enabled
| * | | Do not abort with an exception when a default app can not be enabledJoas Schilling2016-03-212-3/+23
| | | |
* | | | Merge pull request #23443 from owncloud/some-more-logging-informationThomas Müller2016-03-221-8/+15
|\ \ \ \ | |_|_|/ |/| | | Log more information by default
| * | | Log more information by defaultLukas Reschke2016-03-211-8/+15
| |/ / | | | | | | | | | | | | | | | | | | | | | This modifies the logger to add the following logging information by default: - Request Method - Request URL - Current user
* | | Merge pull request #23424 from owncloud/fix-cachewrapper-doc-issueThomas Müller2016-03-211-1/+1
|\ \ \ | | | | | | | | Fix doc issue of cache wrapper
| * | | Fix doc issue of cache wrapperJoas Schilling2016-03-211-1/+1
| |/ /
* / / Do not fire pre/post hooks twice on chunk uploadVincent Petry2016-03-211-43/+5
|/ /
* | Merge pull request #23349 from owncloud/hardeningsThomas Müller2016-03-212-29/+4
|\ \ | | | | | | Hardenings
| * | Remove unused codeLukas Reschke2016-03-171-29/+0
| | | | | | | | | | | | This code is not used anymore.
| * | Escape App IDLukas Reschke2016-03-171-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-pathThomas Müller2016-03-211-1/+1
|\ \ \ | | | | | | | | Use raw PATH_INFO
| * | | Use raw PATH_INFOLukas Reschke2016-03-171-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-issuesThomas Müller2016-03-211-20/+20
|\ \ \ | | | | | | | | Write .htaccess update only if not already written
| * | | Write .htaccess update only if not already writtenLukas Reschke2016-03-171-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 transifexJenkins for ownCloud2016-03-212-0/+6
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-204-0/+12
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-198-0/+16
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2016-03-188-0/+16
|/
* Update oci.phpManish Bisht2016-03-162-6/+8
| | | | | | | | Error Fixed combined the database errors Merged Database Errors
* Merge pull request #23108 from owncloud/set-encrypted-version-at-least-to-1Thomas Müller2016-03-161-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 copyLukas Reschke2016-03-161-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-0Thomas Müller2016-03-161-0/+8
|\ \ | |/ |/| Require at least libxml 2.7.0
| * Require at least libxml 2.7.0Lukas Reschke2016-03-121-0/+8
| | | | | | | | Fixes https://github.com/owncloud/core/issues/23168
* | [tx-robot] updated from transifexJenkins for ownCloud2016-03-162-0/+8
| |
* | Merge pull request #23157 from owncloud/remove-share-prop-entriesThomas Müller2016-03-152-0/+54
|\ \ | | | | | | remove old share propagation entries from appconfig
| * | remove old share propagation entries from appconfigRobin Appelman2016-03-152-0/+54
| | |
* | | Merge pull request #23164 from owncloud/db-connection-precondition-fixThomas Müller2016-03-151-1/+1
|\ \ \ | | | | | | | | Prevent certain DBs throwing exceptions on same-value updates
| * | | Prevent certain DBs throwing exceptions on same-value updatesRobin McCorkell2016-03-151-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-htaccessThomas Müller2016-03-153-4/+44
|\ \ \ \ | |/ / / |/| | | Fix several .htaccess and .user.ini related problems
| * | | Add support for custom values in integrity checkerLukas Reschke2016-03-152-3/+43
| | | |
| * | | Replace all required valuesLukas Reschke2016-03-151-1/+1
| | | |
* | | | Merge pull request #23226 from owncloud/fix_23190Thomas Müller2016-03-151-2/+11
|\ \ \ \ | |_|/ / |/| | | Generate a valid URL for link notification
| * | | Generate a valid URL for link notificationRoeland Jago Douma2016-03-151-2/+11
| |/ / | | | | | | | | | | | | | | | fixes #23197 * Updated unit test
* | | Merge pull request #23039 from owncloud/invalid-share-storageThomas Müller2016-03-152-0/+357
|\ \ \ | | | | | | | | dont break when there is an invalid share
| * | | move failedstorage to coreRobin Appelman2016-03-112-0/+357
| | | |
* | | | Merge pull request #23074 from ↵Thomas Müller2016-03-151-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | owncloud/issue-22835-correctly-use-querybuilder-api Correctly escape join statements and use selectAlias
| * | | Correctly escape join statements and use selectAliasJoas Schilling2016-03-101-1/+1
| | | |
* | | | Revert "Removed unnecessary check 'installed' system value' call."Lukas Reschke2016-03-151-1/+1
| | | |
* | | | Merge pull request #23171 from maxolasersquad/masterThomas Müller2016-03-141-1/+1
|\ \ \ \ | | | | | | | | | | Removed unnecessary check 'installed' system value' call.
| * | | | Removed unnecessary check 'installed' system value' call.David Baucum2016-03-111-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_logtimezoneThomas Müller2016-03-141-3/+5
|\ \ \ \ \ | | | | | | | | | | | | fix broken logtimezone
| * | | | | fix broken logtimezonePhiber20002016-03-141-3/+5
| | | | | |
* | | | | | Merge pull request #22901 from owncloud/add-dav-authenticatedThomas Müller2016-03-142-1/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add DAV authenticated also to other scopes