[Pkg-owncloud-commits] [owncloud] 22/23: Merge tag 'upstream/7.0.0_rc4_+dfsg'
David Prévot
taffit at moszumanska.debian.org
Tue Jul 22 15:21:37 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 b98b6d2877a308c39c3fcb89be1f3a883d0c45df
Merge: 2e9eae2 13acd2b
Author: David Prévot <taffit at debian.org>
Date: Tue Jul 22 10:09:09 2014 -0400
Merge tag 'upstream/7.0.0_rc4_+dfsg'
Upstream version 7.0.0~rc4~+dfsg
# gpg: Signature faite le mar. 22 juil. 2014 10:05:21 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 | 10 ++
apps/activity/ajax/fetch.php | 24 +++--
apps/activity/ajax/settings.php | 4 +-
apps/activity/appinfo/database.xml | 8 +-
apps/activity/appinfo/info.xml | 1 +
apps/activity/appinfo/version | 2 +-
apps/activity/css/style.css | 4 +-
apps/activity/index.php | 7 +-
apps/activity/l10n/ar.php | 3 -
apps/activity/l10n/ast.php | 13 +--
apps/activity/l10n/bg_BG.php | 48 +++++++++-
apps/activity/l10n/bn_IN.php | 47 ++++++++-
apps/activity/l10n/ca.php | 4 +-
apps/activity/l10n/cs_CZ.php | 7 +-
apps/activity/l10n/da.php | 13 ++-
apps/activity/l10n/de.php | 7 +-
apps/activity/l10n/de_DE.php | 19 ++--
apps/activity/l10n/el.php | 3 -
apps/activity/l10n/en_GB.php | 7 +-
apps/activity/l10n/eo.php | 3 -
apps/activity/l10n/es.php | 7 +-
apps/activity/l10n/es_CL.php | 3 -
apps/activity/l10n/et_EE.php | 8 +-
apps/activity/l10n/eu.php | 4 +-
apps/activity/l10n/fi_FI.php | 7 +-
apps/activity/l10n/fr.php | 3 -
apps/activity/l10n/gl.php | 7 +-
apps/activity/l10n/hu_HU.php | 1 -
apps/activity/l10n/id.php | 3 -
apps/activity/l10n/it.php | 9 +-
apps/activity/l10n/ja.php | 8 +-
apps/activity/l10n/km.php | 3 -
apps/activity/l10n/lt_LT.php | 43 ++++++++-
apps/activity/l10n/mk.php | 1 -
apps/activity/l10n/ml_IN.php | 10 +-
apps/activity/l10n/nb_NO.php | 7 +-
apps/activity/l10n/nl.php | 3 -
apps/activity/l10n/nn_NO.php | 3 -
apps/activity/l10n/pl.php | 7 +-
apps/activity/l10n/pt_BR.php | 7 +-
apps/activity/l10n/pt_PT.php | 7 +-
apps/activity/l10n/ro.php | 3 -
apps/activity/l10n/ru.php | 8 +-
apps/activity/l10n/sk_SK.php | 3 -
apps/activity/l10n/sl.php | 7 +-
apps/activity/l10n/sv.php | 3 -
apps/activity/l10n/tr.php | 7 +-
apps/activity/l10n/zh_CN.php | 8 +-
apps/activity/l10n/zh_TW.php | 3 -
apps/activity/lib/api.php | 14 ++-
.../lib/backgroundjob/emailnotification.php | 4 +-
.../lib/backgroundjob/expireactivities.php | 5 +-
apps/activity/lib/data.php | 101 +++++++++++---------
apps/activity/lib/datahelper.php | 88 ++++++++---------
apps/activity/lib/display.php | 2 +-
apps/activity/lib/grouphelper.php | 29 +++++-
apps/activity/lib/hooks.php | 61 +++++++-----
apps/activity/lib/mailqueuehandler.php | 14 +--
apps/activity/lib/parameterhelper.php | 106 +++++++++++++--------
apps/activity/lib/usersettings.php | 15 ++-
apps/activity/personal.php | 4 +-
apps/activity/rss.php | 15 ++-
apps/activity/templates/personal.php | 6 ++
apps/activity/tests/apitest.php | 10 +-
apps/activity/tests/bootstrap.php | 14 ---
...eteusertest.php => datadeleteactivitestest.php} | 67 +++++++------
apps/activity/tests/datahelpertest.php | 18 +++-
apps/activity/tests/datatest.php | 5 +-
apps/activity/tests/grouphelpertest.php | 99 ++++++++++++++++++-
apps/activity/tests/hooksdeleteusertest.php | 5 +-
apps/activity/tests/mailqueuehandlertest.php | 72 ++++++++++++++
apps/admin_dependencies_chk/appinfo/info.xml | 1 +
apps/admin_dependencies_chk/appinfo/version | 2 +-
apps/bookmarks/appinfo/info.xml | 1 +
apps/bookmarks/appinfo/version | 2 +-
apps/calendar/js/calendar.js | 18 +++-
apps/contacts/appinfo/info.xml | 1 +
apps/contacts/appinfo/version | 2 +-
apps/documents/appinfo/info.xml | 1 +
apps/documents/appinfo/version | 2 +-
apps/external/appinfo/info.xml | 1 +
apps/external/appinfo/version | 2 +-
apps/files_external/lib/sftp.php | 22 +++--
apps/files_sharing/l10n/nl.php | 2 +-
apps/files_texteditor/appinfo/info.xml | 1 +
apps/files_texteditor/appinfo/version | 2 +-
apps/files_videoviewer/appinfo/info.xml | 1 +
apps/files_videoviewer/appinfo/version | 2 +-
apps/firstrunwizard/appinfo/info.xml | 1 +
apps/firstrunwizard/appinfo/version | 2 +-
apps/gallery/css/styles.css | 5 +
apps/gallery/js/album.js | 4 +
apps/gallery/js/gallery.js | 6 +-
apps/gallery/js/slideshow.js | 22 +++--
apps/gallery/js/thumbnail.js | 2 +
apps/search_lucene/appinfo/info.xml | 1 +
apps/search_lucene/appinfo/version | 2 +-
apps/updater/appinfo/info.xml | 3 +-
apps/updater/appinfo/version | 1 +
apps/user_external/appinfo/info.xml | 1 +
apps/user_external/appinfo/version | 2 +-
apps/user_ldap/lib/access.php | 6 ++
apps/user_ldap/tests/access.php | 29 ++++++
core/doc/admin/apps/activity/index.html | 8 +-
.../admin/apps/admin_dependencies_chk/index.html | 8 +-
core/doc/admin/apps/files_antivirus/index.html | 8 +-
core/doc/admin/apps/files_encryption/index.html | 8 +-
core/doc/admin/apps/files_external/index.html | 8 +-
core/doc/admin/apps/files_sharing/index.html | 8 +-
core/doc/admin/apps/files_trashbin/index.html | 8 +-
core/doc/admin/apps/files_versions/index.html | 8 +-
core/doc/admin/apps/firstrunwizard/index.html | 8 +-
core/doc/admin/apps/index.html | 8 +-
core/doc/admin/apps/user_ldap/index.html | 8 +-
core/doc/admin/apps/viewers/index.html | 8 +-
core/doc/admin/config/apps.html | 8 +-
core/doc/admin/config/code_locations.html | 8 +-
core/doc/admin/config/default_parameters.html | 8 +-
core/doc/admin/config/deleted_items.html | 8 +-
core/doc/admin/config/index.html | 8 +-
core/doc/admin/config/logging.html | 8 +-
core/doc/admin/config/mail_parameters.html | 8 +-
core/doc/admin/config/maintenance.html | 8 +-
core/doc/admin/config/miscellaneous.html | 8 +-
core/doc/admin/config/previews.html | 8 +-
.../admin/config/reverse_proxy_configurations.html | 8 +-
core/doc/admin/config/session_info.html | 8 +-
core/doc/admin/config/user_experience.html | 8 +-
core/doc/admin/config/verification.html | 8 +-
core/doc/admin/configuration/auth_ldap.html | 8 +-
core/doc/admin/configuration/background_jobs.html | 8 +-
.../configuration/configuration_3rdparty.html | 8 +-
.../admin/configuration/configuration_apps.html | 8 +-
.../configuration/configuration_automation.html | 8 +-
.../configuration_custom_clients.html | 8 +-
.../configuration/configuration_database.html | 8 +-
.../configuration/configuration_encryption.html | 8 +-
.../configuration/configuration_knowledgebase.html | 8 +-
.../configuration/configuration_language.html | 8 +-
.../admin/configuration/configuration_logging.html | 8 +-
.../admin/configuration/configuration_mail.html | 8 +-
.../configuration/configuration_maintenance.html | 8 +-
.../admin/configuration/configuration_preview.html | 8 +-
.../configuration/configuration_reverseproxy.html | 8 +-
.../admin/configuration/configuration_users.html | 8 +-
.../configuration/configuring_big_file_upload.html | 8 +-
.../admin/configuration/custom_mount_config.html | 8 +-
.../configuration/custom_mount_config_gui.html | 8 +-
.../admin/configuration/custom_user_backend.html | 8 +-
core/doc/admin/configuration/index.html | 8 +-
core/doc/admin/configuration/xsendfile.html | 8 +-
core/doc/admin/contents.html | 10 +-
core/doc/admin/cron/index.html | 8 +-
core/doc/admin/genindex.html | 8 +-
core/doc/admin/index.html | 10 +-
core/doc/admin/installation/index.html | 10 +-
.../admin/installation/installation_appliance.html | 8 +-
.../doc/admin/installation/installation_linux.html | 8 +-
.../doc/admin/installation/installation_macos.html | 8 +-
.../admin/installation/installation_others.html | 8 +-
.../admin/installation/installation_source.html | 8 +-
core/doc/admin/installation/installation_ucs.html | 8 +-
.../admin/installation/installation_windows.html | 8 +-
.../admin/installation/installation_wizard.html | 8 +-
core/doc/admin/issues/index.html | 8 +-
core/doc/admin/maintenance/backup.html | 8 +-
core/doc/admin/maintenance/index.html | 8 +-
core/doc/admin/maintenance/migrating.html | 8 +-
core/doc/admin/maintenance/restore.html | 8 +-
core/doc/admin/maintenance/update.html | 8 +-
core/doc/admin/objects.inv | 2 +-
core/doc/admin/quota/index.html | 8 +-
core/doc/admin/search.html | 8 +-
core/doc/admin/sharing_api/create_a_new_share.html | 8 +-
core/doc/admin/sharing_api/delete_share.html | 8 +-
core/doc/admin/sharing_api/get_all_shares.html | 8 +-
.../get_information_about_a_known_share.html | 8 +-
.../get_shares_from_a_specific_file_or_folder.html | 8 +-
core/doc/admin/sharing_api/index.html | 8 +-
core/doc/user/bookmarks.html | 8 +-
core/doc/user/contents.html | 10 +-
core/doc/user/documents.html | 8 +-
core/doc/user/external_storage/google_drive.html | 8 +-
.../user/files/configuring_big_file_upload.html | 8 +-
core/doc/user/files/deletedfiles.html | 8 +-
core/doc/user/files/encryption.html | 8 +-
core/doc/user/files/files.html | 8 +-
core/doc/user/files/filesweb.html | 8 +-
core/doc/user/files/index.html | 8 +-
core/doc/user/files/quota.html | 8 +-
core/doc/user/files/sync.html | 8 +-
core/doc/user/files/versioncontrol.html | 8 +-
core/doc/user/genindex.html | 8 +-
core/doc/user/index.html | 10 +-
core/doc/user/migration.html | 8 +-
core/doc/user/objects.inv | Bin 294 -> 293 bytes
core/doc/user/pim/calendar.html | 8 +-
core/doc/user/pim/contacts.html | 8 +-
core/doc/user/pim/index.html | 8 +-
core/doc/user/pim/sync_ios.html | 10 +-
core/doc/user/pim/sync_kde.html | 8 +-
core/doc/user/pim/sync_osx.html | 8 +-
core/doc/user/pim/sync_thunderbird.html | 8 +-
core/doc/user/pim/troubleshooting.html | 8 +-
core/doc/user/search.html | 8 +-
core/doc/user/userpreferences.html | 8 +-
core/doc/user/web_guide/index.html | 8 +-
core/doc/user/webinterface.html | 10 +-
l10n/nl/files_sharing.po | 2 +-
lib/private/connector/sabre/filesplugin.php | 2 +-
lib/private/db/connectionfactory.php | 10 +-
lib/private/user/session.php | 33 +++++--
lib/repair/innodb.php | 8 +-
settings/ajax/createuser.php | 16 ++--
settings/ajax/grouplist.php | 4 +-
settings/ajax/userlist.php | 7 +-
settings/js/users/users.js | 4 +-
version.php | 8 +-
218 files changed, 1399 insertions(+), 866 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