Commit Graph

24094 Commits

Author SHA1 Message Date
Clark Tomlinson fc2711e156 Merge pull request #15472 from owncloud/enc_backward_compatibility
make private key handling backward compatible
2015-04-08 09:38:27 -04:00
Morris Jobke 103d451459 Merge pull request #14987 from rullzer/ocs_password_fix2
OCS Fixes to allow setting of password without removing additional settings
2015-04-08 14:44:17 +02:00
Lukas Reschke d01a2acbcf Merge pull request #15469 from owncloud/fix/15463
Fix language level incompatibilties
2015-04-08 14:30:56 +02:00
Bjoern Schiessle 4ce5669419 read cipher from key header and always write a key header if a new private key is stored 2015-04-08 14:26:00 +02:00
Vincent Petry 69ba67ec0f Merge pull request #15464 from owncloud/fixmasterunittests
Replace originalStorage in tests with a proper teardown
2015-04-08 14:24:42 +02:00
Lukas Reschke c3c50fb481 Fix language level incompatibilties
Arbitrary expressions in empty are allowed in PHP 5.5 ands upwards. Seems to only affect master.

Fixed https://github.com/owncloud/core/issues/15463
2015-04-08 13:55:10 +02:00
Vincent Petry c12dd2820c Merge pull request #15465 from owncloud/issue/15456-disable-ocs-maintenance
Disable OCS api when in maintenance mode
2015-04-08 13:29:49 +02:00
Thomas Müller 19834211b4 Merge pull request #15443 from owncloud/encryption-user-hook-tests
adding test for user hooks
2015-04-08 12:56:18 +02:00
Joas Schilling f7dd16f1ac Disable OCS api when in maintenance mode 2015-04-08 12:51:20 +02:00
Vincent Petry f8cfc03f36 Replace originalStorage in tests with a proper teardown
The purpose of $originalStorage in unit tests was to remount the old
root.
However that storage itself is already wrapped by storage wrapper, so
remounting it would rewrap the storage several times.

This fix makes use of "loginAsUser()" and "logout()" from the TestCase
class to properly initialize and cleanup the FS as expected.
2015-04-08 12:45:38 +02:00
Morris Jobke 59322a5037 Merge pull request #15333 from owncloud/copy-cross-device
fix copying folder across devices
2015-04-08 12:35:15 +02:00
Morris Jobke dfc0a26e57 Merge pull request #15453 from owncloud/enc2_fix
fix function call
2015-04-08 11:10:00 +02:00
Bjoern Schiessle 215a9bcbc3 fix function call 2015-04-08 09:32:55 +02:00
Morris Jobke 6c327f8331 Merge pull request #14879 from oparoz/fix-preview-caching
Introducing the maximum size preview
2015-04-07 18:16:24 +02:00
Clark Tomlinson 4098f5f7fd adding test for user hooks 2015-04-07 11:49:50 -04:00
Morris Jobke d28d7c470f Merge pull request #15441 from owncloud/fix-file-headers-master
fixing license headers - encryption code related
2015-04-07 17:15:17 +02:00
Thomas Müller a4483243ac fixing license headers - encryption code related 2015-04-07 17:02:49 +02:00
Thomas Müller 1fbf5d86df Merge pull request #14472 from owncloud/feature/wipencryptionapp
encryption 2.0 app
2015-04-07 16:46:45 +02:00
Olivier Paroz 74bf9806b0 Introducing the maximum size preview
The first time we're asked to generate a preview we'll generate one of the maximum dimension indicated in the configuration and all future resizing requests will be done on that preview in order to not waste time converting the same file over and over.

One of the fixes required for #12465
2015-04-07 16:45:59 +02:00
Thomas Müller 2d2cb09715 fixing unit test - expected value change due to different size being stored in cache table 2015-04-07 14:30:01 +02:00
Morris Jobke 2182ae0d27 Merge pull request #15431 from owncloud/displayname-width
widen displayName input field
2015-04-07 14:24:01 +02:00
Thomas Müller 161d80da5b In case of encryption exceptions we return 503 - this will allow the client to retry 2015-04-07 14:17:42 +02:00
Morris Jobke 6cc3fd9270 Merge pull request #15426 from owncloud/issue/15420-remove-hardcoded-docs-link
Remove hardcoded link to performance docs
2015-04-07 13:47:35 +02:00
Thomas Müller 54a3bdf1c5 fixing unit test execution related to trashbin 2015-04-07 13:30:31 +02:00
Thomas Müller 268d346b36 fixing unit tests 2015-04-07 13:30:31 +02:00
Thomas Müller 4a70ca665c respect mount option while encrypting 2015-04-07 13:30:31 +02:00
Clark Tomlinson d637bffac6 adding user setup test and adding 4 tests to keymanager 2015-04-07 13:30:31 +02:00
Clark Tomlinson 28c8017928 adding recoverFileTest 2015-04-07 13:30:31 +02:00
Clark Tomlinson c7c3caedf5 adding recovery tests 2015-04-07 13:30:31 +02:00
Thomas Müller fce42a3161 fixing unit test execution - test dummy module was behaving wrong 2015-04-07 13:30:31 +02:00
Thomas Müller 870c53ee37 fixing unit test execution 2015-04-07 13:30:31 +02:00
Thomas Müller 111fbabfb4 PHPDoc cleanup - clean code \o/ 2015-04-07 13:30:31 +02:00
Bjoern Schiessle b9e4e61759 userRecovery() was replaced by setRecoveryForUser() 2015-04-07 13:30:31 +02:00
Thomas Müller 69e95531f8 comment change as it broke unit tests 2015-04-07 13:30:31 +02:00
Thomas Müller ba9a797eaa Encryption storage wrapper is enabled by default - necessary to detect encrypted files even if encryption was disabled after files have been encrypted - prevents data corruption 2015-04-07 13:30:31 +02:00
Bjoern Schiessle 9a7fbbbc5a fix versions tests 2015-04-07 13:30:31 +02:00
Bjoern Schiessle 3d7404fe68 add unit tests to the keystorage 2015-04-07 13:30:31 +02:00
Bjoern Schiessle fe74a0cb4f implement webdav copy 2015-04-07 13:30:31 +02:00
Thomas Müller 8991272269 Using stream_get_contents in file_get_contents implementation + close handle 2015-04-07 13:30:31 +02:00
jknockaert ff16e3dbff Adjusting count on read 2015-04-07 13:30:31 +02:00
Thomas Müller 3e3226da4c Properly set size and unencrypted size in the stream unit tests 2015-04-07 13:30:31 +02:00
Bjoern Schiessle a7e7151364 remove unused code 2015-04-07 13:30:31 +02:00
Bjoern Schiessle e8fa3a2370 fix versions download and previews 2015-04-07 13:30:31 +02:00
Thomas Müller b3c5ef3afe Adding unit test for read and write of big file 2015-04-07 13:30:31 +02:00
jknockaert 02404a6a8c Fixing encryption stream wrapper seek - thanks @jknockaert 2015-04-07 13:30:30 +02:00
Thomas Müller 104d11ec4c Fixing encryption storage wrapper tests 2015-04-07 13:30:30 +02:00
Thomas Müller d9c41b00ab Introducing trait LocalTempFileTrait 2015-04-07 13:30:30 +02:00
Bjoern Schiessle d3e887a7cf reset init status before login 2015-04-07 13:30:30 +02:00
Thomas Müller 8cf9b423d5 cleanup 2015-04-07 13:30:30 +02:00
Thomas Müller e8e5bd61ae fixing unit tests for encryption stream wrapper seek 2015-04-07 13:30:30 +02:00