[Pkg-owncloud-commits] [owncloud] 56/59: Merge tag 'upstream/7.0.0_rc3+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 28cbb187a006b81763fa30b252498a2706847214
Merge: aa1d30c 7ccf1e9
Author: David Prévot <taffit at debian.org>
Date:   Fri Jul 18 09:33:18 2014 -0400

    Merge tag 'upstream/7.0.0_rc3+dfsg'
    
    Upstream version 7.0.0~rc3+dfsg
    
    # gpg: Signature faite le ven. 18 juil. 2014 09:32:52 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/documents/ajax/admin.php                      |   3 +-
 apps/documents/css/style.css                       |  83 +++++++----
 apps/documents/js/documents.js                     |   9 +-
 apps/documents/lib/converter.php                   |   1 +
 apps/external/ajax/setsites.php                    |  16 ++-
 apps/external/appinfo/app.php                      |  12 +-
 apps/external/index.php                            |  11 +-
 apps/external/js/admin.js                          |  14 +-
 apps/external/lib/external.php                     |   6 +-
 apps/external/settings.php                         |   1 +
 apps/external/templates/settings.php               |   9 +-
 apps/files_encryption/appinfo/app.php              |   4 +
 apps/files_encryption/files/error.php              |   1 +
 apps/files_encryption/hooks/hooks.php              |  59 ++++----
 apps/files_encryption/lib/crypt.php                |  23 +---
 .../lib/exceptions.php}                            |  35 +++--
 apps/files_encryption/lib/util.php                 |  25 ++--
 apps/files_encryption/tests/crypt.php              |   2 +
 apps/files_encryption/tests/migration.php          |  43 +++++-
 apps/files_encryption/tests/share.php              |  48 +++++++
 apps/files_external/css/settings.css               |  15 +-
 apps/files_external/js/settings.js                 |  12 +-
 apps/files_external/templates/settings.php         |  14 +-
 apps/files_external/tests/mountconfig.php          |  37 +++++
 apps/files_sharing/js/share.js                     |   2 +-
 apps/files_sharing/lib/cache.php                   |   2 +-
 apps/files_sharing/tests/cache.php                 |  19 +++
 apps/files_sharing/tests/js/shareSpec.js           |   8 +-
 apps/files_trashbin/appinfo/app.php                |   2 +
 .../lib/exceptions.php}                            |  18 +--
 apps/files_trashbin/lib/trashbin.php               |  24 +++-
 apps/files_versions/lib/versions.php               |  32 +++--
 apps/gallery/css/styles.css                        |   9 ++
 apps/gallery/js/gallery.js                         |  33 +++--
 apps/gallery/public.php                            |   6 +-
 apps/gallery/templates/index.php                   |   1 +
 apps/user_ldap/lib/user/manager.php                |   3 +-
 apps/user_ldap/tests/user/manager.php              | 151 +++++++++++++++++++++
 apps/user_webdavauth/appinfo/info.xml              |   2 +-
 config/config.sample.php                           |   2 +-
 core/js/share.js                                   |   4 +-
 core/js/tests/specs/shareSpec.js                   |  14 +-
 db_structure.xml                                   |  12 --
 lib/private/db.php                                 |  10 ++
 lib/private/db/mdb2schemamanager.php               |   6 +-
 lib/private/defaults.php                           |   2 +-
 lib/private/files/view.php                         |   3 +-
 lib/private/group/metadata.php                     | 100 +++++++-------
 lib/private/installer.php                          |  13 +-
 lib/private/log.php                                |   2 +-
 lib/private/ocsclient.php                          |   2 +-
 lib/private/search/result/file.php                 |  55 +++-----
 lib/private/share/share.php                        |   2 +-
 lib/private/user/manager.php                       |   3 +-
 lib/private/user/session.php                       |   3 +-
 lib/private/user/user.php                          |   3 +-
 lib/public/iservercontainer.php                    |   7 +
 lib/public/iuser.php                               | 105 ++++++++++++++
 lib/public/iusermanager.php                        | 105 ++++++++++++++
 lib/public/iusersession.php                        |  13 ++
 settings/ajax/grouplist.php                        |  14 +-
 settings/css/settings.css                          |   5 +
 settings/js/users/deleteHandler.js                 |   4 +-
 settings/js/users/filter.js                        |   6 +-
 settings/js/users/groups.js                        |   7 +-
 settings/js/users/users.js                         |  16 ++-
 settings/templates/users/part.grouplist.php        |   4 +-
 settings/users.php                                 |   9 +-
 version.php                                        |   6 +-
 69 files changed, 1005 insertions(+), 327 deletions(-)

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