diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-09-05 10:19:35 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-09-05 10:19:35 +0200 |
| commit | 00aab0666c6f772548c160fdfa871a8843b88f37 (patch) | |
| tree | 73958f6f5d41371980f9653c8cb0ed8f46683c5a /client/src/app/+signup/+register | |
| parent | be04c6fdab5d91a7a57fa3ff36cde22a549c29da (diff) | |
| parent | 951532924c1b3fd547cbf45f0c9cf9734203d6b4 (diff) | |
| download | PeerTube-00aab0666c6f772548c160fdfa871a8843b88f37.tar.gz PeerTube-00aab0666c6f772548c160fdfa871a8843b88f37.tar.zst PeerTube-00aab0666c6f772548c160fdfa871a8843b88f37.zip | |
Merge branch 'release/1.4.0' into develop
Diffstat (limited to 'client/src/app/+signup/+register')
| -rw-r--r-- | client/src/app/+signup/+register/register.component.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/src/app/+signup/+register/register.component.html b/client/src/app/+signup/+register/register.component.html index e7440fe1e..906e29aed 100644 --- a/client/src/app/+signup/+register/register.component.html +++ b/client/src/app/+signup/+register/register.component.html | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | <div class="wrapper" [hidden]="signupDone"> | 10 | <div class="wrapper" [hidden]="signupDone"> |
| 11 | <div class="register-form"> | 11 | <div class="register-form"> |
| 12 | <my-custom-stepper linear *ngIf="!signupDone"> | 12 | <my-custom-stepper linear *ngIf="!signupDone"> |
| 13 | <cdk-step [stepControl]="formStepUser" i18n-label label="User information"> | 13 | <cdk-step [stepControl]="formStepUser" i18n-label label="User"> |
| 14 | <my-register-step-user | 14 | <my-register-step-user |
| 15 | [hasCodeOfConduct]="!!aboutHtml.codeOfConduct" | 15 | [hasCodeOfConduct]="!!aboutHtml.codeOfConduct" |
| 16 | (formBuilt)="onUserFormBuilt($event)" (termsClick)="onTermsClick()" (codeOfConductClick)="onCodeOfConductClick()" | 16 | (formBuilt)="onUserFormBuilt($event)" (termsClick)="onTermsClick()" (codeOfConductClick)="onCodeOfConductClick()" |
| @@ -20,7 +20,7 @@ | |||
| 20 | <button i18n cdkStepperNext [disabled]="!formStepUser || !formStepUser.valid">Next</button> | 20 | <button i18n cdkStepperNext [disabled]="!formStepUser || !formStepUser.valid">Next</button> |
| 21 | </cdk-step> | 21 | </cdk-step> |
| 22 | 22 | ||
| 23 | <cdk-step [stepControl]="formStepChannel" i18n-label label="Channel information"> | 23 | <cdk-step [stepControl]="formStepChannel" i18n-label label="Channel"> |
| 24 | <my-register-step-channel (formBuilt)="onChannelFormBuilt($event)" [username]="getUsername()"></my-register-step-channel> | 24 | <my-register-step-channel (formBuilt)="onChannelFormBuilt($event)" [username]="getUsername()"></my-register-step-channel> |
| 25 | 25 | ||
| 26 | <button i18n cdkStepperNext (click)="signup()" | 26 | <button i18n cdkStepperNext (click)="signup()" |