diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-12-22 13:14:30 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-12-22 13:14:30 +0000 |
| commit | e009510c52d62a19136e01d9f0753448ad703016 (patch) | |
| tree | b3dbe611155aeb7d3ff554e900635575792527b4 /src/components/user_card/user_card.vue | |
| parent | 515dcfd3395ce4c6bd228e6bfc20120de78976c1 (diff) | |
| parent | 2e2512019230f299c2c9eae18afec3c8218d2697 (diff) | |
Merge branch 'from/develop/tusooa/user-note' into 'develop'
User note
See merge request pleroma/pleroma-fe!1612
Diffstat (limited to 'src/components/user_card/user_card.vue')
| -rw-r--r-- | src/components/user_card/user_card.vue | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue index 897d89f9..349c7cb1 100644 --- a/src/components/user_card/user_card.vue +++ b/src/components/user_card/user_card.vue @@ -268,6 +268,12 @@ > <RemoteFollow :user="user" /> </div> + <UserNote + v-if="loggedIn && isOtherUser && (hasNote || (hasNoteEditor && supportsNote))" + :user="user" + :relationship="relationship" + :editable="hasNoteEditor" + /> </div> </div> <div |