wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
25332 commits 157 branches 562 tags 714 MiB
Commit graph

25332 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joas Schilling
7d8b728066 Merge pull request #16832 from owncloud/memcache-fail 
Throw exception if memcache misconfigured or missing
 2015-06-16 11:00:18 +02:00
Joas Schilling
60005bea19 Merge pull request #16943 from owncloud/sabre-convertinvalidpath 
Convert invalid path exception to sabre exception on MOVE
 2015-06-16 10:49:22 +02:00
Morris Jobke
b052eccd9a Merge pull request #16938 from owncloud/ext-s3-opendirduplicate 
Skip directory entry in S3 opendir
 2015-06-16 09:48:10 +02:00
Jenkins for ownCloud
0a5d73b874 [tx-robot] updated from transifex 2015-06-16 01:55:41 -04:00
Thomas Müller
e9d11a65e0 Merge pull request #16944 from owncloud/fix-avatars 
Reintroduce user cache
 2015-06-15 21:16:04 +02:00
Lukas Reschke
fffef529ee Adjust NullCache tests 2015-06-15 19:17:50 +02:00
Lukas Reschke
34f5541088 Add no-store to AppFramework 2015-06-15 18:35:41 +02:00
Lukas Reschke
15ba2a4100 Reintroduce user cache 
This was required by avatars and was broken with https://github.com/owncloud/core/pull/16200

Fixes https://github.com/owncloud/core/issues/16942
 2015-06-15 17:54:48 +02:00
Vincent Petry
1f91e9e65d Convert invalid path exception to sabre exception on MOVE 2015-06-15 17:49:11 +02:00
Vincent Petry
d3f828af45 Skip directory entry in S3 opendir 
The result set contains the directory itself, so skip it to avoid
scanning a non-existing directory
 2015-06-15 17:30:09 +02:00
Thomas Müller
4bc35286ff Merge pull request #16931 from owncloud/make-security-checks-more-stringent 
Align recommended settings
 2015-06-15 15:15:28 +02:00
Thomas Müller
911c43e5f9 Merge pull request #16727 from owncloud/file-put-content-lock 
add proper locking to file_put_contents when using streams
 2015-06-15 14:22:06 +02:00
Thomas Müller
5eb0dace8c Merge pull request #16802 from Brewal/master 
Fixed "p" element containing a "div"
 2015-06-15 14:10:00 +02:00
Thomas Müller
de3ed8e077 Merge pull request #16821 from owncloud/compare-and-delete-locking-watch 
Compare and delete locking watch
 2015-06-15 14:09:06 +02:00
Thomas Müller
433db48027 Merge pull request #16911 from oparoz/prettier-public-thumbnails 
Determine the size we need before asking for a thumbnail
 2015-06-15 13:30:44 +02:00
Thomas Müller
b8ab6fb68d Merge pull request #16915 from aidanamavi/add-opus-mimetype 
Added Opus Mimetype Support
 2015-06-15 13:27:44 +02:00
Thomas Müller
3ce616fb03 Merge pull request #16885 from owncloud/files-previewurlresolutionrounding 
Truncate preview resolution
 2015-06-15 12:53:05 +02:00
Thomas Müller
b6165b6865 Merge pull request #16912 from owncloud/webdav-smalltransferlockfix 
Webdav PUT small file lock must be shared during hooks
 2015-06-15 11:30:59 +02:00
Lukas Reschke
eec8d776b7 Align recommended settings 
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
 2015-06-15 10:39:25 +02:00
Jenkins for ownCloud
2806c9476c [tx-robot] updated from transifex 2015-06-15 01:54:58 -04:00
Jenkins for ownCloud
fe9b28a800 [tx-robot] updated from transifex 2015-06-14 01:54:49 -04:00
Aidan Amavi
89a7aefad5 Added Opus Mimetype Support 
Added Opus audio mimetype support.
 2015-06-13 04:39:37 -04:00
Jenkins for ownCloud
51d181f331 [tx-robot] updated from transifex 2015-06-13 01:55:04 -04:00
Olivier Paroz
7b84343cfc floats are not welcome when setting the size of a preview 2015-06-12 18:56:18 +02:00
Vincent Petry
4497aa4c68 Webdav PUT small file lock must be shared during hooks 
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.
 2015-06-12 18:52:18 +02:00
Olivier Paroz
8ff4a66f01 Determine the size we need before asking for a thumbnail 
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
 2015-06-12 18:50:21 +02:00
Robin Appelman
a9ff242f6a switch to using watch to implement cas and cad on redis 2015-06-12 17:28:09 +02:00
Robin Appelman
520a741876 clear memcache keys in locking 2015-06-12 17:28:09 +02:00
Robin Appelman
ac9f998abd add compare-and-delete to the memcache interface 2015-06-12 17:28:09 +02:00
Robin Appelman
1bc56a99e9 compare-and-set and compare-and-delete using lua scripts for redis 2015-06-12 17:28:09 +02:00
Vincent Petry
446f628136 Merge pull request #16886 from owncloud/webdav-verify-path-again 
verify path when getting a node for sabredav
 2015-06-12 16:45:20 +02:00
Jan-Christoph Borchardt
bb0ea6336d Merge pull request #16888 from owncloud/feature/fix-titles 
fixing setting page titles
 2015-06-12 14:54:42 +02:00
Vincent Petry
da96cbbcd4 Merge pull request #16884 from owncloud/issue-16843-stop-locking-encryption-key-storage 
Do not lock the encryption key storage
 2015-06-12 14:03:37 +02:00
Vincent Petry
3b08b26589 Throw exception if memcache misconfigured or missing 
Instead of falling back to null memcache, throw exceptions.
Also throw file locking specific exceptions in case the class is not
available.
 2015-06-12 12:33:06 +02:00
Joas Schilling
5586b2db09 Don't use limit on explode to have only 1 code path 2015-06-12 11:58:26 +02:00
Joas Schilling
a7d2b3b9ae Add return value to lock methods and check it in tests 2015-06-12 11:41:05 +02:00
Joas Schilling
caf16b083e Only lock files in data/username/files/ 2015-06-12 11:09:38 +02:00
Jenkins for ownCloud
abd70932c6 [tx-robot] updated from transifex 2015-06-12 01:55:11 -04:00
Clark Tomlinson
62286f00a1 fixing setting page titles 2015-06-11 11:39:34 -04:00
Robin Appelman
5a5639ab76 tests for getNodeForPath with invalid path 2015-06-11 17:25:06 +02:00
Vincent Petry
d256425aba Truncate preview resolution 
This prevents having float numbers appear in the URL
 2015-06-11 17:17:40 +02:00
Robin Appelman
05cecb101d verify path when getting a node for sabredav 2015-06-11 17:11:33 +02:00
Vincent Petry
cda9685c0e Merge pull request #16883 from owncloud/revert-16880-webdav-verify-path 
Revert "verify path when getting a node for sabredav"
 2015-06-11 15:27:53 +02:00
Vincent Petry
f13a2d9251 Revert "verify path when getting a node for sabredav" 2015-06-11 15:25:06 +02:00
Vincent Petry
e5c6a9481f Merge pull request #16880 from owncloud/webdav-verify-path 
verify path when getting a node for sabredav
 2015-06-11 15:17:15 +02:00
Lukas Reschke
dbe344ef3d Merge pull request #16879 from jcfischer/jcf_fix_user_delete_message 
Fix error message and add 'user' to it
 2015-06-11 14:53:50 +02:00
Robin Appelman
4d10dab813 verify path when getting a node for sabredav 2015-06-11 14:12:04 +02:00
Jens-Christian Fischer
bffadd069d Fix test message and add 'user' to it 2015-06-11 13:44:38 +02:00
Lukas Reschke
fee52f7f44 Merge pull request #16872 from owncloud/missing-nullcache-import 
Correctly import NullCache class
 2015-06-11 13:35:45 +02:00
Jens-Christian Fischer
0013c4115e Fix error message and add 'user' to it 2015-06-11 13:02:47 +02:00