82 Commits

Author	SHA1	Message	Date
Björn Schießle	96e175ffbf	don't move empty folders to the trash bin	2013-07-25 16:27:40 +02:00
Björn Schießle	bf668eb14f	nicer format of unique names, use 'file (restored).txt' instead of 'files.txt.restored'	2013-07-25 16:20:06 +02:00
Björn Schießle	ae30eb48f2	make trash bin aware of system wide mounts with respect to encryption keys	2013-07-05 16:00:25 +02:00
Björn Schießle	99c62dfd76	Merge branch 'master' into fix_glob_escaping ... Conflicts: apps/files_trashbin/lib/trash.php	2013-06-17 14:51:08 +02:00
Morris Jobke	c99e7e97a3	Merge pull request #3301 from bastho/fix_filestrashbin_missing-sub-folder ... Fix inexisting trashbin's sub-folders	2013-06-15 01:31:32 -07:00
Björn Schießle	c3371812a0	fix indention	2013-06-14 15:14:23 +02:00
Björn Schießle	f91b02e9b6	only escape glob pattern	2013-06-14 15:07:06 +02:00
Florin Peter	842d0608f1	added static function registerHooks() for better unit tests handling	2013-05-22 23:50:45 +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
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
Björn Schießle	d649f77898	make sure to find the correct path for shared files	2013-05-03 17:14:43 +02:00
Björn Schießle	050258f003	remove encryption keys if a file gets deleted permanently	2013-05-03 16:33:18 +02:00
Björn Schießle	8a1223181b	disable proxys before copying files to the trash bin	2013-05-03 15:18:05 +02:00
Björn Schießle	a2516e549b	get original path in case of shared files when restoring file from trash bin	2013-05-03 14:03:42 +02:00
Björn Schießle	996a557475	get original path in case of shared files	2013-05-03 13:00:04 +02:00
Florin Peter	9f8f052f0d	merged files_trashbin	2013-05-01 01:52:06 +02:00
Florin Peter	3c100af132	revert changes to fbbc76f281 because master is very unstable right now	2013-05-01 01:38:06 +02:00
Florin Peter	7a3ecd0429	delete and restore of versions and share-keys now works ... fix restore of the same file name	2013-04-28 20:48:30 +02:00
Florin Peter	5e11948598	added handling for share-keys ... this works only with latest files_encryption branch up from 813641e6e8	2013-04-28 20:48:30 +02:00
Florin Peter	26e5ef193d	restore fixed	2013-04-28 20:48:30 +02:00
Florin Peter	228c501515	fixed some problems and broken code	2013-04-28 20:48:30 +02:00
Björn Schießle	680ba4bea1	restore encryption keys from trash bin (development snapshot)	2013-04-28 20:48:29 +02:00
Björn Schießle	cb65b7ca9d	move encryption keys to trash bin	2013-04-28 20:45:51 +02:00
Björn Schießle	a3999036f7	improved free space calculation if no quota is set, discussed in #2936	2013-04-17 10:42:59 +02:00
Björn Schießle	032c54273c	write a info message to the log if a file gets removed from the trash bin automatically	2013-04-16 12:31:22 +02:00
Björn Schießle	1b3b766244	cleanup the trash bin tables in the database after a user was deleted	2013-04-11 14:40:06 +02:00
Björn Schießle	16b0855992	only add filesize to trashbin size if the file was moved to the trash bin successfully	2013-04-10 10:09:22 +02:00
Björn Schießle	5924d1d95c	add backticks around table names	2013-03-25 12:29:13 +01:00
Brice Maron	1631aa2434	Add backtick for trash app to prevent pg errors	2013-03-15 00:03:37 +01:00
Björn Schießle	d23702d324	make trashbin work with different user homes	2013-03-04 12:57:32 +01:00
Björn Schießle	21bad1fcc0	fix type in var name	2013-03-04 12:33:16 +01:00
Björn Schießle	94dab96dba	fix quota calculation for trash and versions	2013-03-04 12:17:57 +01:00
Björn Schießle	df2a9a3c60	add additional parameter to signal	2013-03-01 12:44:43 +01:00
Björn Schießle	7c360c2491	add post_moveToTrash and post_restore signals to the trash bin	2013-03-01 12:20:29 +01:00
Robin Appelman	d2fe600789	Trash: fix trash when default quota is used	2013-02-27 20:29:49 +01:00
Robin Appelman	429bf42e98	Merge master into trash_fileactions	2013-02-27 20:29:19 +01:00
Björn Schießle	b917646516	fix quota calculation	2013-02-25 16:12:44 +01:00
Björn Schießle	272f854ce6	fix getVersion call	2013-02-25 15:34:36 +01:00
Björn Schießle	e30b3f64e0	fix line endings	2013-02-25 14:29:31 +01:00
Björn Schießle	4c980a4851	Merge branch 'master' into update-expire-function ... Conflicts: apps/files_trashbin/appinfo/version apps/files_trashbin/lib/trash.php	2013-02-25 14:26:59 +01:00
Björn Schießle	7da97550df	some final code clean-up	2013-02-25 14:12:56 +01:00
Björn Schießle	7ebbecd81f	always use "==="	2013-02-25 14:09:20 +01:00
Björn Schießle	4dea6a6228	Merge branch 'master' into trashbin_encryption ... Conflicts: apps/files_trashbin/index.php apps/files_trashbin/lib/trash.php	2013-02-25 12:14:51 +01:00
Björn Schießle	632ca9f06d	Merge branch 'master' into update-expire-function ... Conflicts: apps/files_trashbin/lib/trash.php	2013-02-25 11:14:06 +01:00
Bart Visscher	bb75dfc021	Whitespace fixes	2013-02-22 19:05:36 +01:00
Bart Visscher	fb7de77474	Style cleanup files_trashbin	2013-02-21 23:47:21 +01:00
Björn Schießle	2436d01985	calculate trashbin size per user	2013-02-21 12:37:13 +01:00
Björn Schießle	b685aa8bcb	some fixes for the keyfile handling	2013-02-20 22:17:04 +01:00