nextcloud-server.git - Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into files_encryption_check_private_key	Björn Schießle	2013-06-13	2	-22/+27
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: apps/files_encryption/appinfo/app.php apps/files_encryption/lib/util.php
\| *	Merge branch 'master' into files_encryption_upgrade_fix	Björn Schießle	2013-06-13	1	-3/+26
\| \|\
\| \| *	Merge pull request #3668 from owncloud/encryption_migrate_only_once	Björn Schießle	2013-06-13	1	-3/+26
\| \| \|\ \| \| \| \| \| \| \| \|	make sure that only one process can enter the migration mode
\| \| \| *	add comment to explain the helper function	Björn Schießle	2013-06-13	1	-0/+8
\| \| \| \|
\| \| \| *	adapt test to the code changes	Björn Schießle	2013-06-12	1	-3/+18
\| \| \| \|
\| * \| \|	LegacyKeyRecryptKeyfileEncrypt() no longer exists, so test can be removed	Björn Schießle	2013-06-13	1	-18/+0
\| \| \| \|
\| * \| \|	Merge branch 'master' into files_encryption_upgrade_fix	Björn Schießle	2013-06-12	6	-1/+141
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: apps/files_encryption/tests/crypt.php
\| * \| \|	cleanup unused method legacyKeyRecryptKeyfile	Florin Peter	2013-05-31	1	-17/+0
\| \| \| \|
\| * \| \|	Merge branch 'master' into files_encryption_upgrade_fix	Florin Peter	2013-05-31	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: apps/files_encryption/lib/util.php
\| * \| \| \|	fix legacy key in until test	Florin Peter	2013-05-31	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' into files_encryption_check_private_key	Björn Schießle	2013-06-11	6	-0/+124
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: apps/files_encryption/tests/crypt.php
\| * \| \| \|	allow 30 sec for testDeleteFile	Jörn Friedrich Dreyer	2013-06-10	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	raise failed tests from first commit to size @medium	Jörn Friedrich Dreyer	2013-06-10	1	-0/+3
\| \| \| \| \|
\| * \| \| \|	add timeouts 3/30/90 to phpunit tests	Jörn Friedrich Dreyer	2013-06-10	5	-0/+119
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'master' into files_encryption_check_private_key	Björn Schießle	2013-06-10	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: settings/ajax/changepassword.php
\| * \| \|	fix broken tests	Florin Peter	2013-05-31	1	-1/+1
\| \| \|/ \| \|/\|
* \| \|	reformat code	Florin Peter	2013-06-03	2	-4/+2
\| \| \|
* \| \|	use generated private key fro m setUp()	Björn Schießle	2013-06-03	1	-4/+2
\| \| \|
* \| \|	added test for decryptPrivateKey()	Björn Schießle	2013-06-03	1	-0/+18
\| \| \|
* \| \|	control files are no longer needed, remove them from the tests	Björn Schießle	2013-06-03	1	-6/+0
\|/ /
* \|	Merge branch 'master' into file_encryption_external_storage_fixes	Florin Peter	2013-05-30	2	-4/+4
\|\\| \| \| \| \| \| \| \| \|	Conflicts: apps/files_encryption/hooks/hooks.php
\| *	Merge branch 'master' into remove_unused_vars	Florin Peter	2013-05-29	2	-5/+5
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	changed basic auth to test user	Florin Peter	2013-05-27	1	-3/+3
\| \| \|
\| * \|	Merge branch 'master' into remove_unused_vars	Björn Schießle	2013-05-27	1	-3/+3
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: apps/files_encryption/hooks/hooks.php apps/files_encryption/lib/crypt.php apps/files_encryption/lib/proxy.php
\| * \| \|	fix tests, after unused variables are removed	Björn Schießle	2013-05-27	1	-1/+1
\| \| \| \|
* \| \| \|	fixed typo	Florin Peter	2013-05-29	1	-1/+1
\| \|_\|/ \|/\| \|
* \| \|	fixed encryption session namespace to avoid problems	Florin Peter	2013-05-28	1	-2/+2
\| \| \|
* \| \|	Use the new session wrapper	Robin Appelman	2013-05-28	1	-3/+3
\| \|/ \|/\|
* \|	make legacyDecrypt() private als always call legacyBlockDecrypt() from other ↵	Björn Schießle	2013-05-27	1	-3/+3
\|/ \| \| \|	classes
*	added users for tests	Florin Peter	2013-05-26	9	-891/+1098
\| \| \| \|	reformat code to meet coding guidelines
*	improved test	Florin Peter	2013-05-26	7	-975/+944
\| \| \| \| \| \|	- fixed testPermanentDeleteFile sometimes failed - speed optimization - reformat code
*	improved trashbin test again	Florin Peter	2013-05-24	1	-0/+1
\|
*	improved trashbin test	Florin Peter	2013-05-24	1	-1/+1
\|
*	added trash bin tests	Florin Peter	2013-05-22	1	-0/+269
\|
*	improved tests	Florin Peter	2013-05-22	5	-333/+301
\|
*	added webdav test	Florin Peter	2013-05-21	1	-0/+251
\|
*	move 3rdparty dependencies to app	Björn Schießle	2013-05-21	2	-2/+2
\|
*	fix broken tests	Florin Peter	2013-05-21	1	-9/+0
\|
*	cleanup unused code optimize tests	Florin Peter	2013-05-21	1	-2/+17
\|
*	improved tests	Florin Peter	2013-05-20	1	-36/+3
\|
*	added test for failed sharing	Florin Peter	2013-05-20	3	-0/+67
\|
*	added legacy encryption test	Florin Peter	2013-05-20	2	-3/+46
\|
*	reformat code added and changed phpdoc	Florin Peter	2013-05-20	4	-920/+970
\|
*	changed recovery_enabled and migration_status columns to integer and fix tests	Florin Peter	2013-05-20	1	-6/+6
\|
*	cleanup tests	Florin Peter	2013-05-19	4	-41/+101
\|
*	fixed again key-manager tests	Florin Peter	2013-05-18	1	-20/+14
\|
*	fixed key-manager tests	Florin Peter	2013-05-18	1	-8/+15
\|
*	removed mockery from tests and changed class names	Florin Peter	2013-05-18	3	-171/+12
\|
*	improved tests	Florin Peter	2013-05-17	1	-2/+10
\|
*	added folder move test	Florin Peter	2013-05-17	1	-1/+34
\|