[Pkg-owncloud-commits] [owncloud] 181/239: Merge pull request #6058 from owncloud/ldap2avatar

[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 4f15282bc998bb68896b5df67f4f749dd435897d
Merge: 1fef97f 69518b9
Author: blizzz <blizzz at owncloud.com>
Date:   Tue Nov 26 12:05:32 2013 -0800

    Merge pull request #6058 from owncloud/ldap2avatar
    
    Set Avatar for LDAP users automatically (if a picture is available)

 apps/user_ldap/group_proxy.php       |  5 ++-
 apps/user_ldap/lib/access.php        |  4 +-
 apps/user_ldap/lib/configuration.php |  3 ++
 apps/user_ldap/lib/proxy.php         |  7 ++--
 apps/user_ldap/user_ldap.php         | 76 +++++++++++++++++++++++++++++++++++-
 apps/user_ldap/user_proxy.php        | 15 ++++++-
 lib/private/avatar.php               | 10 +++--
 lib/private/user.php                 | 16 ++++++++
 lib/private/user/backend.php         | 15 +++----
 lib/private/user/user.php            | 12 ++++++
 settings/personal.php                |  1 +
 settings/templates/personal.php      |  4 ++
 tests/lib/user/avataruserdummy.php   | 27 +++++++++++++
 tests/lib/user/user.php              | 69 ++++++++++++++++++++++++++++++++
 14 files changed, 245 insertions(+), 19 deletions(-)


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