10135 commits

Author	SHA1	Message	Date
Lukas Reschke	d01a2acbcf	Merge pull request #15469 from owncloud/fix/15463 ... Fix language level incompatibilties	2015-04-08 14:30:56 +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
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
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
Bjoern Schiessle	215a9bcbc3	fix function call	2015-04-08 09:32:55 +02:00
Clark Tomlinson	4098f5f7fd	adding test for user hooks	2015-04-07 11:49:50 -04:00
Thomas Müller	a4483243ac	fixing license headers - encryption code related	2015-04-07 17:02:49 +02:00
Thomas Müller	54a3bdf1c5	fixing unit test execution related to trashbin	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	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
Bjoern Schiessle	9a7fbbbc5a	fix versions 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
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
Bjoern Schiessle	fac7ec3fc4	fix re-shares with encryption	2015-04-07 13:30:30 +02:00
Bjoern Schiessle	60d8a39f03	store init status per user	2015-04-07 13:30:30 +02:00
Bjoern Schiessle	8b1a12a224	use loginHelper from base class	2015-04-07 13:30:30 +02:00
Bjoern Schiessle	391fab35f0	reset storage for each unit test	2015-04-07 13:30:30 +02:00
Thomas Müller	4c899238e9	fixing unit test execution	2015-04-07 13:30:30 +02:00
Clark Tomlinson	e507dc11a0	adding util test and reducing keymanager instances to one in test	2015-04-07 13:30:30 +02:00
Bjoern Schiessle	2511c32e61	add more descriptive message to the exception, will be displayed to the user	2015-04-07 13:30:30 +02:00
Bjoern Schiessle	ee53ba5ed6	remove encryption specific code from files app	2015-04-07 13:30:30 +02:00
Bjoern Schiessle	5ea94b7c45	add priority to trashbin storage wrapper so that he is always on top	2015-04-07 13:30:30 +02:00
Thomas Müller	664b2bb7af	cleaning up exception mess	2015-04-07 13:30:30 +02:00
Bjoern Schiessle	de4ec21c39	work arround to make sure that shares are initialized only once	2015-04-07 13:30:30 +02:00
Thomas Müller	feb9a6e216	Set human readable module ids	2015-04-07 13:30:30 +02:00
Thomas Müller	43c0af2580	Fix shouldEncrypt and don't throw exception id fileKey not present - can happen	2015-04-07 13:30:30 +02:00
Bjoern Schiessle	a057108c0c	make recovery key work	2015-04-07 13:30:30 +02:00
Thomas Müller	cac83642f2	Finally fixing encryption with public share	2015-04-07 13:30:30 +02:00
Thomas Müller	d203296e35	only encrypt files and files_versions	2015-04-07 13:30:30 +02:00
Thomas Müller	035646c0f6	fix exception handling	2015-04-07 13:30:30 +02:00
Bjoern Schiessle	d90663704c	fix hook registration	2015-04-07 13:30:29 +02:00
Clark Tomlinson	505e0eaf61	remove useless setup base class	2015-04-07 13:30:29 +02:00
Clark Tomlinson	1fb29ec546	adding hook manager test	2015-04-07 13:30:29 +02:00
Bjoern Schiessle	c9ca068427	keyManagerTest: remove code which is no longer needed	2015-04-07 13:30:29 +02:00
Bjoern Schiessle	4efbcb0280	cleanup keymanager test and add some additional tests	2015-04-07 13:30:29 +02:00
Bjoern Schiessle	dac94679c6	delete recovery keys on disable	2015-04-07 13:30:29 +02:00
Clark Tomlinson	ea6b53042d	fixing test helper and undoing fubar in class...	2015-04-07 13:30:29 +02:00
Clark Tomlinson	48e3864c77	💯% coverage for session class	2015-04-07 13:30:29 +02:00
Bjoern Schiessle	1358d07d35	let user enable recovery key	2015-04-07 13:30:29 +02:00
Bjoern Schiessle	e4895bda01	add helper class accessible for encryption modules to ask for a list of users with access to a file, needed to apply the recovery key to all files	2015-04-07 13:30:29 +02:00
Thomas Müller	bd933b1c85	Adding app icon and fixing admin setting	2015-04-07 13:30:29 +02:00
Bjoern Schiessle	6bd83c0422	register settings and hooks only once	2015-04-07 13:30:29 +02:00
Bjoern Schiessle	4b4aeaa5b2	fix set recovery key and implement change password	2015-04-07 13:30:29 +02:00
Thomas Müller	a98b7dbf6f	Fix double registration of encryption module	2015-04-07 13:30:29 +02:00