diff options
| author | Corey Hulen <corey@hulen.com> | 2016-01-14 16:19:44 -0600 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-01-14 16:19:44 -0600 |
| commit | f1feeb0d72646407c1ebd0e157f22b8151d4d917 (patch) | |
| tree | b6d2d87d44e9ac85955c41b0e883e7bfff2c6ef3 | |
| parent | 1ef6fd1b2595eee03005fc21c5d147290d9610cd (diff) | |
| parent | 8089487d5caccbc642e9fef8ee0e5930ff1e639d (diff) | |
| download | chat-f1feeb0d72646407c1ebd0e157f22b8151d4d917.tar.gz chat-f1feeb0d72646407c1ebd0e157f22b8151d4d917.tar.bz2 chat-f1feeb0d72646407c1ebd0e157f22b8151d4d917.zip | |
Merge pull request #1894 from mattermost/release-1.4
Release 1.4
| -rw-r--r-- | docker/1.4/Dockerfile | 2 | ||||
| -rw-r--r-- | web/react/components/user_settings/user_settings_security.jsx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docker/1.4/Dockerfile b/docker/1.4/Dockerfile index 1f0acdfc9..8dcea3927 100644 --- a/docker/1.4/Dockerfile +++ b/docker/1.4/Dockerfile @@ -34,7 +34,7 @@ VOLUME /var/lib/mysql WORKDIR /mattermost # Copy over files -ADD https://github.com/mattermost/platform/releases/download/v1.4.0-rc2/mattermost.tar.gz / +ADD https://github.com/mattermost/platform/releases/download/v1.4.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/user_settings/user_settings_security.jsx b/web/react/components/user_settings/user_settings_security.jsx index d9c5f58a9..d1266dd3f 100644 --- a/web/react/components/user_settings/user_settings_security.jsx +++ b/web/react/components/user_settings/user_settings_security.jsx @@ -206,7 +206,7 @@ export default class SecurityTab extends React.Component { <div> <a className='btn btn-primary' - href={'/' + teamName + '/claim?email=' + user.email} + href={'/' + teamName + '/claim?email=' + encodeURIComponent(user.email)} > {'Switch to using email and password'} </a> @@ -221,7 +221,7 @@ export default class SecurityTab extends React.Component { <div> <a className='btn btn-primary' - href={'/' + teamName + '/claim?email=' + user.email + '&new_type=' + Constants.GITLAB_SERVICE} + href={'/' + teamName + '/claim?email=' + encodeURIComponent(user.email) + '&new_type=' + Constants.GITLAB_SERVICE} > {'Switch to using GitLab SSO'} </a> @@ -236,7 +236,7 @@ export default class SecurityTab extends React.Component { <div> <a className='btn btn-primary' - href={'/' + teamName + '/claim?email=' + user.email + '&new_type=' + Constants.GOOGLE_SERVICE} + href={'/' + teamName + '/claim?email=' + encodeURIComponent(user.email) + '&new_type=' + Constants.GOOGLE_SERVICE} > {'Switch to using Google SSO'} </a> |