diff options
author | Lauri Ojansivu <x@xet7.org> | 2017-10-01 09:48:52 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2017-10-01 09:48:52 +0300 |
commit | a1d06727399a0d5a0cc11aee6a16ea253548727d (patch) | |
tree | 714a3cdb3f10b17e015c819ddac85dfec6c21722 /client/components/activities/activities.jade | |
parent | 6ec14ee52bca394189a0f1d41d20b597e90f6320 (diff) | |
parent | 7d3fed56ae2baf5d07294bff8998198b257c855a (diff) | |
download | wekan-a1d06727399a0d5a0cc11aee6a16ea253548727d.tar.gz wekan-a1d06727399a0d5a0cc11aee6a16ea253548727d.tar.bz2 wekan-a1d06727399a0d5a0cc11aee6a16ea253548727d.zip |
Merge branch 'nztqa-improve-activities' into devel
Slider for Comments only in activity feed.
Thanks to nztqa ! Closes #1182
Diffstat (limited to 'client/components/activities/activities.jade')
-rw-r--r-- | client/components/activities/activities.jade | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/components/activities/activities.jade b/client/components/activities/activities.jade index be12a728..deaee25e 100644 --- a/client/components/activities/activities.jade +++ b/client/components/activities/activities.jade @@ -31,7 +31,7 @@ template(name="boardActivities") .activity-checklist(href="{{ card.absoluteUrl }}") +viewer = checklist.title - + if($eq activityType 'addChecklistItem') | {{{_ 'activity-checklist-item-added' checklist.title cardLink}}}. .activity-checklist(href="{{ card.absoluteUrl }}") @@ -90,7 +90,7 @@ template(name="boardActivities") template(name="cardActivities") each currentCard.activities - .activity + .activity.js-card-activity +userAvatar(userId=user._id) p.activity-desc +memberName(user=user) |