summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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
| * | | | | Added Opus Mimetype SupportAidan Amavi2015-06-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Added Opus audio mimetype support.
* | | | | | Merge pull request #16885 from owncloud/files-previewurlresolutionroundingThomas Müller2015-06-151-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Truncate preview resolution
| * | | | | | Truncate preview resolutionVincent Petry2015-06-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents having float numbers appear in the URL
* | | | | | | Merge pull request #16912 from owncloud/webdav-smalltransferlockfixThomas Müller2015-06-154-3/+132
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Webdav PUT small file lock must be shared during hooks
| * | | | | | Webdav PUT small file lock must be shared during hooksVincent Petry2015-06-124-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 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
|\ \ \ \ \ | |/ / / / |/| | | | verify path when getting a node for sabredav
| * | | | 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 titles
| * | | | fixing setting page titlesClark Tomlinson2015-06-111-2/+11
| |/ / /
* | | | Merge pull request #16884 from ↵Vincent Petry2015-06-122-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 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
|\ \ \ | | | | | | | | Revert "verify path when getting a node for sabredav"
| * | | Revert "verify path when getting a node for sabredav"Vincent Petry2015-06-111-2/+0
|/ / /
* | | Merge pull request #16880 from owncloud/webdav-verify-pathVincent Petry2015-06-111-0/+2
|\ \ \ | | | | | | | | verify path when getting a node for sabredav
| * | | verify path when getting a node for sabredavRobin Appelman2015-06-111-0/+2
| | | |
* | | | Merge pull request #16879 from jcfischer/jcf_fix_user_delete_messageLukas Reschke2015-06-112-2/+2
|\ \ \ \ | |/ / / |/| | | Fix error message and add 'user' to it
| * | | Fix test message and add 'user' to itJens-Christian Fischer2015-06-111-1/+1
| | | |
| * | | Fix error message and add 'user' to itJens-Christian Fischer2015-06-111-1/+1
| | | |
* | | | Merge pull request #16872 from owncloud/missing-nullcache-importLukas Reschke2015-06-112-6/+169
|\ \ \ \ | |/ / / |/| | | Correctly import NullCache class
| * | | Check the query() for all defined servicesJoas Schilling2015-06-111-1/+112
| | | |
| * | | Order all use statements correctlyJoas Schilling2015-06-111-6/+6
| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-14 20:59:25 +0000