Merge branch 'master' into fix-label-style

This commit is contained in:
Julius Härtl
2018-01-08 14:38:42 +01:00
committed by GitHub
8 changed files with 73 additions and 30 deletions

View File

@@ -66,10 +66,8 @@
</ui-select-choices>
</ui-select>
<div class="card-details-assign-users-list">
<div class="assigned-user" ng-repeat="user in cardservice.getCurrent().assignedUsers"
data-toggle="tooltip" data-placement="bottom" title="{{ user.participant.displayname }}">
<div class="avatardiv" avatar data-contactsmenu="true" ng-attr-user="{{ user.participant.uid }}" ng-attr-displayname="{{ user.participant.uid }}"></div>
<div class="icon icon-delete" ng-click="removeAssignedUser(user)"></div>
<div class="assigned-user" ng-repeat="user in cardservice.getCurrent().assignedUsers">
<avatar ng-attr-contactsmenu ng-attr-tooltip ng-attr-user="{{ user.participant.uid }}" ng-attr-displayname="{{ user.participant.displayname }}" contactsmenudelete ></avatar>
</div>
</div>
</div>