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

133 commits

Author SHA1 Message Date
Björn Schießle
7cfb0dc406 Merge branch 'master' into files_encryption_check_private_key 
Conflicts:
	apps/files_encryption/appinfo/app.php
	apps/files_encryption/lib/util.php
 2013-06-13 13:17:35 +02:00
Björn Schießle
bc2862fcb9 Merge branch 'master' into files_encryption_upgrade_fix 2013-06-13 12:53:29 +02:00
Björn Schießle
2b179ccff0 Merge pull request #3668 from owncloud/encryption_migrate_only_once 
make sure that only one process can enter the migration mode
 2013-06-13 03:31:31 -07:00
Björn Schießle
2f1005f05f LegacyKeyRecryptKeyfileEncrypt() no longer exists, so test can be removed 2013-06-13 10:44:05 +02:00
Björn Schießle
6394fedb33 add comment to explain the helper function 2013-06-13 10:35:30 +02:00
Björn Schießle
27fcdb3af5 Merge branch 'master' into files_encryption_upgrade_fix 
Conflicts:
	apps/files_encryption/tests/crypt.php
 2013-06-12 20:53:45 +02:00
Björn Schießle
df78085171 adapt test to the code changes 2013-06-12 14:00:53 +02:00
Björn Schießle
20ddd6e1c7 Merge branch 'master' into files_encryption_check_private_key 
Conflicts:
	apps/files_encryption/tests/crypt.php
 2013-06-11 15:19:02 +02:00
Jörn Friedrich Dreyer
c70a0f791d allow 30 sec for testDeleteFile 2013-06-10 14:45:39 +02:00
Björn Schießle
13017ce9e1 Merge branch 'master' into files_encryption_check_private_key 
Conflicts:
	settings/ajax/changepassword.php
 2013-06-10 12:12:07 +02:00
Jörn Friedrich Dreyer
b6f8d2b859 raise failed tests from first commit to size @medium 2013-06-10 10:17:47 +02:00
Jörn Friedrich Dreyer
73fb722a9e add timeouts 3/30/90 to phpunit tests 2013-06-10 09:31:22 +02:00
Florin Peter
dc8bcf0688 reformat code 2013-06-03 18:42:13 +02:00
Björn Schießle
1e601cd6f1 use generated private key fro m setUp() 2013-06-03 17:43:06 +02:00
Björn Schießle
35c91ff901 added test for decryptPrivateKey() 2013-06-03 17:34:43 +02:00
Björn Schießle
42f66af5a3 control files are no longer needed, remove them from the tests 2013-06-03 14:21:30 +02:00
Florin Peter
46e5e9bd73 cleanup unused method legacyKeyRecryptKeyfile 2013-05-31 22:49:32 +02:00
Florin Peter
d85a10ebc5 fix broken tests 2013-05-31 20:55:05 +02:00
Florin Peter
1bfe975938 Merge branch 'master' into files_encryption_upgrade_fix 
Conflicts:
	apps/files_encryption/lib/util.php
 2013-05-31 12:58:12 +02:00
Florin Peter
ccdfb59426 fix legacy key in until test 2013-05-31 01:55:48 +02:00
Florin Peter
313631edf6 Merge branch 'master' into file_encryption_external_storage_fixes 
Conflicts:
	apps/files_encryption/hooks/hooks.php
 2013-05-30 00:45:29 +02:00
Florin Peter
df41a60c50 fixed typo 2013-05-29 20:11:53 +02:00
Florin Peter
c398fc59ad Merge branch 'master' into remove_unused_vars 
Conflicts:
	apps/files_encryption/hooks/hooks.php
	apps/files_encryption/lib/proxy.php
	apps/files_encryption/lib/session.php
	apps/files_encryption/lib/stream.php
 2013-05-29 09:21:00 +02:00
Florin Peter
6ae7bde788 fixed encryption session namespace to avoid problems 2013-05-28 17:04:35 +02:00
Robin Appelman
44f9af5a7f Use the new session wrapper 2013-05-28 01:04:09 +02:00
Florin Peter
6075aff687 changed basic auth to test user 2013-05-27 20:32:59 +02:00
Björn Schießle
2c3c60c1af Merge branch 'master' into remove_unused_vars 
Conflicts:
	apps/files_encryption/hooks/hooks.php
	apps/files_encryption/lib/crypt.php
	apps/files_encryption/lib/proxy.php
 2013-05-27 18:09:35 +02:00
Björn Schießle
df22a7c495 make legacyDecrypt() private als always call legacyBlockDecrypt() from other classes 2013-05-27 17:35:28 +02:00
Björn Schießle
710e9c2d14 fix tests, after unused variables are removed 2013-05-27 15:34:57 +02:00
Florin Peter
9dd277576a added users for tests 
reformat code to meet coding guidelines
 2013-05-26 20:44:15 +02:00
Florin Peter
c7981abbc9 improved test 
- fixed testPermanentDeleteFile sometimes failed
- speed optimization
- reformat code
 2013-05-26 03:22:16 +02:00
Florin Peter
fba7200b05 improved trashbin test again 2013-05-24 23:12:16 +02:00
Florin Peter
b32823a96e improved trashbin test 2013-05-24 23:12:07 +02:00
Florin Peter
46c784ccdf added trash bin tests 2013-05-22 23:51:35 +02:00
Florin Peter
afbfa742d7 improved tests 2013-05-22 01:11:55 +02:00
Florin Peter
095fc790ac added webdav test 2013-05-21 21:09:39 +02:00
Björn Schießle
64591cf754 move 3rdparty dependencies to app 2013-05-21 10:30:24 +02:00
Florin Peter
c9e862ccba fix broken tests 2013-05-21 07:19:23 +02:00
Florin Peter
4bf840e2ca cleanup unused code optimize tests 2013-05-21 00:00:55 +02:00
Florin Peter
f2b1158add improved tests 2013-05-20 23:44:10 +02:00
Florin Peter
1c8e5d6873 added test for failed sharing 2013-05-20 21:46:28 +02:00
Florin Peter
171b9a4702 added legacy encryption test 2013-05-20 21:19:28 +02:00
Florin Peter
3b850a2524 reformat code added and changed phpdoc 2013-05-20 01:24:36 +02:00
Florin Peter
dc39ef378e changed recovery_enabled and migration_status columns to integer and fix tests 2013-05-20 00:38:23 +02:00
Florin Peter
bdd2127f19 cleanup tests 2013-05-19 22:28:48 +02:00
Florin Peter
227b122947 fixed again key-manager tests 2013-05-18 22:25:47 +02:00
Florin Peter
e0e89602a2 fixed key-manager tests 2013-05-18 22:00:35 +02:00
Florin Peter
80f9c5bb6d removed mockery from tests and changed class names 2013-05-18 21:37:00 +02:00
Florin Peter
41165afa59 improved tests 2013-05-17 22:45:09 +02:00
Florin Peter
b6572cedac added folder move test 2013-05-17 22:16:56 +02:00