Commit 110388db authored by David Burke's avatar David Burke

Manually merge staging into dev

parent 2c7e8d40
......@@ -19,6 +19,7 @@ import { ResetPasswordEffects } from "./reset-password/reset-password.effects";
import { ResetPasswordVerifyEffects } from "./reset-password/reset-password-verify/reset-password-verify.effects";
import { SetPasswordEffects } from "./reset-password/set-password/set-password.effects";
import { ManageBackupCodeEffects } from "./manage-backup-code/manage-backup-code.effects";
import { ManageMfaContainer } from "./manage-mfa/manage-mfa.container";
import { RegisterContainer } from "./register/register.container";
import { RegisterComponent } from "./register/register.component";
import { UserService } from "./user";
......@@ -43,6 +44,7 @@ import { ManageBackupCodeComponent } from "./manage-backup-code/manage-backup-co
import { PasswordInputComponent } from "./change-password/password-input/password-input.component";
import { AccountRoutingModule } from "./account-routing.module.tns";
import { ChangePasswordEffects } from "./change-password/change-password.effects";
import { SplitMfaLinkPipe } from "./manage-mfa/split-mfa-link.pipe";
export const COMPONENTS = [
RegisterComponent,
......@@ -63,7 +65,9 @@ export const COMPONENTS = [
ResetPasswordVerifyComponent,
SetPasswordComponent,
ManageBackupCodeComponent,
PasswordInputComponent
PasswordInputComponent,
ManageMfaContainer,
SplitMfaLinkPipe
];
export const SERVICES = [BackupCodePdfService, UserService, ConfirmEmailGuard];
......
......@@ -5,7 +5,6 @@
(onSubmit)="onSubmit()"
[nonFieldErrors]="nonFieldErrors"
>
<app-text-field
#password
autocorrect="false"
......@@ -98,7 +97,7 @@
<Label
*ngIf="
!form.errors._newPassword &&
!form.value.passwordConfirm &&
!form.value.newPasswordConfirm &&
form.value.showConfirm
"
class="text-label m-b-20"
......
{
"compileOnSave": false,
"compilerOptions": {
"outDir": "./dist/out-tsc",
"declaration": false,
"module": "esnext",
"moduleResolution": "node",
"noUnusedLocals": true,
"noImplicitThis": false,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"target": "es2015",
"strict": true,
"skipLibCheck": true,
"strictPropertyInitialization": false,
"strictFunctionTypes": false,
"suppressImplicitAnyIndexErrors": true,
"typeRoots": ["node_modules/@types", "node_modules/web-ext-types"],
"lib": ["es2018", "dom"],
"baseUrl": ".",
"paths": {
"~/*": ["./*", "src/*"],
"*": ["./node_modules/*"]
}
},
"angularCompilerOptions": {
"preserveWhitespaces": false
},
"exclude": ["**/*.tns.ts", "**/*.android.ts", "**/*.ios.ts", "**/*.spec.ts"]
}
"compileOnSave": false,
"compilerOptions": {
"outDir": "./dist/out-tsc",
"declaration": false,
"module": "esnext",
"moduleResolution": "node",
"noUnusedLocals": true,
"noImplicitThis": false,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"target": "es2015",
"strict": true,
"skipLibCheck": true,
"strictPropertyInitialization": false,
"strictFunctionTypes": false,
"suppressImplicitAnyIndexErrors": true,
"typeRoots": [
"node_modules/@types",
"node_modules/web-ext-types"
],
"lib": [
"es2018",
"dom",
"es6",
"es2015.iterable"
],
"baseUrl": ".",
"paths": {
"~/*": [
"./*",
"src/*"
],
"*": [
"./node_modules/*"
]
}
},
"angularCompilerOptions": {
"preserveWhitespaces": false
},
"exclude": [
"**/*.tns.ts",
"**/*.android.ts",
"**/*.ios.ts",
"**/*.spec.ts"
]
}
\ No newline at end of file
......@@ -33,6 +33,7 @@
"src/app/account/change-password/password-input/password-input.component.ts",
"src/app/account/manage-backup-code/manage-backup-code.component.ts",
"src/app/account/manage-backup-code/download-backup-code/download-backup-code.component.ts",
"src/app/account/manage-mfa/manage-mfa.component",
"src/app/account/reset-password/reset-password-verify/reset-password-verify.component.ts",
"src/app/account/reset-password/set-password/set-password.component.ts",
"src/app/group/group-detail.component.ts",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment