diff options
| author | lain <lain@soykaf.club> | 2020-01-28 15:24:56 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-01-28 15:24:56 +0000 |
| commit | 73253b87bfce0466848231da47e1864c6ff639b0 (patch) | |
| tree | 732aff3bd3007c26c67e3de00a27379751b3a8a3 /src/components/status/status.vue | |
| parent | 4a11ee9768f2abbaa9da0e2454e2793734cce040 (diff) | |
| parent | 6afff4f8c205ec70d3694564c706f6a46a61db9e (diff) | |
Merge branch 'feat/emoji-reactions' into 'develop'
Emoji reactions
See merge request pleroma/pleroma-fe!1049
Diffstat (limited to 'src/components/status/status.vue')
| -rw-r--r-- | src/components/status/status.vue | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/components/status/status.vue b/src/components/status/status.vue index d291e762..d5739304 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -354,6 +354,10 @@ </div> </transition> + <EmojiReactions + :status="status" + /> + <div v-if="!noHeading && !isPreview" class="status-actions media-body" @@ -382,6 +386,10 @@ :logged-in="loggedIn" :status="status" /> + <ReactButton + :logged-in="loggedIn" + :status="status" + /> <extra-buttons :status="status" @onError="showError" |