krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 07:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into negue/flagpm

Browse Source
This commit is contained in:
negue
2018-11-29 19:02:01 +01:00
parent 0aba448c48 b82660823d
commit 817c943860
316 changed files with 18625 additions and 17558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
website/client/components/chat/chatCard.vue
View File

@@ -15,7 +15,8 @@ div
p.time
span.mr-1(v-if="msg.username") @{{ msg.username }}
span.mr-1(v-if="msg.username") •
span(v-b-tooltip="", :title="msg.timestamp | date") {{ msg.timestamp | timeAgo }}
span(v-b-tooltip="", :title="msg.timestamp | date") {{ msg.timestamp | timeAgo }} 
span(v-if="msg.client && user.contributor.level >= 4") ({{ msg.client }})
.text(v-html='atHighlight(parseMarkdown(msg.text))')
.reported(v-if="isMessageReported && inbox")
span(v-once) {{ $t('reportedMessage')}}