aboutsummaryrefslogtreecommitdiff
path: root/src/components/timeline/timeline.vue
diff options
context:
space:
mode:
authorshpuld <shp@cock.li>2019-03-28 22:25:40 +0200
committershpuld <shp@cock.li>2019-03-28 22:25:40 +0200
commit31010779f6cc1abdd18fa117c0832e20623e1624 (patch)
tree2eaf8861e1baee86a1f4d33e0e10543e62cdd98c /src/components/timeline/timeline.vue
parentfd12263cacd2a869ad61dd8580f918b45d9b2a51 (diff)
parentc829b1a5f4a013882ba298b0f95ec0f8b3ed3758 (diff)
Merge branch 'develop' into feature/mobile-improvements-3
Diffstat (limited to 'src/components/timeline/timeline.vue')
-rw-r--r--src/components/timeline/timeline.vue8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index 8f28d65c..e0a34bd1 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -16,7 +16,13 @@
</div>
<div :class="classes.body">
<div class="timeline">
- <status-or-conversation v-for="status in timeline.visibleStatuses" :key="status.id" v-bind:statusoid="status" class="status-fadein"></status-or-conversation>
+ <conversation
+ v-for="status in timeline.visibleStatuses"
+ class="status-fadein"
+ :key="status.id"
+ :statusoid="status"
+ :collapsable="true"
+ />
</div>
</div>
<div :class="classes.footer">