diff options
| author | HJ <spam@hjkos.com> | 2019-01-22 17:46:08 +0000 |
|---|---|---|
| committer | HJ <spam@hjkos.com> | 2019-01-22 17:46:08 +0000 |
| commit | 3a3cf1d48a67c82bb2c94cafb0150b1fa8e4de1a (patch) | |
| tree | 5e39bb41c1e73191b2ff6222eee8720420f13dfd /src/components/user_profile/user_profile.vue | |
| parent | 7651290e2be72ed35d7582757251eb151fdce953 (diff) | |
| parent | 92dedcd53e56562205e704eea2754f159eb9707d (diff) | |
Merge branch 'favorites' into 'develop'
Add Favorites TL to user profile, add some initial support for MastoAPI
Closes #265 and #262
See merge request pleroma/pleroma-fe!462
Diffstat (limited to 'src/components/user_profile/user_profile.vue')
| -rw-r--r-- | src/components/user_profile/user_profile.vue | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index 50619026..d64ce277 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -20,6 +20,7 @@ <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"/> </tab-switcher> </div> <div v-else class="panel user-profile-placeholder"> |