diff options
| author | lain <lain@soykaf.club> | 2019-06-18 20:28:31 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-06-18 20:28:31 +0000 |
| commit | 0eed2ccca8a0980c161bb5a52b211c507e0ffef5 (patch) | |
| tree | 967230faa328d35db7459ad7126ccf5bf3e2ece1 /src/components/status/status.vue | |
| parent | 69eff65130170c0cd8fffda45b952d3bec49c218 (diff) | |
Feature/polls attempt 2
Diffstat (limited to 'src/components/status/status.vue')
| -rw-r--r-- | src/components/status/status.vue | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/components/status/status.vue b/src/components/status/status.vue index e1dd81ac..58402f7e 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -52,7 +52,7 @@ <span class="heading-right"> <router-link class="timeago faint-link" :to="{ name: 'conversation', params: { id: status.id } }"> - <timeago :since="status.created_at" :auto-update="60"></timeago> + <Timeago :time="status.created_at" :auto-update="60"></Timeago> </router-link> <div class="button-icon visibility-icon" v-if="status.visibility"> <i :class="visibilityIcon(status.visibility)" :title="status.visibility | capitalize"></i> @@ -123,6 +123,10 @@ <a v-if="showingMore" href="#" class="status-unhider" @click.prevent="toggleShowMore">{{$t("general.show_less")}}</a> </div> + <div v-if="status.poll && status.poll.options"> + <poll :poll="status.poll" :status-id="status.id" /> + </div> + <div v-if="status.attachments && (!hideSubjectStatus || showingLongSubject)" class="attachments media-body"> <attachment class="non-gallery" |