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 pull request #4537 from owncloud/no-realpath	Thomas Müller	2013-08-22	7	-75/+75
\|\ \| \| \| \|	Do not use realpath() on includes.
\| *	Use __DIR__ instead of dirname(__FILE__).	Andreas Fischer	2013-08-21	7	-75/+75
\| \| \| \| \| \| \| \|	This is possible because we require PHP 5.3 or higher.
\| *	Also remove other unnecessary realpath() calls.	Andreas Fischer	2013-08-21	3	-14/+14
\| \|
\| *	Do not use realpath() on includes.	Andreas Fischer	2013-08-21	7	-61/+61
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	If the file does not exist, realpath() returns false and "include false;" produces "Failed opening '' for inclusion" which is a useless error message. 'include' works just fine with symlinks, "./" and "../".
* \|	Merge pull request #4239 from owncloud/decrypt_files_again	Björn Schießle	2013-08-18	5	-38/+41
\|\ \ \| \| \| \| \| \|	Enable user to decrypt files again after encryption app was disabled
\| * \|	Merge branch 'master' into decrypt_files_again	Bjoern Schiessle	2013-08-17	3	-246/+39
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: apps/files_encryption/tests/keymanager.php
\| * \|	don't know why it works locally but not on the build server... let's keep it ↵	Bjoern Schiessle	2013-07-31	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \|	out for the moment
\| * \|	this hopefully fixes testRecoveryForUser(), works locally	Bjoern Schiessle	2013-07-31	1	-7/+10
\| \| \| \| \| \| \| \| \| \| \| \|	for now I disabled testRecoveryFile(), no idea why jenkins deletes complete folders... Works nicely in the real world
\| * \|	this test works locally, let's see what out build server says...	Bjoern Schiessle	2013-07-31	1	-3/+0
\| \| \|
\| * \|	fixing some unit tests	Bjoern Schiessle	2013-07-30	2	-6/+6
\| \| \|
\| * \|	adapt unit tests to the modified stream wrapper	Bjoern Schiessle	2013-07-30	5	-35/+35
\| \| \|
* \| \|	Add _many_ newlines at the end of files	kondou	2013-08-18	3	-3/+3
\| \|/ \|/\|
* \|	fixing typos and PHPDoc	Thomas Müller	2013-08-08	1	-3/+4
\| \|
* \|	adapt tests to the changes in crypt.php	Bjoern Schiessle	2013-08-08	2	-244/+31
\| \|
* \|	fix test and make warning translatable	Bjoern Schiessle	2013-08-01	1	-2/+7
\|/
*	Merge branch 'master' into parallel-autotest.sh-master	Thomas Müller	2013-07-22	1	-0/+3
\|\
\| *	mark test as incomplete because I can't reproduce jenkins failure	Morris Jobke	2013-07-21	1	-0/+3
\| \|
* \|	don't rely on admin user but create a test user for Test_Encryption_Keymanager	Thomas Müller	2013-07-19	1	-17/+15
\|/
*	fix getUidAndFilename() test	Björn Schießle	2013-07-05	1	-1/+1
\|
*	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