aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Throw nicer error message instead 500Lukas Reschke2015-06-171-1/+3
|
* Verify if path existsLukas Reschke2015-06-171-0/+5
| | | | We need to verify if the specified path exists to gracefully prevent errors.
* Merge pull request #16988 from owncloud/fix-avatar-failVincent Petry2015-06-173-4/+28
|\ | | | | Fix remaining avatar problems
| * Fix testLukas Reschke2015-06-171-1/+1
| |
| * Fix PHPDoc annotationsLukas Reschke2015-06-171-0/+24
| |
| * Correc type annotationLukas Reschke2015-06-171-3/+3
| |
* | Merge pull request #16985 from owncloud/fix-public-api-phpdocThomas Müller2015-06-171-2/+2
|\ \ | | | | | | Fix OCP PHPDoc
| * | Fix OCP PHPDocMorris Jobke2015-06-171-2/+2
| |/ | | | | | | * was always a string instead of \OCP\IUser
* | Merge pull request #16729 from owncloud/scanner-read-lockThomas Müller2015-06-174-13/+38
|\ \ | |/ |/| keep a read lock while scanning a file or folder
| * explain pre-hook scanRobin Appelman2015-06-151-0/+1
| |
| * ensure normalized path form when changing locksRobin Appelman2015-06-151-0/+1
| |
| * ensure we dont have to scan a file in the trash wrapperRobin Appelman2015-06-151-0/+10
| |
| * properly unlock in case of failed fopenRobin Appelman2015-06-151-2/+2
| |
| * keep a read lock while scanning a file or folderRobin Appelman2015-06-153-12/+25
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-1742-22/+60
| |
* | Merge pull request #16955 from owncloud/lock-changelocktrimpathVincent Petry2015-06-162-4/+27
|\ \ | | | | | | Trim path in changeLock
| * | Normalize path in View's lock methodsVincent Petry2015-06-162-4/+27
|/ /
* | Merge pull request #16892 from owncloud/lock-returnfullpathVincent Petry2015-06-163-13/+102
|\ \ | | | | | | Rethrow LockedException with full path
| * | Rethrow LockedException with full pathVincent Petry2015-06-163-13/+102
| | | | | | | | | | | | | | | Because the path is converted to md5 from the original exception, rethrow the exception with the correct full path
* | | Merge pull request #16856 from ↵Lukas Reschke2015-06-164-15/+35
|\ \ \ | | | | | | | | | | | | | | | | owncloud/issue-15851-fetch-updates-after-page-completion Load the update information asyncroniously to fix the page load speed
| * | | 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 missing
| * | | | Throw exception if memcache misconfigured or missingVincent Petry2015-06-123-24/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of falling back to null memcache, throw exceptions. Also throw file locking specific exceptions in case the class is not available.
* | | | | Merge pull request #16943 from owncloud/sabre-convertinvalidpathJoas Schilling2015-06-162-2/+6
|\ \ \ \ \ | | | | | | | | | | | | Convert invalid path exception to sabre exception on MOVE
| * | | | | 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 opendir
| * | | | | Skip directory entry in S3 opendirVincent Petry2015-06-151-0/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | The result set contains the directory itself, so skip it to avoid scanning a non-existing directory
* | | | | [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
|\ \ \ \ \ | | | | | | | | | | | | Reintroduce user cache
| * | | | | 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
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | This was required by avatars and was broken with https://github.com/owncloud/core/pull/16200 Fixes https://github.com/owncloud/core/issues/16942
* | | | | Merge pull request #16931 from owncloud/make-security-checks-more-stringentThomas Müller2015-06-152-15/+34
|\ \ \ \ \ | | | | | | | | | | | | Align recommended settings
| * | | | | Align recommended settingsLukas Reschke2015-06-152-15/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This aligns the recommended setting with the max-age of `15768000` as described in our documentation. Furthermore it fixes some logical problems with the code, unit tests has been added as well. Fixes https://github.com/owncloud/core/issues/16673
* | | | | | Merge pull request #16727 from owncloud/file-put-content-lockThomas Müller2015-06-151-2/+17
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | add proper locking to file_put_contents when using streams
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixed "p" element containing a "div"
| * \ \ \ \ \ Merge pull request #1 from Brewal/Brewal-patch-1Brewal2015-06-081-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Changed a p element by a div
| | * | | | | | Changed a p element by a div Brewal2015-06-081-2/+2
| |/ / / / / / | | | | | | | | | | | | | | A p element cannot contain a div element (here `<div style="clear: both;"></div>`). It should be change by a div element to fits standards.
* | | | | | | Merge pull request #16821 from owncloud/compare-and-delete-locking-watchThomas Müller2015-06-1510-4/+132
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Compare and delete locking watch
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Determine the size we need before asking for a thumbnail
| * | | | | | | | 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
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | We need to set the size of the preview using the devicePixelRatio and use that as arguments when using the preview endpoint or that endpoint will use the default 36x36 and thumbnails will be blurry on high DPI devices
* | | | | | | | Merge pull request #16915 from aidanamavi/add-opus-mimetypeThomas Müller2015-06-151-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Added Opus Mimetype Support