[Pkg-owncloud-commits] [owncloud] 67/70: Merge tag 'upstream/7.0.0_rc2+dfsg'
David Prévot
taffit at moszumanska.debian.org
Mon Jul 14 17:38:10 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit 1bdfdc11be3766bc08577dd460abde9612770d3a
Merge: dd653bf 3967a0d
Author: David Prévot <taffit at debian.org>
Date: Mon Jul 14 12:37:27 2014 -0400
Merge tag 'upstream/7.0.0_rc2+dfsg'
Upstream version 7.0.0~rc2+dfsg
# gpg: Signature faite le lun. 14 juil. 2014 12:36:44 AST
# gpg: avec la clef RSA B82A217AFDFE09F2
# gpg: Bonne signature de « David Prévot <david at tilapin.org> »
# gpg: alias « David Prévot <davidp at altern.org> »
# gpg: alias « David Prévot <davidp at no-log.org> »
# gpg: alias « David Prévot <taffit at debian.org> »
# gpg: Attention : cette clef n'est pas certifiée avec une signature de confiance.
# gpg: Rien n'indique que la signature appartient à son propriétaire.
# Empreinte de clef principale : AE14 AD01 426D 2BFB 82EF 7E1E B82A 217A FDFE 09F2
apps/activity/README.md | 14 +-
apps/activity/lib/data.php | 72 +-
apps/activity/lib/datahelper.php | 22 +-
apps/activity/lib/display.php | 4 +-
apps/activity/lib/grouphelper.php | 4 +-
apps/activity/lib/navigation.php | 7 +-
apps/activity/lib/parameterhelper.php | 5 +-
apps/activity/lib/usersettings.php | 4 +
apps/activity/tests/datahelpertest.php | 2 +-
apps/activity/tests/datatest.php | 52 +
apps/calendar/appinfo/info.xml | 1 +
apps/calendar/appinfo/version | 2 +-
apps/calendar/js/on-event.js | 2 +-
apps/calendar/lib/object.php | 6 +-
.../templates/part.choosecalendar.rowfields.php | 3 +-
apps/documents/ajax/admin.php | 46 +-
apps/documents/ajax/download.php | 9 +-
apps/documents/js/admin.js | 13 +-
apps/documents/lib/file.php | 6 +-
apps/documents/templates/admin.php | 3 +-
apps/files/appinfo/remote.php | 1 -
apps/files/js/app.js | 34 +-
apps/files/js/fileactions.js | 109 +-
apps/files/js/filelist.js | 25 +-
apps/files/lib/helper.php | 13 +
apps/files/tests/js/appSpec.js | 4 +-
apps/files/tests/js/fileactionsSpec.js | 156 ++-
apps/files/tests/js/filelistSpec.js | 26 +
apps/files_encryption/appinfo/info.xml | 1 +
apps/files_encryption/appinfo/version | 2 +-
apps/files_encryption/hooks/hooks.php | 14 +-
apps/files_encryption/lib/keymanager.php | 13 +-
apps/files_encryption/tests/keymanager.php | 4 +-
apps/files_external/ajax/addMountPoint.php | 19 +-
apps/files_external/appinfo/info.xml | 1 +
apps/files_external/appinfo/version | 2 +-
apps/files_external/js/mountsfilelist.js | 10 +-
apps/files_external/js/settings.js | 9 +-
apps/files_external/lib/amazons3.php | 30 +-
apps/files_external/lib/sftp.php | 15 +
apps/files_external/templates/settings.php | 1 +
apps/files_pdfviewer/3rdparty/pdfjs/viewer.js | 6 +-
apps/files_pdfviewer/appinfo/info.xml | 1 +
apps/files_pdfviewer/appinfo/version | 2 +-
apps/files_pdfviewer/js/loader.js | 4 +-
apps/files_sharing/appinfo/info.xml | 1 +
apps/files_sharing/appinfo/version | 2 +-
apps/files_sharing/css/public.css | 37 +-
apps/files_sharing/js/app.js | 40 +
apps/files_sharing/js/external.js | 35 +-
apps/files_sharing/js/public.js | 2 +-
apps/files_sharing/js/sharedfilelist.js | 28 +-
apps/files_sharing/lib/api.php | 6 +
apps/files_sharing/lib/proxy.php | 24 +-
apps/files_sharing/lib/sharedmount.php | 2 +
apps/files_sharing/lib/updater.php | 4 +-
apps/files_sharing/publicwebdav.php | 1 -
apps/files_sharing/templates/public.php | 4 +-
apps/files_sharing/tests/js/appSpec.js | 7 +-
apps/files_sharing/tests/js/sharedfilelistSpec.js | 42 +
apps/files_sharing/tests/proxy.php | 27 +-
apps/files_sharing/tests/update.php | 30 +-
apps/files_sharing/tests/updater.php | 14 +-
apps/files_trashbin/appinfo/info.xml | 1 +
apps/files_trashbin/appinfo/version | 2 +-
apps/files_versions/appinfo/info.xml | 1 +
apps/files_versions/appinfo/routes.php | 6 +-
apps/files_versions/appinfo/version | 2 +-
apps/gallery/appinfo/info.xml | 1 +
apps/gallery/appinfo/version | 2 +-
apps/gallery/css/public.css | 8 +-
apps/tasks/ajax/addtask.php | 28 -
apps/tasks/ajax/delete.php | 32 -
apps/tasks/ajax/gettasks.php | 36 -
apps/tasks/ajax/update_property.php | 69 -
apps/tasks/appinfo/app.php | 10 -
apps/tasks/appinfo/info.xml | 11 -
apps/tasks/css/style.css | 86 --
apps/tasks/img/tasks.png | Bin 959 -> 0 bytes
apps/tasks/img/tasks.svg | 8 -
apps/tasks/index.php | 36 -
apps/tasks/js/categories.php | 17 -
apps/tasks/js/tasks.js | 526 --------
apps/tasks/l10n/ar.php | 30 -
apps/tasks/l10n/ast.php | 30 -
apps/tasks/l10n/bg_BG.php | 20 -
apps/tasks/l10n/bn_BD.php | 30 -
apps/tasks/l10n/ca.php | 30 -
apps/tasks/l10n/cs_CZ.php | 30 -
apps/tasks/l10n/cy_GB.php | 7 -
apps/tasks/l10n/da.php | 30 -
apps/tasks/l10n/de.php | 30 -
apps/tasks/l10n/de_AT.php | 6 -
apps/tasks/l10n/de_CH.php | 30 -
apps/tasks/l10n/de_DE.php | 30 -
apps/tasks/l10n/el.php | 30 -
apps/tasks/l10n/en_GB.php | 30 -
apps/tasks/l10n/eo.php | 30 -
apps/tasks/l10n/es.php | 30 -
apps/tasks/l10n/es_AR.php | 30 -
apps/tasks/l10n/es_MX.php | 30 -
apps/tasks/l10n/et_EE.php | 30 -
apps/tasks/l10n/eu.php | 30 -
apps/tasks/l10n/eu_ES.php | 6 -
apps/tasks/l10n/fa.php | 30 -
apps/tasks/l10n/fi_FI.php | 30 -
apps/tasks/l10n/fr.php | 30 -
apps/tasks/l10n/gl.php | 30 -
apps/tasks/l10n/he.php | 30 -
apps/tasks/l10n/hr.php | 7 -
apps/tasks/l10n/hu_HU.php | 30 -
apps/tasks/l10n/hy.php | 5 -
apps/tasks/l10n/ia.php | 7 -
apps/tasks/l10n/id.php | 30 -
apps/tasks/l10n/is.php | 30 -
apps/tasks/l10n/it.php | 30 -
apps/tasks/l10n/ja.php | 30 -
apps/tasks/l10n/ja_JP.php | 28 -
apps/tasks/l10n/jv.php | 5 -
apps/tasks/l10n/ka_GE.php | 30 -
apps/tasks/l10n/km.php | 30 -
apps/tasks/l10n/ko.php | 30 -
apps/tasks/l10n/ku_IQ.php | 5 -
apps/tasks/l10n/lb.php | 16 -
apps/tasks/l10n/lt_LT.php | 30 -
apps/tasks/l10n/lv.php | 30 -
apps/tasks/l10n/mk.php | 30 -
apps/tasks/l10n/ms_MY.php | 7 -
apps/tasks/l10n/my_MM.php | 5 -
apps/tasks/l10n/nb_NO.php | 30 -
apps/tasks/l10n/nl.php | 30 -
apps/tasks/l10n/nn_NO.php | 30 -
apps/tasks/l10n/oc.php | 7 -
apps/tasks/l10n/pa.php | 5 -
apps/tasks/l10n/pl.php | 30 -
apps/tasks/l10n/pt_BR.php | 30 -
apps/tasks/l10n/pt_PT.php | 30 -
apps/tasks/l10n/ro.php | 30 -
apps/tasks/l10n/ru.php | 30 -
apps/tasks/l10n/si_LK.php | 30 -
apps/tasks/l10n/sk.php | 6 -
apps/tasks/l10n/sk_SK.php | 30 -
apps/tasks/l10n/sl.php | 30 -
apps/tasks/l10n/sq.php | 12 -
apps/tasks/l10n/sr.php | 11 -
apps/tasks/l10n/sr at latin.php | 6 -
apps/tasks/l10n/sv.php | 30 -
apps/tasks/l10n/ta_LK.php | 30 -
apps/tasks/l10n/te.php | 10 -
apps/tasks/l10n/th_TH.php | 30 -
apps/tasks/l10n/tr.php | 30 -
apps/tasks/l10n/ug.php | 17 -
apps/tasks/l10n/uk.php | 30 -
apps/tasks/l10n/ur_PK.php | 30 -
apps/tasks/l10n/vi.php | 30 -
apps/tasks/l10n/zh_CN.php | 30 -
apps/tasks/l10n/zh_HK.php | 5 -
apps/tasks/l10n/zh_TW.php | 30 -
apps/tasks/lib/app.php | 188 ---
apps/tasks/lib/vtodo.php | 27 -
apps/tasks/templates/no-calendar-app.php | 10 -
apps/tasks/templates/tasks.php | 32 -
apps/templateeditor/lib/mailtemplate.php | 11 +-
apps/user_ldap/appinfo/info.xml | 1 +
apps/user_ldap/appinfo/version | 2 +-
apps/user_ldap/group_ldap.php | 235 +++-
apps/user_ldap/lib/access.php | 94 +-
apps/user_ldap/lib/connection.php | 7 +
apps/user_ldap/lib/ildapwrapper.php | 9 +
apps/user_ldap/lib/ldap.php | 11 +
apps/user_ldap/tests/access.php | 52 +-
apps/user_ldap/tests/data/sid.dat | Bin 0 -> 24 bytes
apps/user_ldap/tests/group_ldap.php | 152 ++-
apps/user_ldap/user_ldap.php | 1 -
apps/user_webdavauth/appinfo/info.xml | 1 +
apps/user_webdavauth/appinfo/version | 2 +-
config/config.sample.php | 8 +-
core/css/header.css | 6 +
core/css/jquery.ocdialog.css | 11 +
core/css/styles.css | 17 +-
.../_sources/installation/installation_windows.txt | 39 +-
.../admin/installation/installation_windows.html | 27 +-
core/js/jquery.ocdialog.js | 7 +
core/js/js.js | 8 +-
core/js/oc-dialogs.js | 42 +-
core/js/setup.js | 4 +
core/js/snap.js | 1349 ++++++++++++--------
core/setup/controller.php | 2 +-
core/templates/layout.user.php | 1 +
l10n/ach/settings.po | 2 +-
l10n/ady/settings.po | 2 +-
l10n/af/settings.po | 2 +-
l10n/af_ZA/settings.po | 2 +-
l10n/ak/settings.po | 2 +-
l10n/am_ET/settings.po | 2 +-
l10n/ar/settings.po | 2 +-
l10n/ast/settings.po | 2 +-
l10n/az/settings.po | 2 +-
l10n/be/settings.po | 2 +-
l10n/bg_BG/settings.po | 2 +-
l10n/bn_BD/settings.po | 2 +-
l10n/bn_IN/settings.po | 2 +-
l10n/bs/settings.po | 2 +-
l10n/ca/settings.po | 2 +-
l10n/ca at valencia/settings.po | 2 +-
l10n/cs_CZ/settings.po | 2 +-
l10n/cy_GB/settings.po | 2 +-
l10n/da/settings.po | 2 +-
l10n/de/settings.po | 2 +-
l10n/de_AT/settings.po | 2 +-
l10n/de_CH/settings.po | 2 +-
l10n/de_DE/settings.po | 2 +-
l10n/el/settings.po | 2 +-
l10n/en at pirate/settings.po | 2 +-
l10n/en_GB/settings.po | 2 +-
l10n/en_NZ/settings.po | 2 +-
l10n/eo/settings.po | 2 +-
l10n/es/settings.po | 2 +-
l10n/es_AR/settings.po | 2 +-
l10n/es_BO/settings.po | 2 +-
l10n/es_CL/settings.po | 2 +-
l10n/es_CO/settings.po | 2 +-
l10n/es_CR/settings.po | 2 +-
l10n/es_EC/settings.po | 2 +-
l10n/es_MX/settings.po | 2 +-
l10n/es_PE/settings.po | 2 +-
l10n/es_PY/settings.po | 2 +-
l10n/es_US/settings.po | 2 +-
l10n/es_UY/settings.po | 2 +-
l10n/et_EE/settings.po | 2 +-
l10n/eu/settings.po | 2 +-
l10n/eu_ES/settings.po | 2 +-
l10n/fa/settings.po | 2 +-
l10n/fi_FI/settings.po | 2 +-
l10n/fr/settings.po | 2 +-
l10n/fr_CA/settings.po | 2 +-
l10n/gl/settings.po | 2 +-
l10n/he/settings.po | 2 +-
l10n/hi/settings.po | 2 +-
l10n/hi_IN/settings.po | 2 +-
l10n/hr/settings.po | 2 +-
l10n/hu_HU/settings.po | 2 +-
l10n/hy/settings.po | 2 +-
l10n/ia/settings.po | 2 +-
l10n/id/settings.po | 2 +-
l10n/is/settings.po | 2 +-
l10n/it/settings.po | 2 +-
l10n/ja/settings.po | 2 +-
l10n/jv/settings.po | 2 +-
l10n/ka/settings.po | 2 +-
l10n/ka_GE/settings.po | 2 +-
l10n/km/settings.po | 2 +-
l10n/kn/settings.po | 2 +-
l10n/ko/settings.po | 2 +-
l10n/ku_IQ/settings.po | 2 +-
l10n/lb/settings.po | 2 +-
l10n/lt_LT/settings.po | 2 +-
l10n/lv/settings.po | 2 +-
l10n/mk/settings.po | 2 +-
l10n/ml/settings.po | 2 +-
l10n/ml_IN/settings.po | 2 +-
l10n/mn/settings.po | 2 +-
l10n/ms_MY/settings.po | 2 +-
l10n/my_MM/settings.po | 2 +-
l10n/nb_NO/settings.po | 2 +-
l10n/nds/settings.po | 2 +-
l10n/ne/settings.po | 2 +-
l10n/nl/settings.po | 2 +-
l10n/nn_NO/settings.po | 2 +-
l10n/nqo/settings.po | 2 +-
l10n/oc/settings.po | 2 +-
l10n/or_IN/settings.po | 2 +-
l10n/pa/settings.po | 2 +-
l10n/pl/settings.po | 2 +-
l10n/pt_BR/settings.po | 2 +-
l10n/pt_PT/settings.po | 2 +-
l10n/ro/settings.po | 2 +-
l10n/ru/settings.po | 2 +-
l10n/si_LK/settings.po | 2 +-
l10n/sk/settings.po | 2 +-
l10n/sk_SK/settings.po | 2 +-
l10n/sl/settings.po | 2 +-
l10n/sq/settings.po | 2 +-
l10n/sr/settings.po | 2 +-
l10n/sr at latin/settings.po | 2 +-
l10n/su/settings.po | 2 +-
l10n/sv/settings.po | 2 +-
l10n/sw_KE/settings.po | 2 +-
l10n/ta_IN/settings.po | 2 +-
l10n/ta_LK/settings.po | 2 +-
l10n/te/settings.po | 2 +-
l10n/templates/settings.pot | 2 +-
l10n/th_TH/settings.po | 2 +-
l10n/tr/settings.po | 2 +-
l10n/tzm/settings.po | 2 +-
l10n/ug/settings.po | 2 +-
l10n/uk/settings.po | 2 +-
l10n/ur/settings.po | 2 +-
l10n/ur_PK/settings.po | 2 +-
l10n/uz/settings.po | 2 +-
l10n/vi/settings.po | 2 +-
l10n/zh_CN/settings.po | 2 +-
l10n/zh_HK/settings.po | 2 +-
l10n/zh_TW/settings.po | 2 +-
lib/base.php | 14 +-
lib/private/activitymanager.php | 194 +++
lib/private/api.php | 2 +
lib/private/app.php | 209 +--
lib/private/appconfig.php | 4 +
.../sabre/aborteduploaddetectionplugin.php | 98 --
lib/private/connector/sabre/file.php | 20 +-
lib/private/db/mdb2schemareader.php | 1 +
lib/private/files/cache/cache.php | 26 +-
lib/private/files/view.php | 16 +-
lib/private/installer.php | 3 +-
lib/private/json.php | 12 +-
lib/private/l10n.php | 3 +-
lib/private/legacy/search/provider.php | 4 +
lib/private/preferences.php | 11 +-
lib/private/repair.php | 2 +
lib/private/request.php | 2 +-
lib/private/route/router.php | 16 +
lib/private/setup/mysql.php | 2 +-
lib/private/share/share.php | 27 +-
lib/public/activity/iextension.php | 120 ++
lib/public/activity/imanager.php | 72 +-
lib/public/route/irouter.php | 7 +
lib/repair/collation.php | 75 ++
lib/repair/innodb.php | 51 +
search/js/result.js | 3 +
settings/ajax/userlist.php | 3 +
settings/js/apps.js | 12 +-
settings/js/log.js | 1 +
settings/js/users/groups.js | 25 +-
settings/js/users/users.js | 115 +-
settings/l10n/ar.php | 2 +-
settings/l10n/ast.php | 2 +-
settings/l10n/ca.php | 2 +-
settings/l10n/cs_CZ.php | 2 +-
settings/l10n/da.php | 2 +-
settings/l10n/de.php | 2 +-
settings/l10n/de_DE.php | 2 +-
settings/l10n/el.php | 2 +-
settings/l10n/en_GB.php | 2 +-
settings/l10n/es.php | 2 +-
settings/l10n/es_AR.php | 2 +-
settings/l10n/es_MX.php | 2 +-
settings/l10n/et_EE.php | 2 +-
settings/l10n/eu.php | 2 +-
settings/l10n/fa.php | 2 +-
settings/l10n/fi_FI.php | 2 +-
settings/l10n/fr.php | 2 +-
settings/l10n/gl.php | 2 +-
settings/l10n/hu_HU.php | 2 +-
settings/l10n/id.php | 2 +-
settings/l10n/it.php | 2 +-
settings/l10n/ja.php | 2 +-
settings/l10n/ja_JP.php | 2 +-
settings/l10n/ko.php | 2 +-
settings/l10n/lt_LT.php | 2 +-
settings/l10n/nb_NO.php | 2 +-
settings/l10n/nl.php | 2 +-
settings/l10n/pl.php | 2 +-
settings/l10n/pt_BR.php | 2 +-
settings/l10n/pt_PT.php | 2 +-
settings/l10n/ru.php | 2 +-
settings/l10n/sk_SK.php | 2 +-
settings/l10n/sl.php | 2 +-
settings/l10n/sv.php | 2 +-
settings/l10n/tr.php | 2 +-
settings/l10n/zh_CN.php | 2 +-
settings/l10n/zh_TW.php | 2 +-
settings/templates/admin.php | 2 +-
settings/templates/apps.php | 2 +-
settings/templates/users/part.grouplist.php | 4 +-
version.php | 6 +-
376 files changed, 3289 insertions(+), 4295 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list