summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #16856 from owncloud/issue-15851-fetch-updates-after-page-...Lukas Reschke2015-06-164-15/+35
|\
| * Make "include update info" part of the cache keyJoas Schilling2015-06-151-3/+5
| * Load the update information asyncroniously to fix the page load speedJoas Schilling2015-06-104-12/+30
* | Merge pull request #16832 from owncloud/memcache-failJoas Schilling2015-06-163-24/+61
|\ \
| * | Throw exception if memcache misconfigured or missingVincent Petry2015-06-123-24/+61
* | | Merge pull request #16943 from owncloud/sabre-convertinvalidpathJoas Schilling2015-06-162-2/+6
|\ \ \
| * | | Convert invalid path exception to sabre exception on MOVEVincent Petry2015-06-152-2/+6
* | | | Merge pull request #16938 from owncloud/ext-s3-opendirduplicateMorris Jobke2015-06-161-0/+4
|\ \ \ \
| * | | | Skip directory entry in S3 opendirVincent Petry2015-06-151-0/+4
| |/ / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-1666-114/+288
* | | | Merge pull request #16944 from owncloud/fix-avatarsThomas Müller2015-06-156-10/+8
|\ \ \ \
| * | | | Adjust NullCache testsLukas Reschke2015-06-151-3/+1
| * | | | Add `no-store` to AppFrameworkLukas Reschke2015-06-153-4/+3
| * | | | Reintroduce user cacheLukas Reschke2015-06-152-3/+4
|/ / / /
* | | | Merge pull request #16931 from owncloud/make-security-checks-more-stringentThomas Müller2015-06-152-15/+34
|\ \ \ \
| * | | | Align recommended settingsLukas Reschke2015-06-152-15/+34
* | | | | Merge pull request #16727 from owncloud/file-put-content-lockThomas Müller2015-06-151-2/+17
|\ \ \ \ \
| * | | | | change lock back to shared before updating the cacheRobin Appelman2015-06-031-1/+4
| * | | | | add proper locking to file_put_contents when using streamsRobin Appelman2015-06-031-2/+14
* | | | | | Merge pull request #16802 from Brewal/masterThomas Müller2015-06-151-2/+2
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #1 from Brewal/Brewal-patch-1Brewal2015-06-081-2/+2
| |\ \ \ \ \ \
| | * | | | | | Changed a p element by a div Brewal2015-06-081-2/+2
| |/ / / / / /
* | | | | | | Merge pull request #16821 from owncloud/compare-and-delete-locking-watchThomas Müller2015-06-1510-4/+132
|\ \ \ \ \ \ \
| * | | | | | | switch to using watch to implement cas and cad on redisRobin Appelman2015-06-121-30/+22
| * | | | | | | clear memcache keys in lockingRobin Appelman2015-06-121-1/+2
| * | | | | | | add compare-and-delete to the memcache interfaceRobin Appelman2015-06-128-0/+87
| * | | | | | | compare-and-set and compare-and-delete using lua scripts for redisRobin Appelman2015-06-121-2/+50
* | | | | | | | Merge pull request #16911 from oparoz/prettier-public-thumbnailsThomas Müller2015-06-151-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | floats are not welcome when setting the size of a previewOlivier Paroz2015-06-121-4/+4
| * | | | | | | | Determine the size we need before asking for a thumbnailOlivier Paroz2015-06-121-0/+2
| |/ / / / / / /
* | | | | | | | Merge pull request #16915 from aidanamavi/add-opus-mimetypeThomas Müller2015-06-151-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Added Opus Mimetype SupportAidan Amavi2015-06-131-0/+1
* | | | | | | | | Merge pull request #16885 from owncloud/files-previewurlresolutionroundingThomas Müller2015-06-151-1/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Truncate preview resolutionVincent Petry2015-06-111-1/+3
* | | | | | | | | Merge pull request #16912 from owncloud/webdav-smalltransferlockfixThomas Müller2015-06-154-3/+132
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Webdav PUT small file lock must be shared during hooksVincent Petry2015-06-124-3/+132
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-1516-114/+626
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-1422-76/+892
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-1310-12/+272
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #16886 from owncloud/webdav-verify-path-againVincent Petry2015-06-122-6/+60
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | tests for getNodeForPath with invalid pathRobin Appelman2015-06-111-6/+56
| * | | | | | verify path when getting a node for sabredavRobin Appelman2015-06-111-0/+4
| |/ / / / /
* | | | | | Merge pull request #16888 from owncloud/feature/fix-titlesJan-Christoph Borchardt2015-06-121-2/+11
|\ \ \ \ \ \
| * | | | | | fixing setting page titlesClark Tomlinson2015-06-111-2/+11
| |/ / / / /
* | | | | | Merge pull request #16884 from owncloud/issue-16843-stop-locking-encryption-k...Vincent Petry2015-06-122-17/+135
|\ \ \ \ \ \
| * | | | | | Don't use limit on explode to have only 1 code pathJoas Schilling2015-06-121-7/+2
| * | | | | | Add return value to lock methods and check it in testsJoas Schilling2015-06-122-13/+92
| * | | | | | Only lock files in data/username/files/Joas Schilling2015-06-121-9/+53
| |/ / / / /
* / / / / / [tx-robot] updated from transifexJenkins for ownCloud2015-06-1210-8/+126
|/ / / / /
* | | | | Merge pull request #16883 from owncloud/revert-16880-webdav-verify-pathVincent Petry2015-06-111-2/+0
|\ \ \ \ \