Merge branch 'release/4.0.0' into develop

pull/4624/head
Chocobozzz 2021-12-09 13:41:24 +01:00
commit 0882c8e650
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
4 changed files with 17 additions and 13 deletions

View File

@ -5,7 +5,12 @@ import { HomeComponent } from './home.component'
const homeRoutes: Routes = [
{
path: '',
component: HomeComponent
component: HomeComponent,
data: {
meta: {
title: $localize`Homepage`
}
}
}
]

View File

@ -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>

View File

@ -141,7 +141,6 @@ export class ThemeService {
}
this.auth.userInformationLoaded
.pipe(first())
.subscribe(() => this.updateCurrentTheme())
}

View File

@ -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())
}
})
}