Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Only sort by group name when LDAP is involved | Joas Schilling | 2015-06-16 | 7 | -11/+157 |
| | |||||
* | Always keep "Everyone" and "admin" at the top of the list | Joas Schilling | 2015-06-16 | 1 | -0/+14 |
| | |||||
* | 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 | ||||
| * | | | | | | | Added Opus Mimetype Support | Aidan Amavi | 2015-06-13 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Opus audio mimetype support. | ||||
* | | | | | | | | Merge pull request #16885 from owncloud/files-previewurlresolutionrounding | Thomas Müller | 2015-06-15 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | Truncate preview resolution | ||||
| * | | | | | | | Truncate preview resolution | Vincent Petry | 2015-06-11 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents having float numbers appear in the URL | ||||
* | | | | | | | | Merge pull request #16912 from owncloud/webdav-smalltransferlockfix | Thomas Müller | 2015-06-15 | 4 | -3/+132 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | Webdav PUT small file lock must be shared during hooks | ||||
| * | | | | | | | Webdav PUT small file lock must be shared during hooks | Vincent Petry | 2015-06-12 | 4 | -3/+132 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed code path for Webdav PUT of small files to use shared locks during hook execution, and exclusive during the file operation This makes it possible for versions to be copied by accessing the file in a post_write hook. | ||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-15 | 16 | -114/+626 |
| | | | | | | | | |||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-14 | 22 | -76/+892 |
| |_|/ / / / / |/| | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-13 | 10 | -12/+272 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #16886 from owncloud/webdav-verify-path-again | Vincent Petry | 2015-06-12 | 2 | -6/+60 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | verify path when getting a node for sabredav | ||||
| * | | | | | tests for getNodeForPath with invalid path | Robin Appelman | 2015-06-11 | 1 | -6/+56 |
| | | | | | | |||||
| * | | | | | verify path when getting a node for sabredav | Robin Appelman | 2015-06-11 | 1 | -0/+4 |
| |/ / / / | |||||
* | | | | | Merge pull request #16888 from owncloud/feature/fix-titles | Jan-Christoph Borchardt | 2015-06-12 | 1 | -2/+11 |
|\ \ \ \ \ | | | | | | | | | | | | | fixing setting page titles | ||||
| * | | | | | fixing setting page titles | Clark Tomlinson | 2015-06-11 | 1 | -2/+11 |
| |/ / / / | |||||
* | | | | | Merge pull request #16884 from ↵ | Vincent Petry | 2015-06-12 | 2 | -17/+135 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-16843-stop-locking-encryption-key-storage Do not lock the encryption key storage | ||||
| * | | | | | Don't use limit on explode to have only 1 code path | Joas Schilling | 2015-06-12 | 1 | -7/+2 |
| | | | | | | |||||
| * | | | | | Add return value to lock methods and check it in tests | Joas Schilling | 2015-06-12 | 2 | -13/+92 |
| | | | | | | |||||
| * | | | | | Only lock files in data/username/files/ | Joas Schilling | 2015-06-12 | 1 | -9/+53 |
| |/ / / / | |||||
* / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-12 | 10 | -8/+126 |
|/ / / / | |||||
* | | | | Merge pull request #16883 from owncloud/revert-16880-webdav-verify-path | Vincent Petry | 2015-06-11 | 1 | -2/+0 |
|\ \ \ \ | | | | | | | | | | | Revert "verify path when getting a node for sabredav" | ||||
| * | | | | Revert "verify path when getting a node for sabredav" | Vincent Petry | 2015-06-11 | 1 | -2/+0 |
|/ / / / |