1315 Commits

Author	SHA1	Message	Date
Jenkins for ownCloud	b037f2dc6e	[tx-robot] updated from transifex	2013-08-01 01:57:04 -04:00
Jenkins for ownCloud	761f40328c	[tx-robot] updated from transifex	2013-07-31 02:01:45 -04:00
Bjoern Schiessle	6f20e081e4	added missing isEmpty ajax file	2013-07-30 12:48:41 +02:00
Thomas Müller	7425efade7	Merge branch 'master' into oc_preview ... Conflicts: 3rdparty lib/template.php	2013-07-30 00:34:36 +02:00
Georg Ehrke	2ea8ee6139	add class='preview-icon' in trashbin app as well	2013-07-29 16:27:40 +02:00
Björn Schießle	2c8e5ec84f	user interface to allow user to decrypt all his files once the encryption app was disabled ... Conflicts: settings/templates/personal.php	2013-07-29 13:36:06 +02:00
Björn Schießle	0a9bb8ba73	reduce time for auto expire to 30 days by default	2013-07-26 15:15:47 +02:00
Björn Schießle	efd8ad6696	found some more places where we can disable buttons while performing a action	2013-07-26 14:54:27 +02:00
Björn Schießle	9d24b9c7e8	Hide Delete Permanently button when Restore happens	2013-07-26 13:17:09 +02:00
Björn Schießle	a5d9b985c3	make 'restored' extension translatable	2013-07-26 12:01:45 +02:00
Björn Schießle	0182a503a6	expire trash bin if trash bin exceeds max size after a new file was added to ownCloud	2013-07-26 11:45:38 +02:00
Björn Schießle	a00cff7c05	disable "deleted files" button if trash bin is empty	2013-07-26 11:14:29 +02:00
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
Jenkins for ownCloud	29d8ae2f95	[tx-robot] updated from transifex	2013-07-14 02:10:41 +02:00
Georg Ehrke	a357e5b284	merge conflicts ...	2013-07-10 12:41:53 +02:00
Georg Ehrke	cf449d42e8	properly encode path	2013-07-10 12:30:20 +02:00
kondou	70b4f85911	Use isIgnoredDir()	2013-07-10 02:36:43 +02:00
kondou	2f11f56d32	Use !== and === in files_trashbin-app	2013-07-10 02:34:00 +02:00
Victor Dubiniuk	257096f1d4	Encode current trashbin directory	2013-07-09 17:46:11 +03:00
Victor Dubiniuk	582631323a	Migrate to encodePath	2013-07-09 17:46:11 +03:00
Jan-Christoph Borchardt	8d8f99fbc4	Merge pull request #3757 from owncloud/icon-cleanup ... Icon cleanup	2013-07-08 06:56:29 -07:00
Georg Ehrke	d699135c5e	fix for previews in trashbin app	2013-07-08 15:14:25 +02:00
Georg Ehrke	04292ff16c	implement use of preview icons in thrashbin app	2013-07-08 10:53:53 +02:00
Jenkins for ownCloud	3cb4a72960	[tx-robot] updated from transifex	2013-07-08 02:09:41 +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
Jenkins for ownCloud	c3b8f2bf64	[tx-robot] updated from transifex	2013-06-25 02:13:40 +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
Jan-Christoph Borchardt	2a57763542	use history icon in Deleted Files template as well	2013-06-17 13:30:57 +02:00
Jan-Christoph Borchardt	d9dcba9a39	remove unused loading spinners, just have one	2013-06-17 12:35:25 +02:00
Jan-Christoph Borchardt	257ebc2830	use consistent icon for 'restore'/versions/history, also SVG	2013-06-17 12:18:45 +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
Jenkins for ownCloud	67c085417c	[tx-robot] updated from transifex	2013-06-07 02:17:50 +02:00
Jenkins for ownCloud	666a5c1cc7	[tx-robot] updated from transifex	2013-06-05 02:01:42 +02:00
Georg Ehrke	841b420bc4	add event.preventDefault to undelete function	2013-05-27 16:37:43 +02:00
Georg Ehrke	d408cd7f37	fix https://github.com/owncloud/core/issues/3320	2013-05-27 15:24:37 +02:00
Jenkins for ownCloud	6a6c18dfab	[tx-robot] updated from transifex	2013-05-25 02:11:52 +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
Jenkins for ownCloud	b47729c5fc	[tx-robot] updated from transifex	2013-05-24 02:02:43 +02:00
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
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
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
root	74b02db337	Fixed things in alert-messages ... Two parameters for OC.dialogs.alert, otherwise one will be "undefined". Also fixed missing translation.	2013-04-05 01:56:32 +02:00
Jenkins for ownCloud	c745bfa821	[tx-robot] updated from transifex	2013-04-05 00:22:48 +02:00
Jenkins for ownCloud	5e74ec26a8	[tx-robot] updated from transifex	2013-03-30 00:06:29 +01:00
Jenkins for ownCloud	0c666cb764	[tx-robot] updated from transifex	2013-03-27 00:11:05 +01:00
Björn Schießle	5924d1d95c	add backticks around table names	2013-03-25 12:29:13 +01:00
Jenkins for ownCloud	4f6e13e673	[tx-robot] updated from transifex	2013-03-23 00:06:16 +01:00
Björn Schießle	4a1a23ce1b	add some error logs to the trash bin app	2013-03-18 12:08:34 +01:00
Jenkins for ownCloud	2a48aa322d	[tx-robot] updated from transifex	2013-03-18 00:06:55 +01:00
Jenkins for ownCloud	1427af4a22	[tx-robot] updated from transifex	2013-03-16 22:18:26 +01:00
Björn Schießle	23fe98a562	Merge pull request #2336 from eMerzh/fix_trashpg ... Add backtick for trash app to prevent pg errors	2013-03-15 03:17:54 -07:00
Jenkins for ownCloud	0c123ebf9d	[tx-robot] updated from transifex	2013-03-15 00:06:36 +01:00
Brice Maron	1631aa2434	Add backtick for trash app to prevent pg errors	2013-03-15 00:03:37 +01:00
Jenkins for ownCloud	9a0cb2ccaa	[tx-robot] updated from transifex	2013-03-14 00:06:29 +01:00
Jenkins for ownCloud	569c7ab138	[tx-robot] updated from transifex	2013-03-12 00:14:05 +01:00
Jenkins for ownCloud	6bdb84ab28	[tx-robot] updated from transifex	2013-03-10 00:06:53 +01:00
Jenkins for ownCloud	0629ff4dd9	[tx-robot] updated from transifex	2013-03-09 00:06:34 +01:00
Jenkins for ownCloud	308c85090e	[tx-robot] updated from transifex	2013-03-08 00:26:35 +01:00
Björn Schießle	ba9f5f5885	add dirlisting var to file list	2013-03-07 14:54:59 +01:00
Björn Schießle	dda4c6bf4b	no dir parameter needed	2013-03-07 13:51:18 +01:00
Björn Schießle	7188303651	let the home icon link to the files view in the trash bin	2013-03-07 13:48:02 +01:00
Frank Karlitschek	33c62bf110	Merge pull request #2090 from owncloud/fixing-2089-master ... fixes #2089	2013-03-04 13:17:35 -08:00
Bernhard Posselt	10b108ed8a	Merge pull request #2030 from j-ed/master ... suppress log messages like `include path for class ... starts with "apps/"`	2013-03-04 12:59:39 -08:00
Thomas Mueller	a118906f26	fixes #2089	2013-03-04 21:45:21 +01:00
raghunayyar	d9c11a93c6	Corrects Files Layout in Trashbin	2013-03-04 21:34:50 +05:30
Björn Schießle	d23702d324	make trashbin work with different user homes	2013-03-04 12:57:32 +01:00
Lukas Reschke	2a9c3c1660	Merge pull request #2069 from owncloud/fix_sanitize_call ... use p() for the output and not for the comparison	2013-03-04 03:41:47 -08: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	ccc4102cd9	fix p() call	2013-03-04 12:12:27 +01:00
Jenkins for ownCloud	b738aaba2a	[tx-robot] updated from transifex	2013-03-04 00:07:35 +01:00
j-ed	4c03c3a31d	Update app.php ... suppress log messages like `include path for class \"OCA\\Files_Trashbin\\Hooks\" starts with \"apps\/\"`.	2013-03-02 12:24:12 +01:00
Lukas Reschke	5e7970f761	Merge master	2013-03-01 23:11:03 +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
Lukas Reschke	dee16deacd	Merge master	2013-02-28 20:03:06 +01:00
Robin Appelman	12fd47af39	Trash: fix opening folders	2013-02-28 13:32:08 +01:00
Lukas Reschke	3ba8881bac	[files_trashbin] From echo to p	2013-02-27 21:46:37 +01:00
Robin Appelman	923c51773a	Trash: disable text editor from trash for now	2013-02-27 20:37:50 +01:00
Robin Appelman	f497970e30	Trash: fix download.php	2013-02-27 20:31:21 +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
Jenkins for ownCloud	63d9feb8c0	[tx-robot] updated from transifex	2013-02-26 00:06:26 +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
Jenkins for ownCloud	21f3291eee	[tx-robot] updated from transifex	2013-02-25 00:06:17 +01:00
Thomas Müller	a417028ccd	Merge pull request #1862 from owncloud/whitespace-cleanup ... Whitespace cleanup	2013-02-23 11:39:13 -08:00
Jenkins for ownCloud	6aa0ecc9b8	[tx-robot] updated from transifex	2013-02-23 00:05:33 +01:00
Bart Visscher	bb75dfc021	Whitespace fixes	2013-02-22 19:05:36 +01:00
Jörn Friedrich Dreyer	e8da90d0f4	Merge pull request #1711 from owncloud/style-cleanup ... Codestyle cleanup	2013-02-22 07:02:51 -08:00
Björn Schießle	df76e0d1c3	use the same string lengths like the file cache	2013-02-22 10:05:08 +01:00
Jenkins for ownCloud	734a463297	[tx-robot] updated from transifex	2013-02-22 00:08:47 +01:00
Bart Visscher	fb7de77474	Style cleanup files_trashbin	2013-02-21 23:47:21 +01:00
Björn Schießle	629097bee7	increase db fileds for usernames	2013-02-21 22:44:44 +01:00
Björn Schießle	89ef06cd79	rename app to 'deleted files'	2013-02-21 16:34:22 +01:00
Björn Schießle	2436d01985	calculate trashbin size per user	2013-02-21 12:37:13 +01:00
Jenkins for ownCloud	dcd93a53e4	[tx-robot] updated from transifex	2013-02-21 00:15:58 +01:00
Björn Schießle	6aed7abfbe	Merge branch 'master' into trashbin_encryption	2013-02-21 00:05:30 +01:00
Björn Schießle	fc1fba2304	don't show empty trash bin message for sub folders	2013-02-21 00:02:52 +01:00
Thomas Mueller	3eb9cd035f	Merge branch 'master' into trash_bin_delete_selected	2013-02-20 23:46:15 +01:00
Björn Schießle	c1847aaf51	change for loop to make it hopefully work with IE	2013-02-20 22:32:44 +01:00
Björn Schießle	2d6efae257	update path to deleted files	2013-02-20 22:19:23 +01:00
Björn Schießle	b685aa8bcb	some fixes for the keyfile handling	2013-02-20 22:17:04 +01:00
Bernhard Posselt	3b9d9eea09	replaced for in loops with normal enumerating loops to fix #1803	2013-02-20 21:57:50 +01:00
Björn Schießle	5329c9ea31	update script which copies all trash bin related files to user/files_trashbin	2013-02-20 19:18:34 +01:00
Björn Schießle	5ce6d1fb57	reuse delete() function in expire()	2013-02-20 18:00:15 +01:00
Björn Schießle	4b5a662e09	delete keyfiles if file in trash bin gets deleted permanently	2013-02-20 17:58:04 +01:00
Björn Schießle	273e1a146b	switch to json encoded file list	2013-02-20 16:33:45 +01:00
Björn Schießle	3a364639b7	use "|" as delimiter instead of ";", since "|" is not allowed in file/folder names	2013-02-20 15:17:32 +01:00
Björn Schießle	c49e73d43c	restore filekeys from trash bin	2013-02-20 15:14:32 +01:00
Björn Schießle	4d0df9614b	put all trash bin content in user/files_trashbin	2013-02-20 13:34:32 +01:00
Jenkins for ownCloud	99758dce2b	[tx-robot] updated from transifex	2013-02-20 00:03:28 +01:00
Björn Schießle	686254ac11	move2trash() handles keyfiles	2013-02-19 18:45:46 +01:00
Björn Schießle	211e651d72	add timestamp to function call; fix trash.js to handle multiple delete operation at once	2013-02-19 12:38:00 +01:00
Björn Schießle	7bfbfe6562	initialize $result	2013-02-19 12:24:51 +01:00
Björn Schießle	f45b268b93	rebase to master	2013-02-19 12:16:54 +01:00
Björn Schießle	e6c39fc3e7	change $_REQUEST to $_POST; fix check if file was successfully deleted	2013-02-19 12:14:44 +01:00
Björn Schießle	95751874a1	Merge pull request #1740 from houqp/issue#1688 ... Bug fix for Issue#1688	2013-02-19 03:09:03 -08:00
Björn Schießle	ac1b2a74ef	add missing paramenter to post request	2013-02-19 11:50:29 +01:00
Björn Schießle	815e964362	use instead of	2013-02-19 11:49:41 +01:00
Lukas Reschke	3d7545269b	Merge pull request #1764 from owncloud/Undelete_directory_fix ... Fix for Undelete directory action	2013-02-19 01:34:49 -08:00
Björn Schießle	51cef9d8f0	allow user to delete selected files from the trash bin permanently	2013-02-19 10:24:21 +01:00
Björn Schießle	9a93db9642	remove obsolete variables	2013-02-19 10:23:34 +01:00
Jenkins for ownCloud	76c4dc6296	[tx-robot] updated from transifex	2013-02-19 00:06:51 +01:00
Victor Dubiniuk	e2f87e456f	Calculate size for existing directories only	2013-02-18 23:48:08 +03:00
Björn Schießle	37352bba96	close file handler after readdir()	2013-02-18 18:16:19 +01:00
Qingping Hou	c0ac98066e	check filename and timestamp in Trashbin's file_exists method	2013-02-18 09:49:50 -05:00
Jenkins for ownCloud	c8e7b14ab3	[tx-robot] updated from transifex	2013-02-17 00:26:17 +01:00
Qingping Hou	4b4b1f8692	Properly delete empty directories in Trashbin ... Instead of checking delted file size, we do a real check. this fixes #1688	2013-02-16 17:44:51 -05:00
Qingping Hou	50759607e4	add file_exists method to files_trashbin app	2013-02-16 17:42:06 -05:00
Jenkins for ownCloud	b169073169	[tx-robot] updated from transifex	2013-02-15 00:06:50 +01:00
Bart Visscher	9058d398a7	Merge pull request #1662 from owncloud/style-cleanup ... Style cleanup	2013-02-14 12:54:36 -08:00
Björn Schießle	ae172ce7de	improved description of the trash bin app	2013-02-14 13:01:02 +01:00
Bart Visscher	cd35d257bb	Fix NoSpaceAfterComma and SpaceBeforeComma	2013-02-14 08:36:26 +01:00
Bart Visscher	d3ef967993	Fix indentation style	2013-02-14 08:36:26 +01:00
Jenkins for ownCloud	bfe6334cd9	[tx-robot] updated from transifex	2013-02-14 00:06:51 +01:00
Jenkins for ownCloud	68fa0b7dcc	[tx-robot] updated from transifex	2013-02-13 00:05:40 +01:00
Jenkins for ownCloud	8d9352a40d	[tx-robot] updated from transifex	2013-02-12 15:12:46 +01:00
Jenkins for ownCloud	fb23ac3ce2	[tx-robot] updated from transifex	2013-02-12 00:21:45 +01:00
Jenkins for ownCloud	39d19a9274	[tx-robot] updated from transifex	2013-02-11 15:42:41 +01:00
Jenkins for ownCloud	04146f2059	[tx-robot] updated from transifex	2013-02-11 00:04:49 +01:00
Björn Schießle	046ede8e46	Merge pull request #1558 from schiesbn/trashbin_sizelimit ... Trashbin sizelimit	2013-02-10 09:02:05 -08:00
Jörn Friedrich Dreyer	1c56539c01	Merge pull request #1551 from owncloud/fix_files_multiselect ... Fix filelist shifting up one row on (multi)select	2013-02-10 02:54:12 -08:00
Björn Schießle	b7b50f8082	remove hascontrols from trash bin file list table	2013-02-10 11:14:03 +01:00
Bernhard Posselt	76a6209c8e	Merge pull request #1564 from schiesbn/trash_bin_breadcrumbs ... don't add a extra 'Trash' breadcrumb since we have the home-symbol now	2013-02-10 01:56:11 -08:00
Jenkins for ownCloud	f7d898d835	[tx-robot] updated from transifex	2013-02-10 00:10:29 +01:00
Björn Schießle	d5dc8ae726	initialize breadcrumbs array	2013-02-09 12:41:47 +01:00
Björn Schießle	7507b1ddd3	don't add a extra 'Trash' breadcrumb since we have the home-symbol now	2013-02-09 12:32:08 +01:00
Björn Schießle	60cc7d0ba2	debug output removed	2013-02-09 11:11:07 +01:00
Björn Schießle	b24e3f1d32	comment added	2013-02-09 11:07:47 +01:00
Jenkins for ownCloud	e5c05e9674	[tx-robot] updated from transifex	2013-02-09 00:14:08 +01:00
Jenkins for ownCloud	59249ebc0c	[tx-robot] updated from transifex	2013-02-08 00:13:16 +01:00
Robin Appelman	f93f9dd50c	merge master into trash_fileactions	2013-02-08 00:11:54 +01:00
Björn Schießle	808de17aeb	use never more that 50% of available disc space for the trash bin	2013-02-07 17:37:46 +01:00
Thomas Mueller	18a288a3c3	l10n support enhanced in files_trashbin	2013-02-07 16:31:04 +01:00
Björn Schießle	ca43e09276	keep track of trash bin size	2013-02-07 15:16:29 +01:00
blizzz	6299704dfd	Merge pull request #1518 from schiesbn/trash_layout_fix ... add class hascontrols to trash bin file table	2013-02-07 04:40:51 -08:00
Björn Schießle	ce293b8efc	remove debug output	2013-02-07 13:16:15 +01:00
Björn Schießle	7e874af2c8	rename OCA_Trash to OCA\Files_Trashbin	2013-02-07 13:14:45 +01:00
Björn Schießle	c81d7b0b90	OCA_Versions is now known as OCA\Files_Versions	2013-02-07 12:45:27 +01:00
Björn Schießle	17384994d6	add class hascontrols to trash bin file table	2013-02-07 10:13:09 +01:00
Jenkins for ownCloud	35bd7a400d	[tx-robot] updated from transifex	2013-02-07 00:11:04 +01:00
Björn Schießle	fd171a4f34	copy&paste bug, no fetchAll() needed here	2013-02-06 16:50:16 +01:00
Björn Schießle	8cc7bab0e5	delete debug code	2013-02-06 16:25:10 +01:00
Björn Schießle	e2516a2b65	allow to delete single files from the trash bin permanently	2013-02-06 16:23:22 +01:00
Jenkins for ownCloud	335b6cd060	[tx-robot] updated from transifex	2013-02-06 00:06:28 +01:00
Jenkins for ownCloud	98f37f4bed	[tx-robot] updated from transifex	2013-02-05 00:20:29 +01:00
Björn Schießle	fee3f80501	Merge pull request #1434 from owncloud/trashbin_CSRF ... [files_trashbin] Add CSRF token	2013-02-04 02:14:52 -08:00
Lukas Reschke	8add89ced1	OCP\JSON instead of OCP\User	2013-02-04 09:15:11 +01:00
Jenkins for ownCloud	da6e79a381	[tx-robot] updated from transifex	2013-02-04 00:05:52 +01:00
Lukas Reschke	018c5f69c0	[files_trashbin] Add CSRF token	2013-02-03 22:49:12 +01:00
Jenkins for ownCloud	2936140838	[tx-robot] updated from transifex	2013-02-03 00:06:15 +01:00
Jenkins for ownCloud	b29b55a332	[tx-robot] updated from transifex	2013-02-02 00:08:15 +01:00
Thomas Mueller	fb0a5f3224	undelete -> restore	2013-02-01 00:43:52 +01:00
Jenkins for ownCloud	94f7446724	[tx-robot] updated from transifex	2013-02-01 00:19:28 +01:00
Robin Appelman	697536cf6a	Trash: use the same sorting algoritm as files	2013-01-31 19:36:59 +01:00
Robin Appelman	9d74ce4595	Trash: fix opening folders	2013-01-31 19:20:22 +01:00
Robin Appelman	3756f235ce	Trash: enable fileactions while viewing trash	2013-01-31 18:14:22 +01:00
Robin Appelman	73cd116968	Trash: don't use depricated filesystem api classes	2013-01-31 18:04:00 +01:00
Robin Appelman	4d3d8ed296	Trash: highlight Files navigation entry while in trash	2013-01-31 17:59:01 +01:00
Thomas Mueller	4162ba4d41	adding l10n support to files_trashbin	2013-01-31 16:48:41 +01:00
Björn Schießle	c8a4878b77	is_writable() is now isUpdatable() with the new filesystem	2013-01-31 14:55:14 +01:00
Björn Schießle	dff5148f6d	debug output removed	2013-01-31 14:48:57 +01:00
Björn Schießle	9c83b307f6	keep mtime	2013-01-31 10:50:02 +01:00
Björn Schießle	2ddd40ed41	rename 'undelete' to 'restore'	2013-01-31 10:06:02 +01:00
Björn Schießle	9ca0a93847	make spinner title translatable	2013-01-30 16:20:13 +01:00
Björn Schießle	c62a38fcb1	add spinner for undelete operation for visualisation	2013-01-30 15:35:24 +01:00
Björn Schießle	e6f1544f51	fix OC_Log::ERROR call	2013-01-30 13:04:32 +01:00
Björn Schießle	a6e5f4b85c	some minor improvements	2013-01-30 13:01:53 +01:00
Björn Schießle	d6adab6734	improved message if trash bin is empty	2013-01-30 10:07:29 +01:00
Björn Schießle	0c8bcacdc8	added some additional error handling	2013-01-29 13:36:33 +01:00
Björn Schießle	eafd34684c	seperate css no longer needed, use files app css instead	2013-01-29 10:08:41 +01:00
Björn Schießle	d10e137939	icons added; empty trash bin message added	2013-01-29 10:03:04 +01:00
Björn Schießle	f28857377d	use hidden input field to disable sharing	2013-01-28 11:28:16 +01:00
Björn Schießle	dbb0d04073	restore file in the root folder if the origin folder is not writable	2013-01-24 15:29:22 +01:00
Björn Schießle	6ab95e8e33	code clean-up	2013-01-23 11:30:42 +01:00
Björn Schießle	f919230f63	remove inline JavaScript	2013-01-22 17:59:33 +01:00
Björn Schießle	b694f996d9	allow admin to change retention obligation for the trash bin, default value is 180 days	2013-01-22 15:33:54 +01:00
Björn Schießle	16d7716dee	calculate correct relative date for trashbin file list	2013-01-22 15:33:54 +01:00
Björn Schießle	97e69e5374	remove table row in trash bin view after undelete	2013-01-22 15:33:54 +01:00
Björn Schießle	81ab0affef	allow to restore single files/folder from a deleted folder	2013-01-22 15:33:54 +01:00
Björn Schießle	1817c7895b	allow to look into deleted directories	2013-01-22 15:33:54 +01:00
Björn Schießle	1255791ef2	handle group restore	2013-01-22 15:33:54 +01:00
Björn Schießle	655a20f963	expire files in trash bin after 30 days	2013-01-22 15:33:54 +01:00
Björn Schießle	8e57fe1a08	remove unneeded function	2013-01-22 15:33:54 +01:00
Björn Schießle	a3da82261b	remove item in the trash bin view after successful undelete	2013-01-22 15:33:53 +01:00
Björn Schießle	d605228937	first version of the trash bin app	2013-01-22 15:33:53 +01:00