diff options
| author | shpuld <shp@cock.li> | 2019-01-28 19:02:46 +0200 |
|---|---|---|
| committer | shpuld <shp@cock.li> | 2019-01-28 19:02:46 +0200 |
| commit | 51024a2c8af9d88b07c050b7502fa62843aa4ba2 (patch) | |
| tree | 4c6f61e08f209d6a89a8a7a5e58991c2445f9e13 /src/components/user_profile/user_profile.vue | |
| parent | 676acdbf82726cd78ce8611d4c6ba78c58b8fc4c (diff) | |
| parent | bb2ee04f04dac177407f7cfbc8709ed4cd9965ff (diff) | |
Merge branch 'develop' into feat/media-modal
Diffstat (limited to 'src/components/user_profile/user_profile.vue')
| -rw-r--r-- | src/components/user_profile/user_profile.vue | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index d64ce277..f9b964ce 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -20,7 +20,8 @@ <i class="icon-spin3 animate-spin"></i> </div> </div> - <Timeline v-if="isUs" :label="$t('user_card.favorites')" :embedded="true" :title="$t('user_profile.favorites_title')" timeline-name="favorites" :timeline="favorites"/> + <Timeline :label="$t('user_card.media')" :embedded="true" :title="$t('user_card.media')" timeline-name="media" :timeline="media" :user-id="fetchBy" /> + <Timeline v-if="isUs" :label="$t('user_card.favorites')" :embedded="true" :title="$t('user_card.favorites')" timeline-name="favorites" :timeline="favorites"/> </tab-switcher> </div> <div v-else class="panel user-profile-placeholder"> |