diff options
| author | Henry Jameson <me@hjkos.com> | 2019-09-25 20:26:49 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2019-09-25 20:26:49 +0300 |
| commit | a3305799c7ee9292550346006cf0389bed963e2c (patch) | |
| tree | cd6a5dc550e35d9c450a349c074366b72892a6fe /src/components/user_profile/user_profile.vue | |
| parent | 2f26e8acc5395753f4d649d9a1bfbe356717e9ac (diff) | |
| parent | e55645aec16f083e4eedf6b01954b79689c244f1 (diff) | |
Merge remote-tracking branch 'upstream/develop' into emoji-selector-update
* upstream/develop: (42 commits)
Fix formatting in oc.json
avoid using global class
fix logo moving bug when lightbox is open
Reserve scrollbar gap when body scroll is locked
setting display: initial makes trouble, instead, toggle display: none using classname
lock body scroll
add body-scroll-lock directive
install body-scroll-lock
wire up props with PostStatusModal
rename component
recover autofocusing behavior
refactor MobilePostStatusModal using new PostStatusModal
add new module and modal to post new status
remove needless condition
add mention button
wire up user state with global store
collapse fav/repeat notifications from muted users
do not collapse thread muted posts in conversation
detect thread-muted posts
do not change word based muting logic
...
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> |