Merge branch 'master' into devel

This commit is contained in:
Maxime Quandalle 2015-09-10 19:25:15 +02:00
commit 0f014c954c
11 changed files with 100 additions and 61 deletions

View file

@ -42,7 +42,7 @@ template(name="labelsWidget")
.board-widget-content
each currentBoard.labels
a.card-label(class="card-label-{{color}}"
class="{{#if currentUser.isBoardMember}}js-add-labels{{/if}}")
class="{{#if currentUser.isBoardMember}}js-label{{/if}}")
span.card-label-name= name
if currentUser.isBoardAdmin
a.card-label.add-label.js-add-label