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.js | |
| 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.js')
| -rw-r--r-- | src/components/status/status.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/components/status/status.js b/src/components/status/status.js index c49e729c..81b57667 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -1,5 +1,6 @@ import Attachment from '../attachment/attachment.vue' import FavoriteButton from '../favorite_button/favorite_button.vue' +import ReactButton from '../react_button/react_button.vue' import RetweetButton from '../retweet_button/retweet_button.vue' import Poll from '../poll/poll.vue' import ExtraButtons from '../extra_buttons/extra_buttons.vue' @@ -11,6 +12,7 @@ import LinkPreview from '../link-preview/link-preview.vue' import AvatarList from '../avatar_list/avatar_list.vue' import Timeago from '../timeago/timeago.vue' import StatusPopover from '../status_popover/status_popover.vue' +import EmojiReactions from '../emoji_reactions/emoji_reactions.vue' import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator' import fileType from 'src/services/file_type/file_type.service' import { processHtml } from 'src/services/tiny_post_html_processor/tiny_post_html_processor.service.js' @@ -319,6 +321,7 @@ const Status = { components: { Attachment, FavoriteButton, + ReactButton, RetweetButton, ExtraButtons, PostStatusForm, @@ -329,7 +332,8 @@ const Status = { LinkPreview, AvatarList, Timeago, - StatusPopover + StatusPopover, + EmojiReactions }, methods: { visibilityIcon (visibility) { |
