diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-02-10 09:54:23 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-02-10 09:54:23 +0200 |
| commit | 0065ca3ad6a3a627cde557b6c80f87c8c6267492 (patch) | |
| tree | f832fde75ee9fba0310a51196c2e7ce90dedcfec /client/components/activities/activities.jade | |
| parent | 89959753cd10321fc21cf290bdd06f26b19874b9 (diff) | |
| parent | 1f7d1f023ff4a6ec2e8923e54fe26c68fa7d9380 (diff) | |
| download | wekan-0065ca3ad6a3a627cde557b6c80f87c8c6267492.tar.gz wekan-0065ca3ad6a3a627cde557b6c80f87c8c6267492.tar.bz2 wekan-0065ca3ad6a3a627cde557b6c80f87c8c6267492.zip | |
Merge branch 'devel' into greenkeeper-xss-0.3.3
Diffstat (limited to 'client/components/activities/activities.jade')
| -rw-r--r-- | client/components/activities/activities.jade | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/client/components/activities/activities.jade b/client/components/activities/activities.jade index 9ff73864..fad147fc 100644 --- a/client/components/activities/activities.jade +++ b/client/components/activities/activities.jade @@ -26,6 +26,12 @@ template(name="boardActivities") +viewer = comment.text + if($eq activityType 'addChecklist') + | {{{_ 'activity-checklist-added' cardLink}}}. + .activity-checklist(href="{{ card.absoluteUrl }}") + +viewer + = checklist.title + if($eq activityType 'archivedCard') | {{{_ 'activity-archived' cardLink}}}. @@ -41,6 +47,9 @@ template(name="boardActivities") if($eq activityType 'createList') | {{_ 'activity-added' list.title boardLabel}}. + if($eq activityType 'removeList') + | {{_ 'activity-removed' title boardLabel}}. + if($eq activityType 'importBoard') | {{{_ 'activity-imported-board' boardLabel sourceLink}}}. @@ -103,6 +112,11 @@ template(name="cardActivities") | {{{_ 'activity-attached' attachmentLink cardLabel}}}. if attachment.isImage img.attachment-image-preview(src=attachment.url) + if($eq activityType 'addChecklist') + | {{{_ 'activity-checklist-added' cardLabel}}}. + .activity-checklist + +viewer + = checklist.title if($eq activityType 'addComment') +inlinedForm(classNames='js-edit-comment') |