You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		14 years ago
..
ajax	all unit files_encryption crypt unit tests now passing after merge	14 years ago
appinfo	Merge branch 'master' into files_encryption	14 years ago
hooks	Merge branch 'master' into files_encryption	14 years ago
js	Add missing ; to js code	14 years ago
l10n	Merge branch 'master' into files_encryption	14 years ago
lib	Merge branch 'master' into files_encryption	14 years ago
templates	cleaning up the settings. standardize the format, add missing I10N and other small things. Yes. This is not perfect. But way better than before ;-)	14 years ago
tests	Merge branch 'master' into files_encryption	14 years ago
settings-personal.php	code cleanup	14 years ago
settings.php	check if admin	14 years ago