summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Prevent certain DBs throwing exceptions on same-value updatesRobin McCorkell2016-03-152-7/+25
* Merge pull request #23226 from owncloud/fix_23190Thomas Müller2016-03-153-8/+38
|\
| * Generate a valid URL for link notificationRoeland Jago Douma2016-03-153-8/+38
* | Merge pull request #22998 from owncloud/delay-loading-the-scannerThomas Müller2016-03-152-5/+5
|\ \
| * | Delay check till scanner is usedLukas Reschke2016-03-092-5/+5
* | | Merge pull request #23039 from owncloud/invalid-share-storageThomas Müller2016-03-154-11/+36
|\ \ \
| * | | move failedstorage to coreRobin Appelman2016-03-114-6/+6
| * | | dont break when there is an invalid shareRobin Appelman2016-03-112-6/+31
* | | | Merge pull request #23074 from owncloud/issue-22835-correctly-use-querybuilde...Thomas Müller2016-03-153-5/+5
|\ \ \ \ | |_|_|/ |/| | |
| * | | Correctly escape join statements and use selectAliasJoas Schilling2016-03-103-5/+5
* | | | Merge pull request #23243 from owncloud/revert-23171-masterLukas Reschke2016-03-151-1/+1
|\ \ \ \
| * | | | Revert "Removed unnecessary check 'installed' system value' call."Lukas Reschke2016-03-151-1/+1
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-1538-16/+142
* | | | Merge pull request #23171 from maxolasersquad/masterThomas Müller2016-03-141-1/+1
|\ \ \ \
| * | | | Removed unnecessary check 'installed' system value' call.David Baucum2016-03-111-1/+1
* | | | | Merge pull request #23225 from owncloud/Phiber2000-fix_logtimezoneThomas Müller2016-03-141-3/+5
|\ \ \ \ \
| * | | | | 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 scopesLukas Reschke2016-03-072-1/+26
* | | | | | | Merge pull request #23124 from owncloud/improved-rewrite-ruleThomas Müller2016-03-141-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Improved rewrite ruleLukas Reschke2016-03-101-1/+1
* | | | | | | | Merge pull request #23190 from owncloud/use-proper-url-for-search-resultsThomas Müller2016-03-141-4/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Use proper URLs for search resultsLukas Reschke2016-03-121-4/+6
* | | | | | | | | Merge pull request #23191 from owncloud/fix-external-dav-storageThomas Müller2016-03-141-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Verify the getResponse returns a ResponseInterfaceLukas Reschke2016-03-121-1/+3
| |/ / / / / / / /
* | | | | | | | | Merge pull request #23208 from owncloud/reduce-unneeded-methodsThomas Müller2016-03-142-11/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Replace unneded OC::needUpgrade with OCP methodMorris Jobke2016-03-142-11/+1
* | | | | | | | | | Merge pull request #23211 from owncloud/cleanup-federation-testsThomas Müller2016-03-143-30/+30
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Only match LOCAL and REMOTE as servers, correctly make use of the sharer serv...Joas Schilling2016-03-143-30/+30
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #23218 from owncloud/memcached-not-found-on-remove-means-s...Thomas Müller2016-03-142-5/+25
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Fix errors in memcached implementationJoas Schilling2016-03-142-5/+25
| |/ / / / / / / /
* | | | | | | | | Merge pull request #23214 from owncloud/issue-23076-max-key-for-memcache-urlsVincent Petry2016-03-141-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Shorter cache key for URL entriesJoas Schilling2016-03-141-1/+1
|/ / / / / / / /
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-1474-76/+66
* | | | | | | | Merge pull request #23201 from owncloud/mark-testing-app-as-compatible-with-9-1Thomas Müller2016-03-131-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Mark testing app as compatible with 9.1Lukas Reschke2016-03-131-1/+1
* | | | | | | | | Merge pull request #23091 from owncloud/issue-23085-csae-insensitive-group-se...Thomas Müller2016-03-133-7/+260
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add integration tests for the "anti user iteration"Joas Schilling2016-03-111-0/+54
| * | | | | | | | | Correctly lower the search input as wellJoas Schilling2016-03-111-5/+5
| * | | | | | | | | Return the correct group casing in sharee apiJoas Schilling2016-03-111-2/+2
| * | | | | | | | | Add integration tests for sharee APIJoas Schilling2016-03-112-0/+199
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #23162 from owncloud/adjust-wording-for-an-happier-mattThomas Müller2016-03-132-2/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Adjust wording a bitLukas Reschke2016-03-112-2/+2
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #22242 from owncloud/remove_old_ocs_share_api_codeRoeland Douma2016-03-133-1538/+636
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Do not recurse link share fetchingRoeland Jago Douma2016-03-131-0/+5
| * | | | | | | Fix intergration testsRoeland Jago Douma2016-03-131-893/+631
| * | | | | | | Remove the old OCS Share API codeRoeland Jago Douma2016-03-131-645/+0
|/ / / / / / /
* / / / / / / [tx-robot] updated from transifexJenkins for ownCloud2016-03-1214-8/+60
|/ / / / / /
* | | | | | Merge pull request #23137 from owncloud/bump_doctrineThomas Müller2016-03-111-0/+0
|\ \ \ \ \ \
| * | | | | | [3rdparty] Bump doctrine/dbalRoeland Jago Douma2016-03-111-0/+0
|/ / / / / /