From e3da156162ce04d987935eeb4649f0aa51590cf2 Mon Sep 17 00:00:00 2001
From: dev92341 <jasper92341@hotmail.com>
Date: Tue, 5 Feb 2019 06:12:14 -0800
Subject: Add option to hide features panel (About page)

---
 src/components/about/about.js  | 3 +++
 src/components/about/about.vue | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/components')

diff --git a/src/components/about/about.js b/src/components/about/about.js
index b4433b4e..b1ce3c7d 100644
--- a/src/components/about/about.js
+++ b/src/components/about/about.js
@@ -7,6 +7,9 @@ const About = {
     InstanceSpecificPanel,
     FeaturesPanel,
     TermsOfServicePanel
+  },
+  computed: {
+    showFeaturesPanel () { return this.$store.state.config.showFeaturesPanel }
   }
 }
 
diff --git a/src/components/about/about.vue b/src/components/about/about.vue
index bf87e0b8..13dec87c 100644
--- a/src/components/about/about.vue
+++ b/src/components/about/about.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="sidebar">
     <instance-specific-panel></instance-specific-panel>
-    <features-panel></features-panel>
+    <features-panel v-if="showFeaturesPanel"></features-panel>
     <terms-of-service-panel></terms-of-service-panel>
   </div>
 </template>
-- 
cgit v1.2.3-70-g09d2


From 0b24454561f677d4e4df68ae2f927e0da7794b96 Mon Sep 17 00:00:00 2001
From: dave <starpumadev@gmail.com>
Date: Tue, 5 Feb 2019 14:33:16 -0500
Subject: #316 - fix empty username issue

---
 src/components/user_settings/user_settings.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/components')

diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue
index be42cc4a..d0743ef0 100644
--- a/src/components/user_settings/user_settings.vue
+++ b/src/components/user_settings/user_settings.vue
@@ -33,7 +33,7 @@
               <input type="checkbox" v-model="newHideNetwork" id="account-hide-network">
               <label for="account-hide-network">{{$t('settings.hide_network_description')}}</label>
             </p>
-            <button :disabled='newName.length <= 0' class="btn btn-default" @click="updateProfile">{{$t('general.submit')}}</button>
+            <button :disabled='newName && newName.length === 0' class="btn btn-default" @click="updateProfile">{{$t('general.submit')}}</button>
           </div>
           <div class="setting-item">
             <h2>{{$t('settings.avatar')}}</h2>
-- 
cgit v1.2.3-70-g09d2


From 52f5ffa86233773953325d9998707558d29810f0 Mon Sep 17 00:00:00 2001
From: Edijs <iamedijs@hotmail.com>
Date: Tue, 5 Feb 2019 15:11:17 -0700
Subject: Fix avatar link in search result

---
 src/components/user_card/user_card.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/components')

diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 35b27319..7129430b 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="card">
-    <a href="#">
+    <router-link :to="userProfileLink(user)">
       <UserAvatar class="avatar" :compact="true" @click.prevent.native="toggleUserExpanded" :src="user.profile_image_url"/>
-    </a>
+    </router-link>
     <div class="usercard" v-if="userExpanded">
       <user-card-content :user="user" :switcher="false"></user-card-content>
     </div>
-- 
cgit v1.2.3-70-g09d2