diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-03-28 20:08:40 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-03-28 20:08:40 +0000 |
| commit | 7e8c2acc981b6d4f55e0fd898f1769a82658d49a (patch) | |
| tree | 074323e3ec8c8cea427780f6c7a095dc032e0d6f /src/components/timeline/timeline.vue | |
| parent | e2e3a65c44c1bd73d3d727333e6163e9b0d07653 (diff) | |
| parent | a39fc49e848c1444f76a7528eac4a7733199b336 (diff) | |
Merge branch 'issue-433-status-reply-form' into 'develop'
Issue 433 status reply form
Closes #433
See merge request pleroma/pleroma-fe!674
Diffstat (limited to 'src/components/timeline/timeline.vue')
| -rw-r--r-- | src/components/timeline/timeline.vue | 8 |
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"> |