Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Throw nicer error message instead 500 | Lukas Reschke | 2015-06-17 | 1 | -1/+3 |
| | |||||
* | Verify if path exists | Lukas Reschke | 2015-06-17 | 1 | -0/+5 |
| | | | | We need to verify if the specified path exists to gracefully prevent errors. | ||||
* | Merge pull request #16988 from owncloud/fix-avatar-fail | Vincent Petry | 2015-06-17 | 3 | -4/+28 |
|\ | | | | | Fix remaining avatar problems | ||||
| * | Fix test | Lukas Reschke | 2015-06-17 | 1 | -1/+1 |
| | | |||||
| * | Fix PHPDoc annotations | Lukas Reschke | 2015-06-17 | 1 | -0/+24 |
| | | |||||
| * | Correc type annotation | Lukas Reschke | 2015-06-17 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #16985 from owncloud/fix-public-api-phpdoc | Thomas Müller | 2015-06-17 | 1 | -2/+2 |
|\ \ | | | | | | | Fix OCP PHPDoc | ||||
| * | | Fix OCP PHPDoc | Morris Jobke | 2015-06-17 | 1 | -2/+2 |
| |/ | | | | | | | * was always a string instead of \OCP\IUser | ||||
* | | Merge pull request #16729 from owncloud/scanner-read-lock | Thomas Müller | 2015-06-17 | 4 | -13/+38 |
|\ \ | |/ |/| | keep a read lock while scanning a file or folder | ||||
| * | explain pre-hook scan | Robin Appelman | 2015-06-15 | 1 | -0/+1 |
| | | |||||
| * | ensure normalized path form when changing locks | Robin Appelman | 2015-06-15 | 1 | -0/+1 |
| | | |||||
| * | ensure we dont have to scan a file in the trash wrapper | Robin Appelman | 2015-06-15 | 1 | -0/+10 |
| | | |||||
| * | properly unlock in case of failed fopen | Robin Appelman | 2015-06-15 | 1 | -2/+2 |
| | | |||||
| * | keep a read lock while scanning a file or folder | Robin Appelman | 2015-06-15 | 3 | -12/+25 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-17 | 42 | -22/+60 |
| | | |||||
* | | Merge pull request #16955 from owncloud/lock-changelocktrimpath | Vincent Petry | 2015-06-16 | 2 | -4/+27 |
|\ \ | | | | | | | Trim path in changeLock | ||||
| * | | Normalize path in View's lock methods | Vincent Petry | 2015-06-16 | 2 | -4/+27 |
|/ / | |||||
* | | Merge pull request #16892 from owncloud/lock-returnfullpath | Vincent Petry | 2015-06-16 | 3 | -13/+102 |
|\ \ | | | | | | | Rethrow LockedException with full path | ||||
| * | | Rethrow LockedException with full path | Vincent Petry | 2015-06-16 | 3 | -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 Reschke | 2015-06-16 | 4 | -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 key | Joas Schilling | 2015-06-15 | 1 | -3/+5 |
| | | | | |||||
| * | | | Load the update information asyncroniously to fix the page load speed | Joas Schilling | 2015-06-10 | 4 | -12/+30 |
| | | | | |||||
* | | | | Merge pull request #16832 from owncloud/memcache-fail | Joas Schilling | 2015-06-16 | 3 | -24/+61 |
|\ \ \ \ | | | | | | | | | | | Throw exception if memcache misconfigured or missing | ||||
| * | | | | Throw exception if memcache misconfigured or missing | Vincent Petry | 2015-06-12 | 3 | -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-convertinvalidpath | Joas Schilling | 2015-06-16 | 2 | -2/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | Convert invalid path exception to sabre exception on MOVE | ||||
| * | | | | | Convert invalid path exception to sabre exception on MOVE | Vincent Petry | 2015-06-15 | 2 | -2/+6 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #16938 from owncloud/ext-s3-opendirduplicate | Morris Jobke | 2015-06-16 | 1 | -0/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Skip directory entry in S3 opendir | ||||
| * | | | | | Skip directory entry in S3 opendir | Vincent Petry | 2015-06-15 | 1 | -0/+4 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | The result set contains the directory itself, so skip it to avoid scanning a non-existing directory | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-16 | 66 | -114/+288 |
| | | | | | |||||
* | | | | | Merge pull request #16944 from owncloud/fix-avatars | Thomas Müller | 2015-06-15 | 6 | -10/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | Reintroduce user cache | ||||
| * | | | | | Adjust NullCache tests | Lukas Reschke | 2015-06-15 | 1 | -3/+1 |
| | | | | | | |||||
| * | | | | | Add `no-store` to AppFramework | Lukas Reschke | 2015-06-15 | 3 | -4/+3 |
| | | | | | | |||||
| * | | | | | Reintroduce user cache | Lukas Reschke | 2015-06-15 | 2 | -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-stringent | Thomas Müller | 2015-06-15 | 2 | -15/+34 |
|\ \ \ \ \ | | | | | | | | | | | | | Align recommended settings | ||||
| * | | | | | Align recommended settings | Lukas Reschke | 2015-06-15 | 2 | -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-lock | Thomas Müller | 2015-06-15 | 1 | -2/+17 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | add proper locking to file_put_contents when using streams | ||||
| * | | | | | change lock back to shared before updating the cache | Robin Appelman | 2015-06-03 | 1 | -1/+4 |
| | | | | | | |||||
| * | | | | | add proper locking to file_put_contents when using streams | Robin Appelman | 2015-06-03 | 1 | -2/+14 |
| | | | | | | |||||
* | | | | | | Merge pull request #16802 from Brewal/master | Thomas Müller | 2015-06-15 | 1 | -2/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fixed "p" element containing a "div" | ||||
| * \ \ \ \ \ | Merge pull request #1 from Brewal/Brewal-patch-1 | Brewal | 2015-06-08 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Changed a p element by a div | ||||
| | * | | | | | | Changed a p element by a div | Brewal | 2015-06-08 | 1 | -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-watch | Thomas Müller | 2015-06-15 | 10 | -4/+132 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Compare and delete locking watch | ||||
| * | | | | | | | switch to using watch to implement cas and cad on redis | Robin Appelman | 2015-06-12 | 1 | -30/+22 |
| | | | | | | | | |||||
| * | | | | | | | clear memcache keys in locking | Robin Appelman | 2015-06-12 | 1 | -1/+2 |
| | | | | | | | | |||||
| * | | | | | | | add compare-and-delete to the memcache interface | Robin Appelman | 2015-06-12 | 8 | -0/+87 |
| | | | | | | | | |||||
| * | | | | | | | compare-and-set and compare-and-delete using lua scripts for redis | Robin Appelman | 2015-06-12 | 1 | -2/+50 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #16911 from oparoz/prettier-public-thumbnails | Thomas Müller | 2015-06-15 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Determine the size we need before asking for a thumbnail | ||||
| * | | | | | | | | floats are not welcome when setting the size of a preview | Olivier Paroz | 2015-06-12 | 1 | -4/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Determine the size we need before asking for a thumbnail | Olivier Paroz | 2015-06-12 | 1 | -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-mimetype | Thomas Müller | 2015-06-15 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Added Opus Mimetype Support |