4177 Commits

Author	SHA1	Message	Date
Sam Tuke	3fbf362ba2	Removed debugging comments	2013-01-14 12:36:46 +00:00
Sam Tuke	fed74eda1c	Removed old and unnecessary comments	2013-01-10 18:48:40 +00:00
Sam Tuke	2e30641caa	Removed misleading crypto gen comment	2013-01-10 18:19:37 +00:00
Sam Tuke	9ca9124dc1	Merge branch 'master' into files_encryption	2013-01-10 18:07:15 +00:00
Sam Tuke	61104d1441	Re-added 'checkAdminUser' ... Improved code formatting	2013-01-10 18:04:52 +00:00
Thomas Müller	23dd7f1bea	Merge pull request #1127 from owncloud/fixing-641-for-webdav-master ... webdav returns "503 Service Unavailable" in case the ownCloud server is ...	2013-01-10 02:27:00 -08:00
Jenkins for ownCloud	912050afa0	[tx-robot] updated from transifex	2013-01-10 00:05:53 +01:00
Lukas Reschke	fda1ada4f0	Merge pull request #1131 from owncloud/more_translations ... translate move and rename error messages	2013-01-09 12:07:39 -08:00
Lukas Reschke	ca027f3749	Merge pull request #1124 from schiesbn/sabredav2 ... OC_Connector_Sabre_Client no longer needed	2013-01-09 12:06:25 -08:00
Jörn Friedrich Dreyer	a40c95242f	more translations	2013-01-09 12:48:57 +01:00
Thomas Mueller	ccdaec6296	webdav returns "503 Service Unavailable" in case the ownCloud server is currently in maintenance mode.	2013-01-09 00:37:50 +01:00
Jenkins for ownCloud	533f0e8e25	[tx-robot] updated from transifex	2013-01-09 00:05:49 +01:00
Thomas Tanghus	dae8f15f9f	Merge pull request #938 from owncloud/fix_minor_files_annoyances ... Fix minor files annoyances	2013-01-08 15:02:06 -08:00
Björn Schießle	43415386a8	Upstream merged my patch to add additional ssl root certificates to the webdav client. ... This means that OC_Connector_Sabre_Client is no longer needed	2013-01-08 17:44:28 +01:00
Thomas Mueller	7b9e6d2f2c	fixing string concatenation in javascript ... refs ae54364d7c	2013-01-08 00:32:41 +01:00
Jenkins for ownCloud	b69328e1d1	[tx-robot] updated from transifex	2013-01-08 00:31:36 +01:00
Frank Karlitschek	861f32a22b	Update apps/user_webdavauth/user_webdavauth.php ... Fixing wrong documentation. Fixes https://github.com/owncloud/core/issues/1110	2013-01-07 16:45:03 +01:00
Jörn Friedrich Dreyer	3bb7ee521f	attach max upload tipsy to div instead of a to fix tooltip not showing due to new z-index	2013-01-07 12:23:29 +01:00
Jörn Friedrich Dreyer	da442b024c	remove aborted uploads	2013-01-07 11:11:21 +01:00
Jörn Friedrich Dreyer	cbb118d4a3	adapt to isFileNameValid, whitespace cleanup	2013-01-07 10:39:35 +01:00
Jenkins for ownCloud	0b007235b9	[tx-robot] updated from transifex	2013-01-07 00:06:32 +01:00
Thomas Mueller	9671ace32e	Merge branch 'master' into fix_minor_files_annoyances ... Conflicts: apps/files/js/files.js	2013-01-06 22:46:40 +01:00
Sam Tuke	a68b597e83	Merge branch 'master' into files_encryption	2013-01-06 18:53:32 +00:00
Sam Tuke	015787fbb3	All in-use unit tests now passing after merge	2013-01-06 18:38:35 +00:00
Sam Tuke	2d98afa1ea	Removed debugging line	2013-01-06 14:06:22 +00:00
Sam Tuke	b024db9f98	Made Keymanager::getFileKey() dependencies explicit, fixed client code and tests accordingly	2013-01-06 13:56:45 +00:00
Thomas Mueller	b4191b7da5	rename containsInvalidCharacters() to isFileNameValid() - NOTE: semantic has changed! ... adding file name checks and notifications to isFileNameValid() for . and empty file name	2013-01-06 12:52:00 +01:00
Sam Tuke	69e86c0213	Merge branch 'master' into files_encryption	2013-01-05 17:22:01 +00:00
Sam Tuke	7fe9245636	Development snapshot ... Crypt{} & Util{} unit tests now passing locally Added keymanager unit tests	2013-01-05 17:12:23 +00:00
Robin Appelman	a5dcbc3d8a	Files: prevent people from renaming files to '.'	2013-01-05 03:30:05 +01:00
Michael Gapczynski	0b13b41189	Merge pull request #1053 from owncloud/ocs_api ... External API for ownCloud based on OCS	2013-01-04 17:18:58 -08:00
Jenkins for ownCloud	934d9dcc42	[tx-robot] updated from transifex	2013-01-05 00:03:58 +01:00
Jörn Friedrich Dreyer	9cd7bb2c8d	reverse z-index of a and input to make upload work again in ie8/9	2013-01-04 13:48:29 +01:00
Jörn Friedrich Dreyer	de496ed16d	remove initial iframe, is added automatically by jquery upload mechanism	2013-01-04 13:47:47 +01:00
Jenkins for ownCloud	90f39cd703	[tx-robot] updated from transifex	2013-01-04 13:23:31 +01:00
Thomas Müller	b673748151	Merge pull request #1063 from owncloud/translate_not_enough_space_available ... add translation call for 'Not enough space available' upload error	2013-01-03 06:46:36 -08:00
Jörn Friedrich Dreyer	fc64e8ec58	fix error when wrong dir was specified	2013-01-03 13:34:56 +01:00
Jörn Friedrich Dreyer	f19787f84c	move $l to top	2013-01-03 12:00:07 +01:00
Jörn Friedrich Dreyer	ea732e5b29	also translate 'No file was uploaded. Unknown error'	2013-01-03 11:57:17 +01:00
Jenkins for ownCloud	3bcdd8c900	[tx-robot] updated from transifex	2013-01-03 00:05:19 +01:00
Thomas Müller	e0e7c98100	Merge pull request #1041 from owncloud/fixing-856-master ... Fixing #856 master	2013-01-02 14:58:54 -08:00
Thomas Mueller	3ea9432d43	fixing undefined variable $l	2013-01-02 22:15:43 +01:00
Jörn Friedrich Dreyer	0405edc798	add translation call for 'Not enough space available' upload error	2013-01-02 21:00:50 +01:00
Sam Tuke	665261dc9a	Development snapshot, mocking out Session{} for crypt unit tests	2013-01-02 19:29:22 +00:00
Sam Tuke	bf69677933	Merge branch 'master' into files_encryption ... Conflicts: apps/files/css/files.css apps/files/index.php apps/files/js/files.js apps/files/js/keyboardshortcuts.js apps/files/l10n/da.php apps/files/l10n/el.php apps/files/l10n/eu.php apps/files/l10n/hu_HU.php apps/files/l10n/mk.php apps/files/l10n/nb_NO.php apps/files/l10n/ro.php apps/files/l10n/ru.php apps/files/l10n/ru_RU.php apps/files/l10n/th_TH.php apps/files/l10n/tr.php apps/files/templates/admin.php apps/files/templates/index.php apps/files/templates/part.breadcrumb.php apps/files_encryption/appinfo/app.php apps/files_encryption/lib/crypt.php apps/files_encryption/lib/cryptstream.php apps/files_encryption/lib/proxy.php apps/files_encryption/settings.php apps/files_encryption/templates/settings.php apps/files_encryption/tests/proxy.php apps/files_encryption/tests/stream.php apps/files_external/l10n/gl.php apps/files_external/l10n/uk.php apps/files_external/personal.php apps/files_external/settings.php apps/files_external/templates/settings.php apps/files_sharing/public.php apps/user_ldap/l10n/gl.php apps/user_ldap/l10n/uk.php apps/user_ldap/lib/access.php apps/user_webdavauth/l10n/eo.php apps/user_webdavauth/l10n/eu.php apps/user_webdavauth/l10n/fr.php apps/user_webdavauth/l10n/gl.php apps/user_webdavauth/l10n/sl.php apps/user_webdavauth/l10n/tr.php apps/user_webdavauth/l10n/uk.php apps/user_webdavauth/l10n/zh_CN.php core/ajax/share.php core/css/styles.css core/l10n/ca.php core/l10n/de.php core/l10n/de_DE.php core/l10n/el.php core/l10n/eo.php core/l10n/es.php core/l10n/eu.php core/l10n/fr.php core/l10n/gl.php core/l10n/he.php core/l10n/is.php core/l10n/it.php core/l10n/nl.php core/l10n/pl.php core/l10n/pt_PT.php core/l10n/ru.php core/l10n/sl.php core/l10n/tr.php core/l10n/uk.php core/l10n/zh_CN.php core/templates/installation.php core/templates/login.php l10n/ar/files_external.po l10n/ar/settings.po l10n/bg_BG/files_external.po l10n/bg_BG/settings.po l10n/ca/core.po l10n/ca/files_external.po l10n/ca/settings.po l10n/cs_CZ/files_external.po l10n/cs_CZ/settings.po l10n/da/files.po l10n/da/files_external.po l10n/da/settings.po l10n/de/core.po l10n/de/files_external.po l10n/de/settings.po l10n/de_DE/core.po l10n/de_DE/files_external.po l10n/de_DE/settings.po l10n/el/core.po l10n/el/files.po l10n/el/files_external.po l10n/el/settings.po l10n/eo/core.po l10n/eo/files_external.po l10n/eo/settings.po l10n/eo/user_webdavauth.po l10n/es/core.po l10n/es/files_external.po l10n/es/settings.po l10n/es_AR/core.po l10n/es_AR/files_external.po l10n/es_AR/settings.po l10n/et_EE/files_external.po l10n/et_EE/settings.po l10n/et_EE/user_webdavauth.po l10n/eu/core.po l10n/eu/files.po l10n/eu/files_external.po l10n/eu/settings.po l10n/eu/user_webdavauth.po l10n/fa/files_external.po l10n/fa/settings.po l10n/fi_FI/files_external.po l10n/fi_FI/settings.po l10n/fr/core.po l10n/fr/files_external.po l10n/fr/settings.po l10n/fr/user_webdavauth.po l10n/gl/core.po l10n/gl/files_external.po l10n/gl/settings.po l10n/gl/user_ldap.po l10n/gl/user_webdavauth.po l10n/he/core.po l10n/he/files_external.po l10n/he/settings.po l10n/hi/files_external.po l10n/hi/settings.po l10n/hr/files_external.po l10n/hr/settings.po l10n/hu_HU/files.po l10n/hu_HU/files_external.po l10n/hu_HU/settings.po l10n/ia/files_external.po l10n/ia/settings.po l10n/id/files_external.po l10n/id/settings.po l10n/is/core.po l10n/is/files.po l10n/is/files_encryption.po l10n/is/files_external.po l10n/is/files_sharing.po l10n/is/files_versions.po l10n/is/lib.po l10n/is/settings.po l10n/is/user_ldap.po l10n/is/user_webdavauth.po l10n/it/core.po l10n/it/files_external.po l10n/it/settings.po l10n/ja_JP/core.po l10n/ja_JP/files_external.po l10n/ja_JP/settings.po l10n/ka_GE/files_external.po l10n/ka_GE/settings.po l10n/ko/core.po l10n/ko/files_external.po l10n/ko/settings.po l10n/ko/user_ldap.po l10n/ko/user_webdavauth.po l10n/ku_IQ/files_external.po l10n/ku_IQ/settings.po l10n/lb/files_external.po l10n/lb/settings.po l10n/lt_LT/files_external.po l10n/lt_LT/settings.po l10n/lv/files_external.po l10n/lv/settings.po l10n/mk/files.po l10n/mk/files_external.po l10n/mk/settings.po l10n/ms_MY/files_external.po l10n/ms_MY/settings.po l10n/nb_NO/files.po l10n/nb_NO/files_external.po l10n/nb_NO/settings.po l10n/nl/core.po l10n/nl/files_external.po l10n/nl/settings.po l10n/nn_NO/files_external.po l10n/nn_NO/settings.po l10n/oc/files_external.po l10n/oc/settings.po l10n/pl/core.po l10n/pl/files_external.po l10n/pl/settings.po l10n/pl_PL/files_external.po l10n/pl_PL/settings.po l10n/pt_BR/core.po l10n/pt_BR/files_external.po l10n/pt_BR/settings.po l10n/pt_PT/core.po l10n/pt_PT/files_external.po l10n/pt_PT/settings.po l10n/ro/files.po l10n/ro/files_external.po l10n/ro/settings.po l10n/ru/core.po l10n/ru/files.po l10n/ru/files_external.po l10n/ru/settings.po l10n/ru_RU/files.po l10n/ru_RU/files_external.po l10n/ru_RU/settings.po l10n/si_LK/files_external.po l10n/si_LK/settings.po l10n/sk_SK/core.po l10n/sk_SK/files_external.po l10n/sk_SK/settings.po l10n/sk_SK/user_webdavauth.po l10n/sl/core.po l10n/sl/files_external.po l10n/sl/settings.po l10n/sl/user_webdavauth.po l10n/sq/core.po l10n/sq/files_external.po l10n/sq/settings.po l10n/sq/user_ldap.po l10n/sq/user_webdavauth.po l10n/sr/core.po l10n/sr/files_external.po l10n/sr/settings.po l10n/sr@latin/files_external.po l10n/sr@latin/settings.po l10n/sv/files_external.po l10n/sv/settings.po l10n/ta_LK/files_external.po l10n/ta_LK/settings.po l10n/ta_LK/user_ldap.po l10n/ta_LK/user_webdavauth.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_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/th_TH/settings.po l10n/th_TH/user_webdavauth.po l10n/tr/core.po l10n/tr/files.po l10n/tr/files_external.po l10n/tr/settings.po l10n/tr/user_webdavauth.po l10n/uk/core.po l10n/uk/files_external.po l10n/uk/settings.po l10n/uk/user_ldap.po l10n/uk/user_webdavauth.po l10n/vi/core.po l10n/vi/files_external.po l10n/vi/settings.po l10n/zh_CN.GB2312/files_external.po l10n/zh_CN.GB2312/settings.po l10n/zh_CN/core.po l10n/zh_CN/files_external.po l10n/zh_CN/settings.po l10n/zh_CN/user_webdavauth.po l10n/zh_HK/core.po l10n/zh_HK/files_external.po l10n/zh_HK/settings.po l10n/zh_HK/user_ldap.po l10n/zh_HK/user_webdavauth.po l10n/zh_TW/core.po l10n/zh_TW/files_external.po l10n/zh_TW/settings.po l10n/zh_TW/user_ldap.po l10n/zh_TW/user_webdavauth.po l10n/zu_ZA/files_external.po l10n/zu_ZA/settings.po lib/base.php lib/filecache.php lib/files.php lib/helper.php lib/l10n.php lib/request.php lib/util.php settings/ajax/togglegroups.php settings/js/users.js settings/l10n/ar.php settings/l10n/de_DE.php settings/l10n/el.php settings/l10n/eo.php settings/l10n/es_AR.php settings/l10n/eu.php settings/l10n/fa.php settings/l10n/gl.php settings/l10n/he.php settings/l10n/hi.php settings/l10n/ko.php settings/l10n/si_LK.php settings/l10n/sk_SK.php settings/l10n/sl.php settings/l10n/sr.php settings/l10n/ta_LK.php settings/l10n/th_TH.php settings/l10n/tr.php settings/l10n/uk.php settings/l10n/vi.php settings/l10n/zh_CN.php settings/l10n/zh_TW.php settings/templates/help.php	2013-01-02 17:14:23 +00:00
Jörn Friedrich Dreyer	03b8a065cf	input/form switching cleanup	2013-01-02 17:03:16 +01:00
Jörn Friedrich Dreyer	a6733ff012	abort rename on ESC keyup	2013-01-02 16:17:30 +01:00
Jörn Friedrich Dreyer	740b6623aa	show notification when renaming a file to ''	2013-01-02 16:17:30 +01:00
Jörn Friedrich Dreyer	32c2b0d50e	enable enter in ie by using .submit()+form instead of .change(), use notifications when name is empty	2013-01-02 16:17:30 +01:00
Jörn Friedrich Dreyer	8148c187a3	whitespace cleanup	2013-01-02 16:07:10 +01:00