287 Commits

Author	SHA1	Message	Date
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
Lukas Reschke	3a6e39b990	It's a class	2013-04-28 23:28:41 +02:00
Lukas Reschke	6cf6103ed2	Move onclick handler	2013-04-28 23:25:58 +02:00
Lukas Reschke	1ee224d8cb	Merge pull request #3108 from owncloud/fileactions-order ... Files: fix the order fileactions are computed for a file	2013-04-24 10:55:38 -07:00
Morris Jobke	637dd685db	fix wrong shared icon description ... fix #2928 translation of string "Shared" has to be marked as located in "files" for the translation extractor	2013-04-24 16:13:17 +02:00
Robin Appelman	ab7fcebeb3	Files: fix the order fileactions are computed for a file	2013-04-24 15:26:36 +02:00
Robin Appelman	1507d1ef26	Files: Fix XSS when creating dropshadow	2013-04-22 21:55:54 +02:00
Bart Visscher	802a5a331b	Fix displaying spinner on delete	2013-04-19 13:46:11 +02:00
Bart Visscher	6d6dfffea7	Merge pull request #2279 from owncloud/refactor_upload_js ... Refactor upload js	2013-04-06 15:44:08 -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
Jörn Friedrich Dreyer	7ecbaef16c	use css browser switch instead of deprecated jquery browser detection	2013-03-28 19:13:37 +01:00
Jörn Friedrich Dreyer	dac875eb9c	'#upload' is actually '#uploadprogresswrapper', fix css and js to show cancel button correctly	2013-03-28 18:50:49 +01:00
Jörn Friedrich Dreyer	e31d74037a	use local variable to walk DOM only once	2013-03-28 18:20:03 +01:00
Jörn Friedrich Dreyer	868d7b956d	use === to compare empty string ''	2013-03-28 18:20:03 +01:00
Jörn Friedrich Dreyer	831b7ca803	don't update progress bar in ie < 10	2013-03-28 18:20:03 +01:00
Jörn Friedrich Dreyer	c1a944a655	return created table row, use as context in fileupload events	2013-03-28 18:17:18 +01:00
Jörn Friedrich Dreyer	4dd4167f80	refactor files.js, make proper use of fileupload events	2013-03-28 18:17:18 +01:00
Jörn Friedrich Dreyer	df31ee5a90	Merge pull request #2575 from owncloud/fixing-1461-master ... Fix upload progressbar in IE8 and IE9	2013-03-28 10:01:39 -07:00
Thomas Mueller	586a47b186	fixes #1463 - file size is now displayed correctly in IE8	2013-03-26 21:28:01 +01:00
Thomas Mueller	cf50e67e1b	prevent to fire delete ajax a second time. ... Before the click on a single file delete icon fired two different handlers - one of them is for multiple deletion only	2013-03-26 16:27:56 +01:00
Thomas Mueller	e0e5cb73bf	fixes #1461	2013-03-26 14:14:30 +01:00
Björn Schießle	d121180d46	Merge pull request #2270 from owncloud/fix_json_encoded_pubic_download ... let public link download handle json encoded file lists [master]	2013-03-26 01:56:47 -07:00
Björn Schießle	e5f40ddaae	only prevent shared action for the Shared folder in the root dir	2013-03-13 11:33:20 +01:00
Björn Schießle	f971ce0b66	let public link download handle json encoded file lists	2013-03-13 11:15:17 +01:00
Björn Schießle	b2da2f769a	don't add share action to the Shared folder	2013-03-12 17:28:36 +01:00
Björn Schießle	4a4f705adc	json encode list of files	2013-03-07 14:15:02 +01:00
Michael Gapczynski	0488968443	Merge pull request #2034 from owncloud/fix_bug47 ... Fix #47 - Duplicate files create a (2) when multiples are uploaded	2013-03-03 11:49:04 -08:00
Georg Ehrke	ff9476b3e3	fix oc#47	2013-03-01 18:30:25 +01:00
Bernhard Posselt	1d83d76b45	fixed bug that prevented a newly created file to be opened with registered files actions	2013-02-25 17:50:17 +01:00
Björn Schießle	3ef8c0bda3	Merge pull request #1892 from owncloud/files_remove_row_on_delete ... delete table row if file was deleted instead of just hide it	2013-02-25 07:44:35 -08:00
Björn Schießle	dbf2bfc8cd	delete table row if file was deleted instead of just hide it	2013-02-25 16:32:54 +01:00
Jörn Friedrich Dreyer	664e7a3fc2	use distance option to delay dragging in sane browsers	2013-02-25 15:08:14 +01:00
Thomas Müller	7c30c1a2e8	Merge pull request #1833 from owncloud/fix_1465 ... Fix 1465	2013-02-25 04:34:13 -08:00
Bart Visscher	bb75dfc021	Whitespace fixes	2013-02-22 19:05:36 +01:00
Jörn Friedrich Dreyer	0dd7fd0599	IE8 does not support window.onclick	2013-02-21 17:38:25 +01:00
Bernhard Posselt	3b9d9eea09	replaced for in loops with normal enumerating loops to fix #1803	2013-02-20 21:57:50 +01:00
VicDeo	fde0a8b520	Add Ability to the app to detect more details on the file	2013-02-18 13:22:43 +03:00
Thomas Mueller	a03d70209f	fixing undefined originalEvent	2013-02-14 12:19:50 +01:00
Robin Appelman	37ea784294	Files: always show share action at the right ... Fixes #1619	2013-02-11 16:09:04 +01:00
Jörn Friedrich Dreyer	bf4a073dca	count divs in actions instead of action div itself (is set to 100%)	2013-02-10 12:38:16 +01:00
Jörn Friedrich Dreyer	676f89bbdb	extract common code	2013-02-09 14:42:03 +01:00
Jörn Friedrich Dreyer	0c73cae77b	Merge pull request #1565 from owncloud/fix_replacing ... remove code properly to make @DeepDiver1975 happy ;)	2013-02-09 03:58:06 -08:00
Georg Ehrke	2137bbe330	remove code properly	2013-02-09 12:38:40 +01:00
Bernhard Posselt	ab4ae2b952	Merge pull request #1560 from owncloud/fix_replacing ... remove (comment out) old code to fix replacing of files	2013-02-09 03:28:40 -08:00
Björn Schießle	ca243f3fac	Merge pull request #1521 from schiesbn/label_fixed ... don't call the delete button unshare, unshare operation no longer available	2013-02-09 03:14:25 -08:00
Georg Ehrke	8961e675c7	remove (comment out) old code to fix replacing of files	2013-02-09 11:28:13 +01:00
Jörn Friedrich Dreyer	5a15221910	Merge pull request #1550 from owncloud/fix-files-download-links ... Fix files router download links	2013-02-09 01:28:25 -08:00
Bart Visscher	ed1dc3e064	Fix files router download links	2013-02-08 22:05:13 +01:00