diff options
| author | Henry Jameson <me@hjkos.com> | 2018-12-25 03:46:51 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2018-12-25 03:46:51 +0300 |
| commit | e3cac42cc78692f8f1ac267ef3209298ae03d527 (patch) | |
| tree | f99a73330218a1394f9ef2eab608f951d599bf7f /src/components/user_profile/user_profile.vue | |
| parent | a4f09029260100f6d5baea67ac333593c5c4432c (diff) | |
| parent | e59b67e119f1f598354fb0dca86774e1b0f6c4c4 (diff) | |
Merge remote-tracking branch 'upstream/develop' into push_fix
* upstream/develop:
Add a translation to the captcha strings in the registration form
Small UI improvements for the CAPTCHA field
Add encrypted captcha_answer_data for stateless captcha
fixes many problems related to user profile
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 5c823b3d..84fdba45 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -1,6 +1,6 @@ <template> <div> - <div v-if="user" class="user-profile panel panel-default"> + <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"/> |