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
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
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
Joas Schilling
afa030c561
Check the query() for all defined services
2015-06-11 12:28:30 +02:00
Joas Schilling
4582d14832
Order all use statements correctly
2015-06-11 11:29:27 +02:00
Joas Schilling
05f1ff8715
Correctly import NullCache class
2015-06-11 10:48:30 +02:00
Morris Jobke
672b8752e4
Merge pull request #16869 from owncloud/php7
...
Null -> NullCache
2015-06-11 09:29:49 +02:00
Jenkins for ownCloud
88d3c9ad40
[tx-robot] updated from transifex
2015-06-11 01:55:05 -04:00
Thomas Müller
3090348bf7
Null -> NullCache
2015-06-11 00:44:13 +02:00
Thomas Müller
48e915c7be
Revert "Null -> NullCache"
...
This reverts commit ff24554e76
.
2015-06-11 00:40:26 +02:00
Thomas Müller
ff24554e76
Null -> NullCache
2015-06-11 00:34:03 +02:00
Morris Jobke
5ccacb9b38
Merge pull request #16860 from owncloud/fix-appmenu
...
fix app menu not showing on mobile, fix #16844
2015-06-10 16:18:31 +02:00
Morris Jobke
be6ba653ea
Merge pull request #16814 from owncloud/improve-repair
...
Reduce amount of rows to update
2015-06-10 15:57:21 +02:00
Jan-Christoph Borchardt
a8b51fdcbd
fix app menu not showing on mobile, fix #16844
2015-06-10 13:43:12 +02:00
Thomas Müller
4747c7f509
Merge pull request #16736 from owncloud/utilize-member-of
...
Utilize memberOf to boost loading time on users page (depending on LDAP server config)
2015-06-10 08:47:53 +02:00
Jenkins for ownCloud
4d88302b3a
[tx-robot] updated from transifex
2015-06-10 01:54:55 -04:00
Thomas Müller
5f4f7e69cf
Merge pull request #16810 from owncloud/disable-search-if-not-implemented
...
Disable search field in case there is no search available to the curr…
2015-06-09 23:49:25 +02:00