921 Commits

Author	SHA1	Message	Date
Florin Peter	3579ba1e41	Merge branch 'master' into files_encryption ... Conflicts: apps/user_ldap/l10n/nn_NO.php core/l10n/es.php core/l10n/et_EE.php core/l10n/ja_JP.php core/l10n/nn_NO.php l10n/ca/core.po l10n/ca/files_external.po l10n/ca/settings.po l10n/cy_GB/core.po l10n/cy_GB/files.po l10n/cy_GB/files_encryption.po l10n/cy_GB/files_external.po l10n/cy_GB/files_sharing.po l10n/cy_GB/files_trashbin.po l10n/cy_GB/lib.po l10n/cy_GB/settings.po l10n/de_DE/core.po l10n/es/core.po l10n/et_EE/core.po l10n/et_EE/files.po l10n/et_EE/settings.po l10n/et_EE/user_ldap.po l10n/gl/core.po l10n/it/core.po l10n/ja_JP/core.po l10n/ja_JP/settings.po l10n/nn_NO/core.po l10n/nn_NO/user_ldap.po l10n/pt_BR/core.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/zh_TW/files_sharing.po settings/l10n/et_EE.php	2013-05-01 09:31:26 +02:00
Jenkins for ownCloud	6163a85668	[tx-robot] updated from transifex	2013-05-01 02:02:59 +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
Jenkins for ownCloud	5764bf088e	[tx-robot] updated from transifex	2013-04-30 01:59:18 +02:00
Morris Jobke	cc9933be1c	Merge pull request #3160 from owncloud/remove-onclick ... Remove onclick	2013-04-29 03:58:44 -07:00
Lukas Reschke	3a6e39b990	It's a class	2013-04-28 23:28:41 +02:00
Lukas Reschke	003e6adb3f	Remove uneeded onclick handler	2013-04-28 23:26:07 +02:00
Lukas Reschke	6cf6103ed2	Move onclick handler	2013-04-28 23:25:58 +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	7ea2f785f4	[tx-robot] updated from transifex	2013-04-26 01:58:21 +02:00
Jenkins for ownCloud	a0df5903b0	[tx-robot] updated from transifex	2013-04-25 01:55:56 +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
Jenkins for ownCloud	62b9c88bb9	[tx-robot] updated from transifex	2013-04-24 18:31:36 +02: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
Jenkins for ownCloud	a7b4469b2e	[tx-robot] updated from transifex	2013-04-24 02:01:20 +02:00
Robin Appelman	1507d1ef26	Files: Fix XSS when creating dropshadow	2013-04-22 21:55:54 +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
Bart Visscher	802a5a331b	Fix displaying spinner on delete	2013-04-19 13:46:11 +02:00
Bart Visscher	a21885953f	No need to strip slashes, json_decode handles that for us	2013-04-19 13:45:40 +02:00
Jenkins for ownCloud	cbd8b792d9	[tx-robot] updated from transifex	2013-04-18 02:09:28 +02:00
Jenkins for ownCloud	37868818ff	[tx-robot] updated from transifex	2013-04-17 02:29:17 +02:00
Jörn Friedrich Dreyer	606b672a3d	always connect file cache updater hooks first	2013-04-16 13:07:55 +02:00
Jenkins for ownCloud	d0b3e8aceb	[tx-robot] updated from transifex	2013-04-16 02:17:30 +02:00
Jenkins for ownCloud	e13e4c412f	[tx-robot] updated from transifex	2013-04-15 02:12:43 +02:00
Jenkins for ownCloud	7d68cd4040	[tx-robot] updated from transifex	2013-04-14 02:20:35 +02:00
Jenkins for ownCloud	19afc216cf	[tx-robot] updated from transifex	2013-04-13 02:15:54 +02:00
Jenkins for ownCloud	33ee2e2f10	[tx-robot] updated from transifex	2013-04-12 02:11:02 +02:00
Jenkins for ownCloud	b02db643d0	[tx-robot] updated from transifex	2013-04-11 02:10:41 +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
Jenkins for ownCloud	ccde0212b1	[tx-robot] updated from transifex	2013-04-08 02:18:28 +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
Bart Visscher	248e097f3c	Merge pull request #1974 from owncloud/use-rawurlencode ... OC6- Just use rawurlencode in files list template	2013-04-06 11:55:44 -07: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
Jenkins for ownCloud	6798b6dc34	[tx-robot] updated from transifex	2013-04-06 00:05:32 +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
Bart Visscher	e824c6cffa	Merge pull request #2611 from owncloud/filename-width ... Adds a fixed width to the filename to prevent horizontal scroll.	2013-04-04 05:32:38 -07:00
Jenkins for ownCloud	cbece8b12f	[tx-robot] updated from transifex	2013-04-04 00:06:51 +02:00
Jan-Christoph Borchardt	f8e48955b9	Merge pull request #2576 from owncloud/fixing-2125-master ... fixes #2125 - the warning is now displayed with a disabled button	2013-03-31 09:53:07 -07:00
Jenkins for ownCloud	5e74ec26a8	[tx-robot] updated from transifex	2013-03-30 00:06:29 +01:00
raghunayyar	5dd1f7d764	Using max-width instead of width for filename.	2013-03-30 00:13:47 +05:30
raghunayyar	024b60decc	Adds a fixed width to the filename to prevent horizontal scroll.	2013-03-29 16:26:03 +05:30
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