diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-09-16 07:27:06 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-09-16 07:27:06 +0000 |
| commit | 9b163d281670e0c0a589adce46727284fbcba0ad (patch) | |
| tree | c7aa9233aeb018edeec2560507198aeecaf86209 /src/components/user_profile/user_profile.vue | |
| parent | 09db4ceb1a1ffbd1886648142f2cc2b287dcb5c9 (diff) | |
| parent | baebf08d20eed14d06f9253e4cc939891955f8cb (diff) | |
Merge branch '656' into 'develop'
Do not collapse thread muted posts when it's expanded/on the thread page and do not collapse muted user's posts on muted user's profile page
Closes #656
See merge request pleroma/pleroma-fe!953
Diffstat (limited to 'src/components/user_profile/user_profile.vue')
| -rw-r--r-- | src/components/user_profile/user_profile.vue | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index 42516916..14082e83 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -26,6 +26,7 @@ timeline-name="user" :user-id="userId" :pinned-status-ids="user.pinnedStatusIds" + :in-profile="true" /> <div v-if="followsTabVisible" @@ -69,6 +70,7 @@ timeline-name="media" :timeline="media" :user-id="userId" + :in-profile="true" /> <Timeline v-if="isUs" @@ -79,6 +81,7 @@ :title="$t('user_card.favorites')" timeline-name="favorites" :timeline="favorites" + :in-profile="true" /> </tab-switcher> </div> |