222 Commits

Author	SHA1	Message	Date
Florin Peter	842d0608f1	added static function registerHooks() for better unit tests handling	2013-05-22 23:50:45 +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
Jenkins for ownCloud	afdad5c74d	[tx-robot] updated from transifex	2013-05-21 02:04:52 +02: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
Jenkins for ownCloud	9428d813ba	[tx-robot] updated from transifex	2013-05-18 02:03:28 +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	0ef8590773	Merge branch 'master' into update_etags_on_restore	2013-05-13 10:48:06 +02:00
Jenkins for ownCloud	74f92d0c7f	[tx-robot] updated from transifex	2013-05-12 02:05:29 +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
Lukas Reschke	db1e6b5f3b	Use $dir instead of $fullpath	2013-05-06 14:28:01 +03:00
Lukas Reschke	b13b19c58b	Use the internal ownCloud view	2013-05-06 13:43:23 +03:00
Jenkins for ownCloud	a876240b32	[tx-robot] updated from transifex	2013-05-04 02:00:54 +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	b2da07fe95	Merge branch 'master' into files_encryption to get the latest files_trashbin app ... Conflicts: apps/files/l10n/bn_BD.php apps/files/l10n/da.php apps/files/l10n/de.php apps/files/l10n/de_DE.php apps/files/l10n/fa.php apps/files/l10n/fi_FI.php apps/files/l10n/hr.php apps/files/l10n/ms_MY.php apps/files/l10n/ro.php apps/files/l10n/si_LK.php apps/files/l10n/sl.php apps/files/l10n/ta_LK.php apps/files_external/l10n/de_DE.php apps/files_external/l10n/et_EE.php apps/user_ldap/l10n/tr.php core/l10n/bg_BG.php l10n/af_ZA/files.po l10n/af_ZA/files_external.po l10n/ar/core.po l10n/ar/files.po l10n/ar/files_external.po l10n/be/files.po l10n/be/files_external.po l10n/bg_BG/core.po l10n/bg_BG/files.po l10n/bg_BG/files_external.po l10n/bg_BG/files_trashbin.po l10n/bg_BG/files_versions.po l10n/bg_BG/settings.po l10n/bn_BD/core.po l10n/bn_BD/files.po l10n/bn_BD/files_external.po l10n/ca/core.po l10n/ca/files.po l10n/ca/files_external.po l10n/cs_CZ/core.po l10n/cs_CZ/files.po l10n/cs_CZ/files_external.po l10n/cs_CZ/lib.po l10n/cy_GB/core.po l10n/cy_GB/files.po l10n/cy_GB/files_external.po l10n/cy_GB/settings.po l10n/da/core.po l10n/da/files.po l10n/da/files_external.po l10n/de/core.po l10n/de/files.po l10n/de/files_external.po l10n/de_DE/core.po l10n/de_DE/files.po l10n/de_DE/files_external.po l10n/el/core.po l10n/el/files.po l10n/el/files_external.po l10n/eo/core.po l10n/eo/files.po l10n/eo/files_external.po l10n/es/core.po l10n/es/files.po l10n/es/files_external.po l10n/es_AR/core.po l10n/es_AR/files.po l10n/es_AR/files_external.po l10n/et_EE/core.po l10n/et_EE/files.po l10n/et_EE/files_external.po l10n/eu/core.po l10n/eu/files.po l10n/eu/files_external.po l10n/fa/core.po l10n/fa/files.po l10n/fa/files_external.po l10n/fi/files.po l10n/fi_FI/core.po l10n/fi_FI/files.po l10n/fi_FI/files_external.po l10n/fr/core.po l10n/fr/files.po l10n/fr/files_external.po l10n/gl/core.po l10n/gl/files.po l10n/gl/files_external.po l10n/he/core.po l10n/he/files.po l10n/he/files_external.po l10n/hi/files.po l10n/hi/files_external.po l10n/hr/core.po l10n/hr/files.po l10n/hr/files_external.po l10n/hu_HU/core.po l10n/hu_HU/files.po l10n/hu_HU/files_external.po l10n/hy/files.po l10n/hy/files_external.po l10n/ia/core.po l10n/ia/files.po l10n/ia/files_external.po l10n/id/core.po l10n/id/files.po l10n/id/files_external.po l10n/is/core.po l10n/is/files.po l10n/is/files_external.po l10n/it/core.po l10n/it/files.po l10n/it/files_external.po l10n/ja_JP/core.po l10n/ja_JP/files.po l10n/ja_JP/files_external.po l10n/ka/files.po l10n/ka/files_external.po l10n/ka_GE/core.po l10n/ka_GE/files.po l10n/ka_GE/files_external.po l10n/kn/files.po l10n/kn/files_external.po l10n/ko/core.po l10n/ko/files.po l10n/ko/files_external.po l10n/ku_IQ/files.po l10n/ku_IQ/files_external.po l10n/lb/core.po l10n/lb/files.po l10n/lb/files_external.po l10n/lt_LT/core.po l10n/lt_LT/files.po l10n/lt_LT/files_external.po l10n/lv/core.po l10n/lv/files.po l10n/lv/files_external.po l10n/mk/core.po l10n/mk/files.po l10n/mk/files_external.po l10n/ms_MY/core.po l10n/ms_MY/files.po l10n/ms_MY/files_external.po l10n/my_MM/files.po l10n/my_MM/files_external.po l10n/nb_NO/core.po l10n/nb_NO/files.po l10n/nb_NO/files_external.po l10n/ne/files.po l10n/ne/files_external.po l10n/nl/core.po l10n/nl/files.po l10n/nl/files_external.po l10n/nn_NO/files.po l10n/nn_NO/files_external.po l10n/oc/core.po l10n/oc/files.po l10n/oc/files_external.po l10n/pl/core.po l10n/pl/files.po l10n/pl/files_external.po l10n/pl_PL/files.po l10n/pt_BR/core.po l10n/pt_BR/files.po l10n/pt_BR/files_external.po l10n/pt_PT/core.po l10n/pt_PT/files.po l10n/pt_PT/files_external.po l10n/ro/core.po l10n/ro/files.po l10n/ro/files_external.po l10n/ru/core.po l10n/ru/files.po l10n/ru/files_external.po l10n/ru_RU/core.po l10n/ru_RU/files.po l10n/si_LK/core.po l10n/si_LK/files.po l10n/si_LK/files_external.po l10n/sk/files.po l10n/sk/files_external.po l10n/sk_SK/core.po l10n/sk_SK/files.po l10n/sk_SK/files_external.po l10n/sl/core.po l10n/sl/files.po l10n/sl/files_external.po l10n/sq/core.po l10n/sq/files.po l10n/sq/files_external.po l10n/sr/core.po l10n/sr/files.po l10n/sr/files_external.po l10n/sr@latin/files.po l10n/sr@latin/files_external.po l10n/sv/core.po l10n/sv/files.po l10n/sv/files_external.po l10n/sw_KE/files.po l10n/sw_KE/files_external.po l10n/ta_LK/core.po l10n/ta_LK/files.po l10n/ta_LK/files_external.po l10n/te/files.po l10n/te/files_external.po l10n/templates/core.pot l10n/templates/files.pot l10n/templates/files_encryption.pot l10n/templates/files_external.pot l10n/templates/files_sharing.pot l10n/templates/files_trashbin.pot l10n/templates/files_versions.pot l10n/templates/lib.pot l10n/templates/settings.pot l10n/templates/user_ldap.pot l10n/templates/user_webdavauth.pot l10n/th_TH/core.po l10n/th_TH/files.po l10n/th_TH/files_external.po l10n/tr/core.po l10n/tr/files.po l10n/tr/files_external.po l10n/tr/user_ldap.po l10n/uk/core.po l10n/uk/files.po l10n/uk/files_external.po l10n/ur_PK/files.po l10n/ur_PK/files_external.po l10n/vi/core.po l10n/vi/files.po l10n/vi/files_external.po l10n/zh_CN.GB2312/core.po l10n/zh_CN.GB2312/files.po l10n/zh_CN.GB2312/files_external.po l10n/zh_CN/core.po l10n/zh_CN/files.po l10n/zh_CN/files_external.po l10n/zh_HK/core.po l10n/zh_HK/files.po l10n/zh_HK/files_external.po l10n/zh_TW/core.po l10n/zh_TW/files.po l10n/zh_TW/files_external.po lib/base.php lib/files/mount/mount.php	2013-04-30 20:53:56 +02:00
FlorinPeter	4ab3614248	Merge pull request #3156 from owncloud/trashbin_for_encryption_keys_against_master ... Trashbin for encryption keys now against master	2013-04-30 11:39:21 -07:00
Jenkins for ownCloud	5764bf088e	[tx-robot] updated from transifex	2013-04-30 01:59:18 +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
Jenkins for ownCloud	901e0c598d	[tx-robot] updated from transifex	2013-04-28 02:01:38 +02:00
Jenkins for ownCloud	7b2c64236c	[tx-robot] updated from transifex	2013-04-27 02:24:29 +02:00
Jenkins for ownCloud	a7b4469b2e	[tx-robot] updated from transifex	2013-04-24 02:01:20 +02:00
Jenkins for ownCloud	05ab9d2de7	[tx-robot] updated from transifex	2013-04-23 02:00:31 +02:00
Jenkins for ownCloud	f6808617b3	[tx-robot] updated from transifex	2013-04-22 02:00:20 +02:00
Jenkins for ownCloud	03c7a52bc5	[tx-robot] updated from transifex	2013-04-20 02:02:09 +02:00
Jenkins for ownCloud	cbd8b792d9	[tx-robot] updated from transifex	2013-04-18 02:09:28 +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
Jenkins for ownCloud	37868818ff	[tx-robot] updated from transifex	2013-04-17 02:29:17 +02:00
Björn Schießle	01d203c773	add explenation of the expire function to the apps description	2013-04-16 12:31:33 +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
Jenkins for ownCloud	d0b3e8aceb	[tx-robot] updated from transifex	2013-04-16 02:17:30 +02:00
Jenkins for ownCloud	19afc216cf	[tx-robot] updated from transifex	2013-04-13 02:15:54 +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
Jenkins for ownCloud	b02db643d0	[tx-robot] updated from transifex	2013-04-11 02:10:41 +02:00
Björn Schießle	48dabd2c14	size of the trash bin could be incorrect, remove it for all users to enforce a recalculation during next usage.	2013-04-10 10:09:37 +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
Jenkins for ownCloud	c06bc81c79	[tx-robot] updated from transifex	2013-04-10 02:09:39 +02:00
Jenkins for ownCloud	5ef389610f	[tx-robot] updated from transifex	2013-04-09 02:14:02 +02:00
Bart Visscher	46a552fd56	Merge pull request #2738 from Kondou-ger/fix_alert_issues ... Fixed things in alert-messages	2013-04-06 08:24:43 -07:00
kondou	de2e546617	Translate 'Error' in core	2013-04-06 16:52:55 +02:00