5722 Commits

Author	SHA1	Message	Date
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	c81e34ef89	replace == with ===	2013-05-27 18:03:29 +02:00
Björn Schießle	4c05259ccf	legacyBlockDecryprt() needs to be public	2013-05-27 17:35:38 +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	8b35578833	fix migration from old to new encryption	2013-05-27 17:35:06 +02:00
Florin Peter	5d32e214b7	reformat code	2013-05-27 17:26:58 +02:00
Florin Peter	690bf9b8c4	Merge branch 'master' into remove_unused_vars ... Conflicts: apps/files_encryption/lib/util.php	2013-05-27 17:26:35 +02:00
Björn Schießle	f8d1c32112	Merge pull request #3506 from owncloud/fix_3320 ... fix https://github.com/owncloud/core/issues/3320	2013-05-27 08:04:55 -07:00
Georg Ehrke	841b420bc4	add event.preventDefault to undelete function	2013-05-27 16:37:43 +02:00
Björn Schießle	710e9c2d14	fix tests, after unused variables are removed	2013-05-27 15:34:57 +02:00
Björn Schießle	1a3f7891ea	remove unused varaibles	2013-05-27 15:31:26 +02:00
Georg Ehrke	d408cd7f37	fix https://github.com/owncloud/core/issues/3320	2013-05-27 15:24:37 +02:00
Florin Peter	80433fc4c4	Merge branch 'master' into file_encryption_util_is_error ... Conflicts: apps/files_encryption/lib/util.php	2013-05-27 14:41:53 +02:00
Björn Schießle	5e243b48bb	Merge pull request #3481 from owncloud/firsttime_enc ... fix first time encryption after app was enabled	2013-05-27 05:17:31 -07:00
Florin Peter	8cf827ee9d	Merge branch 'master' into file_encryption_tests	2013-05-27 12:54:33 +02:00
Florin Peter	89f0c8f39d	added check by numRows() ... changed to public api where it was possible reformat code to comply with the coding guidelines	2013-05-27 12:41:55 +02:00
Jenkins for ownCloud	73e0b4c10a	[tx-robot] updated from transifex	2013-05-27 02:07:24 +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
Jenkins for ownCloud	0c621ff6a9	[tx-robot] updated from transifex	2013-05-26 02:03:54 +02:00
Florin Peter	788c5940f0	fixed error rising from fetchRow	2013-05-25 23:20:55 +02:00
Florin Peter	9a6cd89a69	added OC_DB::isError and logging	2013-05-25 21:33:05 +02:00
Michael Gapczynski	dbb6a10364	Merge pull request #3478 from davidak/master ... small typo fix: added 2 whitespaces	2013-05-25 11:21:21 -07:00
Frank Karlitschek	29c8cbf4d1	increase version and add warning	2013-05-25 12:08:18 +02:00
Arthur Schiwon	86d72b9a61	LDAP: fix possible recursion	2013-05-25 11:03:58 +02:00
Arthur Schiwon	bfa715768a	LDAP: fix handling when LDAP Host is offline	2013-05-25 11:02:51 +02:00
Jenkins for ownCloud	6a6c18dfab	[tx-robot] updated from transifex	2013-05-25 02:11:52 +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
Björn Schießle	f56802a437	no use the recoveryPassword var instead of accessing the POST array	2013-05-24 18:37:58 +02:00
Björn Schießle	5ce4149e75	fix first time encryption after app was enabled	2013-05-24 17:35:00 +02:00
davidak	56006ea852	small typo fix: added 2 whitespaces	2013-05-24 14:31:06 +02:00
Thomas Müller	4911305887	Merge pull request #3416 from owncloud/files_encryption ... New files encryption app	2013-05-24 02:21:19 -07:00
Michael Gapczynski	a98d6c4be6	Merge pull request #3425 from owncloud/move-storages ... Support for moving/copying folders between storages	2013-05-23 17:35:11 -07:00
Jenkins for ownCloud	b47729c5fc	[tx-robot] updated from transifex	2013-05-24 02:02:43 +02:00
Florin Peter	6c8de5ae6d	fixes after review from @DeepDiver1975	2013-05-23 23:56:31 +02:00
Florin Peter	adc930d9f9	added l10n support in apps/files_encryption/ajax/adminrecovery.php	2013-05-23 22:09:28 +02:00
Björn Schießle	7b07168c46	code clean up; nicer solution to solve the public link share problem if a user is logged in	2013-05-23 21:18:31 +02:00
Björn Schießle	a9ebf2aabe	fix public link share if a user is logged in	2013-05-23 20:30:07 +02:00
opensaucesystems	acba7d7b13	Update settings.php	2013-05-23 17:27:22 +02:00
opensaucesystems	b23ce9ed40	Remove http:// from label and add placeholder	2013-05-23 17:24:48 +02:00
opensaucesystems	169eb10030	Enable https authentication ... Allow authentication using https:// as well as http://	2013-05-23 17:22:05 +02:00
opensaucesystems	e866e564c2	Enable https authentication	2013-05-23 16:57:22 +02:00
Michael Gapczynski	30330b4343	Merge branch 'master' into move-storages ... Conflicts: tests/lib/files/view.php	2013-05-23 10:25:12 -04:00
Björn Schießle	cb79169cf5	Merge branch 'master' into files_encryption	2013-05-23 11:11:57 +02:00
Jenkins for ownCloud	698862519d	[tx-robot] updated from transifex	2013-05-23 02:00:27 +02:00
Florin Peter	46c784ccdf	added trash bin tests	2013-05-22 23:51:35 +02:00
Florin Peter	842d0608f1	added static function registerHooks() for better unit tests handling	2013-05-22 23:50:45 +02:00
Michael Gapczynski	9b622bdeed	RUNTIME_NOSETUPFS no longer exists, using tearDownFS() in public links instead	2013-05-22 15:02:11 -04:00
Björn Schießle	80dea1a8c5	settings clean-up; There is no blacklist in the new encryption app	2013-05-22 18:05:12 +02:00
Björn Schießle	15a3ae6db1	improved error messages	2013-05-22 18:01:18 +02:00
Björn Schießle	ee53bd1aa3	Merge branch 'master' into files_encryption ... Conflicts: lib/files/cache/cache.php	2013-05-22 15:29:22 +02:00
Morris Jobke	9fd2be0757	Merge pull request #3406 from owncloud/oc_dialogs_oc_template ... Use js templates in OC.dialogs etc.	2013-05-22 03:00:04 -07:00
Jenkins for ownCloud	d590064fdf	[tx-robot] updated from transifex	2013-05-22 02:19:52 +02:00
Florin Peter	c6722581f9	fix pgsql error	2013-05-22 02:02:42 +02:00
Florin Peter	afbfa742d7	improved tests	2013-05-22 01:11:55 +02:00
Florin Peter	9ca9a22c6a	fixed finding encrypted files in subfolders and removed unused code	2013-05-22 00:54:47 +02:00
Florin Peter	095fc790ac	added webdav test	2013-05-21 21:09:39 +02:00
Florin Peter	1deeec93b7	fixed postFileSize	2013-05-21 21:09:25 +02:00
Björn Schießle	5cd14425f9	Merge branch 'master' into files_encryption ... Conflicts: apps/files_trashbin/l10n/nn_NO.php	2013-05-21 15:30:19 +02:00
Björn Schießle	9d324db054	fix path to 3rdparty apps	2013-05-21 12:33:32 +02:00
Björn Schießle	4c27c7e199	fix path, needs to be relative to data/	2013-05-21 12:22:03 +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
Jenkins for ownCloud	afdad5c74d	[tx-robot] updated from transifex	2013-05-21 02:04:52 +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	1fa2f19ee4	removed dead code for delShareKey	2013-05-20 21:24:39 +02:00
Florin Peter	8e0540d0e4	key creation should never override a private or public key	2013-05-20 21:22:03 +02:00
Florin Peter	171b9a4702	added legacy encryption test	2013-05-20 21:19:28 +02:00
Michael Gapczynski	ec475cbcfa	Add data-dir attribute to home breadcrumb	2013-05-20 10:21:13 -04:00
Florin Peter	31037241e1	Merge branch 'master' into files_encryption	2013-05-20 02:25:56 +02:00
Jenkins for ownCloud	6609de28d8	[tx-robot] updated from transifex	2013-05-20 02:10:11 +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	5d572c3449	update phpdoc	2013-05-19 22:31:00 +02:00
Florin Peter	bdd2127f19	cleanup tests	2013-05-19 22:28:48 +02:00
Florin Peter	ddda2a1f79	changed database column 'recovery' to 'recovery_enabled' because recovery is a pgsql keyword ... more info about pgsql keywords http://www.postgresql.org/docs/9.1/static/sql-keywords-appendix.html	2013-05-19 07:04:31 +02:00
Jenkins for ownCloud	694f42dfd5	[tx-robot] updated from transifex	2013-05-19 02:01:55 +02:00
Florin Peter	2a038baee0	updated authors info	2013-05-18 22:33:31 +02:00
Florin Peter	227b122947	fixed again key-manager tests	2013-05-18 22:25:47 +02:00
Florin Peter	681252669a	changed migrationStatus to migration_status for pgsql	2013-05-18 22:10:00 +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	6980f59b2f	fixed typos	2013-05-18 21:12:53 +02:00
Jenkins for ownCloud	9428d813ba	[tx-robot] updated from transifex	2013-05-18 02:03:28 +02:00
Florin Peter	41165afa59	improved tests	2013-05-17 22:45:09 +02:00
Florin Peter	3aa48616a6	remove unused code	2013-05-17 22:44:45 +02:00
Florin Peter	b6572cedac	added folder move test	2013-05-17 22:16:56 +02:00
Florin Peter	cea9208cec	fix broken legacy tests	2013-05-17 21:59:53 +02:00
Björn Schießle	e7d1fe82aa	fix path to class	2013-05-17 18:01:32 +02:00
Björn Schießle	eaa61b8539	fix migration to new encryption	2013-05-17 17:29:32 +02:00
Björn Schießle	002445e23d	some typo fixed	2013-05-17 14:49:54 +02:00
Björn Schießle	93771f735b	gremove unused code	2013-05-17 14:13:05 +02:00
Björn Schießle	bf04a21973	set migration status after successful upgrade	2013-05-17 13:16:52 +02:00
Björn Schießle	0b40c1d08a	Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption	2013-05-17 11:20:17 +02:00
Björn Schießle	ca6a77d39b	upgrade from old encryption to the new one needs to generate share keys too	2013-05-17 11:15:36 +02:00
Thomas Tanghus	152e275c8a	Various cleanups in OC.dialogs	2013-05-17 04:54:08 +02:00
Jenkins for ownCloud	6a6079176b	[tx-robot] updated from transifex	2013-05-17 02:07:36 +02:00
Florin Peter	2b0bf4dc87	added tests for recovery	2013-05-17 01:07:50 +02:00
Florin Peter	a4c0eb1756	improved tests	2013-05-17 01:07:26 +02:00
Florin Peter	42b4963dd0	moved enable and disable recovery to Helper class for unit tests	2013-05-17 00:58:41 +02:00
Florin Peter	3793e4d2d6	fix for recover files in subfolder	2013-05-16 22:57:55 +02:00
Florin Peter	d40d6aa358	fix typo in addRecoveryKeys	2013-05-16 22:39:09 +02:00
Björn Schießle	9d1e60325c	allow admin to recover users files in case of password lost	2013-05-16 14:53:04 +02:00
blizzz	2d51eefcb8	Merge pull request #3302 from owncloud/ldap_configurable_username_n_uuid ... Ldap configurable username n uuid	2013-05-16 05:40:31 -07:00
Jenkins for ownCloud	966c2231e3	[tx-robot] updated from transifex	2013-05-16 02:01:37 +02:00
Florin Peter	67a80e1870	improved tests for touch	2013-05-16 00:44:40 +02:00
Florin Peter	0fca2f8f31	added tests for put content, get content, touch and fopen	2013-05-16 00:36:40 +02:00
Florin Peter	c651950a17	fix for re-share and removed check if file exists because we are sometime into a pre_put_contents hook	2013-05-16 00:34:45 +02:00
Florin Peter	c0c4fe5fd3	fix if file is not yet created	2013-05-16 00:31:17 +02:00
Florin Peter	8f963b95e5	added test for share with group	2013-05-16 00:30:01 +02:00
Florin Peter	b75a0abb6b	added test for rename folder	2013-05-15 22:42:22 +02:00
Florin Peter	ec2e193a44	removed unused code	2013-05-15 21:01:03 +02:00
Florin Peter	5fcb5f3aba	added test for password change	2013-05-15 21:00:35 +02:00
Björn Schießle	57c0a7ed69	add recovery key to all files if the user enabled the feature and removes them again on disable	2013-05-15 17:56:45 +02:00
Björn Schießle	1a31dc036a	added missing file to enable the admin to change the recovery key password	2013-05-15 16:14:54 +02:00
Björn Schießle	1f5ed65b12	Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption	2013-05-15 16:13:29 +02:00
Björn Schießle	64d94c540a	enable admin to change the recovery password	2013-05-15 16:12:20 +02:00
Florin Peter	63a790b415	fix for broken tests	2013-05-15 14:33:08 +02:00
Florin Peter	1fbdc3ce8f	fix for previous workaround	2013-05-15 14:32:50 +02:00
Björn Schießle	5b160edebb	check if the user knows the correct recovery password before changing the recovery key settings	2013-05-15 14:02:13 +02:00
Björn Schießle	335f2ca321	Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption	2013-05-15 11:42:41 +02:00
Björn Schießle	d8ae2fa80d	only let the user change the recovery admin settings if a key passwords was entered.	2013-05-15 11:42:22 +02:00
Florin Peter	137039d35a	workaround for blank page need an other solution	2013-05-15 10:52:23 +02:00
Florin Peter	3d7534da74	improved files_encryption tests	2013-05-15 10:21:56 +02:00
Florin Peter	01f1153b08	Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption ... Conflicts: apps/files/l10n/ar.php apps/files/l10n/bn_BD.php apps/files/l10n/de.php apps/files/l10n/de_DE.php apps/files/l10n/el.php apps/files/l10n/es.php apps/files/l10n/fa.php apps/files/l10n/fr.php apps/files/l10n/gl.php apps/files/l10n/id.php apps/files/l10n/ko.php apps/files/l10n/nl.php apps/files/l10n/nn_NO.php apps/files/l10n/pl.php apps/files/l10n/pt_BR.php apps/files/l10n/pt_PT.php apps/files/l10n/ro.php apps/files/l10n/ru.php apps/files/l10n/sl.php apps/files/l10n/uk.php apps/files/l10n/vi.php apps/files_encryption/l10n/ca.php apps/files_sharing/lib/cache.php apps/files_sharing/lib/sharedstorage.php apps/user_ldap/l10n/tr.php core/l10n/cs_CZ.php core/l10n/de.php core/l10n/de_DE.php core/l10n/ru.php core/l10n/sk_SK.php core/l10n/tr.php core/l10n/vi.php core/l10n/zh_CN.php l10n/af_ZA/files.po l10n/ar/files.po l10n/be/files.po l10n/bg_BG/files.po l10n/bn_BD/files.po l10n/ca/files.po l10n/ca/files_encryption.po l10n/cs_CZ/core.po l10n/cs_CZ/files.po l10n/da/files.po l10n/da/settings.po l10n/de/core.po l10n/de/files.po l10n/de/files_encryption.po l10n/de/files_external.po l10n/de/files_sharing.po l10n/de/files_trashbin.po l10n/de/files_versions.po l10n/de/lib.po l10n/de/settings.po l10n/de/user_ldap.po l10n/de_DE/files.po l10n/de_DE/files_encryption.po l10n/de_DE/files_external.po l10n/de_DE/files_sharing.po l10n/de_DE/files_trashbin.po l10n/de_DE/lib.po l10n/de_DE/settings.po l10n/de_DE/user_ldap.po l10n/el/files.po l10n/eo/files.po l10n/es/files.po l10n/es/lib.po l10n/es/settings.po l10n/es_AR/files.po l10n/eu/files.po l10n/fa/files.po l10n/fi/files.po l10n/fi_FI/files.po l10n/fr/core.po l10n/fr/files.po l10n/gl/files.po l10n/gl/settings.po l10n/he/core.po l10n/he/files.po l10n/he/user_ldap.po l10n/hi/files.po l10n/hr/files.po l10n/hu_HU/core.po l10n/hu_HU/files.po l10n/hu_HU/files_external.po l10n/hu_HU/settings.po l10n/hy/files.po l10n/ia/core.po l10n/ia/files.po l10n/ia/files_trashbin.po l10n/ia/settings.po l10n/id/files.po l10n/is/files.po l10n/it/files.po l10n/ja_JP/files.po l10n/ja_JP/user_ldap.po l10n/ka/files.po l10n/ka_GE/files.po l10n/kn/files.po l10n/ko/files.po l10n/ko/files_trashbin.po l10n/ko/settings.po l10n/ku_IQ/files.po l10n/lb/files.po l10n/lt_LT/core.po l10n/lt_LT/files.po l10n/lv/files.po l10n/mk/files.po l10n/ms_MY/files.po l10n/my_MM/files.po l10n/nb_NO/files.po l10n/ne/files.po l10n/nl/core.po l10n/nl/files.po l10n/nn_NO/files.po l10n/oc/files.po l10n/pl/files.po l10n/pl_PL/files.po l10n/pt_BR/files.po l10n/pt_PT/core.po l10n/pt_PT/files.po l10n/pt_PT/files_external.po l10n/pt_PT/settings.po l10n/ro/files.po l10n/ru/core.po l10n/ru/files.po l10n/si_LK/files.po l10n/sk/files.po l10n/sk_SK/core.po l10n/sk_SK/files.po l10n/sl/core.po l10n/sl/files.po l10n/sq/files.po l10n/sr/files.po l10n/sr@latin/files.po l10n/sv/files.po l10n/sw_KE/files.po l10n/ta_LK/files.po l10n/te/files.po l10n/th_TH/files.po l10n/tr/core.po l10n/tr/files.po l10n/tr/lib.po l10n/tr/settings.po l10n/tr/user_ldap.po l10n/uk/files.po l10n/ur_PK/files.po l10n/vi/core.po l10n/vi/files.po l10n/vi/files_external.po l10n/zh_CN.GB2312/files.po l10n/zh_CN/core.po l10n/zh_CN/files.po l10n/zh_CN/settings.po l10n/zh_HK/files.po l10n/zh_TW/core.po l10n/zh_TW/files.po l10n/zh_TW/files_versions.po l10n/zh_TW/settings.po l10n/zh_TW/user_ldap.po lib/base.php lib/files/filesystem.php lib/files/view.php lib/public/share.php settings/l10n/es.php settings/l10n/pt_PT.php settings/l10n/tr.php settings/l10n/zh_CN.php settings/personal.php	2013-05-15 10:18:25 +02:00
Florin Peter	226aec8d56	Merge branch 'master' into files_encryption	2013-05-15 03:22:06 +02:00
Florin Peter	7461e9c2b5	improved tests and added new tests for file rename and move	2013-05-15 02:38:08 +02:00
Florin Peter	499fe6ca8e	disabled FileProxy in Keymanager::getPrivateKey	2013-05-15 02:36:23 +02:00
Florin Peter	ddedf20106	prevent of infinite loop with FileProxy	2013-05-15 02:34:36 +02:00
Jenkins for ownCloud	6a788d1a54	[tx-robot] updated from transifex	2013-05-15 02:02:45 +02:00
Florin Peter	8776000754	fix for move file to an empty folder	2013-05-14 23:19:16 +02:00
Florin Peter	0a7aa6e8cd	fix for Allowed memory size of xx bytes exhausted while reading big files	2013-05-14 22:32:39 +02:00
Thomas Müller	fdef2a373a	Merge pull request #2821 from owncloud/fix-2159-rename-to-shared ... fix allowed rename of folder in root directory to reserved name "Shared"	2013-05-14 13:13:16 -07:00
Florin Peter	84c56a5d56	fix for zero size files	2013-05-14 21:29:24 +02:00
Björn Schießle	96ff19a703	fix history template, print_unescaped() needs to include closing tags	2013-05-14 21:22:30 +02:00
Florin Peter	517105660d	fix for public link share	2013-05-14 20:11:07 +02:00
Raghu Nayyar	418503a4ad	Merge pull request #3338 from owncloud/button_color_fix ... Keeping Font Colors Consistant on the headers.	2013-05-14 09:52:54 -07:00
Morris Jobke	784f117ec2	Merge pull request #3330 from owncloud/preselect_filename_on_rename ... peselect filename without extension on rename	2013-05-14 06:16:30 -07:00
Morris Jobke	0d8fa2eb98	[files] add private declaration of $view	2013-05-14 12:49:23 +02:00
raghunayyar	18618c75aa	color change to crumb elements as well.	2013-05-14 11:07:12 +05:30
Florin Peter	81ae4cb5d0	added test for public shared file via link	2013-05-14 00:00:20 +02:00
Florin Peter	a4e9e2fc79	added post_deleteUser hook for cleanup public key	2013-05-13 22:49:27 +02:00
Florin Peter	b2d021b2a5	added post_createUser hook	2013-05-13 22:34:11 +02:00
Florin Peter	61ed347d26	added handling for public file access via files_sharing link	2013-05-13 21:24:59 +02:00
Florin Peter	d92f6b887d	removed var_dump	2013-05-13 21:22:59 +02:00
raghunayyar	6d95d130e4	Keeping Font Colors Consistant on the headers.	2013-05-13 23:12:05 +05:30
Björn Schießle	aa3eb6bb5b	don't handle public share keys in lib/public/share.php but in apps/files_encryption/lib/util.php instead	2013-05-13 17:40:57 +02:00
Björn Schießle	517efdf952	don't create a recovery user, only generate recovery key similar to the public link share key	2013-05-13 17:26:21 +02:00
Jörn Friedrich Dreyer	591b383f2d	peselect filename without extension on rename	2013-05-13 15:54:45 +02:00
Björn Schießle	2f4ba9d1e8	if file was shared to user than userIds is just the users Id	2013-05-13 15:45:30 +02:00
Björn Schießle	d1e2e47592	generate random key name for share key to avoid name conflicts	2013-05-13 15:15:35 +02:00
Björn Schießle	a6ef25ba08	use preShare hook only to check if all pub keys are available and the postShare hook to finaly update the shareKeys if the file was shared successfully	2013-05-13 14:28:45 +02:00
Arthur Schiwon	beaa10b823	Merge branch 'master' into ldap_configurable_username_n_uuid	2013-05-13 12:41:22 +02:00
Björn Schießle	0ef8590773	Merge branch 'master' into update_etags_on_restore	2013-05-13 10:48:06 +02:00
Jenkins for ownCloud	e8c154f341	[tx-robot] updated from transifex	2013-05-13 02:10:20 +02:00
Morris Jobke	e2bd32323d	[files] fix mock creation and remove hardcoded 'require' statement	2013-05-12 13:02:01 +02:00
Morris Jobke	b777c0fd75	[files] rename lib to "App"	2013-05-12 11:47:22 +02:00
Morris Jobke	b32c30b6d0	[files] ownCloud typo	2013-05-12 11:47:22 +02:00
Morris Jobke	7e23e97676	[files] rename test class and add rename test	2013-05-12 11:47:22 +02:00
Morris Jobke	d4ba9cf338	[files] remove realpath in test	2013-05-12 11:47:22 +02:00
Morris Jobke	bb5554de7f	[files] rename tests	2013-05-12 11:47:22 +02:00
Morris Jobke	b9f426b1d7	[files] remove normalizePath on rename and dependency injection	2013-05-12 11:47:22 +02:00
Morris Jobke	324c423548	[files] kill stripslashes	2013-05-12 11:47:22 +02:00
Morris Jobke	418e878ba8	[files] fix typos	2013-05-12 11:47:22 +02:00
Morris Jobke	1020d5c16c	[files] refactoring	2013-05-12 11:47:22 +02:00
Morris Jobke	33b31931bd	string comparision	2013-05-12 11:47:22 +02:00
Morris Jobke	b393c91a96	wrong root dir name	2013-05-12 11:47:22 +02:00
Morris Jobke	a878bd9923	fix allowed rename of folder in root directory to reserved name "Shared" ... refs #2159	2013-05-12 11:47:22 +02:00
Jenkins for ownCloud	74f92d0c7f	[tx-robot] updated from transifex	2013-05-12 02:05:29 +02:00
Florin Peter	8e004cc3e1	added handling for sharing with link ... NOTE: only encryption work atm	2013-05-11 01:03:43 +02:00
Florin Peter	33e0dfeecb	sharing with group should work now	2013-05-11 00:25:32 +02:00
Florin Peter	e88595638c	fix for webdav	2013-05-11 00:23:30 +02:00
Björn Schießle	cc433d47cb	touch() needs to be performed relative to user/files otherwise ownCloud doesn't execute the hooks which means that etags aren't updated properly	2013-05-10 12:05:11 +02:00
Bastien Ho	bb640df06e	duplicate verification	2013-05-10 11:16:18 +02:00
Bastien Ho	6082a09e62	Fix inexisting trashbin's sub-folders	2013-05-10 11:12:42 +02:00
Florin Peter	3eae26143f	added test for re-share folder	2013-05-10 01:00:24 +02:00
Florin Peter	15845bf0bf	fix for autotest.sh	2013-05-09 23:22:46 +02:00
Florin Peter	18a821b1e3	added helper	2013-05-09 23:22:22 +02:00
Florin Peter	de855ac31b	improved tests and include helper	2013-05-09 19:37:26 +02:00
Florin Peter	e25aa78caf	added helper class and moved hook registration to it	2013-05-09 19:36:18 +02:00
Sam Tuke	163fe64016	Fixes to code formatting and indentation	2013-05-09 18:24:07 +02:00
Sam Tuke	92e28839ff	Improvements to code formatting & indentation	2013-05-09 18:16:59 +02:00
Sam Tuke	3003dd46d1	Implemented initial recoveryAdmin functionality in crypto file proxy	2013-05-09 18:09:20 +02:00
Sam Tuke	101e037529	Fixed bugs with pre_share hook usage ... Made sure new user being shared to is added to array of sharing users	2013-05-09 14:43:06 +02:00
Björn Schießle	bda8187f3b	rename a file if it gets restored so that it no longer exists as a version. Otherwise it can happen that the expire() function removes all other versions so that we end up with only one version which is exactly the same as the original file	2013-05-08 23:00:13 +02:00
Björn Schießle	b9134dcd6a	touch file relative to users file folder, otherwise the hooks will be ignored	2013-05-08 22:59:49 +02:00
Arthur Schiwon	d69579f773	LDAP: fix display of numerical display names	2013-05-08 17:54:38 +02:00
Arthur Schiwon	796ee8c4c0	LDAP: Implement clear mappings functionality	2013-05-08 17:47:07 +02:00
Sam Tuke	28866de44b	Added pre_share hook ... Switched it for post_share hook in encryption hooks Stop a file from being shared if the encryption procedure fails for any users	2013-05-08 16:22:08 +02:00
Arthur Schiwon	3f1717d3d5	LDAP: implement UUID and internal username override	2013-05-08 14:56:52 +02:00
Arthur Schiwon	c9b3da5bbc	LDAP: better variable name	2013-05-08 14:55:56 +02:00
Arthur Schiwon	bc23010670	LDAP: implement r+w for new settings	2013-05-08 14:05:08 +02:00
Arthur Schiwon	c18158906c	LDAP: add settings for UUID override	2013-05-08 13:57:21 +02:00
Florin Peter	fdc49e7acb	added test for share folder	2013-05-07 22:56:59 +02:00
Florin Peter	33fc830dd3	added test for re-share	2013-05-07 22:22:05 +02:00
Bart Visscher	175633d380	Merge pull request #3050 from owncloud/===_and_!==_in_user_ldap-app ... Use === and !== in user_ldap app	2013-05-07 12:45:43 -07:00