Commit Graph

35 Commits

Author SHA1 Message Date
Sam Tuke 063f225a26 Merge branch 'master' into files_encryption
Encryption unit tests still failing, needs work
Conflicts:
	3rdparty/Archive/Tar.php
	3rdparty/MDB2/Driver/Datatype/Common.php
	3rdparty/MDB2/Driver/mysql.php
	3rdparty/Sabre/CalDAV/CalendarQueryValidator.php
	3rdparty/Sabre/CalDAV/Plugin.php
	3rdparty/Sabre/CalDAV/Version.php
	3rdparty/Sabre/CardDAV/AddressBook.php
	3rdparty/Sabre/CardDAV/AddressBookQueryParser.php
	3rdparty/Sabre/CardDAV/Plugin.php
	3rdparty/Sabre/CardDAV/Version.php
	3rdparty/Sabre/DAV/Client.php
	3rdparty/Sabre/DAV/Locks/Plugin.php
	3rdparty/Sabre/DAV/Server.php
	3rdparty/Sabre/DAV/Tree/Filesystem.php
	3rdparty/Sabre/DAV/Version.php
	3rdparty/Sabre/HTTP/BasicAuth.php
	3rdparty/Sabre/HTTP/Version.php
	3rdparty/Sabre/VObject/Component/VEvent.php
	3rdparty/Sabre/VObject/DateTimeParser.php
	3rdparty/Sabre/VObject/RecurrenceIterator.php
	3rdparty/Sabre/VObject/Version.php
	3rdparty/class.phpmailer.php
	3rdparty/class.smtp.php
	3rdparty/css/chosen-sprite.png
	3rdparty/css/chosen.css
	3rdparty/css/chosen/chosen.css
	3rdparty/fullcalendar/css/fullcalendar.css
	3rdparty/fullcalendar/css/fullcalendar.print.css
	3rdparty/fullcalendar/js/fullcalendar.js
	3rdparty/fullcalendar/js/fullcalendar.min.js
	3rdparty/fullcalendar/js/gcal.js
	3rdparty/js/chosen/VERSION
	3rdparty/js/chosen/chosen.jquery.js
	3rdparty/js/chosen/chosen.jquery.min.js
	3rdparty/openid/class.openid.v3.php
	3rdparty/openid/phpmyid.php
	3rdparty/php-cloudfiles/cloudfiles.php
	3rdparty/smb4php/smb.php
	3rdparty/timepicker/css/jquery.ui.timepicker.css
	3rdparty/timepicker/js/i18n/i18n.html
	3rdparty/timepicker/js/i18n/jquery.ui.timepicker-de.js
	3rdparty/timepicker/js/i18n/jquery.ui.timepicker-ja.js
	3rdparty/timepicker/js/jquery.ui.timepicker.js
	3rdparty/timepicker/releases.txt
	README
	apps/files/admin.php
	apps/files/ajax/autocomplete.php
	apps/files/ajax/move.php
	apps/files/ajax/newfile.php
	apps/files/ajax/scan.php
	apps/files/ajax/timezone.php
	apps/files/ajax/upload.php
	apps/files/appinfo/filesync.php
	apps/files/appinfo/update.php
	apps/files/css/files.css
	apps/files/index.php
	apps/files/js/fileactions.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files/l10n/ar.php
	apps/files/l10n/bg_BG.php
	apps/files/l10n/ca.php
	apps/files/l10n/cs_CZ.php
	apps/files/l10n/da.php
	apps/files/l10n/de.php
	apps/files/l10n/el.php
	apps/files/l10n/eo.php
	apps/files/l10n/es.php
	apps/files/l10n/es_AR.php
	apps/files/l10n/et_EE.php
	apps/files/l10n/eu.php
	apps/files/l10n/fa.php
	apps/files/l10n/fi_FI.php
	apps/files/l10n/fr.php
	apps/files/l10n/gl.php
	apps/files/l10n/he.php
	apps/files/l10n/hr.php
	apps/files/l10n/hu_HU.php
	apps/files/l10n/ia.php
	apps/files/l10n/id.php
	apps/files/l10n/it.php
	apps/files/l10n/ja_JP.php
	apps/files/l10n/ko.php
	apps/files/l10n/lb.php
	apps/files/l10n/lt_LT.php
	apps/files/l10n/lv.php
	apps/files/l10n/mk.php
	apps/files/l10n/ms_MY.php
	apps/files/l10n/nb_NO.php
	apps/files/l10n/nl.php
	apps/files/l10n/nn_NO.php
	apps/files/l10n/oc.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/ru_RU.php
	apps/files/l10n/si_LK.php
	apps/files/l10n/sk_SK.php
	apps/files/l10n/sl.php
	apps/files/l10n/sr.php
	apps/files/l10n/sr@latin.php
	apps/files/l10n/sv.php
	apps/files/l10n/th_TH.php
	apps/files/l10n/tr.php
	apps/files/l10n/uk.php
	apps/files/l10n/vi.php
	apps/files/l10n/zh_CN.GB2312.php
	apps/files/l10n/zh_CN.php
	apps/files/l10n/zh_TW.php
	apps/files/templates/admin.php
	apps/files/templates/index.php
	apps/files/templates/part.breadcrumb.php
	apps/files/templates/part.list.php
	apps/files_encryption/appinfo/app.php
	apps/files_encryption/appinfo/info.xml
	apps/files_encryption/js/settings.js
	apps/files_encryption/l10n/fa.php
	apps/files_encryption/l10n/sl.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/encryption.php
	apps/files_encryption/tests/proxy.php
	apps/files_encryption/tests/stream.php
	apps/files_external/l10n/cs_CZ.php
	apps/files_external/l10n/et_EE.php
	apps/files_external/l10n/lt_LT.php
	apps/files_external/l10n/nl.php
	apps/files_external/l10n/ru.php
	apps/files_external/l10n/sk_SK.php
	apps/files_external/l10n/sl.php
	apps/files_external/l10n/vi.php
	apps/files_external/lib/config.php
	apps/files_external/lib/ftp.php
	apps/files_external/lib/smb.php
	apps/files_external/lib/streamwrapper.php
	apps/files_external/lib/swift.php
	apps/files_external/lib/webdav.php
	apps/files_external/tests/ftp.php
	apps/files_sharing/appinfo/update.php
	apps/files_sharing/css/public.css
	apps/files_sharing/js/share.js
	apps/files_sharing/l10n/de.php
	apps/files_sharing/l10n/et_EE.php
	apps/files_sharing/l10n/ja_JP.php
	apps/files_sharing/l10n/nb_NO.php
	apps/files_sharing/l10n/ru.php
	apps/files_sharing/l10n/sl.php
	apps/files_sharing/l10n/vi.php
	apps/files_sharing/lib/share/file.php
	apps/files_sharing/lib/share/folder.php
	apps/files_sharing/lib/sharedstorage.php
	apps/files_sharing/public.php
	apps/files_sharing/templates/public.php
	apps/files_versions/l10n/et_EE.php
	apps/files_versions/l10n/lt_LT.php
	apps/files_versions/l10n/nb_NO.php
	apps/files_versions/l10n/nl.php
	apps/files_versions/l10n/ru.php
	apps/files_versions/l10n/sl.php
	apps/files_versions/l10n/vi.php
	apps/files_versions/lib/hooks.php
	apps/files_versions/lib/versions.php
	apps/user_ldap/appinfo/database.xml
	apps/user_ldap/appinfo/update.php
	apps/user_ldap/group_ldap.php
	apps/user_ldap/l10n/da.php
	apps/user_ldap/l10n/et_EE.php
	apps/user_ldap/l10n/pt_PT.php
	apps/user_ldap/l10n/sl.php
	apps/user_ldap/l10n/vi.php
	apps/user_ldap/l10n/zh_CN.php
	apps/user_ldap/lib/access.php
	apps/user_ldap/lib/connection.php
	apps/user_ldap/settings.php
	apps/user_ldap/templates/settings.php
	apps/user_ldap/tests/group_ldap.php
	apps/user_ldap/user_ldap.php
	apps/user_webdavauth/appinfo/app.php
	apps/user_webdavauth/appinfo/info.xml
	apps/user_webdavauth/settings.php
	apps/user_webdavauth/templates/settings.php
	apps/user_webdavauth/user_webdavauth.php
	autotest.sh
	core/ajax/appconfig.php
	core/ajax/share.php
	core/ajax/translations.php
	core/ajax/vcategories/add.php
	core/ajax/vcategories/delete.php
	core/ajax/vcategories/edit.php
	core/css/share.css
	core/js/eventsource.js
	core/js/js.js
	core/js/oc-vcategories.js
	core/js/share.js
	core/l10n/ar.php
	core/l10n/bg_BG.php
	core/l10n/ca.php
	core/l10n/cs_CZ.php
	core/l10n/da.php
	core/l10n/de.php
	core/l10n/el.php
	core/l10n/eo.php
	core/l10n/es.php
	core/l10n/es_AR.php
	core/l10n/et_EE.php
	core/l10n/eu.php
	core/l10n/fa.php
	core/l10n/fi_FI.php
	core/l10n/fr.php
	core/l10n/gl.php
	core/l10n/he.php
	core/l10n/hi.php
	core/l10n/hr.php
	core/l10n/hu_HU.php
	core/l10n/ia.php
	core/l10n/id.php
	core/l10n/it.php
	core/l10n/ja_JP.php
	core/l10n/ko.php
	core/l10n/ku_IQ.php
	core/l10n/lb.php
	core/l10n/lt_LT.php
	core/l10n/lv.php
	core/l10n/mk.php
	core/l10n/ms_MY.php
	core/l10n/nb_NO.php
	core/l10n/nl.php
	core/l10n/nn_NO.php
	core/l10n/oc.php
	core/l10n/pl.php
	core/l10n/pt_BR.php
	core/l10n/pt_PT.php
	core/l10n/ro.php
	core/l10n/ru.php
	core/l10n/ru_RU.php
	core/l10n/si_LK.php
	core/l10n/sk_SK.php
	core/l10n/sl.php
	core/l10n/sr.php
	core/l10n/sr@latin.php
	core/l10n/sv.php
	core/l10n/th_TH.php
	core/l10n/tr.php
	core/l10n/uk.php
	core/l10n/vi.php
	core/l10n/zh_CN.GB2312.php
	core/l10n/zh_CN.php
	core/l10n/zh_TW.php
	core/lostpassword/index.php
	core/lostpassword/resetpassword.php
	core/templates/layout.base.php
	core/templates/layout.guest.php
	core/templates/layout.user.php
	cron.php
	db_structure.xml
	files/webdav.php
	index.php
	l10n/.tx/config
	l10n/af/calendar.po
	l10n/af/contacts.po
	l10n/af/core.po
	l10n/af/files.po
	l10n/ar/calendar.po
	l10n/ar/contacts.po
	l10n/ar/core.po
	l10n/ar/files.po
	l10n/ar/files_encryption.po
	l10n/ar/lib.po
	l10n/ar/media.po
	l10n/ar/settings.po
	l10n/ar_SA/core.po
	l10n/ar_SA/files.po
	l10n/bg_BG/calendar.po
	l10n/bg_BG/contacts.po
	l10n/bg_BG/core.po
	l10n/bg_BG/files.po
	l10n/bg_BG/lib.po
	l10n/bg_BG/media.po
	l10n/bg_BG/settings.po
	l10n/ca/calendar.po
	l10n/ca/contacts.po
	l10n/ca/core.po
	l10n/ca/files.po
	l10n/ca/gallery.po
	l10n/ca/lib.po
	l10n/ca/settings.po
	l10n/cs_CZ/calendar.po
	l10n/cs_CZ/contacts.po
	l10n/cs_CZ/core.po
	l10n/cs_CZ/files.po
	l10n/cs_CZ/files_external.po
	l10n/cs_CZ/gallery.po
	l10n/cs_CZ/lib.po
	l10n/cs_CZ/settings.po
	l10n/da/calendar.po
	l10n/da/contacts.po
	l10n/da/core.po
	l10n/da/files.po
	l10n/da/lib.po
	l10n/da/settings.po
	l10n/da/user_ldap.po
	l10n/de/calendar.po
	l10n/de/contacts.po
	l10n/de/core.po
	l10n/de/files.po
	l10n/de/files_sharing.po
	l10n/de/gallery.po
	l10n/de/lib.po
	l10n/de/settings.po
	l10n/de_DE/core.po
	l10n/de_DE/files.po
	l10n/de_DE/settings.po
	l10n/el/calendar.po
	l10n/el/contacts.po
	l10n/el/core.po
	l10n/el/files.po
	l10n/el/gallery.po
	l10n/el/lib.po
	l10n/el/settings.po
	l10n/eo/calendar.po
	l10n/eo/contacts.po
	l10n/eo/core.po
	l10n/eo/files.po
	l10n/eo/lib.po
	l10n/eo/media.po
	l10n/eo/settings.po
	l10n/es/calendar.po
	l10n/es/contacts.po
	l10n/es/core.po
	l10n/es/files.po
	l10n/es/gallery.po
	l10n/es/lib.po
	l10n/es/settings.po
	l10n/es_AR/core.po
	l10n/es_AR/files.po
	l10n/es_AR/lib.po
	l10n/es_AR/settings.po
	l10n/et_EE/calendar.po
	l10n/et_EE/contacts.po
	l10n/et_EE/core.po
	l10n/et_EE/files.po
	l10n/et_EE/files_external.po
	l10n/et_EE/files_sharing.po
	l10n/et_EE/files_versions.po
	l10n/et_EE/lib.po
	l10n/et_EE/settings.po
	l10n/et_EE/user_ldap.po
	l10n/eu/calendar.po
	l10n/eu/contacts.po
	l10n/eu/core.po
	l10n/eu/files.po
	l10n/eu/lib.po
	l10n/eu/settings.po
	l10n/eu_ES/core.po
	l10n/eu_ES/files.po
	l10n/fa/calendar.po
	l10n/fa/contacts.po
	l10n/fa/core.po
	l10n/fa/files.po
	l10n/fa/files_encryption.po
	l10n/fa/lib.po
	l10n/fa/settings.po
	l10n/fi/core.po
	l10n/fi/files.po
	l10n/fi_FI/calendar.po
	l10n/fi_FI/contacts.po
	l10n/fi_FI/core.po
	l10n/fi_FI/files.po
	l10n/fi_FI/gallery.po
	l10n/fi_FI/lib.po
	l10n/fi_FI/settings.po
	l10n/fr/calendar.po
	l10n/fr/contacts.po
	l10n/fr/core.po
	l10n/fr/files.po
	l10n/fr/gallery.po
	l10n/fr/lib.po
	l10n/fr/media.po
	l10n/fr/settings.po
	l10n/gl/calendar.po
	l10n/gl/contacts.po
	l10n/gl/core.po
	l10n/gl/files.po
	l10n/gl/lib.po
	l10n/gl/settings.po
	l10n/he/calendar.po
	l10n/he/contacts.po
	l10n/he/core.po
	l10n/he/files.po
	l10n/he/lib.po
	l10n/he/settings.po
	l10n/hi/core.po
	l10n/hi/files.po
	l10n/hi/lib.po
	l10n/hi/settings.po
	l10n/hr/calendar.po
	l10n/hr/contacts.po
	l10n/hr/core.po
	l10n/hr/files.po
	l10n/hr/lib.po
	l10n/hr/settings.po
	l10n/hu_HU/calendar.po
	l10n/hu_HU/contacts.po
	l10n/hu_HU/core.po
	l10n/hu_HU/files.po
	l10n/hu_HU/lib.po
	l10n/hu_HU/settings.po
	l10n/hy/calendar.po
	l10n/hy/contacts.po
	l10n/hy/core.po
	l10n/hy/files.po
	l10n/ia/calendar.po
	l10n/ia/contacts.po
	l10n/ia/core.po
	l10n/ia/files.po
	l10n/ia/lib.po
	l10n/ia/settings.po
	l10n/id/calendar.po
	l10n/id/contacts.po
	l10n/id/core.po
	l10n/id/files.po
	l10n/id/files_encryption.po
	l10n/id/files_external.po
	l10n/id/files_sharing.po
	l10n/id/files_versions.po
	l10n/id/lib.po
	l10n/id/settings.po
	l10n/id/user_ldap.po
	l10n/id_ID/core.po
	l10n/id_ID/files.po
	l10n/it/calendar.po
	l10n/it/contacts.po
	l10n/it/core.po
	l10n/it/files.po
	l10n/it/gallery.po
	l10n/it/lib.po
	l10n/it/settings.po
	l10n/ja_JP/calendar.po
	l10n/ja_JP/contacts.po
	l10n/ja_JP/core.po
	l10n/ja_JP/files.po
	l10n/ja_JP/files_sharing.po
	l10n/ja_JP/lib.po
	l10n/ja_JP/settings.po
	l10n/ko/calendar.po
	l10n/ko/contacts.po
	l10n/ko/core.po
	l10n/ko/files.po
	l10n/ko/lib.po
	l10n/ko/settings.po
	l10n/ku_IQ/core.po
	l10n/ku_IQ/files.po
	l10n/ku_IQ/lib.po
	l10n/ku_IQ/settings.po
	l10n/lb/calendar.po
	l10n/lb/contacts.po
	l10n/lb/core.po
	l10n/lb/files.po
	l10n/lb/lib.po
	l10n/lb/settings.po
	l10n/lt_LT/calendar.po
	l10n/lt_LT/contacts.po
	l10n/lt_LT/core.po
	l10n/lt_LT/files.po
	l10n/lt_LT/files_external.po
	l10n/lt_LT/files_versions.po
	l10n/lt_LT/lib.po
	l10n/lt_LT/settings.po
	l10n/lv/core.po
	l10n/lv/files.po
	l10n/lv/lib.po
	l10n/lv/settings.po
	l10n/mk/calendar.po
	l10n/mk/contacts.po
	l10n/mk/core.po
	l10n/mk/files.po
	l10n/mk/lib.po
	l10n/mk/settings.po
	l10n/ms_MY/calendar.po
	l10n/ms_MY/contacts.po
	l10n/ms_MY/core.po
	l10n/ms_MY/files.po
	l10n/ms_MY/lib.po
	l10n/ms_MY/settings.po
	l10n/nb_NO/calendar.po
	l10n/nb_NO/contacts.po
	l10n/nb_NO/core.po
	l10n/nb_NO/files.po
	l10n/nb_NO/files_sharing.po
	l10n/nb_NO/files_versions.po
	l10n/nb_NO/gallery.po
	l10n/nb_NO/lib.po
	l10n/nb_NO/settings.po
	l10n/nb_NO/user_ldap.po
	l10n/nl/calendar.po
	l10n/nl/contacts.po
	l10n/nl/core.po
	l10n/nl/files.po
	l10n/nl/files_external.po
	l10n/nl/files_versions.po
	l10n/nl/gallery.po
	l10n/nl/lib.po
	l10n/nl/settings.po
	l10n/nl/user_ldap.po
	l10n/nn_NO/calendar.po
	l10n/nn_NO/contacts.po
	l10n/nn_NO/core.po
	l10n/nn_NO/files.po
	l10n/nn_NO/lib.po
	l10n/nn_NO/settings.po
	l10n/oc/core.po
	l10n/oc/files.po
	l10n/oc/lib.po
	l10n/oc/settings.po
	l10n/pl/calendar.po
	l10n/pl/contacts.po
	l10n/pl/core.po
	l10n/pl/files.po
	l10n/pl/gallery.po
	l10n/pl/lib.po
	l10n/pl/settings.po
	l10n/pl_PL/core.po
	l10n/pl_PL/files.po
	l10n/pl_PL/lib.po
	l10n/pl_PL/settings.po
	l10n/pt_BR/calendar.po
	l10n/pt_BR/contacts.po
	l10n/pt_BR/core.po
	l10n/pt_BR/files.po
	l10n/pt_BR/lib.po
	l10n/pt_BR/settings.po
	l10n/pt_PT/calendar.po
	l10n/pt_PT/contacts.po
	l10n/pt_PT/core.po
	l10n/pt_PT/files.po
	l10n/pt_PT/gallery.po
	l10n/pt_PT/lib.po
	l10n/pt_PT/settings.po
	l10n/pt_PT/user_ldap.po
	l10n/ro/calendar.po
	l10n/ro/contacts.po
	l10n/ro/core.po
	l10n/ro/files.po
	l10n/ro/lib.po
	l10n/ro/settings.po
	l10n/ru/calendar.po
	l10n/ru/contacts.po
	l10n/ru/core.po
	l10n/ru/files.po
	l10n/ru/files_external.po
	l10n/ru/files_sharing.po
	l10n/ru/files_versions.po
	l10n/ru/gallery.po
	l10n/ru/lib.po
	l10n/ru/settings.po
	l10n/ru_RU/core.po
	l10n/ru_RU/files.po
	l10n/ru_RU/lib.po
	l10n/ru_RU/settings.po
	l10n/si_LK/core.po
	l10n/si_LK/files.po
	l10n/si_LK/files_encryption.po
	l10n/si_LK/files_external.po
	l10n/si_LK/files_sharing.po
	l10n/si_LK/files_versions.po
	l10n/si_LK/lib.po
	l10n/si_LK/settings.po
	l10n/si_LK/user_ldap.po
	l10n/sk_SK/calendar.po
	l10n/sk_SK/contacts.po
	l10n/sk_SK/core.po
	l10n/sk_SK/files.po
	l10n/sk_SK/files_external.po
	l10n/sk_SK/lib.po
	l10n/sk_SK/settings.po
	l10n/sk_SK/user_ldap.po
	l10n/sl/calendar.po
	l10n/sl/contacts.po
	l10n/sl/core.po
	l10n/sl/files.po
	l10n/sl/files_encryption.po
	l10n/sl/files_external.po
	l10n/sl/files_sharing.po
	l10n/sl/files_versions.po
	l10n/sl/gallery.po
	l10n/sl/lib.po
	l10n/sl/settings.po
	l10n/sl/user_ldap.po
	l10n/so/core.po
	l10n/so/files.po
	l10n/sr/calendar.po
	l10n/sr/contacts.po
	l10n/sr/core.po
	l10n/sr/files.po
	l10n/sr/lib.po
	l10n/sr/settings.po
	l10n/sr@latin/calendar.po
	l10n/sr@latin/contacts.po
	l10n/sr@latin/core.po
	l10n/sr@latin/files.po
	l10n/sr@latin/lib.po
	l10n/sr@latin/settings.po
	l10n/sv/calendar.po
	l10n/sv/contacts.po
	l10n/sv/core.po
	l10n/sv/files.po
	l10n/sv/gallery.po
	l10n/sv/lib.po
	l10n/sv/media.po
	l10n/sv/settings.po
	l10n/ta_LK/core.po
	l10n/ta_LK/files.po
	l10n/ta_LK/lib.po
	l10n/ta_LK/settings.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/th_TH/calendar.po
	l10n/th_TH/contacts.po
	l10n/th_TH/core.po
	l10n/th_TH/files.po
	l10n/th_TH/gallery.po
	l10n/th_TH/lib.po
	l10n/th_TH/settings.po
	l10n/tr/calendar.po
	l10n/tr/contacts.po
	l10n/tr/core.po
	l10n/tr/files.po
	l10n/tr/gallery.po
	l10n/tr/lib.po
	l10n/tr/settings.po
	l10n/uk/calendar.po
	l10n/uk/contacts.po
	l10n/uk/core.po
	l10n/uk/files.po
	l10n/uk/files_encryption.po
	l10n/uk/files_versions.po
	l10n/uk/lib.po
	l10n/uk/media.po
	l10n/uk/settings.po
	l10n/vi/core.po
	l10n/vi/files.po
	l10n/vi/files_external.po
	l10n/vi/files_sharing.po
	l10n/vi/files_versions.po
	l10n/vi/lib.po
	l10n/vi/settings.po
	l10n/vi/user_ldap.po
	l10n/zh_CN.GB2312/core.po
	l10n/zh_CN.GB2312/files.po
	l10n/zh_CN.GB2312/lib.po
	l10n/zh_CN.GB2312/settings.po
	l10n/zh_CN/calendar.po
	l10n/zh_CN/contacts.po
	l10n/zh_CN/core.po
	l10n/zh_CN/files.po
	l10n/zh_CN/files_external.po
	l10n/zh_CN/gallery.po
	l10n/zh_CN/lib.po
	l10n/zh_CN/settings.po
	l10n/zh_CN/user_ldap.po
	l10n/zh_TW/calendar.po
	l10n/zh_TW/contacts.po
	l10n/zh_TW/core.po
	l10n/zh_TW/files.po
	l10n/zh_TW/lib.po
	l10n/zh_TW/settings.po
	lib/MDB2/Driver/sqlite3.php
	lib/app.php
	lib/appconfig.php
	lib/archive.php
	lib/archive/tar.php
	lib/archive/zip.php
	lib/base.php
	lib/connector/sabre/auth.php
	lib/connector/sabre/directory.php
	lib/connector/sabre/file.php
	lib/connector/sabre/locks.php
	lib/connector/sabre/node.php
	lib/db.php
	lib/eventsource.php
	lib/filecache.php
	lib/filecache/cached.php
	lib/filecache/update.php
	lib/filechunking.php
	lib/fileproxy.php
	lib/fileproxy/fileoperations.php
	lib/fileproxy/quota.php
	lib/files.php
	lib/filestorage.php
	lib/filestorage/common.php
	lib/filestorage/commontest.php
	lib/filestorage/local.php
	lib/filesystem.php
	lib/filesystemview.php
	lib/group.php
	lib/group/dummy.php
	lib/group/example.php
	lib/helper.php
	lib/image.php
	lib/installer.php
	lib/json.php
	lib/l10n.php
	lib/l10n/ca.php
	lib/l10n/cs_CZ.php
	lib/l10n/da.php
	lib/l10n/de.php
	lib/l10n/el.php
	lib/l10n/eo.php
	lib/l10n/es.php
	lib/l10n/es_AR.php
	lib/l10n/et_EE.php
	lib/l10n/eu.php
	lib/l10n/fa.php
	lib/l10n/fi_FI.php
	lib/l10n/fr.php
	lib/l10n/gl.php
	lib/l10n/he.php
	lib/l10n/hu_HU.php
	lib/l10n/it.php
	lib/l10n/ja_JP.php
	lib/l10n/lt_LT.php
	lib/l10n/nb_NO.php
	lib/l10n/nl.php
	lib/l10n/oc.php
	lib/l10n/pl.php
	lib/l10n/pt_BR.php
	lib/l10n/pt_PT.php
	lib/l10n/ro.php
	lib/l10n/ru.php
	lib/l10n/ru_RU.php
	lib/l10n/sk_SK.php
	lib/l10n/sl.php
	lib/l10n/sv.php
	lib/l10n/th_TH.php
	lib/l10n/uk.php
	lib/l10n/vi.php
	lib/l10n/zh_CN.GB2312.php
	lib/l10n/zh_CN.php
	lib/l10n/zh_TW.php
	lib/log.php
	lib/log/owncloud.php
	lib/mail.php
	lib/migrate.php
	lib/migration/content.php
	lib/minimizer.php
	lib/ocs.php
	lib/ocsclient.php
	lib/preferences.php
	lib/public/backgroundjob.php
	lib/public/db.php
	lib/public/share.php
	lib/public/util.php
	lib/request.php
	lib/search.php
	lib/search/provider/file.php
	lib/search/result.php
	lib/setup.php
	lib/streamwrappers.php
	lib/template.php
	lib/templatelayout.php
	lib/updater.php
	lib/user.php
	lib/user/database.php
	lib/user/http.php
	lib/util.php
	lib/vcategories.php
	lib/vobject.php
	public.php
	remote.php
	search/ajax/search.php
	settings/admin.php
	settings/ajax/apps/ocs.php
	settings/ajax/changepassword.php
	settings/ajax/creategroup.php
	settings/ajax/createuser.php
	settings/ajax/disableapp.php
	settings/ajax/enableapp.php
	settings/ajax/getlog.php
	settings/ajax/lostpassword.php
	settings/ajax/openid.php
	settings/ajax/removegroup.php
	settings/ajax/removeuser.php
	settings/ajax/setlanguage.php
	settings/ajax/setloglevel.php
	settings/ajax/setquota.php
	settings/ajax/togglegroups.php
	settings/ajax/togglesubadmins.php
	settings/ajax/userlist.php
	settings/apps.php
	settings/css/settings.css
	settings/help.php
	settings/js/apps.js
	settings/js/users.js
	settings/l10n/ar.php
	settings/l10n/bg_BG.php
	settings/l10n/ca.php
	settings/l10n/cs_CZ.php
	settings/l10n/da.php
	settings/l10n/de.php
	settings/l10n/el.php
	settings/l10n/eo.php
	settings/l10n/es.php
	settings/l10n/es_AR.php
	settings/l10n/et_EE.php
	settings/l10n/eu.php
	settings/l10n/fa.php
	settings/l10n/fi_FI.php
	settings/l10n/fr.php
	settings/l10n/gl.php
	settings/l10n/hr.php
	settings/l10n/hu_HU.php
	settings/l10n/id.php
	settings/l10n/it.php
	settings/l10n/ja_JP.php
	settings/l10n/ko.php
	settings/l10n/lb.php
	settings/l10n/lt_LT.php
	settings/l10n/lv.php
	settings/l10n/ms_MY.php
	settings/l10n/nb_NO.php
	settings/l10n/nl.php
	settings/l10n/nn_NO.php
	settings/l10n/oc.php
	settings/l10n/pl.php
	settings/l10n/pt_BR.php
	settings/l10n/pt_PT.php
	settings/l10n/ro.php
	settings/l10n/ru.php
	settings/l10n/ru_RU.php
	settings/l10n/si_LK.php
	settings/l10n/sk_SK.php
	settings/l10n/sl.php
	settings/l10n/sr.php
	settings/l10n/sr@latin.php
	settings/l10n/sv.php
	settings/l10n/th_TH.php
	settings/l10n/tr.php
	settings/l10n/uk.php
	settings/l10n/vi.php
	settings/l10n/zh_CN.GB2312.php
	settings/l10n/zh_CN.php
	settings/l10n/zh_TW.php
	settings/personal.php
	settings/settings.php
	settings/templates/admin.php
	settings/templates/apps.php
	settings/templates/help.php
	settings/templates/personal.php
	settings/templates/users.php
	settings/trans.png
	settings/users.php
	tests/bootstrap.php
	tests/data/db_structure.xml
	tests/lib/archive.php
	tests/lib/cache.php
	tests/lib/cache/apc.php
	tests/lib/cache/xcache.php
	tests/lib/db.php
	tests/lib/filesystem.php
	tests/lib/geo.php
	tests/lib/share/share.php
	tests/lib/streamwrappers.php
	tests/lib/util.php
	tests/phpunit.xml
2012-12-12 17:39:43 +00:00
Robin Appelman 34fee8afaa remove debug statements 2012-11-05 13:52:02 +01:00
Robin Appelman 4f32f49fb1 this line shouldn't be here 2012-11-04 21:00:36 +01:00
Robin Appelman f187aa6c93 some more code reuse for fileactions
also fixes an issue where some fileactions always worked on the last file in the list
2012-11-04 20:48:38 +01:00
Michael Gapczynski 60e5054ae8 Fix shared status icons 2012-10-28 16:02:05 -04:00
Robin Appelman 0fbb99690b properly replace fileaction icons with pngs when needed 2012-10-28 16:03:52 +01:00
Robin Appelman fe6b987b3d use css to show/hide fileactions 2012-10-28 12:47:42 +01:00
Robin Appelman d9ef6da2e4 code style 2012-10-28 12:47:42 +01:00
Bart Visscher 939b51e46f Fix download url generation 2012-10-27 15:10:21 +02:00
Sam Tuke 8b01286a5d Merged branch 'master' 2012-10-16 16:57:07 +01:00
Bart Visscher c9317b5a68 Merge branch 'master' into routing 2012-09-28 21:41:21 +02:00
Bart Visscher 4e2f575938 Correctly fix oc-1016 and fix downloading of files 2012-09-28 21:18:20 +02:00
Bart Visscher bf1057143c Merge branch 'master' into routing
Conflicts:
	apps/files/js/filelist.js
	core/js/js.js
	lib/ocs.php
2012-09-28 15:38:49 +02:00
scambra 107b641708 translate rename and history actions 2012-09-21 12:30:13 +02:00
Bart Visscher 5eba579827 Merge branch 'master' into routing
Conflicts:
	apps/files/js/fileactions.js
	lib/base.php
	lib/helper.php
	lib/ocs.php
2012-09-07 15:51:44 +02:00
Michael Gapczynski 73d726d1b2 Support for unshare from self, with a bunch of temporary fixes to overcome configuration problems with file actions 2012-09-07 00:02:22 -04:00
Bart Visscher 9329af921d Add missing ; to js code 2012-09-05 22:26:09 +02:00
Bart Visscher f188f6cc2f Fix some jslint warnings 2012-09-04 21:27:37 +02:00
Jörn Friedrich Dreyer ca8120e9f4 unify permissions (3/3): remove old PERMISSION_X from FileActions & OC.Share 2012-08-31 01:11:10 +02:00
Jörn Friedrich Dreyer 3ba27e624f unify permissions (2/3): change apps to use OC::PERMISSION_X 2012-08-31 01:11:10 +02:00
Bart Visscher cbaf858dea Merge remote-tracking branch 'gitorious/master' into routing
Conflicts:
	apps/files/js/fileactions.js
	apps/files_archive/js/archive.js
2012-08-29 20:16:39 +02:00
Michael Gapczynski 0c4575db7a Temporary fix to prevent rename action in root of Shared directory 2012-08-24 15:12:16 -04:00
Bart Visscher ddfb9de147 Fix linkTo calls for new routing 2012-08-15 18:16:06 +02:00
Michael Gapczynski 94ce8f2168 Merge branch 'master' into share_api
Conflicts:
	apps/contacts/lib/app.php
	apps/files_sharing/js/share.js
2012-07-31 15:00:04 -04:00
Michael Gapczynski e02d8d7f7e Remove delete tipsy if file is deleted, fixes bug oc-958 2012-07-27 21:28:41 -04:00
Michael Gapczynski 4d17ed2f71 Make file actions permissions aware 2012-07-25 16:33:08 -04:00
Thomas Tanghus 8f6121ffa8 Files: Double encode download links. Fix for oc-1016. 2012-06-15 15:57:04 +02:00
Bjoern Schiessle 8626f04f5d Label the delete operation "unshare" for files in the "Shared" folder to reduce
confusion about the operation.
2012-06-12 16:27:24 +02:00
Bjoern Schiessle b38ce8adfd committed patch (bug #967) to add missing translations for file actions 2012-06-12 11:39:03 +02:00
Bjoern Schiessle 2d80c148ba Don't allow user to delete, rename and re-share the "Shared" directory 2012-06-04 10:42:09 +02:00
Arthur Schiwon 3db28d7616 linkTo instead of hard links in Files and Files_Archive. Hope that makes sense. 2012-05-31 19:46:51 +02:00
Georg Ehrke 2b10371bde fix merge conflicts 2012-04-26 18:08:49 +02:00
Georg Ehrke 40f95ffdf3 fix security check for the path of the requested file 2012-04-26 17:55:00 +02:00
Georg Ehrke 0249a72cab fix downloading of files in files app 2012-04-26 17:35:12 +02:00
Georg Ehrke 45de7ad221 move files to app folder 2012-04-18 17:27:34 +02:00