diff options
author | Asaad Mahmood <asaad@spinpunch.com> | 2016-03-10 13:27:34 +0500 |
---|---|---|
committer | Asaad Mahmood <asaad@spinpunch.com> | 2016-03-11 19:26:58 +0500 |
commit | e4fed928d9365ba3e096a02e590cd741de4d2cb2 (patch) | |
tree | 0e1d60c32c6c46b7b290d8fab6a8ab9fd779a980 | |
parent | 7d7260273770a2e40fb01f1162228d598a28b7ce (diff) | |
download | chat-e4fed928d9365ba3e096a02e590cd741de4d2cb2.tar.gz chat-e4fed928d9365ba3e096a02e590cd741de4d2cb2.tar.bz2 chat-e4fed928d9365ba3e096a02e590cd741de4d2cb2.zip |
Adding or separator between ldap, username, email, github
Updating code theme name
Updating conditions for login page
updated the 2.0 Dockerfile to include the proper location of mm gzip
Fixing search loading icon on mobile
Adding or separator between ldap, username, email and github
-rw-r--r-- | docker/2.0/Dockerfile | 2 | ||||
-rw-r--r-- | web/react/components/login.jsx | 34 | ||||
-rw-r--r-- | web/react/utils/constants.jsx | 6 | ||||
-rw-r--r-- | web/static/images/themes/code_themes/solarized-dark.png (renamed from web/static/images/themes/code_themes/solarized_dark.png) | bin | 81942 -> 81942 bytes | |||
-rw-r--r-- | web/static/images/themes/code_themes/solarized-light.png (renamed from web/static/images/themes/code_themes/solarized_light.png) | bin | 82868 -> 82868 bytes |
5 files changed, 38 insertions, 4 deletions
diff --git a/docker/2.0/Dockerfile b/docker/2.0/Dockerfile index 0f7a13e45..38cb1e197 100644 --- a/docker/2.0/Dockerfile +++ b/docker/2.0/Dockerfile @@ -34,7 +34,7 @@ VOLUME /var/lib/mysql WORKDIR /mattermost # Copy over files -ADD https://github.com/mattermost/platform/releases/download/v2.0.0-rc2/mattermost.tar.gz / +ADD https://github.com/mattermost/platform/releases/download/v2.0.0/mattermost.tar.gz / RUN tar -zxvf /mattermost.tar.gz --strip-components=1 && rm /mattermost.tar.gz ADD config_docker.json / ADD docker-entry.sh / diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx index 581b8e0b5..1c393c679 100644 --- a/web/react/components/login.jsx +++ b/web/react/components/login.jsx @@ -19,6 +19,8 @@ export default class Login extends React.Component { render() { const teamDisplayName = this.props.teamDisplayName; const teamName = this.props.teamName; + const ldapEnabled = global.window.mm_config.EnableLdap === 'true'; + const usernameSigninEnabled = global.window.mm_config.EnableSignInWithUsername === 'true'; let loginMessage = []; if (global.window.mm_config.EnableSignUpWithGitLab === 'true') { @@ -173,6 +175,22 @@ export default class Login extends React.Component { ); } + if (ldapEnabled && (loginMessage.length > 0 || emailSignup || usernameSigninEnabled)) { + ldapLogin = ( + <div> + <div className='or__container'> + <FormattedMessage + id='login.or' + defaultMessage='or' + /> + </div> + <LoginLdap + teamName={this.props.teamName} + /> + </div> + ); + } + let findTeams = null; if (!Utils.isMobileApp()) { findTeams = ( @@ -197,6 +215,22 @@ export default class Login extends React.Component { ); } + if (usernameSigninEnabled && (loginMessage.length > 0 || emailSignup || ldapEnabled)) { + usernameLogin = ( + <div> + <div className='or__container'> + <FormattedMessage + id='login.or' + defaultMessage='or' + /> + </div> + <LoginUsername + teamName={this.props.teamName} + /> + </div> + ); + } + return ( <div className='signup-team__container'> <h5 className='margin--less'> diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx index 4b1f73b79..3147bbd6a 100644 --- a/web/react/utils/constants.jsx +++ b/web/react/utils/constants.jsx @@ -267,7 +267,7 @@ export default { buttonColor: '#FFFFFF', mentionHighlightBg: '#984063', mentionHighlightLink: '#A4FFEB', - codeTheme: 'solarized_dark' + codeTheme: 'solarized-dark' }, windows10: { type: 'Windows Dark', @@ -386,11 +386,11 @@ export default { uiName: 'Code Theme', themes: [ { - id: 'solarized_dark', + id: 'solarized-dark', uiName: 'Solarized Dark' }, { - id: 'solarized_light', + id: 'solarized-light', uiName: 'Solarized Light' }, { diff --git a/web/static/images/themes/code_themes/solarized_dark.png b/web/static/images/themes/code_themes/solarized-dark.png Binary files differindex 582df48f9..582df48f9 100644 --- a/web/static/images/themes/code_themes/solarized_dark.png +++ b/web/static/images/themes/code_themes/solarized-dark.png diff --git a/web/static/images/themes/code_themes/solarized_light.png b/web/static/images/themes/code_themes/solarized-light.png Binary files differindex d2c2702fb..d2c2702fb 100644 --- a/web/static/images/themes/code_themes/solarized_light.png +++ b/web/static/images/themes/code_themes/solarized-light.png |