[Pkg-owncloud-commits] [owncloud] 31/34: Merge tag 'upstream/7.0.3_rc3+dfsg'
David Prévot
taffit at moszumanska.debian.org
Fri Nov 7 11:44:13 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 3416397bf493e46e8b2e0b72448f5c427fe6de53
Merge: daec804 f7371b8
Author: David Prévot <taffit at debian.org>
Date: Thu Nov 6 16:34:45 2014 -0400
Merge tag 'upstream/7.0.3_rc3+dfsg'
Upstream version 7.0.3~rc3+dfsg
# gpg: Signature faite le jeu. 06 nov. 2014 16:29:45 AST
# gpg: avec la clef RSA 058C1CF944F6BD3C
# 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
# Empreinte de la sous-clef : 7875 4D07 BC09 5C74 48F7 8D66 058C 1CF9 44F6 BD3C
3rdparty/phpass/c/Makefile | 21 ---
3rdparty/phpass/c/crypt_private.c | 106 --------------
apps/bookmarks/ajax/import.php | 6 +-
apps/bookmarks/js/bookmarks.js | 8 +
apps/bookmarks/l10n/ach/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/ady/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/af/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/af_ZA.php | 4 +-
apps/bookmarks/l10n/af_ZA/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/ak/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/am_ET/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/ar.js | 38 +++++
apps/bookmarks/l10n/ar.json | 36 +++++
apps/bookmarks/l10n/ar.php | 4 +-
apps/bookmarks/l10n/ar/bookmarks.po | 154 --------------------
apps/bookmarks/l10n/ast.js | 38 +++++
apps/bookmarks/l10n/ast.json | 36 +++++
apps/bookmarks/l10n/ast.php | 6 +-
apps/bookmarks/l10n/ast/bookmarks.po | 153 -------------------
apps/bookmarks/l10n/az.js | 38 +++++
apps/bookmarks/l10n/az.json | 36 +++++
apps/bookmarks/l10n/az.php | 37 +++++
apps/bookmarks/l10n/az/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/be.php | 4 +-
apps/bookmarks/l10n/be/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/bg_BG.js | 38 +++++
apps/bookmarks/l10n/bg_BG.json | 36 +++++
apps/bookmarks/l10n/bg_BG.php | 28 ++--
apps/bookmarks/l10n/bg_BG/bookmarks.po | 156 --------------------
apps/bookmarks/l10n/bn_BD.js | 38 +++++
apps/bookmarks/l10n/bn_BD.json | 36 +++++
apps/bookmarks/l10n/bn_BD.php | 10 +-
apps/bookmarks/l10n/bn_BD/bookmarks.po | 154 --------------------
apps/bookmarks/l10n/bn_IN.js | 38 +++++
apps/bookmarks/l10n/bn_IN.json | 36 +++++
apps/bookmarks/l10n/bn_IN.php | 37 +++++
apps/bookmarks/l10n/bn_IN/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/bs.php | 4 +-
apps/bookmarks/l10n/bs/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/ca.js | 38 +++++
apps/bookmarks/l10n/ca.json | 36 +++++
apps/bookmarks/l10n/ca.php | 4 +-
apps/bookmarks/l10n/ca/bookmarks.po | 156 --------------------
apps/bookmarks/l10n/ca at valencia/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/cs_CZ.js | 38 +++++
apps/bookmarks/l10n/cs_CZ.json | 36 +++++
apps/bookmarks/l10n/cs_CZ.php | 4 +-
apps/bookmarks/l10n/cs_CZ/bookmarks.po | 156 --------------------
apps/bookmarks/l10n/cy_GB.js | 37 +++++
apps/bookmarks/l10n/cy_GB.json | 35 +++++
apps/bookmarks/l10n/cy_GB.php | 4 +-
apps/bookmarks/l10n/cy_GB/bookmarks.po | 153 -------------------
apps/bookmarks/l10n/da.js | 38 +++++
apps/bookmarks/l10n/da.json | 36 +++++
apps/bookmarks/l10n/da.php | 28 ++--
apps/bookmarks/l10n/da/bookmarks.po | 158 --------------------
apps/bookmarks/l10n/de.js | 38 +++++
apps/bookmarks/l10n/de.json | 36 +++++
apps/bookmarks/l10n/de.php | 4 +-
apps/bookmarks/l10n/de/bookmarks.po | 162 ---------------------
apps/bookmarks/l10n/de_AT.php | 4 +-
apps/bookmarks/l10n/de_AT/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/de_CH.js | 37 +++++
apps/bookmarks/l10n/de_CH.json | 35 +++++
apps/bookmarks/l10n/de_CH.php | 4 +-
apps/bookmarks/l10n/de_CH/bookmarks.po | 160 --------------------
apps/bookmarks/l10n/de_DE.js | 38 +++++
apps/bookmarks/l10n/de_DE.json | 36 +++++
apps/bookmarks/l10n/de_DE.php | 4 +-
apps/bookmarks/l10n/de_DE/bookmarks.po | 162 ---------------------
apps/bookmarks/l10n/el.js | 38 +++++
apps/bookmarks/l10n/el.json | 36 +++++
apps/bookmarks/l10n/el.php | 4 +-
apps/bookmarks/l10n/el/bookmarks.po | 157 --------------------
apps/bookmarks/l10n/en at pirate/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/en_GB.js | 38 +++++
apps/bookmarks/l10n/en_GB.json | 36 +++++
apps/bookmarks/l10n/en_GB.php | 4 +-
apps/bookmarks/l10n/en_GB/bookmarks.po | 153 -------------------
apps/bookmarks/l10n/en_NZ/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/eo.js | 38 +++++
apps/bookmarks/l10n/eo.json | 36 +++++
apps/bookmarks/l10n/eo.php | 4 +-
apps/bookmarks/l10n/eo/bookmarks.po | 155 --------------------
apps/bookmarks/l10n/es.js | 38 +++++
apps/bookmarks/l10n/es.json | 36 +++++
apps/bookmarks/l10n/es.php | 4 +-
apps/bookmarks/l10n/es/bookmarks.po | 162 ---------------------
apps/bookmarks/l10n/es_AR.js | 38 +++++
apps/bookmarks/l10n/es_AR.json | 36 +++++
apps/bookmarks/l10n/es_AR.php | 4 +-
apps/bookmarks/l10n/es_AR/bookmarks.po | 155 --------------------
apps/bookmarks/l10n/es_BO/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/es_CL.php | 4 +-
apps/bookmarks/l10n/es_CL/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/es_CO/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/es_CR/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/es_EC/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/es_MX.js | 38 +++++
apps/bookmarks/l10n/es_MX.json | 36 +++++
apps/bookmarks/l10n/es_MX.php | 4 +-
apps/bookmarks/l10n/es_MX/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/es_PE/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/es_PY/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/es_US/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/es_UY/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/et_EE.js | 38 +++++
apps/bookmarks/l10n/et_EE.json | 36 +++++
apps/bookmarks/l10n/et_EE.php | 4 +-
apps/bookmarks/l10n/et_EE/bookmarks.po | 155 --------------------
apps/bookmarks/l10n/eu.js | 38 +++++
apps/bookmarks/l10n/eu.json | 36 +++++
apps/bookmarks/l10n/eu.php | 4 +-
apps/bookmarks/l10n/eu/bookmarks.po | 155 --------------------
apps/bookmarks/l10n/eu_ES.php | 4 +-
apps/bookmarks/l10n/eu_ES/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/fa.js | 38 +++++
apps/bookmarks/l10n/fa.json | 36 +++++
apps/bookmarks/l10n/fa.php | 9 +-
apps/bookmarks/l10n/fa/bookmarks.po | 154 --------------------
apps/bookmarks/l10n/fi.php | 4 +-
apps/bookmarks/l10n/fi/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/fi_FI.js | 38 +++++
apps/bookmarks/l10n/fi_FI.json | 36 +++++
apps/bookmarks/l10n/fi_FI.php | 4 +-
apps/bookmarks/l10n/fi_FI/bookmarks.po | 154 --------------------
apps/bookmarks/l10n/fr.js | 38 +++++
apps/bookmarks/l10n/fr.json | 36 +++++
apps/bookmarks/l10n/fr.php | 6 +-
apps/bookmarks/l10n/fr/bookmarks.po | 158 --------------------
apps/bookmarks/l10n/fr_CA/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/gl.js | 38 +++++
apps/bookmarks/l10n/gl.json | 36 +++++
apps/bookmarks/l10n/gl.php | 4 +-
apps/bookmarks/l10n/gl/bookmarks.po | 156 --------------------
apps/bookmarks/l10n/he.js | 38 +++++
apps/bookmarks/l10n/he.json | 36 +++++
apps/bookmarks/l10n/he.php | 4 +-
apps/bookmarks/l10n/he/bookmarks.po | 156 --------------------
apps/bookmarks/l10n/hi.php | 5 +-
apps/bookmarks/l10n/hi/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/hi_IN/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/hr.php | 5 +-
apps/bookmarks/l10n/hr/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/hu_HU.js | 38 +++++
apps/bookmarks/l10n/hu_HU.json | 36 +++++
apps/bookmarks/l10n/hu_HU.php | 4 +-
apps/bookmarks/l10n/hu_HU/bookmarks.po | 156 --------------------
apps/bookmarks/l10n/hy.php | 4 +-
apps/bookmarks/l10n/hy/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/ia.js | 38 +++++
apps/bookmarks/l10n/ia.json | 36 +++++
apps/bookmarks/l10n/ia.php | 4 +-
apps/bookmarks/l10n/ia/bookmarks.po | 153 -------------------
apps/bookmarks/l10n/id.js | 37 +++++
apps/bookmarks/l10n/id.json | 35 +++++
apps/bookmarks/l10n/id.php | 4 +-
apps/bookmarks/l10n/id/bookmarks.po | 154 --------------------
apps/bookmarks/l10n/is.js | 38 +++++
apps/bookmarks/l10n/is.json | 36 +++++
apps/bookmarks/l10n/is.php | 8 +-
apps/bookmarks/l10n/is/bookmarks.po | 154 --------------------
apps/bookmarks/l10n/it.js | 38 +++++
apps/bookmarks/l10n/it.json | 36 +++++
apps/bookmarks/l10n/it.php | 4 +-
apps/bookmarks/l10n/it/bookmarks.po | 153 -------------------
apps/bookmarks/l10n/ja.js | 38 +++++
apps/bookmarks/l10n/ja.json | 36 +++++
apps/bookmarks/l10n/ja.php | 4 +-
apps/bookmarks/l10n/ja/bookmarks.po | 154 --------------------
apps/bookmarks/l10n/ja_JP.php | 35 -----
apps/bookmarks/l10n/jv.php | 4 +-
apps/bookmarks/l10n/jv/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/ka/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/ka_GE.js | 37 +++++
apps/bookmarks/l10n/ka_GE.json | 35 +++++
apps/bookmarks/l10n/ka_GE.php | 4 +-
apps/bookmarks/l10n/ka_GE/bookmarks.po | 154 --------------------
apps/bookmarks/l10n/km.js | 38 +++++
apps/bookmarks/l10n/km.json | 36 +++++
apps/bookmarks/l10n/km.php | 4 +-
apps/bookmarks/l10n/km/bookmarks.po | 154 --------------------
apps/bookmarks/l10n/kn/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/ko.js | 38 +++++
apps/bookmarks/l10n/ko.json | 36 +++++
apps/bookmarks/l10n/ko.php | 4 +-
apps/bookmarks/l10n/ko/bookmarks.po | 156 --------------------
apps/bookmarks/l10n/ku_IQ.php | 4 +-
apps/bookmarks/l10n/ku_IQ/bookmarks.po | 153 -------------------
apps/bookmarks/l10n/l10n.pl | 130 -----------------
apps/bookmarks/l10n/lb.js | 37 +++++
apps/bookmarks/l10n/lb.json | 35 +++++
apps/bookmarks/l10n/lb.php | 4 +-
apps/bookmarks/l10n/lb/bookmarks.po | 153 -------------------
apps/bookmarks/l10n/lt_LT.js | 35 +++++
apps/bookmarks/l10n/lt_LT.json | 33 +++++
apps/bookmarks/l10n/lt_LT.php | 4 +-
apps/bookmarks/l10n/lt_LT/bookmarks.po | 155 --------------------
apps/bookmarks/l10n/lv.js | 38 +++++
apps/bookmarks/l10n/lv.json | 36 +++++
apps/bookmarks/l10n/lv.php | 4 +-
apps/bookmarks/l10n/lv/bookmarks.po | 154 --------------------
apps/bookmarks/l10n/mk.js | 31 ++++
apps/bookmarks/l10n/mk.json | 29 ++++
apps/bookmarks/l10n/mk.php | 4 +-
apps/bookmarks/l10n/mk/bookmarks.po | 153 -------------------
apps/bookmarks/l10n/ml/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/ml_IN/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/mn/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/ms_MY.php | 4 +-
apps/bookmarks/l10n/ms_MY/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/my_MM.php | 4 +-
apps/bookmarks/l10n/my_MM/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/nb_NO.js | 38 +++++
apps/bookmarks/l10n/nb_NO.json | 36 +++++
apps/bookmarks/l10n/nb_NO.php | 4 +-
apps/bookmarks/l10n/nb_NO/bookmarks.po | 159 --------------------
apps/bookmarks/l10n/nds/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/ne/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/nl.js | 38 +++++
apps/bookmarks/l10n/nl.json | 36 +++++
apps/bookmarks/l10n/nl.php | 4 +-
apps/bookmarks/l10n/nl/bookmarks.po | 155 --------------------
apps/bookmarks/l10n/nn_NO.js | 38 +++++
apps/bookmarks/l10n/nn_NO.json | 36 +++++
apps/bookmarks/l10n/nn_NO.php | 5 +-
apps/bookmarks/l10n/nn_NO/bookmarks.po | 153 -------------------
apps/bookmarks/l10n/nqo/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/oc.php | 4 +-
apps/bookmarks/l10n/oc/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/or_IN/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/pa.php | 4 +-
apps/bookmarks/l10n/pa/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/pl.js | 38 +++++
apps/bookmarks/l10n/pl.json | 36 +++++
apps/bookmarks/l10n/pl.php | 8 +-
apps/bookmarks/l10n/pl/bookmarks.po | 155 --------------------
apps/bookmarks/l10n/pl_PL.php | 4 +-
apps/bookmarks/l10n/pl_PL/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/pt_BR.js | 38 +++++
apps/bookmarks/l10n/pt_BR.json | 36 +++++
apps/bookmarks/l10n/pt_BR.php | 4 +-
apps/bookmarks/l10n/pt_BR/bookmarks.po | 158 --------------------
apps/bookmarks/l10n/pt_PT.js | 38 +++++
apps/bookmarks/l10n/pt_PT.json | 36 +++++
apps/bookmarks/l10n/pt_PT.php | 4 +-
apps/bookmarks/l10n/pt_PT/bookmarks.po | 157 --------------------
apps/bookmarks/l10n/ro.js | 38 +++++
apps/bookmarks/l10n/ro.json | 36 +++++
apps/bookmarks/l10n/ro.php | 4 +-
apps/bookmarks/l10n/ro/bookmarks.po | 157 --------------------
apps/bookmarks/l10n/ru.js | 38 +++++
apps/bookmarks/l10n/ru.json | 36 +++++
apps/bookmarks/l10n/ru.php | 4 +-
apps/bookmarks/l10n/ru/bookmarks.po | 157 --------------------
apps/bookmarks/l10n/ru_RU.php | 4 +-
apps/bookmarks/l10n/ru_RU/bookmarks.po | 153 -------------------
apps/bookmarks/l10n/si_LK.js | 34 +++++
apps/bookmarks/l10n/si_LK.json | 32 ++++
apps/bookmarks/l10n/si_LK.php | 4 +-
apps/bookmarks/l10n/si_LK/bookmarks.po | 154 --------------------
apps/bookmarks/l10n/sk.php | 4 +-
apps/bookmarks/l10n/sk/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/sk_SK.js | 38 +++++
apps/bookmarks/l10n/sk_SK.json | 36 +++++
apps/bookmarks/l10n/sk_SK.php | 4 +-
apps/bookmarks/l10n/sk_SK/bookmarks.po | 156 --------------------
apps/bookmarks/l10n/sl.js | 38 +++++
apps/bookmarks/l10n/sl.json | 36 +++++
apps/bookmarks/l10n/sl.php | 4 +-
apps/bookmarks/l10n/sl/bookmarks.po | 155 --------------------
apps/bookmarks/l10n/sq.php | 4 +-
apps/bookmarks/l10n/sq/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/sr.js | 37 +++++
apps/bookmarks/l10n/sr.json | 35 +++++
apps/bookmarks/l10n/sr.php | 4 +-
apps/bookmarks/l10n/sr/bookmarks.po | 155 --------------------
apps/bookmarks/l10n/sr at latin.php | 5 +-
apps/bookmarks/l10n/sr at latin/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/su/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/sv.js | 38 +++++
apps/bookmarks/l10n/sv.json | 36 +++++
apps/bookmarks/l10n/sv.php | 4 +-
apps/bookmarks/l10n/sv/bookmarks.po | 156 --------------------
apps/bookmarks/l10n/sw_KE/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/ta_IN.php | 6 +
apps/bookmarks/l10n/ta_IN/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/ta_LK.js | 35 +++++
apps/bookmarks/l10n/ta_LK.json | 33 +++++
apps/bookmarks/l10n/ta_LK.php | 4 +-
apps/bookmarks/l10n/ta_LK/bookmarks.po | 153 -------------------
apps/bookmarks/l10n/te.php | 4 +-
apps/bookmarks/l10n/te/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/templates/bookmarks.pot | 152 -------------------
apps/bookmarks/l10n/th_TH.js | 38 +++++
apps/bookmarks/l10n/th_TH.json | 36 +++++
apps/bookmarks/l10n/th_TH.php | 4 +-
apps/bookmarks/l10n/th_TH/bookmarks.po | 154 --------------------
apps/bookmarks/l10n/tr.js | 38 +++++
apps/bookmarks/l10n/tr.json | 36 +++++
apps/bookmarks/l10n/tr.php | 4 +-
apps/bookmarks/l10n/tr/bookmarks.po | 156 --------------------
apps/bookmarks/l10n/tzm/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/ug.js | 37 +++++
apps/bookmarks/l10n/ug.json | 35 +++++
apps/bookmarks/l10n/ug.php | 4 +-
apps/bookmarks/l10n/ug/bookmarks.po | 153 -------------------
apps/bookmarks/l10n/uk.js | 38 +++++
apps/bookmarks/l10n/uk.json | 36 +++++
apps/bookmarks/l10n/uk.php | 4 +-
apps/bookmarks/l10n/uk/bookmarks.po | 154 --------------------
apps/bookmarks/l10n/ur/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/ur_PK.php | 4 +-
apps/bookmarks/l10n/ur_PK/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/uz/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/vi.js | 38 +++++
apps/bookmarks/l10n/vi.json | 36 +++++
apps/bookmarks/l10n/vi.php | 4 +-
apps/bookmarks/l10n/vi/bookmarks.po | 155 --------------------
apps/bookmarks/l10n/zh_CN.GB2312.php | 35 -----
apps/bookmarks/l10n/zh_CN.GB2312/bookmarks.po | 154 --------------------
apps/bookmarks/l10n/zh_CN.js | 38 +++++
apps/bookmarks/l10n/zh_CN.json | 36 +++++
apps/bookmarks/l10n/zh_CN.php | 4 +-
apps/bookmarks/l10n/zh_CN/bookmarks.po | 156 --------------------
apps/bookmarks/l10n/zh_HK.php | 6 +-
apps/bookmarks/l10n/zh_HK/bookmarks.po | 152 -------------------
apps/bookmarks/l10n/zh_TW.js | 38 +++++
apps/bookmarks/l10n/zh_TW.json | 36 +++++
apps/bookmarks/l10n/zh_TW.php | 4 +-
apps/bookmarks/l10n/zh_TW/bookmarks.po | 157 --------------------
apps/bookmarks/lib/bookmarks.php | 40 ++---
apps/bookmarks/templates/js_tpl.php | 2 +-
apps/bookmarks/templates/settings.php | 2 +
apps/bookmarks/tests/bootstrap.php | 15 ++
.../{lib_bookmark.php => lib_bookmark_test.php} | 0
apps/bookmarks/tests/phpunit.xml | 27 ++++
apps/contacts/lib/controller/groupcontroller.php | 4 +-
apps/contacts/lib/hooks.php | 6 +-
apps/contacts/lib/utils/properties.php | 1 -
.../ajax/updatePrivateKeyPassword.php | 44 ++++--
apps/files_encryption/tests/share.php | 8 +-
apps/files_external/lib/amazons3.php | 23 ++-
apps/files_external/tests/amazons3migration.php | 117 +++++++++++++++
apps/files_sharing/lib/external/storage.php | 8 +-
apps/files_sharing/templates/settings-admin.php | 14 +-
apps/files_trashbin/lib/trashbin.php | 2 +-
apps/files_versions/lib/hooks.php | 43 +++++-
apps/files_versions/lib/versions.php | 46 +++++-
apps/files_versions/tests/versions.php | 101 ++++++++++++-
apps/templateeditor/templates/settings-admin.php | 2 +-
apps/user_ldap/js/experiencedAdmin.js | 14 +-
apps/user_ldap/js/settings.js | 10 +-
config/config.sample.php | 22 ++-
.../doc/admin/_sources/configuration/auth_ldap.txt | 6 +-
.../configuration_config_sample_php.txt | 40 ++++-
core/doc/admin/configuration/auth_ldap.html | 4 +-
.../configuration_config_sample_php.html | 37 ++++-
core/l10n/bg_BG.php | 5 +-
core/l10n/cs_CZ.php | 5 +-
core/l10n/da.php | 5 +-
core/l10n/de.php | 5 +-
core/l10n/de_DE.php | 5 +-
core/l10n/es.php | 5 +-
core/l10n/fi_FI.php | 5 +-
core/l10n/it.php | 5 +-
core/l10n/nl.php | 5 +-
core/l10n/pt_BR.php | 5 +-
core/l10n/sl.php | 5 +-
core/l10n/tr.php | 5 +-
core/templates/layout.user.php | 2 +-
lib/private/db.php | 6 +
lib/private/defaults.php | 12 ++
lib/private/setup.php | 2 +-
lib/public/appframework/http/jsonresponse.php | 2 +-
lib/public/defaults.php | 8 +
settings/l10n/it.php | 2 +-
settings/templates/admin.php | 2 +-
version.php | 6 +-
379 files changed, 5397 insertions(+), 18851 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