summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | | Add DAV authenticated also to other scopesLukas Reschke2016-03-072-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/22893
* | | | | | | Merge pull request #23124 from owncloud/improved-rewrite-ruleThomas Müller2016-03-141-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Improved rewrite rule
| * | | | | | | Improved rewrite ruleLukas Reschke2016-03-101-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-resultsThomas Müller2016-03-141-4/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use proper URLs for search results
| * | | | | | | | Use proper URLs for search resultsLukas Reschke2016-03-121-4/+6
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/23136
* | | | | | | | Merge pull request #23191 from owncloud/fix-external-dav-storageThomas Müller2016-03-141-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Verify the getResponse returns a ResponseInterface
| * | | | | | | | Verify the getResponse returns a ResponseInterfaceLukas Reschke2016-03-121-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-methodsThomas Müller2016-03-142-11/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Replace unneded OC::needUpgrade with OCP method
| * | | | | | | | Replace unneded OC::needUpgrade with OCP methodMorris Jobke2016-03-142-11/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #23218 from ↵Thomas Müller2016-03-141-4/+17
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/memcached-not-found-on-remove-means-success Fix errors in memcached implementation
| * | | | | | | | Fix errors in memcached implementationJoas Schilling2016-03-141-4/+17
| |/ / / / / / /
* / / / / / / / Shorter cache key for URL entriesJoas Schilling2016-03-141-1/+1
|/ / / / / / /
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-144-4/+4
| | | | | | |
* | | | | | | Do not recurse link share fetchingRoeland Jago Douma2016-03-131-0/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | * Might fix an issue on oracle
* | | / / / [tx-robot] updated from transifexJenkins for ownCloud2016-03-122-2/+20
| |_|/ / / |/| | | |
* | | | | Merge pull request #23125 from owncloud/add-port-support-to-trusteddomainThomas Müller2016-03-111-0/+6
|\ \ \ \ \ | | | | | | | | | | | | Explicitly check for port
| * | | | | Explicitly check for portLukas Reschke2016-03-101-0/+6
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | The setup uses `\OCP\IRequest::getInsecureServerHost` which in some cases can also include a port. This makes the trusted domain check fail thus. I've decided to add this here that way because adjusting the setup would require parsing the host properly. This is not something that can be done very good in PHP. Check the following example for why `parse_url` is not our friend: https://3v4l.org/k501Z
* | | | / Use more generic node instead of File/FolderRoeland Jago Douma2016-03-114-26/+9
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The phpdoc for the sharing functions was very restrictive. As a consequence passing node object (for example from the OCS Share API where we don't really care if it is a file or folder), would actually be invalid. With this loser restriction the interfaces become more generic.
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-116-16/+48
|/ / /
* | | Fix some scrutinizer warning in the sharing codeRoeland Jago Douma2016-03-101-2/+2
| | | | | | | | | | | | | | | | | | * Better phpdoc * Promper use statements * Unused parameter
* | | Merge pull request #21582 from owncloud/core_composerThomas Müller2016-03-1010-0/+518
|\ \ \ | |_|/ |/| | Composers PSR-4 autoloader in core
| * | POC for PSR-4 autoloader server.php => Server.phpRoeland Jago Douma2016-03-091-0/+0
| | |
| * | Add composers default autoloader to coreRoeland Jago Douma2016-03-099-0/+518
| | | | | | | | | | | | | | | | | | | | | | | | This introduces the defacto standard PSR-4 autoloader from composer into core. This will allow proper PSR-4 naming of our classes. Since our original autoloader is still available we can slowly switch over classes to PSR-4.
* | | Merge pull request #23029 from owncloud/add-rewrite-rules-after-setupThomas Müller2016-03-101-2/+3
|\ \ \ | | | | | | | | Add base rewrite rule only when RewriteBase is defined
| * | | Add base rewrite rule only when RewriteBase is definedLukas Reschke2016-03-091-2/+3
| | | | | | | | | | | | | | | | In case Apache is configured with an `Alias` such as with the ownCloud packages the rewrite rules will fail when no valid RewriteBase is configured.
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-102-2/+2
| | | |