[Pkg-owncloud-commits] [owncloud] 103/107: Merge tag 'upstream/8.2.2__rc1_dfsg' into stable8

David Prévot taffit at moszumanska.debian.org
Thu Dec 17 19:40:42 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 e1dcd22c08733737eda24649431a8f2ffd60d95b
Merge: 0a991c2 257fe88
Author: David Prévot <taffit at debian.org>
Date:   Wed Dec 16 22:27:01 2015 -0400

    Merge tag 'upstream/8.2.2__rc1_dfsg' into stable8
    
    Upstream version 8.2.2~~rc1~dfsg
    
    # gpg: Signature faite le mer. 16 déc. 2015 22:26:40 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

 .htaccess                                          |   2 +-
 apps/files/ajax/scan.php                           |   8 -
 apps/files/appinfo/remote.php                      |   3 +-
 apps/files/js/fileactions.js                       |  26 +-
 apps/files/js/fileactionsmenu.js                   |   8 +
 apps/files/lib/activity.php                        |   9 +-
 apps/files/tests/activitytest.php                  |  21 +-
 apps/files/tests/controller/apicontrollertest.php  |   9 +-
 apps/files/tests/js/fileactionsmenuSpec.js         |  20 +-
 apps/files_external/lib/personalmount.php          |   8 +-
 apps/files_external/tests/personalmounttest.php    |  50 ++++
 apps/files_pdfviewer/appinfo/app.php               |   1 +
 apps/files_pdfviewer/css/style.css                 |  19 +-
 apps/files_pdfviewer/css/{style.css => viewer.css} |   2 +-
 apps/files_pdfviewer/js/previewplugin.js           |  16 +-
 apps/files_pdfviewer/templates/viewer.php          |   3 +-
 apps/files_sharing/ajax/external.php               |  11 +-
 apps/files_sharing/api/remote.php                  |   2 +-
 apps/files_sharing/api/sharees.php                 |  25 +-
 apps/files_sharing/appinfo/application.php         |   4 +-
 apps/files_sharing/css/sharetabview.css            |   2 +-
 apps/files_sharing/js/external.js                  |   3 +-
 apps/files_sharing/js/public.js                    |   7 +-
 apps/files_sharing/js/sharedfilelist.js            |  12 +-
 apps/files_sharing/l10n/de.js                      |   2 +-
 apps/files_sharing/l10n/de.json                    |   2 +-
 apps/files_sharing/l10n/de_DE.js                   |   2 +-
 apps/files_sharing/l10n/de_DE.json                 |   2 +-
 .../lib/controllers/sharecontroller.php            |   1 +
 apps/files_sharing/lib/external/storage.php        |   7 +
 apps/files_sharing/lib/mountprovider.php           |   2 +-
 .../lib/propagation/propagationmanager.php         |  32 +-
 .../lib/propagation/recipientpropagator.php        |  40 ++-
 apps/files_sharing/lib/sharedstorage.php           |   2 +-
 apps/files_sharing/lib/updater.php                 |  41 +++
 apps/files_sharing/publicwebdav.php                |   3 +-
 apps/files_sharing/templates/public.php            |   2 +-
 apps/files_sharing/tests/api/shareestest.php       |  28 +-
 .../tests/controller/sharecontroller.php           |   1 +
 apps/files_sharing/tests/etagpropagation.php       | 136 +++------
 apps/files_sharing/tests/groupetagpropagation.php  | 104 +++++++
 apps/files_sharing/tests/js/externalSpec.js        |   4 +
 apps/files_sharing/tests/js/sharedfilelistSpec.js  |  26 +-
 apps/files_sharing/tests/propagationtestcase.php   | 103 +++++++
 apps/files_sharing/tests/testcase.php              |   6 +
 apps/files_trashbin/command/expire.php             |  11 +-
 apps/files_trashbin/lib/storage.php                |   5 +-
 apps/files_trashbin/lib/trashbin.php               |  25 +-
 apps/files_trashbin/tests/command/expiretest.php   |   2 +-
 apps/files_trashbin/tests/storage.php              |  13 +
 apps/files_versions/ajax/preview.php               |  18 +-
 apps/files_versions/command/expire.php             |  18 +-
 apps/files_versions/lib/storage.php                |  29 +-
 apps/updater/js/app.js                             |  27 --
 apps/updater/js/{controllers.js => updater.js}     |  36 ++-
 apps/updater/lib/location/core.php                 |   2 +-
 apps/updater/templates/admin.php                   |   3 +-
 apps/user_ldap/ajax/testConfiguration.php          |   2 +-
 apps/user_ldap/appinfo/info.xml                    |   2 +-
 apps/user_ldap/appinfo/update.php                  |   7 +-
 apps/user_ldap/js/wizard/wizardTabGeneric.js       |   6 +-
 apps/user_ldap/lib/access.php                      |  95 ++++++
 apps/user_ldap/lib/mapping/abstractmapping.php     |  12 +-
 apps/user_ldap/tests/user_ldap.php                 |  62 +++-
 apps/user_ldap/user_ldap.php                       |  43 ++-
 config/config.sample.php                           |   5 +
 core/css/styles.css                                |  11 +-
 core/doc/admin/_images/2-updates.png               | Bin 0 -> 26784 bytes
 core/doc/admin/_images/antivirus-daemon.png        | Bin 0 -> 14001 bytes
 core/doc/admin/_images/encryption1.png             | Bin 12827 -> 12135 bytes
 core/doc/admin/_images/encryption10.png            | Bin 22921 -> 21821 bytes
 core/doc/admin/_images/encryption3.png             | Bin 20160 -> 46034 bytes
 core/doc/admin/_images/files_locking_app.png       | Bin 85425 -> 0 bytes
 core/doc/admin/_images/google-drive.png            | Bin 9414 -> 11950 bytes
 core/doc/admin/_images/google-drive1.png           | Bin 12420 -> 11030 bytes
 core/doc/admin/_images/google-drive10.png          | Bin 27812 -> 14967 bytes
 core/doc/admin/_images/google-drive11.png          | Bin 41117 -> 46479 bytes
 core/doc/admin/_images/google-drive12.png          | Bin 0 -> 31465 bytes
 core/doc/admin/_images/google-drive13.png          | Bin 0 -> 14859 bytes
 core/doc/admin/_images/google-drive2.png           | Bin 14560 -> 27860 bytes
 core/doc/admin/_images/google-drive3.png           | Bin 15648 -> 8890 bytes
 core/doc/admin/_images/google-drive4.png           | Bin 42952 -> 17205 bytes
 core/doc/admin/_images/google-drive5.png           | Bin 30934 -> 14608 bytes
 core/doc/admin/_images/google-drive6.png           | Bin 69950 -> 47083 bytes
 core/doc/admin/_images/google-drive8.png           | Bin 11987 -> 56891 bytes
 core/doc/admin/_images/google-drive9.png           | Bin 0 -> 55514 bytes
 core/doc/admin/_images/shib-gui5.png               | Bin 35247 -> 70565 bytes
 core/doc/admin/_images/shib-gui6.png               | Bin 0 -> 43939 bytes
 core/doc/admin/_images/smb.png                     | Bin 6000 -> 16133 bytes
 core/doc/admin/_images/ucs-app-center-install.png  | Bin 75597 -> 0 bytes
 core/doc/admin/_images/ucs-app-center-module.png   | Bin 106791 -> 0 bytes
 core/doc/admin/_images/upgrade-2.png               | Bin 47237 -> 23680 bytes
 core/doc/admin/_images/upgrade-3.png               | Bin 0 -> 36298 bytes
 core/doc/admin/_images/upgrade-notifier.png        | Bin 0 -> 3854 bytes
 .../linux_database_configuration.txt               |   3 +-
 .../collaborative_documents_configuration.txt      |   1 -
 .../encryption_configuration.txt                   | 196 ++++---------
 .../external_storage/google.txt                    |  98 ++++---
 .../configuration_files/external_storage/smb.txt   |   2 +
 .../configuration_files/files_locking_enabling.txt |  19 --
 .../files_locking_transactional.txt                |  45 +--
 .../admin/_sources/configuration_files/index.txt   |   1 -
 .../antivirus_configuration.txt                    |   2 +-
 .../configuration_server/caching_configuration.txt |   2 +-
 .../config_sample_php_parameters.txt               |   5 +
 .../custom_client_repos.txt                        |  15 +-
 .../configuration_server/harden_server.txt         |   4 +-
 .../admin/_sources/configuration_server/index.txt  |   1 +
 .../performance_tuning/database_best_practice.txt  |   2 +-
 .../enterprise_clients/custom_client_repos.txt     |  15 +-
 .../user_auth_shibboleth.txt                       |  91 +++---
 .../installation/appliance_installation.txt        |   2 +-
 core/doc/admin/_sources/installation/index.txt     |   1 +
 .../_sources/installation/linux_installation.txt   |   4 +-
 .../_sources/installation/nginx_configuration.txt  |  24 +-
 .../_sources/installation/php_54_installation.txt  |   4 +-
 .../_sources/installation/php_55_installation.txt  |  81 ++++++
 .../_sources/installation/source_installation.txt  |  70 +++--
 .../_sources/installation/ucs_installation.txt     |  85 ++----
 core/doc/admin/_sources/maintenance/index.txt      |   2 +
 .../admin/_sources/maintenance/manual_upgrade.txt  | 125 ++++++++
 .../admin/_sources/maintenance/package_upgrade.txt | 159 ++++++++++
 core/doc/admin/_sources/maintenance/upgrade.txt    | 321 ++++-----------------
 .../configuration_database/db_conversion.html      |   6 +-
 core/doc/admin/configuration_database/index.html   |   6 +-
 .../linux_database_configuration.html              |   9 +-
 .../oracle_db_configuration.html                   |   6 +-
 .../big_file_upload_configuration.html             |   7 +-
 .../collaborative_documents_configuration.html     |   8 +-
 .../default_files_configuration.html               |   7 +-
 .../encryption_configuration.html                  | 173 ++++-------
 .../external_storage/amazons3.html                 |   6 +-
 .../external_storage/auth_mechanisms.html          |   7 +-
 .../external_storage/dropbox.html                  |   6 +-
 .../configuration_files/external_storage/ftp.html  |   6 +-
 .../external_storage/google.html                   |  97 ++++---
 .../external_storage/local.html                    |   6 +-
 .../external_storage/openstack.html                |   6 +-
 .../external_storage/owncloud.html                 |   6 +-
 .../configuration_files/external_storage/sftp.html |   6 +-
 .../configuration_files/external_storage/smb.html  |   8 +-
 .../external_storage/webdav.html                   |   6 +-
 .../external_storage_configuration.html            |   7 +-
 .../external_storage_configuration_gui.html        |   7 +-
 .../federated_cloud_sharing_configuration.html     |   7 +-
 .../file_sharing_configuration.html                |   7 +-
 .../files_locking_enabling.html                    | 191 ------------
 .../files_locking_transactional.html               |  57 ++--
 core/doc/admin/configuration_files/index.html      |  12 +-
 .../previews_configuration.html                    |   7 +-
 core/doc/admin/configuration_mimetypes/index.html  |   6 +-
 .../configuration_mimetypes/mimetype_aliases.html  |   6 +-
 .../configuration_mimetypes/mimetype_mapping.html  |   6 +-
 .../activity_configuration.html                    |   7 +-
 .../antivirus_configuration.html                   |   9 +-
 .../automatic_configuration.html                   |   7 +-
 .../background_jobs_configuration.html             |   7 +-
 .../caching_configuration.html                     |   9 +-
 .../config_sample_php_parameters.html              |  11 +-
 ...configuration.html => custom_client_repos.html} |  42 ++-
 .../configuration_server/email_configuration.html  |   7 +-
 .../admin/configuration_server/external_sites.html |   9 +-
 .../admin/configuration_server/harden_server.html  |  13 +-
 core/doc/admin/configuration_server/index.html     |   8 +-
 .../js_css_asset_management_configuration.html     |   7 +-
 .../knowledgebase_configuration.html               |   9 +-
 .../language_configuration.html                    |   7 +-
 .../logging_configuration.html                     |   7 +-
 .../admin/configuration_server/occ_command.html    |   9 +-
 .../performance_tuning/database_best_practice.html |   9 +-
 .../performance_tuning/index.html                  |   7 +-
 .../performance_tuning/oc_server_tuning.html       |   7 +-
 .../performance_tuning/ssl_encryption_app.html     |   7 +-
 .../performance_tuning/webserver_tips.html         |   7 +-
 .../reverse_proxy_configuration.html               |   7 +-
 .../configuration_server/search_configuration.html |   7 +-
 .../security_setup_warnings.html                   |   9 +-
 .../thirdparty_php_configuration.html              |   7 +-
 core/doc/admin/configuration_user/index.html       |   6 +-
 .../configuration_user/reset_admin_password.html   |   6 +-
 .../configuration_user/user_auth_ftp_smb_imap.html |   6 +-
 .../admin/configuration_user/user_auth_ldap.html   |   6 +-
 .../configuration_user/user_auth_ldap_cleanup.html |   6 +-
 .../configuration_user/user_configuration.html     |   6 +-
 .../configuration_user/user_provisioning_api.html  |   6 +-
 core/doc/admin/contents.html                       |  42 ++-
 .../enterprise_clients/creating_branded_apps.html  |   6 +-
 .../enterprise_clients/custom_client_repos.html    |  19 +-
 core/doc/admin/enterprise_clients/index.html       |   6 +-
 .../enterprise_clients/publishing_android_app.html |   6 +-
 .../admin/enterprise_external_storage/index.html   |   6 +-
 .../jive_configuration.html                        |   6 +-
 .../ldap_home_connector_configuration.html         |   6 +-
 ...wift_as_primary_object_store_configuration.html |   6 +-
 .../sharepoint-integration_configuration.html      |   6 +-
 .../windows-network-drive_configuration.html       |   6 +-
 .../admin/enterprise_files_drop/files_drop.html    |   6 +-
 core/doc/admin/enterprise_files_drop/index.html    |   6 +-
 core/doc/admin/enterprise_installation/index.html  |   6 +-
 .../license_keys_installation.html                 |   6 +-
 .../linux_installation.html                        |   8 +-
 .../supported_apps_installation.html               |   6 +-
 core/doc/admin/enterprise_ios_app/index.html       |   6 +-
 .../enterprise_ios_app/publishing_ios_app.html     |   6 +-
 .../enterprise_ios_app/publishing_ios_app_2.html   |   6 +-
 .../enterprise_ios_app/publishing_ios_app_3.html   |   6 +-
 .../enterprise_ios_app/publishing_ios_app_4.html   |   6 +-
 .../enterprise_ios_app/publishing_ios_app_5.html   |   6 +-
 .../enterprise_ios_app/publishing_ios_app_6.html   |   6 +-
 .../enterprise_ios_app/publishing_ios_app_7.html   |   6 +-
 .../enterprise_ios_app/publishing_ios_app_8.html   |   6 +-
 .../enterprise_ios_app/publishing_ios_app_9.html   |   6 +-
 .../enterprise_server_branding.html                |   6 +-
 .../admin/enterprise_server_branding/index.html    |   6 +-
 .../admin/enterprise_user_management/index.html    |   9 +-
 .../user_auth_shibboleth.html                      | 102 +++----
 core/doc/admin/genindex.html                       |   6 +-
 core/doc/admin/index.html                          |   6 +-
 .../admin/installation/appliance_installation.html |   9 +-
 .../installation/apps_management_installation.html |   7 +-
 .../installation/command_line_installation.html    |   7 +-
 .../admin/installation/hiawatha_configuration.html |   7 +-
 core/doc/admin/installation/index.html             |  12 +-
 .../admin/installation/installation_wizard.html    |   7 +-
 .../doc/admin/installation/linux_installation.html |   9 +-
 .../doc/admin/installation/macos_installation.html |   7 +-
 .../admin/installation/nginx_configuration.html    |  31 +-
 .../admin/installation/php_54_installation.html    |  13 +-
 ..._installation.html => php_55_installation.html} | 101 +++----
 .../admin/installation/selinux_configuration.html  |   9 +-
 .../admin/installation/source_installation.html    |  83 +++---
 .../admin/installation/system_requirements.html    |   7 +-
 core/doc/admin/installation/ucs_installation.html  |  73 ++---
 .../doc/admin/installation/yaws_configuration.html |   7 +-
 core/doc/admin/issues/index.html                   |   6 +-
 core/doc/admin/maintenance/backup.html             |  12 +-
 core/doc/admin/maintenance/enable_maintenance.html |  10 +-
 core/doc/admin/maintenance/index.html              |  32 +-
 core/doc/admin/maintenance/manual_upgrade.html     | 284 ++++++++++++++++++
 core/doc/admin/maintenance/migrating.html          |  10 +-
 core/doc/admin/maintenance/package_upgrade.html    | 303 +++++++++++++++++++
 core/doc/admin/maintenance/restore.html            |  10 +-
 core/doc/admin/maintenance/update.html             |  16 +-
 core/doc/admin/maintenance/upgrade.html            | 309 ++++----------------
 core/doc/admin/objects.inv                         | Bin 1675 -> 1675 bytes
 .../operations/considerations_on_monitoring.html   |   6 +-
 core/doc/admin/operations/index.html               |   6 +-
 .../operations/scaling_multiple_machines.html      |   6 +-
 core/doc/admin/operations/theming.html             |   6 +-
 core/doc/admin/release_notes.html                  |   8 +-
 core/doc/admin/search.html                         |   6 +-
 core/doc/admin/whats_new_admin.html                |   8 +-
 core/doc/user/_sources/files/access_webdav.txt     |   2 +-
 core/doc/user/_sources/files/access_webgui.txt     |   8 +
 core/doc/user/bookmarks.html                       |   6 +-
 core/doc/user/contents.html                        |   6 +-
 core/doc/user/documents.html                       |   6 +-
 .../user/external_storage/external_storage.html    |   6 +-
 core/doc/user/external_storage/index.html          |   6 +-
 .../external_storage/sharepoint_connecting.html    |   6 +-
 core/doc/user/files/access_webdav.html             |   8 +-
 core/doc/user/files/access_webgui.html             |  14 +-
 core/doc/user/files/deleted_file_management.html   |   6 +-
 core/doc/user/files/desktop_mobile_sync.html       |   6 +-
 core/doc/user/files/encrypting_files.html          |   6 +-
 core/doc/user/files/federated_cloud_sharing.html   |   6 +-
 core/doc/user/files/file_drop.html                 |   6 +-
 core/doc/user/files/index.html                     |   6 +-
 core/doc/user/files/large_file_upload.html         |   6 +-
 core/doc/user/files/quota.html                     |   6 +-
 core/doc/user/files/version_control.html           |   6 +-
 core/doc/user/genindex.html                        |   6 +-
 core/doc/user/index.html                           |   6 +-
 core/doc/user/objects.inv                          |   2 +-
 core/doc/user/pim/calendar.html                    |   6 +-
 core/doc/user/pim/contacts.html                    |   6 +-
 core/doc/user/pim/index.html                       |   6 +-
 core/doc/user/pim/sync_ios.html                    |   6 +-
 core/doc/user/pim/sync_kde.html                    |   6 +-
 core/doc/user/pim/sync_osx.html                    |   6 +-
 core/doc/user/pim/sync_thunderbird.html            |   6 +-
 core/doc/user/pim/troubleshooting.html             |   6 +-
 core/doc/user/search.html                          |   6 +-
 core/doc/user/userpreferences.html                 |   6 +-
 core/doc/user/webinterface.html                    |   6 +-
 core/doc/user/whats_new.html                       |   6 +-
 core/js/sharedialoglinkshareview.js                |  15 +-
 core/js/sharedialogshareelistview.js               |   8 +-
 core/js/tests/specs/sharedialogviewSpec.js         |   1 +
 core/skeleton/ownCloud_User_Manual.pdf             | Bin 0 -> 2544984 bytes
 lib/private/app/appmanager.php                     |   7 +
 lib/private/connector/sabre/fakelockerplugin.php   | 159 ++++++++++
 lib/private/connector/sabre/filesplugin.php        |  12 +-
 lib/private/connector/sabre/serverfactory.php      |  38 ++-
 lib/private/console/application.php                |   9 +-
 lib/private/files/fileinfo.php                     |   8 +-
 lib/private/files/storage/common.php               |   4 -
 lib/private/l10n.php                               |  10 +-
 lib/private/lock/abstractlockingprovider.php       |   2 +
 lib/private/lock/dblockingprovider.php             |   8 +-
 lib/private/lock/memcachelockingprovider.php       |   9 +
 lib/private/memcache/redis.php                     |  11 +-
 lib/private/route/cachingrouter.php                |   7 +-
 lib/private/route/router.php                       |  21 +-
 lib/private/server.php                             |   5 +-
 lib/private/setup/mysql.php                        |  25 +-
 lib/private/share/helper.php                       |  34 +++
 lib/private/share/mailnotifications.php            |   4 +-
 lib/private/share/share.php                        |  34 ++-
 .../expiretest.php => lib/public/imemcachettl.php  |  28 +-
 ocs/providers.php                                  |  43 +--
 settings/js/users/users.js                         |   8 +-
 settings/templates/admin.php                       |   8 +-
 version.php                                        |   8 +-
 314 files changed, 3614 insertions(+), 2498 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