[Pkg-owncloud-commits] [owncloud] 06/07: Merge tag 'upstream/7.0.12__rc1_dfsg'

David Prévot taffit at moszumanska.debian.org
Thu Dec 17 18:03:18 UTC 2015


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit fb5fdc4460be449cea4536b49f65bd07549630af
Merge: f88e6d6 571bda9
Author: David Prévot <taffit at debian.org>
Date:   Wed Dec 16 22:36:16 2015 -0400

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

 apps/files_versions/ajax/preview.php               |  18 ++-
 core/doc/admin/release/.buildinfo                  |   2 +-
 .../external-storage-google-drive-0auth.png        | Bin 65496 -> 0 bytes
 .../_images/external-storage-google-drive-9.png    | Bin 34285 -> 0 bytes
 .../_images/external-storage-google-drive-sdk.png  | Bin 45813 -> 0 bytes
 .../_images/external-storage-google-drive.png      | Bin 9414 -> 0 bytes
 .../_images/external-storage-google-drive1.png     | Bin 20527 -> 0 bytes
 .../_images/external-storage-google-drive2.png     | Bin 5359 -> 0 bytes
 .../_images/external-storage-google-drive5.png     | Bin 75172 -> 0 bytes
 .../_images/external-storage-google-drive7.png     | Bin 29240 -> 0 bytes
 .../_images/external-storage-google-drive8.png     | Bin 11987 -> 0 bytes
 core/doc/admin/release/_images/google-drive.png    | Bin 0 -> 11950 bytes
 core/doc/admin/release/_images/google-drive1.png   | Bin 0 -> 11030 bytes
 core/doc/admin/release/_images/google-drive10.png  | Bin 0 -> 14967 bytes
 core/doc/admin/release/_images/google-drive11.png  | Bin 0 -> 46479 bytes
 core/doc/admin/release/_images/google-drive12.png  | Bin 0 -> 31465 bytes
 core/doc/admin/release/_images/google-drive13.png  | Bin 0 -> 14859 bytes
 core/doc/admin/release/_images/google-drive2.png   | Bin 0 -> 27860 bytes
 core/doc/admin/release/_images/google-drive3.png   | Bin 0 -> 8890 bytes
 core/doc/admin/release/_images/google-drive5.png   | Bin 0 -> 14608 bytes
 core/doc/admin/release/_images/google-drive6.png   | Bin 0 -> 47083 bytes
 core/doc/admin/release/_images/google-drive8.png   | Bin 0 -> 56891 bytes
 core/doc/admin/release/_images/google-drive9.png   | Bin 0 -> 55514 bytes
 .../release/_images/ucs-app-center-install.png     | Bin 75597 -> 0 bytes
 .../release/_images/ucs-app-center-module.png      | Bin 106791 -> 0 bytes
 .../external_storage_configuration_gui.txt         | 147 +++++++++++++--------
 .../_sources/installation/ucs_installation.txt     |  85 +++---------
 .../admin/release/_sources/maintenance/restore.txt |   3 +
 .../admin/release/_sources/maintenance/upgrade.txt |   2 +-
 .../configuration/activity_configuration.html      |   6 +-
 .../configuration/antivirus_configuration.html     |   6 +-
 .../configuration/automatic_configuration.html     |   6 +-
 .../background_jobs_configuration.html             |   6 +-
 .../big_file_upload_configuration.html             |   6 +-
 .../collaborative_documents_configuration.html     |   6 +-
 .../config_sample_php_parameters.html              |   6 +-
 .../configuration/custom_client_configuration.html |   6 +-
 .../configuration/database_configuration.html      |   6 +-
 .../release/configuration/email_configuration.html |   6 +-
 .../configuration/encryption_configuration.html    |   6 +-
 .../release/configuration/external_sites.html      |   6 +-
 .../external_storage_configuration.html            |   6 +-
 .../external_storage_configuration_gui.html        | 121 ++++++++++-------
 .../configuration/file_sharing_configuration.html  |   6 +-
 .../configuration/files_locking_enabling.html      |   6 +-
 .../admin/release/configuration/harden_server.html |   6 +-
 core/doc/admin/release/configuration/index.html    |   6 +-
 .../js_css_asset_management_configuration.html     |   6 +-
 .../configuration/knowledgebase_configuration.html |   6 +-
 .../configuration/language_configuration.html      |   6 +-
 .../configuration/logging_configuration.html       |   6 +-
 .../admin/release/configuration/occ_command.html   |   6 +-
 .../release/configuration/performance_tips.html    |   6 +-
 .../configuration/previews_configuration.html      |   6 +-
 .../configuration/reset_admin_password.html        |   6 +-
 .../configuration/reverse_proxy_configuration.html |   6 +-
 .../configuration/search_configuration.html        |   6 +-
 .../server_to_server_configuration.html            |   6 +-
 .../serving_static_files_configuration.html        |   6 +-
 .../thirdparty_php_configuration.html              |   6 +-
 .../configuration/user_auth_ftp_smb_imap.html      |   6 +-
 .../release/configuration/user_auth_ldap.html      |   6 +-
 .../configuration/user_auth_ldap_cleanup.html      |   6 +-
 .../release/configuration/user_configuration.html  |   6 +-
 core/doc/admin/release/contents.html               |   6 +-
 core/doc/admin/release/genindex.html               |   6 +-
 core/doc/admin/release/index.html                  |   6 +-
 .../installation/appliance_installation.html       |   6 +-
 .../installation/apps_management_installation.html |   6 +-
 .../installation/hiawatha_configuration.html       |   6 +-
 core/doc/admin/release/installation/index.html     |   6 +-
 .../release/installation/installation_wizard.html  |   6 +-
 .../installation/lighttpd_configuration.html       |   6 +-
 .../release/installation/linux_installation.html   |   6 +-
 .../release/installation/macos_installation.html   |   6 +-
 .../release/installation/nginx_configuration.html  |   6 +-
 .../release/installation/others_installation.html  |   6 +-
 .../installation/selinux_configuration.html        |   6 +-
 .../release/installation/source_installation.html  |   6 +-
 .../release/installation/ucs_installation.html     |  72 +++-------
 .../release/installation/windows_installation.html |   6 +-
 .../release/installation/yaws_configuration.html   |   6 +-
 core/doc/admin/release/issues/index.html           |   6 +-
 core/doc/admin/release/maintenance/backup.html     |   6 +-
 core/doc/admin/release/maintenance/convert_db.html |   6 +-
 .../release/maintenance/enable_maintenance.html    |   6 +-
 core/doc/admin/release/maintenance/index.html      |   6 +-
 core/doc/admin/release/maintenance/migrating.html  |   6 +-
 core/doc/admin/release/maintenance/restore.html    |  11 +-
 core/doc/admin/release/maintenance/update.html     |   6 +-
 core/doc/admin/release/maintenance/upgrade.html    |   8 +-
 core/doc/admin/release/objects.inv                 |   2 +-
 core/doc/admin/release/release_notes.html          |   6 +-
 core/doc/admin/release/search.html                 |   6 +-
 core/doc/admin/release/videos.html                 |   6 +-
 core/doc/admin/release/whats_new_admin.html        |   6 +-
 core/doc/user/_sources/files/files.txt             |   2 +-
 core/doc/user/_sources/files/filesweb.txt          |  11 +-
 core/doc/user/files/files.html                     |   2 +-
 core/doc/user/files/filesweb.html                  |   8 ++
 ocs/providers.php                                  |  43 +++---
 version.php                                        |   8 +-
 102 files changed, 469 insertions(+), 448 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