aboutsummaryrefslogtreecommitdiff
path: root/src/components/notification/notification.vue
diff options
context:
space:
mode:
authordave <starpumadev@gmail.com>2019-03-14 07:55:39 -0400
committerdave <starpumadev@gmail.com>2019-03-14 07:55:39 -0400
commite5e1d4c643d6b69217fb9a62b60f3f9c94ef4714 (patch)
treef609f14274dd193a02a25f22ded27b74d45a4b85 /src/components/notification/notification.vue
parent93a2510ede667f61b4659596ca237d7bfc708381 (diff)
#436: fix notification order, follow type link issue, duplicate key
Diffstat (limited to 'src/components/notification/notification.vue')
-rw-r--r--src/components/notification/notification.vue7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index 87b0fde2..6e8e9844 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -30,7 +30,12 @@
<small>{{$t('notifications.followed_you')}}</small>
</span>
</div>
- <div class="timeago">
+ <div class="timeago" v-if="notification.type === 'follow'">
+ <span class="faint">
+ <timeago :since="notification.action.created_at" :auto-update="240"></timeago>
+ </span>
+ </div>
+ <div class="timeago" v-else>
<router-link v-if="notification.status" :to="{ name: 'conversation', params: { id: notification.status.id } }" class="faint-link">
<timeago :since="notification.action.created_at" :auto-update="240"></timeago>
</router-link>