Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Nextcloud
- Activity
- Members
- Labels
- Service Desk
- Model experiments

Snippets Groups Projects

dc8809e7

Unverified Commit dc8809e7 authored 7 years ago by Morris Jobke Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge pull request #7498 from nextcloud/fix_7497

Better handle avatars

parents b6fcf598 0ff3c81f

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

core/js/jquery.avatar.js 31 additions, 46 deletions

core/js/jquery.avatar.js
core/js/placeholder.js 3 additions, 2 deletions

core/js/placeholder.js
core/js/tests/specs/jquery.avatarSpec.js 60 additions, 77 deletions

core/js/tests/specs/jquery.avatarSpec.js
lib/private/Avatar.php 17 additions, 0 deletions

lib/private/Avatar.php
lib/private/Server.php 18 additions, 1 deletion

lib/private/Server.php
lib/private/Template/JSConfigHelper.php 1 addition, 0 deletions

lib/private/Template/JSConfigHelper.php
lib/public/IAvatar.php 6 additions, 0 deletions

lib/public/IAvatar.php
settings/js/settings/personalInfo.js 11 additions, 3 deletions

settings/js/settings/personalInfo.js
tests/lib/AvatarTest.php 1 addition, 1 deletion

tests/lib/AvatarTest.php

with 148 additions and 130 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