therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into wakarimasen/pleroma-fe-develop

Browse source
This commit is contained in:
Roger Braun 2017-03-09 09:19:40 +01:00
commit 2f52669380
28 changed files with 440 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/status_or_conversation/status_or_conversation.vue
View file

@ -1,7 +1,7 @@
<template>
<div>
<conversation v-if="expanded" @toggleExpanded="toggleExpanded" :collapsable="true" :statusoid="statusoid"></conversation>
<status v-if="!expanded" @toggleExpanded="toggleExpanded" :expandable="true" :inConversation="false" :statusoid="statusoid"></status>
<status v-if="!expanded" @toggleExpanded="toggleExpanded" :expandable="true" :inConversation="false" :focused="false" :statusoid="statusoid"></status>
</div>
</template>