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

1977 commits

Author SHA1 Message Date
Andreas Fischer
4f6ecd3da6 \OC\Connector\Sabre\CopyEtagHeaderPlugin constructor does not take arguments. 2015-05-07 12:24:06 +02:00
Thomas Müller
2344298954 Merge pull request #16035 from owncloud/issue-15975-occ-encryption-enable-warning-no-module 
Display a message when there is a problem with the default module
 2015-05-07 12:03:30 +02:00
Joas Schilling
aea734aaf1 Fix missing types on doc block and deduplicate the method name 2015-05-06 14:31:10 +02:00
Bjoern Schiessle
dc39bda870 move/copy from storage 2015-05-06 14:20:02 +02:00
Bjoern Schiessle
83ed4ee5b6 unit tests 2015-05-06 12:28:15 +02:00
Morris Jobke
874d35b27a Merge pull request #16070 from owncloud/enc_update_file_cache_on_copy 
make sure that we keep the correct encrypted-flag and the (unencrypted)size
 2015-05-06 10:28:10 +02:00
Bjoern Schiessle
7089af96f2 make sure that we keep the correct encrypted-flag and the (unencrypted)size if a file gets copied 2015-05-05 16:17:14 +02:00
Jan-Christoph Borchardt
2aaafc134c Merge pull request #16064 from owncloud/fix-empty-mail-address 
Allow user to set an empty email address
 2015-05-05 14:51:53 +02:00
Joas Schilling
d36d14366b Add test for setEmailAddress 2015-05-05 13:53:00 +02:00
Morris Jobke
493844eda4 add positive tests for operator in code checker 2015-05-05 13:09:12 +02:00
Thomas Müller
aae098c24a Check usage of != and == - refs #16054 2015-05-05 12:59:33 +02:00
Joas Schilling
59c657da53 Merge pull request #15772 from owncloud/issue-15771-dont-restrict-permissions-for-share-owner 
Do not restrict permissions for the original owner
 2015-05-04 15:07:37 +02:00
Joas Schilling
10144bd7f5 Display a message when there is a problem with the default module 2015-05-04 12:36:50 +02:00
Thomas Müller
7376ea9b26 Merge pull request #15584 from owncloud/enc_fix_upload_shared_folder 
skip user if we don't have a public key
 2015-05-04 09:57:19 +02:00
Robin Appelman
ba7d221cff allow getting the path from the lockedexception 2015-04-30 14:48:42 +02:00
Robin Appelman
8119b8b040 add tests for castrait 2015-04-30 14:48:39 +02:00
Robin Appelman
96f9573a4b add memcache based shared/exclusive locking 2015-04-30 14:48:39 +02:00
Robin Appelman
acf30ede95 add compare and swap to memcache 2015-04-30 14:48:39 +02:00
Robin Appelman
29213b6136 extends memcache with add, inc and dec 2015-04-30 14:48:36 +02:00
Joas Schilling
cf4a6874fb Allow setting protected properties 2015-04-30 12:04:02 +02:00
Joas Schilling
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
Morris Jobke
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
Morris Jobke
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
Lukas Reschke
34d0e610cc Filter potential dangerous filenames for avatars 
We don't want to have users misusing this API resulting in a potential file disclosure of "avatar.(jpg|png)" files.
 2015-04-28 16:57:23 +02:00
Joas Schilling
b55ef51a27 Add tests for the correct share id on the call aswell 2015-04-28 14:56:13 +02:00
Roeland Jago Douma
02269b6464 Added unit test 2015-04-28 14:00:36 +02:00
Joas Schilling
02c60949dd make scrutinizer happy 2015-04-28 11:28:54 +02:00
Joas Schilling
d146c13abd Add tests for the remote sharing url 2015-04-28 11:28:54 +02:00
Morris Jobke
de8c15e1a4 Merge pull request #14764 from owncloud/shared-etag-propagate 
Propagate etags across shared storages
 2015-04-28 10:58:50 +02:00
Thomas Müller
7d0eba7a41 Merge pull request #15886 from owncloud/fix-15848-master 
Adjust isLocal() on encryption wrapper
 2015-04-27 15:06:26 +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
Thomas Müller
936d564058 fixes #15848 2015-04-27 14:26:05 +02:00
Robin Appelman
6bf0579622 fix test 2015-04-27 14:07:16 +02:00
Robin Appelman
be55a90323 dont use our now non existing hook 2015-04-27 14:07:15 +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
8f61fbb81f Fix new tests 2015-04-27 11:10:31 +02:00
Joas Schilling
e4977841b4 Add unit tests for the commands 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
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
Lukas Reschke
b9df932e3c Merge pull request #15683 from owncloud/block-legacy-clients 
Block old legacy clients
 2015-04-24 18:21:10 +02:00
Bjoern Schiessle
9a5783b284 fix unit tests 2015-04-24 16:47:27 +02:00
jknockaert
4554df2512 enable testWriteWriteRead 2015-04-24 16:44:00 +02:00
jknockaert
18a1225b0c enable testRewind 2015-04-24 16:44:00 +02:00
jknockaert
27ea23ea6b Update encryption.php 2015-04-24 16:44:00 +02:00
jknockaert
d6841aa706 disable r+ test 2015-04-24 16:44:00 +02:00
jknockaert
7a34f75da6 add two tests 
testRewind tests reading and writing after rewind on an encrypted stream; testWriteWriteRead tests r+ mode
 2015-04-24 16:44:00 +02:00
Joas Schilling
4334e77035 Merge pull request #15839 from owncloud/enc_fix_moving_shared_files 
[encryption] fix moving files to a shared folder
 2015-04-24 15:07:36 +02:00