[Pkg-owncloud-commits] [owncloud] 02/07: Merge tag 'upstream/8.1.1_dfsg' into stable8
David Prévot
taffit at moszumanska.debian.org
Sat Aug 22 12:18:26 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch stable8
in repository owncloud.
commit ae6e4e7312fae2bb21201c67f2016e1d674163d2
Merge: a7ab528 2f5b96e
Author: David Prévot <taffit at debian.org>
Date: Tue Aug 11 19:34:07 2015 +0200
Merge tag 'upstream/8.1.1_dfsg' into stable8
Upstream version 8.1.1~dfsg
# gpg: Signature made mar. 11 août 2015 19:33:55 CEST
# gpg: using RSA key 058C1CF944F6BD3C
# gpg: Good signature from "David Prévot <david at tilapin.org>"
# gpg: aka "David Prévot <davidp at altern.org>"
# gpg: aka "David Prévot <davidp at no-log.org>"
# gpg: aka "David Prévot <taffit at debian.org>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: AE14 AD01 426D 2BFB 82EF 7E1E B82A 217A FDFE 09F2
# Subkey fingerprint: 7875 4D07 BC09 5C74 48F7 8D66 058C 1CF9 44F6 BD3C
.htaccess | 2 +-
3rdparty/composer.json | 2 +-
3rdparty/composer.lock | 20 +-
3rdparty/composer/installed.json | 156 ++++++-------
3rdparty/sabre/dav/ChangeLog.md | 49 ++++
3rdparty/sabre/dav/composer.json | 2 +-
3rdparty/sabre/dav/lib/CalDAV/Backend/PDO.php | 2 +-
3rdparty/sabre/dav/lib/CalDAV/Plugin.php | 14 ++
3rdparty/sabre/dav/lib/CalDAV/Schedule/Plugin.php | 3 +-
3rdparty/sabre/dav/lib/DAV/Browser/Plugin.php | 4 +-
3rdparty/sabre/dav/lib/DAV/Server.php | 2 +-
3rdparty/sabre/dav/lib/DAV/Version.php | 2 +-
apps/activity/lib/display.php | 6 +-
apps/activity/lib/grouphelper.php | 9 +
apps/activity/tests/grouphelpertest.php | 90 ++++++++
apps/encryption/appinfo/info.xml | 21 +-
apps/encryption/appinfo/register_command.php | 3 +-
apps/encryption/command/migratekeys.php | 12 +-
apps/encryption/lib/keymanager.php | 25 +-
apps/encryption/lib/migration.php | 142 +++++++++---
apps/encryption/tests/lib/KeyManagerTest.php | 50 +++-
apps/encryption/tests/lib/MigrationTest.php | 183 ++++++++++++++-
apps/files/appinfo/update.php | 96 ++++++++
apps/files/appinfo/version | 2 +-
apps/files/command/scan.php | 9 +-
apps/files_external/lib/smb.php | 5 +-
apps/files_external/tests/backends/smb.php | 12 +
apps/files_sharing/api/server2server.php | 8 +-
apps/files_sharing/css/public.css | 2 +-
apps/files_sharing/js/share.js | 2 +-
apps/files_sharing/lib/activity.php | 2 +-
apps/files_sharing/lib/external/storage.php | 20 +-
.../lib/propagation/recipientpropagator.php | 4 +-
apps/files_sharing/lib/sharedmount.php | 27 ++-
apps/files_sharing/lib/sharedstorage.php | 16 ++
apps/files_sharing/templates/public.php | 2 +-
apps/files_sharing/tests/etagpropagation.php | 19 +-
apps/files_sharing/tests/js/shareSpec.js | 17 ++
apps/files_sharing/tests/locking.php | 101 ++++++++
apps/files_sharing/tests/share.php | 130 +++++++++++
apps/files_sharing/tests/unsharechildren.php | 8 +-
apps/files_texteditor/js/editor.js | 4 +
apps/files_trashbin/lib/storage.php | 34 ++-
apps/files_trashbin/tests/storage.php | 30 +++
apps/files_videoviewer/js/viewer.js | 1 -
apps/gallery/appinfo/info.xml | 1 -
apps/gallery/css/slideshow.css | 32 +--
apps/gallery/js/thumbnail.js | 1 +
apps/updater/appinfo/info.xml | 1 -
apps/user_ldap/group_ldap.php | 9 +-
apps/user_ldap/lib/access.php | 38 +++
apps/user_ldap/lib/user/manager.php | 4 +-
apps/user_ldap/tests/.htaccess | 14 ++
apps/user_ldap/tests/group_ldap.php | 4 +
.../lib/IntegrationTestAccessGroupsMatchFilter.php | 184 +++++++++++++++
apps/user_ldap/tests/integration/readme.md | 60 +++++
apps/user_ldap/tests/integration/run-test.sh | 17 ++
.../setup-scripts/createExplicitGroups.php | 52 +++++
.../createExplicitGroupsDifferentOU.php | 52 +++++
.../setup-scripts/createExplicitUsers.php | 54 +++++
apps/user_ldap/tests/user/manager.php | 254 +++++++++++----------
config/config.sample.php | 223 +++++++++---------
core/ajax/share.php | 2 +-
core/avatar/avatarcontroller.php | 8 +
core/command/upgrade.php | 9 +
.../admin/_images/build-a-cloud-of-servers-320.png | Bin 13713 -> 0 bytes
core/doc/admin/_images/cert-37.png | Bin 23623 -> 41858 bytes
core/doc/admin/_images/cert-46.png | Bin 37104 -> 20550 bytes
core/doc/admin/_images/cert-47.png | Bin 29801 -> 34314 bytes
core/doc/admin/_images/cert-52.png | Bin 18469 -> 0 bytes
core/doc/admin/_images/cert-53.png | Bin 0 -> 70303 bytes
core/doc/admin/_images/cert-54.png | Bin 0 -> 22543 bytes
core/doc/admin/_images/cert-55.png | Bin 0 -> 44506 bytes
core/doc/admin/_images/cert-56.png | Bin 0 -> 31060 bytes
core/doc/admin/_images/cert-57.png | Bin 0 -> 25109 bytes
core/doc/admin/_images/cert-58.png | Bin 0 -> 27781 bytes
core/doc/admin/_images/cert-59.png | Bin 0 -> 31302 bytes
core/doc/admin/_images/cert-60.png | Bin 0 -> 7367 bytes
core/doc/admin/_images/cert-61.png | Bin 0 -> 73768 bytes
core/doc/admin/_images/cert-62.png | Bin 0 -> 32311 bytes
core/doc/admin/_images/file-lock-status.png | Bin 8350 -> 0 bytes
core/doc/admin/_images/ios-publish-10.png | Bin 0 -> 21250 bytes
core/doc/admin/_images/ios-publish-11.png | Bin 0 -> 93086 bytes
core/doc/admin/_images/ios-publish-12.png | Bin 0 -> 17998 bytes
core/doc/admin/_images/ios-publish-13.png | Bin 0 -> 49756 bytes
core/doc/admin/_images/ios-publish-14.png | Bin 0 -> 11134 bytes
core/doc/admin/_images/ios-publish-15.png | Bin 0 -> 54036 bytes
core/doc/admin/_images/ios-publish-2.png | Bin 0 -> 11980 bytes
core/doc/admin/_images/ios-publish-3.png | Bin 0 -> 23579 bytes
core/doc/admin/_images/ios-publish-4.png | Bin 0 -> 12077 bytes
core/doc/admin/_images/ios-publish-5.png | Bin 0 -> 24714 bytes
core/doc/admin/_images/ios-publish-6.png | Bin 0 -> 14699 bytes
core/doc/admin/_images/ios-publish-7.png | Bin 0 -> 11812 bytes
core/doc/admin/_images/ios-publish-8.png | Bin 0 -> 17600 bytes
core/doc/admin/_images/ios-publish-9.png | Bin 0 -> 130555 bytes
core/doc/admin/_images/ios-publish.png | Bin 0 -> 21776 bytes
core/doc/admin/_images/oc-video-1.png | Bin 48076 -> 0 bytes
core/doc/admin/_images/oc-video-2.png | Bin 28469 -> 0 bytes
core/doc/admin/_images/ownbrander-10.png | Bin 35497 -> 0 bytes
core/doc/admin/_images/ownbrander-25.png | Bin 10879 -> 20762 bytes
core/doc/admin/_images/ownbrander-29.png | Bin 0 -> 34545 bytes
core/doc/admin/_images/ownbrander-30.png | Bin 0 -> 14580 bytes
core/doc/admin/_images/ownbrander-31.png | Bin 0 -> 8826 bytes
core/doc/admin/_images/ownbrander-32.png | Bin 0 -> 16589 bytes
core/doc/admin/_images/ownbrander-5.png | Bin 59230 -> 68743 bytes
core/doc/admin/_images/ownbrander-6.png | Bin 80778 -> 37552 bytes
core/doc/admin/_images/ownbrander-8.png | Bin 56745 -> 17415 bytes
core/doc/admin/_images/ownbrander-9.png | Bin 68436 -> 0 bytes
core/doc/admin/_images/transactional-locking-1.png | Bin 0 -> 4522 bytes
core/doc/admin/_images/transactional-locking-2.png | Bin 0 -> 4496 bytes
core/doc/admin/_images/video_externalstorage.png | Bin 0 -> 26792 bytes
core/doc/admin/_images/video_firstminute.png | Bin 0 -> 28617 bytes
core/doc/admin/_images/video_usermanagement.png | Bin 0 -> 20486 bytes
.../oracle_db_configuration.txt | 2 +-
.../encryption_configuration.txt | 28 +--
.../external_storage_configuration.txt | 41 +++-
.../external_storage_configuration_gui.txt | 30 ++-
.../federated_cloud_sharing_configuration.txt | 20 +-
...imental.txt => files_locking_transactional.txt} | 44 ++--
.../admin/_sources/configuration_files/index.txt | 2 +-
.../config_sample_php_parameters.txt | 253 ++++++++++----------
.../configuration_server/harden_server.txt | 9 +
.../_sources/configuration_server/occ_command.txt | 72 +++++-
.../configuration_server/performance_tuning.txt | 24 +-
.../security_setup_warnings.txt | 64 +++++-
.../configuration_user/user_auth_ftp_smb_imap.txt | 6 +
.../_sources/configuration_user/user_auth_ldap.txt | 7 +-
.../configuration_user/user_configuration.txt | 6 +
core/doc/admin/_sources/contents.txt | 3 +-
.../enterprise_clients/creating_branded_apps.txt | 83 +++++--
.../enterprise_clients/publishing_android_app.txt | 12 +-
.../enterprise_ios_app/publishing_ios_app.txt | 37 +--
.../enterprise_ios_app/publishing_ios_app_2.txt | 8 +-
.../enterprise_ios_app/publishing_ios_app_3.txt | 44 +++-
.../enterprise_ios_app/publishing_ios_app_5.txt | 87 +++++--
.../enterprise_ios_app/publishing_ios_app_6.txt | 2 +-
.../enterprise_ios_app/publishing_ios_app_7.txt | 27 ++-
.../enterprise_ios_app/publishing_ios_app_8.txt | 9 +-
.../enterprise_ios_app/publishing_ios_app_9.txt | 168 ++++++++++++--
.../user_auth_shibboleth.txt | 44 +++-
core/doc/admin/_sources/index.txt | 13 +-
.../installation/apps_management_installation.txt | 8 +-
.../installation/command_line_installation.txt | 7 +-
.../_sources/installation/installation_wizard.txt | 40 +++-
.../_sources/installation/nginx_configuration.txt | 3 +
.../installation/selinux_configuration.txt | 9 +
.../_sources/installation/source_installation.txt | 18 +-
core/doc/admin/_sources/issues/index.txt | 5 +-
core/doc/admin/_sources/maintenance/restore.txt | 24 +-
core/doc/admin/_sources/maintenance/upgrade.txt | 33 +--
core/doc/admin/_sources/operations/theming.txt | 12 +-
core/doc/admin/_sources/release_notes.txt | 108 +++++++--
core/doc/admin/_sources/videos/index.txt | 55 -----
core/doc/admin/_sources/whats_new_admin.txt | 71 +++++-
.../configuration_database/db_conversion.html | 11 +-
core/doc/admin/configuration_database/index.html | 11 +-
.../linux_database_configuration.html | 11 +-
.../oracle_db_configuration.html | 13 +-
.../big_file_upload_configuration.html | 13 +-
.../collaborative_documents_configuration.html | 13 +-
.../default_files_configuration.html | 13 +-
.../encryption_configuration.html | 41 ++--
.../external_storage_configuration.html | 56 +++--
.../external_storage_configuration_gui.html | 44 +++-
.../federated_cloud_sharing_configuration.html | 34 ++-
.../file_sharing_configuration.html | 13 +-
.../files_locking_enabling.html | 15 +-
...ental.html => files_locking_transactional.html} | 50 ++--
core/doc/admin/configuration_files/index.html | 20 +-
.../previews_configuration.html | 13 +-
.../serving_static_files_configuration.html | 13 +-
.../activity_configuration.html | 11 +-
.../antivirus_configuration.html | 11 +-
.../automatic_configuration.html | 11 +-
.../background_jobs_configuration.html | 11 +-
.../config_sample_php_parameters.html | 195 ++++++++--------
.../configuration_server/email_configuration.html | 11 +-
.../admin/configuration_server/external_sites.html | 11 +-
.../admin/configuration_server/harden_server.html | 24 +-
core/doc/admin/configuration_server/index.html | 18 +-
.../js_css_asset_management_configuration.html | 11 +-
.../knowledgebase_configuration.html | 11 +-
.../language_configuration.html | 11 +-
.../logging_configuration.html | 11 +-
.../admin/configuration_server/occ_command.html | 68 +++++-
.../configuration_server/performance_tuning.html | 41 +++-
.../reverse_proxy_configuration.html | 11 +-
.../configuration_server/search_configuration.html | 11 +-
.../security_setup_warnings.html | 66 +++++-
.../thirdparty_php_configuration.html | 11 +-
core/doc/admin/configuration_user/index.html | 11 +-
.../configuration_user/reset_admin_password.html | 11 +-
.../configuration_user/user_auth_ftp_smb_imap.html | 19 +-
.../admin/configuration_user/user_auth_ldap.html | 18 +-
.../configuration_user/user_auth_ldap_cleanup.html | 11 +-
.../configuration_user/user_configuration.html | 15 +-
.../configuration_user/user_provisioning_api.html | 11 +-
core/doc/admin/contents.html | 54 +++--
.../enterprise_clients/creating_branded_apps.html | 85 ++++---
.../enterprise_clients/custom_client_repos.html | 11 +-
core/doc/admin/enterprise_clients/index.html | 30 ++-
.../enterprise_clients/publishing_android_app.html | 21 +-
.../admin/enterprise_external_storage/index.html | 11 +-
.../jive_configuration.html | 11 +-
.../ldap_home_connector_configuration.html | 11 +-
...wift_as_primary_object_store_configuration.html | 11 +-
.../sharepoint-integration_configuration.html | 11 +-
.../windows-network-drive_configuration.html | 11 +-
.../admin/enterprise_files_drop/files_drop.html | 11 +-
core/doc/admin/enterprise_files_drop/index.html | 11 +-
core/doc/admin/enterprise_installation/index.html | 13 +-
.../license_keys_installation.html | 11 +-
.../linux_installation.html | 11 +-
.../supported_apps_installation.html | 11 +-
core/doc/admin/enterprise_ios_app/index.html | 28 ++-
.../enterprise_ios_app/publishing_ios_app.html | 41 ++--
.../enterprise_ios_app/publishing_ios_app_2.html | 19 +-
.../enterprise_ios_app/publishing_ios_app_3.html | 51 ++++-
.../enterprise_ios_app/publishing_ios_app_4.html | 11 +-
.../enterprise_ios_app/publishing_ios_app_5.html | 95 ++++++--
.../enterprise_ios_app/publishing_ios_app_6.html | 13 +-
.../enterprise_ios_app/publishing_ios_app_7.html | 36 ++-
.../enterprise_ios_app/publishing_ios_app_8.html | 22 +-
.../enterprise_ios_app/publishing_ios_app_9.html | 167 ++++++++++++--
.../file_firewall_configuration.html | 11 +-
.../admin/enterprise_user_management/index.html | 11 +-
.../user_auth_shibboleth.html | 185 ++++++++-------
core/doc/admin/genindex.html | 11 +-
core/doc/admin/index.html | 28 +--
.../admin/installation/appliance_installation.html | 11 +-
.../installation/apps_management_installation.html | 17 +-
.../installation/command_line_installation.html | 17 +-
.../admin/installation/hiawatha_configuration.html | 11 +-
core/doc/admin/installation/index.html | 12 +-
.../admin/installation/installation_wizard.html | 48 ++--
.../doc/admin/installation/linux_installation.html | 13 +-
.../doc/admin/installation/macos_installation.html | 13 +-
.../admin/installation/nginx_configuration.html | 14 +-
.../admin/installation/selinux_configuration.html | 21 +-
.../admin/installation/source_installation.html | 27 ++-
core/doc/admin/installation/ucs_installation.html | 11 +-
.../doc/admin/installation/yaws_configuration.html | 11 +-
core/doc/admin/issues/index.html | 18 +-
core/doc/admin/maintenance/backup.html | 11 +-
core/doc/admin/maintenance/enable_maintenance.html | 11 +-
core/doc/admin/maintenance/index.html | 11 +-
core/doc/admin/maintenance/migrating.html | 11 +-
core/doc/admin/maintenance/restore.html | 32 +--
core/doc/admin/maintenance/update.html | 11 +-
core/doc/admin/maintenance/upgrade.html | 31 ++-
core/doc/admin/objects.inv | Bin 653 -> 914 bytes
.../operations/considerations_on_monitoring.html | 11 +-
core/doc/admin/operations/index.html | 11 +-
.../operations/scaling_multiple_machines.html | 11 +-
core/doc/admin/operations/theming.html | 23 +-
core/doc/admin/release_notes.html | 121 +++++++---
core/doc/admin/search.html | 11 +-
core/doc/admin/videos/index.html | 201 ----------------
core/doc/admin/whats_new_admin.html | 77 ++++++-
.../_images/notifications_personal_settings.png | Bin 15316 -> 51877 bytes
.../_sources/external_storage/external_storage.txt | 2 +-
core/doc/user/_sources/files/large_file_upload.txt | 2 +-
core/doc/user/_sources/pim/calendar.txt | 4 +-
core/doc/user/_sources/pim/contacts.txt | 4 +-
core/doc/user/_sources/pim/index.txt | 2 +-
core/doc/user/_sources/userpreferences.txt | 112 ++++++---
core/doc/user/_sources/webinterface.txt | 4 +-
core/doc/user/_sources/whats_new.txt | 2 +
core/doc/user/bookmarks.html | 8 +-
core/doc/user/contents.html | 25 +-
core/doc/user/documents.html | 8 +-
.../user/external_storage/external_storage.html | 10 +-
core/doc/user/external_storage/index.html | 8 +-
.../external_storage/sharepoint_connecting.html | 8 +-
core/doc/user/files/access_webdav.html | 8 +-
core/doc/user/files/access_webgui.html | 8 +-
core/doc/user/files/deleted_file_management.html | 10 +-
core/doc/user/files/desktop_mobile_sync.html | 8 +-
core/doc/user/files/encrypting_files.html | 8 +-
core/doc/user/files/federated_cloud_sharing.html | 8 +-
core/doc/user/files/file_drop.html | 8 +-
core/doc/user/files/index.html | 8 +-
core/doc/user/files/large_file_upload.html | 10 +-
core/doc/user/files/quota.html | 8 +-
core/doc/user/files/version_control.html | 8 +-
core/doc/user/genindex.html | 8 +-
core/doc/user/index.html | 10 +-
core/doc/user/objects.inv | Bin 304 -> 324 bytes
core/doc/user/pim/calendar.html | 12 +-
core/doc/user/pim/contacts.html | 12 +-
core/doc/user/pim/index.html | 10 +-
core/doc/user/pim/sync_ios.html | 8 +-
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 | 158 +++++++------
core/doc/user/webinterface.html | 12 +-
core/doc/user/whats_new.html | 12 +-
core/js/apps.js | 2 +-
core/js/setupchecks.js | 3 +
core/js/share.js | 17 +-
lib/base.php | 10 +-
lib/private/app.php | 44 ++--
lib/private/appframework/http/request.php | 3 +-
lib/private/cache/file.php | 13 +-
lib/private/connector/sabre/file.php | 12 +-
lib/private/encryption/util.php | 29 ---
.../files/config/mountprovidercollection.php | 10 +-
lib/private/files/storage/dav.php | 50 ++--
lib/private/files/storage/wrapper/encryption.php | 122 ++++++++--
lib/private/files/utils/scanner.php | 8 +-
lib/private/repair.php | 6 +-
lib/private/server.php | 2 +
lib/private/share/hooks.php | 4 +-
lib/private/share/share.php | 62 ++++-
lib/private/updater.php | 6 +
lib/public/share.php | 2 +-
lib/repair/collation.php | 1 +
lib/repair/updateoutdatedocsids.php | 108 +++++++++
settings/admin.php | 4 +-
settings/application.php | 6 +-
settings/controller/appsettingscontroller.php | 4 +-
settings/controller/checksetupcontroller.php | 70 +++++-
settings/controller/encryptioncontroller.php | 49 ++--
settings/js/personal.js | 38 ++-
settings/js/users/users.js | 4 +
settings/personal.php | 4 +-
settings/templates/apps.php | 8 +-
settings/templates/personal.php | 2 +-
version.php | 6 +-
332 files changed, 5530 insertions(+), 2586 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