Merge branch 'release/4.0.0' into develop

diff --git a/client/src/app/+home/home-routing.module.ts b/client/src/app/+home/home-routing.module.ts
index a2085f1915bbfc5fba56c5bd6bbc104a13b02ccc..bedf26be0f0b6412ab95e768a065a07a1eff2a78 100644 (file)
--- a/client/src/app/+home/home-routing.module.ts
+++ b/client/src/app/+home/home-routing.module.ts
@@ -5,7 +5,12 @@ import { HomeComponent } from './home.component'
 const homeRoutes: Routes = [
   {
     path: '',
-    component: HomeComponent
+    component: HomeComponent,
+    data: {
+      meta: {
+        title: $localize`Homepage`
+      }
+    }
   }
 ]
 

diff --git a/client/src/app/+my-account/my-account-settings/my-account-settings.component.html b/client/src/app/+my-account/my-account-settings/my-account-settings.component.html
index 48d06280b5e27b38098176c9975a04b069b25082..8ca197fd48449a13d0d0982be1bb665dd28f93dd 100644 (file)
--- a/client/src/app/+my-account/my-account-settings/my-account-settings.component.html
+++ b/client/src/app/+my-account/my-account-settings/my-account-settings.component.html
@@ -20,6 +20,16 @@
   </div>
 </div>
 
+<div class="form-row mt-5"> <!-- interface grid -->
+  <div class="form-group col-12 col-lg-4 col-xl-3">
+    <h2 i18n class="account-title">INTERFACE</h2>
+  </div>
+
+  <div class="form-group col-12 col-lg-8 col-xl-9">
+    <my-user-interface-settings [user]="user" [userInformationLoaded]="userInformationLoaded"></my-user-interface-settings>
+  </div>
+</div>
+
 <div class="form-row mt-5"> <!-- video settings grid -->
   <div class="form-group col-12 col-lg-4 col-xl-3">
     <div class="anchor" id="video-settings"></div> <!-- video settings anchor -->
@@ -42,16 +52,6 @@
   </div>
 </div>
 
-<div class="form-row mt-5"> <!-- interface grid -->
-  <div class="form-group col-12 col-lg-4 col-xl-3">
-    <h2 i18n class="account-title">INTERFACE</h2>
-  </div>
-
-  <div class="form-group col-12 col-lg-8 col-xl-9">
-    <my-user-interface-settings [user]="user" [userInformationLoaded]="userInformationLoaded"></my-user-interface-settings>
-  </div>
-</div>
-
 <div class="form-row mt-5" *ngIf="user.pluginAuth === null"> <!-- password grid -->
   <div class="form-group col-12 col-lg-4 col-xl-3">
     <h2 i18n class="account-title">PASSWORD</h2>

diff --git a/client/src/app/core/theme/theme.service.ts b/client/src/app/core/theme/theme.service.ts
index c9e6fa7005475ca85b5e4e6812b80d32224372d6..ac34689419df7a271cb7edc05ace477904083e85 100644 (file)
--- a/client/src/app/core/theme/theme.service.ts
+++ b/client/src/app/core/theme/theme.service.ts
@@ -141,7 +141,6 @@ export class ThemeService {
     }
 
     this.auth.userInformationLoaded
-      .pipe(first())
       .subscribe(() => this.updateCurrentTheme())
   }
 

diff --git a/client/src/app/shared/shared-user-settings/user-interface-settings.component.ts b/client/src/app/shared/shared-user-settings/user-interface-settings.component.ts
index bd1cb0353b8c1e291778e522912c8b6fe08a0103..d04a2c3488cd4ecf84afa33dc8ce1f14ccdb725a 100644 (file)
--- a/client/src/app/shared/shared-user-settings/user-interface-settings.component.ts
+++ b/client/src/app/shared/shared-user-settings/user-interface-settings.component.ts
@@ -48,7 +48,7 @@ export class UserInterfaceSettingsComponent extends FormReactive implements OnIn
         })
 
         if (this.reactiveUpdate) {
-          this.formValuesWatcher = this.form.valueChanges.subscribe(val => this.updateInterfaceSettings())
+          this.formValuesWatcher = this.form.valueChanges.subscribe(() => this.updateInterfaceSettings())
         }
       })
   }