diff options
| author | Shpuld Shpludson <shp@cock.li> | 2018-04-11 03:37:25 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2018-04-11 03:37:25 +0000 |
| commit | 020d2f83f9fe2290bd74dd118f7e796a415439a4 (patch) | |
| tree | 6aa7ea8931fa9472025f80dd0e978e48750b168c /src/components/conversation/conversation.vue | |
| parent | daa018aecf58599f4c5c0d2f401750e1ebe93cf2 (diff) | |
| parent | 896fea7dbdedce3aea88b185565b4fdccde405bd (diff) | |
Merge branch 'feature/rewrite-status-and-notifications-and-preview' into 'develop'
Rewrite status and notifications and preview, graceful handling of linkless attachments
See merge request pleroma/pleroma-fe!223
Diffstat (limited to 'src/components/conversation/conversation.vue')
| -rw-r--r-- | src/components/conversation/conversation.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index 2ff122c2..4000bce2 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -8,7 +8,7 @@ </div> <div class="panel-body"> <div class="timeline"> - <status v-for="status in conversation" @goto="setHighlight" :key="status.id" :statusoid="status" :expandable='false' :focused="focused(status.id)" :inConversation='true' :highlight="highlight" :replies="getReplies(status.id)"></status> + <status v-for="status in conversation" @goto="setHighlight" :key="status.id" :inlineExpanded="collapsable" :statusoid="status" :expandable='false' :focused="focused(status.id)" :inConversation='true' :highlight="highlight" :replies="getReplies(status.id)"></status> </div> </div> </div> |