[Pkg-owncloud-commits] [owncloud] 30/32: Merge tag 'upstream/6.0.3_rc1+dfsg'

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit bb4ce1ece02f3a8aac59cd55405262dd9466f4dd
Merge: 1b24134 61eba84
Author: David Prévot <taffit at debian.org>
Date:   Wed Apr 23 13:34:14 2014 -0400

    Merge tag 'upstream/6.0.3_rc1+dfsg'
    
    Upstream version 6.0.3~rc1+dfsg
    
    # gpg: Signature faite le mer. 23 avril 2014 13:06:42 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

 3rdparty/doctrine/common/bin/travis-setup.php      | 141 ---------------
 apps/activity/lib/data.php                         |   2 +-
 apps/activity/lib/search.php                       |   2 +-
 apps/calendar/lib/export.php                       |  10 --
 apps/contacts/lib/backend/database.php             |   6 +-
 apps/contacts/lib/backend/shared.php               |  14 +-
 apps/contacts/lib/dispatcher.php                   |   6 +-
 apps/contacts/lib/share/addressbook.php            |   5 +-
 apps/files_external/ajax/addMountPoint.php         |   7 +-
 .../3rdparty/Zend/Search/Lucene/Document/Docx.php  |   1 +
 .../Zend/Search/Lucene/Document/OpenXml.php        |   1 +
 .../3rdparty/Zend/Search/Lucene/Document/Xlsx.php  |   1 +
 apps/search_lucene/document/Ods.php                |   1 +
 apps/search_lucene/document/Odt.php                |   1 +
 apps/search_lucene/document/OpenDocument.php       |   1 +
 apps/user_ldap/group_ldap.php                      |  21 +--
 apps/user_ldap/group_proxy.php                     |  16 --
 apps/user_ldap/js/ldapFilter.js                    | 100 +++++++++++
 apps/user_ldap/js/settings.js                      | 100 +++--------
 apps/user_ldap/lib/access.php                      |  15 ++
 apps/user_ldap/settings.php                        |   1 +
 .../doc/admin/_sources/configuration/auth_ldap.txt |  65 ++++---
 core/doc/admin/configuration/auth_ldap.html        |  65 ++++---
 core/skeleton/ownCloudUserManual.pdf               | Bin 1572014 -> 1571999 bytes
 lib/base.php                                       |  29 ++++
 .../dependencyinjection/dicontainer.php            |  12 +-
 lib/private/appframework/http/request.php          |  87 ++++------
 lib/private/connector/sabre/file.php               |   7 +-
 lib/private/eventsource.php                        |   3 +-
 lib/private/files/type/detection.php               |  36 +++-
 lib/private/group.php                              |  12 +-
 lib/private/group/backend.php                      |  22 +--
 lib/private/group/database.php                     |  26 ---
 lib/private/group/group.php                        |   6 +-
 lib/private/group/manager.php                      |  34 ++++
 lib/private/helper.php                             |  10 ++
 lib/private/json.php                               |   2 -
 lib/private/mimetypes.list.php                     | 192 ++++++++++++---------
 lib/private/server.php                             |   9 +-
 lib/private/template.php                           |  23 ---
 lib/private/user/manager.php                       |   4 +-
 lib/public/appframework/iappcontainer.php          |   4 +-
 version.php                                        |   8 +-
 43 files changed, 517 insertions(+), 591 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git