Commit graph

24950 commits

Author SHA1 Message Date
Joas Schilling
db6395ae20 Fix several type(hint) errors in private/helper.php 2015-04-27 14:45:05 +02:00
Thomas Müller
678b7d7e4d Merge pull request #15860 from owncloud/enc_fallback_old_encryption
[encryption] handle encrypted files correctly which where encrypted with a old version of ownCloud (<=oc6)
2015-04-27 14:32:19 +02:00
Joas Schilling
1341d03455 Can't use function return value in write context 2015-04-27 14:28:31 +02:00
Thomas Müller
936d564058 fixes #15848 2015-04-27 14:26:05 +02:00
Morris Jobke
93c25a1f4a Merge pull request #15882 from owncloud/fix-type-annotation
Fix type annotation
2015-04-27 14:17:59 +02:00
Robin Appelman
0789a6433e safer teardown 2015-04-27 14:07:16 +02:00
Robin Appelman
32067f9e80 use microtime to prevent race conditions 2015-04-27 14:07:16 +02:00
Robin Appelman
83b8ac0d7b cleanup hooks 2015-04-27 14:07:16 +02:00
Robin Appelman
6bf0579622 fix test 2015-04-27 14:07:16 +02:00
Robin Appelman
2e897f05b1 triger propagation for webdav uploads
use post hooks for share etag propagator
2015-04-27 14:07:16 +02:00
Robin Appelman
dd9601ae8f fix merge 2015-04-27 14:07:16 +02:00
Robin Appelman
45784f213f fix propagation when renaming a directly reshared folder 2015-04-27 14:07:16 +02:00
Robin Appelman
f488624e5f minor fixes 2015-04-27 14:07:16 +02:00
Robin Appelman
526ea3fcba add rename hook for propagation 2015-04-27 14:07:16 +02:00
Robin Appelman
77fbb4125b propagate changes up reshares 2015-04-27 14:07:16 +02:00
Robin Appelman
8cb40f6043 Make sure the owner mountpoints are setup 2015-04-27 14:07:16 +02:00
Robin Appelman
d5434c9c4e more propagation tests 2015-04-27 14:07:16 +02:00
Robin Appelman
b5c62cdad6 remove duplicates from rebase 2015-04-27 14:07:15 +02:00
Robin Appelman
19486837b2 adjust test 2015-04-27 14:07:15 +02:00
Robin Appelman
be55a90323 dont use our now non existing hook 2015-04-27 14:07:15 +02:00
Robin Appelman
30ad56813a propagate etags for all user of a share 2015-04-27 14:07:15 +02:00
Robin Appelman
518d5aadf5 Allow getting *all* share entries owned by a user 2015-04-27 14:07:15 +02:00
Robin Appelman
849e5521de Make the change propagator an emitter 2015-04-27 14:07:15 +02:00
Robin Appelman
2dc11cf20e unit test for etag propagation across shared storage boundary 2015-04-27 14:07:15 +02:00
Thomas Müller
cc331609bf Merge pull request #15411 from mmattel/fix_for_15375_better_message_text
Improve error messge text for app upgrade try (#15375)
2015-04-27 13:38:16 +02:00
Lukas Reschke
d0363fe396 Fix type annotation
Obviously should be an int
2015-04-27 13:31:18 +02:00
Morris Jobke
6a7b7caa81 Merge pull request #15681 from owncloud/issue/15667-occ-encryption
OCC commands to manage encryption
2015-04-27 13:28:59 +02:00
Vincent Petry
63e2a4a5fa Fix version rename with files and folders
- fix moving folder into another folder
- fix moving file or folder into shared folder as recipient
2015-04-27 13:17:03 +02:00
Bjoern Schiessle
27683f9442 fall back to the ownCloud default encryption module and aes128 if we read a encrypted file without a header 2015-04-27 13:01:18 +02:00
Joas Schilling
e4c24a6b5c Undefined index: default 2015-04-27 12:21:48 +02:00
Joas Schilling
6f5de37f5b Fix module registration 2015-04-27 12:21:27 +02:00
Joas Schilling
25b5adfe87 Fix scrutinizer complain 2015-04-27 11:46:00 +02:00
Joas Schilling
8f61fbb81f Fix new tests 2015-04-27 11:10:31 +02:00
Joas Schilling
a4c314622a Use interface 2015-04-27 11:03:51 +02:00
Joas Schilling
e4977841b4 Add unit tests for the commands 2015-04-27 11:03:51 +02:00
Joas Schilling
5855d23ff9 Make methods explicit public 2015-04-27 11:03:51 +02:00
Joas Schilling
d600955a51 Make getDefaultModuleId public and get module protected 2015-04-27 11:03:51 +02:00
Joas Schilling
4e97228cde Deduplicate module mock 2015-04-27 11:03:51 +02:00
Joas Schilling
4b7ae395f2 Add test for setDefaultEncryptionModule 2015-04-27 11:03:51 +02:00
Joas Schilling
b35379515c Add a test that the default module is returned before we fall back 2015-04-27 11:03:50 +02:00
Joas Schilling
f6d4bdb1fd Add occ commands to manage the encryption modules 2015-04-27 11:03:50 +02:00
Joas Schilling
a09df6d453 Verify that the encryption module exists before setting it 2015-04-27 11:03:50 +02:00
Joas Schilling
802f818c27 Merge pull request #15875 from owncloud/multiline-buttons
fix layout for multiline buttons which are <a class='button'>
2015-04-27 10:04:51 +02:00
Jenkins for ownCloud
e58029f8ad [tx-robot] updated from transifex 2015-04-27 01:54:46 -04:00
Jan-Christoph Borchardt
84b41b3a4b fix layout for multiline buttons which are <a class='button'> 2015-04-26 11:05:51 +02:00
Jenkins for ownCloud
37adf6df01 [tx-robot] updated from transifex 2015-04-26 01:54:49 -04:00
Lukas Reschke
4dfdaf741c Merge pull request #15834 from owncloud/make-temporary-file-really-unique
Fix collision on temporary files + adjust permissions
2015-04-25 23:18:26 +02:00
Jenkins for ownCloud
7855174879 [tx-robot] updated from transifex 2015-04-25 01:55:13 -04:00
Lukas Reschke
b9df932e3c Merge pull request #15683 from owncloud/block-legacy-clients
Block old legacy clients
2015-04-24 18:21:10 +02:00
Vincent Petry
f63a0c99a4 Merge pull request #15774 from owncloud/jknockaert-patch-1
fix encryption header error
2015-04-24 17:24:32 +02:00