diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-02-04 13:57:24 +0100 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-02-04 13:57:24 +0100 |
| commit | 670298cca1fd6de8c63ba3e4fb03ae3307eff07d (patch) | |
| tree | 584fa1a69a2cae041b2a7a49b9513d24cea67f8c /src/components/timeline | |
| parent | 51473f04842af5f135a248b09b55b3f9a381bc97 (diff) | |
| parent | 2269e815e1829558295e8c1d83ed1235644e02dd (diff) | |
Merge branch 'develop' into feature/hash-routed
Diffstat (limited to 'src/components/timeline')
| -rw-r--r-- | src/components/timeline/timeline.js | 4 | ||||
| -rw-r--r-- | src/components/timeline/timeline.vue | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js index 8799e69c..addd0255 100644 --- a/src/components/timeline/timeline.js +++ b/src/components/timeline/timeline.js @@ -1,5 +1,6 @@ import Status from '../status/status.vue' import timelineFetcher from '../../services/timeline_fetcher/timeline_fetcher.service.js' +import StatusOrConversation from '../status_or_conversation/status_or_conversation.vue' const Timeline = { props: [ @@ -7,7 +8,8 @@ const Timeline = { 'timelineName' ], components: { - Status + Status, + StatusOrConversation }, created () { const store = this.$store diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index 3da31f14..45886f6c 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -7,7 +7,7 @@ </p> </div> </a> - <status v-for="status in timeline.visibleStatuses" :key="status.id" v-bind:statusoid="status"></status> + <status-or-conversation v-for="status in timeline.visibleStatuses" :key="status.id" v-bind:statusoid="status"></status-or-conversation> <a href="#" v-on:click.prevent='fetchOlderStatuses()' v-if="!timeline.loading"> <div class="base01-background base05-border new-status-notification"> <p class="text-center" > |