diff options
author | Chocobozzz <me@florianbigard.com> | 2021-07-21 15:51:30 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-07-21 15:51:30 +0200 |
commit | a24bd1ed41b43790bab6ba789580bb4e85f07d85 (patch) | |
tree | a54b0f6c921ba83a6e909cd0ced325b2d4b8863c /client/src/app/+login | |
parent | 5f26f13b3c16ac5ae0a3b0a7142d84a9528cf565 (diff) | |
parent | c63830f15403ac4e750829f27d8bbbdc9a59282c (diff) | |
download | PeerTube-a24bd1ed41b43790bab6ba789580bb4e85f07d85.tar.gz PeerTube-a24bd1ed41b43790bab6ba789580bb4e85f07d85.tar.zst PeerTube-a24bd1ed41b43790bab6ba789580bb4e85f07d85.zip |
Merge branch 'next' into develop
Diffstat (limited to 'client/src/app/+login')
-rw-r--r-- | client/src/app/+login/login.component.html | 4 | ||||
-rw-r--r-- | client/src/app/+login/login.component.ts | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/client/src/app/+login/login.component.html b/client/src/app/+login/login.component.html index 5f5b0f565..27793ff0c 100644 --- a/client/src/app/+login/login.component.html +++ b/client/src/app/+login/login.component.html | |||
@@ -28,6 +28,10 @@ | |||
28 | <div *ngIf="formErrors.username" class="form-error"> | 28 | <div *ngIf="formErrors.username" class="form-error"> |
29 | {{ formErrors.username }} | 29 | {{ formErrors.username }} |
30 | </div> | 30 | </div> |
31 | |||
32 | <div *ngIf="hasUsernameUppercase()" i18n class="form-warning"> | ||
33 | ⚠️ Most email addresses do not include capital letters. | ||
34 | </div> | ||
31 | </div> | 35 | </div> |
32 | 36 | ||
33 | <div class="form-group"> | 37 | <div class="form-group"> |
diff --git a/client/src/app/+login/login.component.ts b/client/src/app/+login/login.component.ts index d8ad49081..9731383af 100644 --- a/client/src/app/+login/login.component.ts +++ b/client/src/app/+login/login.component.ts | |||
@@ -141,6 +141,10 @@ The link will expire within 1 hour.` | |||
141 | this.accordion = instanceAboutAccordion.accordion | 141 | this.accordion = instanceAboutAccordion.accordion |
142 | } | 142 | } |
143 | 143 | ||
144 | hasUsernameUppercase () { | ||
145 | return this.form.value['username'].match(/[A-Z]/) | ||
146 | } | ||
147 | |||
144 | private loadExternalAuthToken (username: string, token: string) { | 148 | private loadExternalAuthToken (username: string, token: string) { |
145 | this.isAuthenticatedWithExternalAuth = true | 149 | this.isAuthenticatedWithExternalAuth = true |
146 | 150 | ||