diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-10-13 08:39:27 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-10-13 08:39:27 -0400 |
| commit | ffdeba70ef1ec69233beeb032773c54156359da1 (patch) | |
| tree | c9567cb513665da58b90b592d58c7245092a259e | |
| parent | 2663cede2b16293abe1b29dddf56cc7378a58efe (diff) | |
| parent | 6bf3383bced0636f28d561abb26e21fcb76cb108 (diff) | |
| download | chat-ffdeba70ef1ec69233beeb032773c54156359da1.tar.gz chat-ffdeba70ef1ec69233beeb032773c54156359da1.tar.bz2 chat-ffdeba70ef1ec69233beeb032773c54156359da1.zip | |
Merge release branch 'release-1.1.0'
| -rw-r--r-- | docker/1.1/Dockerfile | 2 | ||||
| -rw-r--r-- | web/react/components/email_verify.jsx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/1.1/Dockerfile b/docker/1.1/Dockerfile index 600d33308..855dd4375 100644 --- a/docker/1.1/Dockerfile +++ b/docker/1.1/Dockerfile @@ -34,7 +34,7 @@ VOLUME /var/lib/mysql WORKDIR /mattermost # Copy over files -ADD https://github.com/mattermost/platform/releases/download/v1.1.0-rc1/mattermost.tar.gz / +ADD https://github.com/mattermost/platform/releases/download/v1.1.0-rc2/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/email_verify.jsx b/web/react/components/email_verify.jsx index 2b413b848..9be7f97f8 100644 --- a/web/react/components/email_verify.jsx +++ b/web/react/components/email_verify.jsx @@ -22,7 +22,7 @@ export default class EmailVerify extends React.Component { title = global.window.config.SiteName + ' Email Verified'; body = <p>Your email has been verified! Click <a href={this.props.teamURL + '?email=' + this.props.userEmail}>here</a> to log in.</p>; } else { - title = global.window.config.SiteName + ' Email Not Verified'; + title = global.window.config.SiteName + ': You are almost done'; body = <p>Please verify your email address. Check your inbox for an email.</p>; resend = ( <button |