4dd8a22e51
also add title to multiselect create new element, fix #15954
2015-05-01 13:47:37 -04:00
6b691e3840
Merge pull request #15937 from owncloud/file-locking
...
Add memcache based shared/exclusive locking
2015-05-01 17:47:23 +02:00
eda4d45836
[tx-robot] updated from transifex
2015-05-01 01:54:43 -04:00
8f117cb89b
Merge pull request #15993 from owncloud/admin-documentation
...
add admin documentation links for Sharing, Encryption and Email server
2015-05-01 00:15:06 +02:00
9ec80377e6
fix layout for documentation link hints
2015-04-30 17:12:34 -04:00
8b37e25ec2
add admin documentation links for Sharing, Encryption and Email server
2015-04-30 17:10:24 -04:00
ca8b6f24cb
Merge pull request #15955 from owncloud/move-dummy-encryption
...
Moving encryption_dummy to the apps repo
2015-04-30 18:14:01 +02:00
e14540c1f1
Merge pull request #15972 from owncloud/enable-scrutinizer-code-coverage
...
Enable code coverage on scrutinizer
2015-04-30 18:12:36 +02:00
972e189605
Use moveFromStorage instead of streamCopy when restoring version
2015-04-30 16:15:18 +02:00
2228faaa39
Fix version rollback to keep fileid
2015-04-30 16:15:18 +02:00
41d7870d7b
Merge pull request #15964 from owncloud/fix-l10n-string-warn
...
Fix #15962
2015-04-30 15:55:40 +02:00
ba7d221cff
allow getting the path from the lockedexception
2015-04-30 14:48:42 +02:00
8119b8b040
add tests for castrait
2015-04-30 14:48:39 +02:00
a40a237441
use trait for cas polyfill for xcache
2015-04-30 14:48:39 +02:00
96f9573a4b
add memcache based shared/exclusive locking
2015-04-30 14:48:39 +02:00
acf30ede95
add compare and swap to memcache
2015-04-30 14:48:39 +02:00
29213b6136
extends memcache with add, inc and dec
2015-04-30 14:48:36 +02:00
42097bfc6a
Merge pull request #15968 from owncloud/enc-wrapper-presetup
...
use the preSetup hook to ensure the encryption wrapper is applied correctly
2015-04-30 14:14:31 +02:00
d0ad69aa9c
use the preSetup hook to ensure the encryption wrapper is applied correctly
2015-04-30 13:28:06 +02:00
4ef797f649
Enable code coverage on scrutinizer
2015-04-30 13:18:15 +02:00
360d0e3e5e
fix #15962
2015-04-30 12:44:45 +02:00
4a6808a0f4
Simplify the test
2015-04-30 12:04:02 +02:00
cf4a6874fb
Allow setting protected properties
2015-04-30 12:04:02 +02:00
4ef9df8750
skip user if we don't have a public key
2015-04-30 12:04:02 +02:00
fbba7a61cb
Use internally \OCP\ILogger instead of \OC\Log
...
* this is the preparation for some upcoming logger related changes
* also fixes an issue in the public interface where we request
an internal class as parameter
2015-04-30 11:52:30 +02:00
31b65749dd
Allow setting protected properties
2015-04-30 11:38:53 +02:00
70a44621be
check recovery setting for the right user
2015-04-30 11:38:53 +02:00
d308ec4f0e
Merge pull request #15949 from owncloud/l10n-string-json
...
Implement json serialize for l10n string
2015-04-30 11:11:16 +02:00
7795265d93
Moving encryption_dummy to the apps repo - fixes #15950
2015-04-30 10:51:51 +02:00
b9c1bf26ee
Merge pull request #15951 from owncloud/fix-install-again
...
Make command optional
2015-04-30 10:45:23 +02:00
08aef98e11
Merge pull request #15946 from owncloud/auto-controller-resolve
...
Make controller automatically assemblable
2015-04-30 10:12:17 +02:00
8bc9c56dcf
Merge pull request #15947 from owncloud/add-title-to-multiselect
...
add title to multiselect list items so longer group names are visible
2015-04-30 10:04:43 +02:00
ae853445ef
[tx-robot] updated from transifex
2015-04-30 03:27:57 -04:00
9205a9b52e
Merge pull request #15942 from owncloud/revert-15875-multiline-buttons
...
Revert "fix layout for multiline buttons which are <a class='button'>"
2015-04-30 08:25:43 +02:00
4209757d61
Merge pull request #15919 from owncloud/enc_handle_empty_files
...
Encryption improve handling of empty and unencrypted files
2015-04-29 19:32:02 -04:00
7c0dc06c10
make command optional
2015-04-29 22:53:16 +02:00
1e58538f0e
add aliases to pascal case constructor paramters to make it possible to auto assemble controllers
2015-04-29 22:29:45 +02:00
5b857a6eab
implement json serialize for l10n string
2015-04-29 21:22:42 +02:00
8955f38e55
Merge pull request #15926 from owncloud/install-empty-pw
...
Make it possible to pass empty database passwords to install command
2015-04-29 21:19:28 +02:00
3dfa05c0d0
add title to multiselect list items so longer group names are visible, fix #15819
2015-04-29 13:53:29 -04:00
9ecfc7c237
Revert "fix layout for multiline buttons which are <a class='button'>"
2015-04-29 11:53:46 -04:00
b0d1d61db2
default to an empty string for database password if ommited
...
fix null passwords
remove password trimming
2015-04-29 15:39:51 +02:00
f524ae261a
Ignore "parent" shares when the sharee is the owner of the reshare-source
2015-04-29 14:18:46 +02:00
3c37cbdfe7
Correctly select file cache values also when checking group shares
2015-04-29 14:12:12 +02:00
09d479e79d
Add a test to share a subfolder of a folder shared with the owner by group
2015-04-29 13:33:20 +02:00
002d74f95a
Merge pull request #15908 from owncloud/fix-replace-with-sed
...
Replace `replace` with `sed` statement
2015-04-29 12:28:23 +02:00
8c7db2536d
Merge pull request #15596 from owncloud/issue/15589
...
Correctly generate the feedback URL for remote share
2015-04-29 10:52:43 +02:00
7df7a3b360
Merge pull request #15906 from rullzer/fix_15777
...
Password set via OCS API should not be double escaped
2015-04-29 10:44:25 +02:00
93cf51389a
Added unit test for reshare by share owner
2015-04-29 10:34:37 +02:00
4d53706d4c
Do not restrict permissions for the original owner
2015-04-29 10:34:36 +02:00
Jan-Christoph Borchardt
Thomas Müller
Jenkins for ownCloud
Morris Jobke
Vincent Petry
Robin Appelman
Bernhard Posselt
Joas Schilling
Bjoern Schiessle
Joas Schilling
Clark Tomlinson