diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-02-03 07:33:43 -0500 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-02-03 07:33:43 -0500 |
commit | 4a09adeb391b23c7e850fec96a2e8a731b70d755 (patch) | |
tree | ca9cc2410dc17de823d923c9e0ff74fea16d2a82 /web/react/components/login.jsx | |
parent | d31ae207389b7402debbcaa40bb691e86023f1ba (diff) | |
parent | b013f02209c7c128a35d1c54f2d4a7d6a9701f72 (diff) | |
download | chat-4a09adeb391b23c7e850fec96a2e8a731b70d755.tar.gz chat-4a09adeb391b23c7e850fec96a2e8a731b70d755.tar.bz2 chat-4a09adeb391b23c7e850fec96a2e8a731b70d755.zip |
Merge pull request #1991 from rgarmsen2295/plt-976
PLT-976 Adds ability to sign in with username
Diffstat (limited to 'web/react/components/login.jsx')
-rw-r--r-- | web/react/components/login.jsx | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx index c4f530af0..0123a0f3c 100644 --- a/web/react/components/login.jsx +++ b/web/react/components/login.jsx @@ -2,6 +2,7 @@ // See License.txt for license information. import LoginEmail from './login_email.jsx'; +import LoginUsername from './login_username.jsx'; import LoginLdap from './login_ldap.jsx'; import * as Utils from '../utils/utils.jsx'; @@ -35,7 +36,7 @@ export default class Login extends React.Component { /> </span> </a> - ); + ); } if (global.window.mm_config.EnableSignUpWithGoogle === 'true') { @@ -87,7 +88,7 @@ export default class Login extends React.Component { } let emailSignup; - if (global.window.mm_config.EnableSignUpWithEmail === 'true') { + if (global.window.mm_config.EnableSignInWithEmail === 'true') { emailSignup = ( <LoginEmail teamName={this.props.teamName} @@ -189,6 +190,15 @@ export default class Login extends React.Component { ); } + let usernameLogin = null; + if (global.window.mm_config.EnableSignInWithUsername === 'true') { + usernameLogin = ( + <LoginUsername + teamName={this.props.teamName} + /> + ); + } + return ( <div className='signup-team__container'> <h5 className='margin--less'> @@ -210,6 +220,7 @@ export default class Login extends React.Component { {extraBox} {loginMessage} {emailSignup} + {usernameLogin} {ldapLogin} {userSignUp} {findTeams} |