Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

our_own_cloud_project
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents

Snippets Groups Projects

4f15282b

Commit 4f15282b authored 11 years ago by Arthur Schiwon

Downloads
- Plain Diff

Merge pull request #6058 from owncloud/ldap2avatar

Set Avatar for LDAP users automatically (if a picture is available)

parents 1fef97f6 69518b90

No related branches found

No related tags found

Loading

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

apps/user_ldap/group_proxy.php 3 additions, 2 deletions

apps/user_ldap/group_proxy.php
apps/user_ldap/lib/access.php 3 additions, 1 deletion

apps/user_ldap/lib/access.php
apps/user_ldap/lib/configuration.php 3 additions, 0 deletions

apps/user_ldap/lib/configuration.php
apps/user_ldap/lib/proxy.php 4 additions, 3 deletions

apps/user_ldap/lib/proxy.php
apps/user_ldap/user_ldap.php 75 additions, 1 deletion

apps/user_ldap/user_ldap.php
apps/user_ldap/user_proxy.php 13 additions, 2 deletions

apps/user_ldap/user_proxy.php
lib/private/avatar.php 7 additions, 3 deletions

lib/private/avatar.php
lib/private/user.php 16 additions, 0 deletions

lib/private/user.php
lib/private/user/backend.php 8 additions, 7 deletions

lib/private/user/backend.php
lib/private/user/user.php 12 additions, 0 deletions

lib/private/user/user.php
settings/personal.php 1 addition, 0 deletions

settings/personal.php
settings/templates/personal.php 4 additions, 0 deletions

settings/templates/personal.php
tests/lib/user/avataruserdummy.php 27 additions, 0 deletions

tests/lib/user/avataruserdummy.php
tests/lib/user/user.php 69 additions, 0 deletions

tests/lib/user/user.php

with 245 additions and 19 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment