aboutsummaryrefslogtreecommitdiff
path: root/src/components/conversation-page/conversation-page.vue
diff options
context:
space:
mode:
authorHenry Jameson <me@hjkos.com>2019-03-30 12:31:50 +0200
committerHenry Jameson <me@hjkos.com>2019-03-30 12:31:50 +0200
commit9f4a9bff464e43e1c01d621e8c55db6105d327de (patch)
tree3124790d8a00ef148acb199efeac59594879f875 /src/components/conversation-page/conversation-page.vue
parente89a62200532a4d61de35d73299c33555aad8bed (diff)
parent0117f6af9f8ae600e613402590de4c9364806967 (diff)
Merge remote-tracking branch 'upstream/develop' into minimal-scopes-mode
* upstream/develop: (173 commits) Fix: Change condition fix typo update store according to retweeted status #433 - update sort by for conversation display replies_count right after reply icon expose replies_count from mastodon api Apparently, MastoAPI gives status in ancestors if you try opening a repeat... make side drawer use gesture service and fix its animations review/remove error hiding errata review #433 - sort conversation for retweets and clean up Revert "Merge branch 'revert-987b5162' into 'develop'" Revert "Merge branch 'mastoapi/friends-tl' into 'develop'" Add await to login action' Remove console log Fix warnings in user profile routing Add tests for gesture service, fix bug with perpendicular directions #255 - clean up autocomplete form #255 - clean up user settings page with self-closing html tags ...
Diffstat (limited to 'src/components/conversation-page/conversation-page.vue')
-rw-r--r--src/components/conversation-page/conversation-page.vue6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/components/conversation-page/conversation-page.vue b/src/components/conversation-page/conversation-page.vue
index b03eea28..9e322cf5 100644
--- a/src/components/conversation-page/conversation-page.vue
+++ b/src/components/conversation-page/conversation-page.vue
@@ -1,5 +1,9 @@
<template>
- <conversation :collapsable="false" :statusoid="statusoid"></conversation>
+ <conversation
+ :collapsable="false"
+ isPage="true"
+ :statusoid="statusoid"
+ ></conversation>
</template>
<script src="./conversation-page.js"></script>