mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
24,577 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

24577 Commits

Author SHA1 Message Date
Roeland Jago Douma 02269b6464 Added unit test 2015-04-28 14:00:36 +02:00
Roeland Jago Douma 73bb3a22f6 Password set via OCS API should not be double escaped 2015-04-28 10:33:19 +02:00
Thomas Müller 9108c103b2 Merge pull request #15903 from owncloud/issue-15899-fix-getfoortfolder-doc 
Fix return type of the getRootFolder() method
 2015-04-28 10:04:15 +02:00
Joas Schilling 7c65448377 Fix return type of the getRootFolder() method 2015-04-28 09:36:29 +02:00
Jenkins for ownCloud 6679ef287a [tx-robot] updated from transifex 2015-04-28 01:54:44 -04:00
Morris Jobke 24bb4e3f6f Merge pull request #15893 from owncloud/files-fixnewfilevalidation 
Fix file name validation in New menu
 2015-04-27 22:59:14 +02:00
Lukas Reschke 28ecc1e9d4 Merge pull request #15891 from owncloud/LukasReschke-patch-1 
Rephrase "TL;DR"
 2015-04-27 19:50:11 +02:00
Vincent Petry 69f88b38c9 Fix file name validation in New menu 2015-04-27 16:31:18 +02:00
Lukas Reschke 4006c1c3d9 Simplify even more 2015-04-27 15:39:37 +02:00
Thomas Müller eb0e9e5646 Merge pull request #15890 from owncloud/fix-helper-docs 
Fix several type(hint) errors in private/helper.php
 2015-04-27 15:28:50 +02:00
Lukas Reschke 69c041cb63 Rephrase "TL;DR" 
"TL;DR" seems not to be understood or respected by everyone. Maybe we should do a try with "Important". Open for alternative suggestions.
 2015-04-27 15:19:29 +02:00
Thomas Müller 3b54161164 Merge pull request #15887 from owncloud/issue-15885-empty-getenv-path 
Can't use function return value in write context
 2015-04-27 15:16:27 +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
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
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
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
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 49df8ef525 Update encryption.php 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 238302ee7d fixed name 2015-04-24 16:44:00 +02:00