diff options
| author | Henry Jameson <me@hjkos.com> | 2019-01-13 22:21:09 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2019-01-13 22:21:09 +0300 |
| commit | f9fb85ee42ffe04d7f3532342d26f89a16b2a259 (patch) | |
| tree | 53790ded22d36aaaa0b990141bd1c8f65c234b15 /src/components/user_profile/user_profile.vue | |
| parent | 519f49e29b38e568727dd7f59618002459a64d64 (diff) | |
| parent | 52579b09b17ff7260dc64b673545fb4690aed939 (diff) | |
Merge remote-tracking branch 'upstream/develop' into favorites
* upstream/develop:
Add Korean translation
Change emptlyTl to take userId
better fix
fixes #265 and also that thin line below gradient on chrome (UGH)
fix #262 part of user profiles not being able to load previous posts
Retain userId on clearing user timeline, don't flush when empty timeline
Diffstat (limited to 'src/components/user_profile/user_profile.vue')
| -rw-r--r-- | src/components/user_profile/user_profile.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index 15f7d44f..265fc65b 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -3,7 +3,7 @@ <div v-if="user.id" class="user-profile panel panel-default"> <user-card-content :user="user" :switcher="true" :selected="timeline.viewing"></user-card-content> <tab-switcher> - <Timeline :label="$t('user_card.statuses')" :embedded="true" :title="$t('user_profile.timeline_title')" :timeline="timeline" :timeline-name="'user'" :user-id="userId"/> + <Timeline :label="$t('user_card.statuses')" :embedded="true" :title="$t('user_profile.timeline_title')" :timeline="timeline" :timeline-name="'user'" :user-id="fetchBy"/> <div :label="$t('user_card.followees')"> <div v-if="friends"> <user-card v-for="friend in friends" :key="friend.id" :user="friend" :showFollows="true"></user-card> |