diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-03-21 15:46:05 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-03-21 15:46:05 +0000 |
| commit | c2b7aff3257530654e1e7aae39136d1d34d07c4f (patch) | |
| tree | b2fb7b22a8acb10c9a23cd8c9734bec2e008b81f /src/components/user_card/user_card.js | |
| parent | 9890e414402ce19ab012d3fc8046bd6af537fd5c (diff) | |
| parent | 96c88b334c2bf19ed1ffc418f0603d49c5a71652 (diff) | |
Merge branch 'issue-444-remote-follow' into 'develop'
#444 - show `remote follow` button when logged out
Closes #444
See merge request pleroma/pleroma-fe!692
Diffstat (limited to 'src/components/user_card/user_card.js')
| -rw-r--r-- | src/components/user_card/user_card.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js index 43a77f45..b07da675 100644 --- a/src/components/user_card/user_card.js +++ b/src/components/user_card/user_card.js @@ -1,4 +1,5 @@ import UserAvatar from '../user_avatar/user_avatar.vue' +import RemoteFollow from '../remote_follow/remote_follow.vue' import { hex2rgb } from '../../services/color_convert/color_convert.js' import { requestFollow, requestUnfollow } from '../../services/follow_manipulate/follow_manipulate' import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator' @@ -99,7 +100,8 @@ export default { } }, components: { - UserAvatar + UserAvatar, + RemoteFollow }, methods: { followUser () { |