[Pkg-owncloud-commits] [owncloud] 34/36: Merge tag 'upstream/7.0.7__beta_dfsg'

David Prévot taffit at moszumanska.debian.org
Tue Jun 23 23:12:27 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 0e96a4470a8aef5e2404b787e6cda433370fe099
Merge: a0bcf7e 8fb2daa
Author: David Prévot <taffit at debian.org>
Date:   Tue Jun 23 18:19:59 2015 -0400

    Merge tag 'upstream/7.0.7__beta_dfsg'
    
    Upstream version 7.0.7~~beta~dfsg
    
    # gpg: Signature made mar. 23 juin 2015 18:19:39 AST
    # 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

 apps/files/ajax/upload.php                         |   4 +
 .../files_external/3rdparty/Dropbox/OAuth/Curl.php |  12 +-
 apps/files_external/3rdparty/smb4php/smb.php       |   6 +-
 apps/files_sharing/ajax/publicpreview.php          |   7 +
 apps/files_sharing/appinfo/update.php              |   8 +-
 apps/files_sharing/public.php                      |   1 +
 apps/files_sharing/templates/public.php            |   2 +-
 apps/gallery/ajax/getimages.php                    |   3 +
 apps/gallery/ajax/image.php                        |   3 +
 apps/gallery/ajax/thumbnail.php                    |   3 +
 apps/user_ldap/lib/wizard.php                      |  34 ++-
 apps/user_ldap/tests/user_ldap.php                 |   4 +
 apps/user_ldap/user_ldap.php                       |  11 +-
 core/command/upgrade.php                           |   3 +
 core/css/fixes.css                                 |   1 +
 .../_sources/configuration/user_auth_ldap.txt      |  25 +-
 core/doc/admin/release/_sources/contents.txt       |   1 +
 core/doc/admin/release/_sources/release_notes.txt  | 188 ++++++++++++
 .../configuration/activity_configuration.html      |   1 +
 .../configuration/antivirus_configuration.html     |   1 +
 .../configuration/automatic_configuration.html     |   1 +
 .../background_jobs_configuration.html             |   1 +
 .../big_file_upload_configuration.html             |   1 +
 .../collaborative_documents_configuration.html     |   1 +
 .../config_sample_php_parameters.html              |   1 +
 .../configuration/custom_client_configuration.html |   1 +
 .../configuration/database_configuration.html      |   1 +
 .../release/configuration/email_configuration.html |   1 +
 .../configuration/encryption_configuration.html    |   1 +
 .../release/configuration/external_sites.html      |   1 +
 .../external_storage_configuration.html            |   1 +
 .../external_storage_configuration_gui.html        |   1 +
 .../configuration/file_sharing_configuration.html  |   1 +
 .../configuration/files_locking_enabling.html      |   1 +
 .../admin/release/configuration/harden_server.html |   1 +
 core/doc/admin/release/configuration/index.html    |   1 +
 .../js_css_asset_management_configuration.html     |   1 +
 .../configuration/knowledgebase_configuration.html |   1 +
 .../configuration/language_configuration.html      |   1 +
 .../configuration/logging_configuration.html       |   1 +
 .../admin/release/configuration/occ_command.html   |   1 +
 .../release/configuration/performance_tips.html    |   1 +
 .../configuration/previews_configuration.html      |   1 +
 .../configuration/reset_admin_password.html        |   1 +
 .../configuration/reverse_proxy_configuration.html |   1 +
 .../configuration/search_configuration.html        |   1 +
 .../server_to_server_configuration.html            |   1 +
 .../serving_static_files_configuration.html        |   1 +
 .../thirdparty_php_configuration.html              |   1 +
 .../configuration/user_auth_ftp_smb_imap.html      |   1 +
 .../release/configuration/user_auth_ldap.html      |  26 +-
 .../configuration/user_auth_ldap_cleanup.html      |   1 +
 .../release/configuration/user_configuration.html  |   1 +
 core/doc/admin/release/contents.html               |  28 ++
 core/doc/admin/release/genindex.html               |   1 +
 core/doc/admin/release/index.html                  |   1 +
 .../installation/appliance_installation.html       |   1 +
 .../installation/apps_management_installation.html |   1 +
 .../installation/hiawatha_configuration.html       |   1 +
 core/doc/admin/release/installation/index.html     |   3 +-
 .../release/installation/installation_wizard.html  |   1 +
 .../installation/lighttpd_configuration.html       |   1 +
 .../release/installation/linux_installation.html   |   1 +
 .../release/installation/macos_installation.html   |   1 +
 .../release/installation/nginx_configuration.html  |   1 +
 .../release/installation/others_installation.html  |   1 +
 .../installation/selinux_configuration.html        |   1 +
 .../release/installation/source_installation.html  |   1 +
 .../release/installation/ucs_installation.html     |   1 +
 .../release/installation/windows_installation.html |   1 +
 .../release/installation/yaws_configuration.html   |   1 +
 core/doc/admin/release/issues/index.html           |   1 +
 core/doc/admin/release/maintenance/backup.html     |   1 +
 core/doc/admin/release/maintenance/convert_db.html |   1 +
 .../release/maintenance/enable_maintenance.html    |   1 +
 core/doc/admin/release/maintenance/index.html      |   1 +
 core/doc/admin/release/maintenance/migrating.html  |   1 +
 core/doc/admin/release/maintenance/restore.html    |   1 +
 core/doc/admin/release/maintenance/update.html     |   1 +
 core/doc/admin/release/maintenance/upgrade.html    |   1 +
 core/doc/admin/release/release_notes.html          | 334 +++++++++++++++++++++
 core/doc/admin/release/search.html                 |   1 +
 core/doc/admin/release/videos.html                 |   1 +
 core/doc/admin/release/whats_new_admin.html        |   3 +-
 core/user/controller.php                           |   2 +-
 .../dependencyinjection/dicontainer.php            |   7 +-
 .../middleware/security/corsmiddleware.php         |  46 ++-
 .../utility/controllermethodreflector.php          |   2 +-
 lib/private/files/cache/cache.php                  |   9 +-
 lib/repair/collation.php                           |   1 +
 version.php                                        |   8 +-
 91 files changed, 777 insertions(+), 69 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