[Pkg-owncloud-commits] [owncloud] 75/103: Merge pull request #15797 from owncloud/stable8-backport-15489

[David Prévot]

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

taffit pushed a commit to annotated tag v8.0.4RC1
in repository owncloud.

commit 6fa4ee8e868eb66c7801c3fd3b43deaabb1b9373
Merge: 485d415 3b7d285
Author: Jörn Friedrich Dreyer <jfd at butonic.de>
Date:   Wed May 13 08:41:51 2015 +0200

    Merge pull request #15797 from owncloud/stable8-backport-15489
    
    Stable8 backport 15489

 apps/files/tests/service/tagservice.php     |   2 +-
 apps/files_encryption/lib/util.php          |  11 +-
 apps/files_encryption/tests/hooks.php       |  24 ++-
 apps/user_ldap/lib/connection.php           |   9 +-
 apps/user_ldap/lib/ldap.php                 |   4 +
 apps/user_ldap/lib/user/manager.php         |  15 +-
 apps/user_ldap/tests/user_ldap.php          | 246 ++++++++++++++++++++++------
 apps/user_ldap/user_ldap.php                |  16 +-
 core/js/share.js                            |   4 +
 core/templates/login.php                    |   6 +
 lib/base.php                                |   4 +
 lib/private/files/filesystem.php            |  62 +++----
 lib/private/hook.php                        |   3 +
 lib/private/servernotavailableexception.php |  27 +++
 lib/private/user/nouserexception.php        |  14 ++
 tests/lib/files/filesystem.php              |  22 ++-
 tests/lib/preview.php                       |  48 +++---
 17 files changed, 374 insertions(+), 143 deletions(-)


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