diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-05-03 14:10:36 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-05-03 14:10:36 -0400 |
commit | 87989b8afd4666a72940389db716b6500d0a9ec3 (patch) | |
tree | d4b0270eb4a9adbff0dd1b6f527ddcccbc9a83d9 /webapp/i18n/en.json | |
parent | e76a30bca0690bad53a4cabd6c7c629e89c17268 (diff) | |
download | chat-87989b8afd4666a72940389db716b6500d0a9ec3.tar.gz chat-87989b8afd4666a72940389db716b6500d0a9ec3.tar.bz2 chat-87989b8afd4666a72940389db716b6500d0a9ec3.zip |
PLT-2258 Unified login screen and related APIs (#2820)
* Unified login screen and related APIs
* Refactored login API call to be less convoluted
* Removed LDAP login prompt from invite process
* Fixed existing LDAP users being able to log in if LDAP was configured, but disabled
* Gofmt
* Future proofed login API
* Updated login APIs based on feedback
* Added additional auditing to login API
* Actually removed loginById
Diffstat (limited to 'webapp/i18n/en.json')
-rw-r--r-- | webapp/i18n/en.json | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 3bceb978c..fbbf66fbd 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -953,41 +953,29 @@ "login.changed": " Sign-in method changed successfully", "login.create": "Create one now", "login.createTeam": "Create a new team", + "login.email": "Email", "login.find": "Find your other teams", "login.forgot": "I forgot my password", + "login.loginIdRequired": "A {type} is required", "login.gitlab": "with GitLab", "login.google": "with Google Apps", + "login.ldapUsername": "LDAP Username", "login.noAccount": "Don't have an account? ", "login.on": "on {siteName}", "login.or": "or", + "login.password": "Password", "login.passwordChanged": " Password updated successfully", + "login.passwordRequired": "A password is required", "login.session_expired": " Your session has expired. Please login again.", + "login.signIn": "Sign in", "login.signTo": "Sign in to:", + "login.username": "Username", + "login.userNotFound": "We couldn't find an existing account matching your login credentials.", "login.verified": " Email Verified", - "login_email.badTeam": "Bad team name", - "login_email.email": "Email", - "login_email.emailReq": "An email is required", - "login_email.pwd": "Password", - "login_email.pwdReq": "A password is required", - "login_email.signin": "Sign in", - "login_ldap.badTeam": "Bad team name", - "login_ldap.idlReq": "An LDAP ID is required", - "login_ldap.pwd": "LDAP Password", - "login_ldap.pwdReq": "An LDAP password is required", - "login_ldap.signin": "Sign in", - "login_ldap.username": "LDAP Username", "login_mfa.enterToken": "To complete the sign in process, please enter a token from your smartphone's authenticator", "login_mfa.submit": "Submit", "login_mfa.token": "MFA Token", "login_mfa.tokenReq": "Please enter an MFA token", - "login_username.badTeam": "Bad team name", - "login_username.pwd": "Password", - "login_username.pwdReq": "A password is required", - "login_username.signin": "Sign in", - "login_username.userNotFoundError": "We couldn't find an existing account matching your username for this team.", - "login_username.username": "Username", - "login_username.usernameReq": "A username is required", - "login_username.verifyEmailError": "Please verify your email address. Check your inbox for an email.", "member_item.makeAdmin": "Make Admin", "member_item.member": "Member", "member_list.noUsersAdd": "No users to add.", |