diff options
Diffstat (limited to 'webapp/components')
| -rw-r--r-- | webapp/components/file_attachment.jsx | 2 | ||||
| -rw-r--r-- | webapp/components/login/login.jsx | 2 | ||||
| -rw-r--r-- | webapp/components/password_reset_send_link.jsx | 4 | ||||
| -rw-r--r-- | webapp/components/signup_team_complete/components/team_signup_password_page.jsx | 2 | ||||
| -rw-r--r-- | webapp/components/view_image.jsx | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/webapp/components/file_attachment.jsx b/webapp/components/file_attachment.jsx index 6253e17e1..ccd4070aa 100644 --- a/webapp/components/file_attachment.jsx +++ b/webapp/components/file_attachment.jsx @@ -130,7 +130,7 @@ class FileAttachment extends React.Component { var filename = this.props.filename; var fileInfo = utils.splitFileLocation(filename); - var fileUrl = utils.getFileUrl(filename, true); + var fileUrl = utils.getFileUrl(filename); var type = utils.getFileType(fileInfo.ext); var thumbnail; diff --git a/webapp/components/login/login.jsx b/webapp/components/login/login.jsx index e867af47a..ed7495b13 100644 --- a/webapp/components/login/login.jsx +++ b/webapp/components/login/login.jsx @@ -90,7 +90,7 @@ export default class Login extends React.Component { }, (err) => { if (err.id === 'api.user.login.not_verified.app_error') { - browserHistory.push('/verify_email?teamname=' + encodeURIComponent(name) + '&email=' + encodeURIComponent(loginId)); + browserHistory.push('/should_verify_email?teamname=' + encodeURIComponent(team) + '&email=' + encodeURIComponent(loginId)); return; } this.setState({serverEmailError: err.message}); diff --git a/webapp/components/password_reset_send_link.jsx b/webapp/components/password_reset_send_link.jsx index a42b8935c..e3ab8949e 100644 --- a/webapp/components/password_reset_send_link.jsx +++ b/webapp/components/password_reset_send_link.jsx @@ -55,7 +55,9 @@ class PasswordResetSendLink extends React.Component { <FormattedHTMLMessage id='password_send.link' defaultMessage='<p>A password reset link has been sent to <b>{email}</b></p>' - email={email} + values={{ + email + }} /> <FormattedMessage id={'password_send.checkInbox'} diff --git a/webapp/components/signup_team_complete/components/team_signup_password_page.jsx b/webapp/components/signup_team_complete/components/team_signup_password_page.jsx index fbe8ab683..7b8b49e0c 100644 --- a/webapp/components/signup_team_complete/components/team_signup_password_page.jsx +++ b/webapp/components/signup_team_complete/components/team_signup_password_page.jsx @@ -81,7 +81,7 @@ class TeamSignupPasswordPage extends React.Component { }, (err) => { if (err.id === 'api.user.login.not_verified.app_error') { - browserHistory.push('/verify_email?email=' + encodeURIComponent(teamSignup.team.email) + '&teamname=' + encodeURIComponent(teamSignup.team.name)); + browserHistory.push('/should_verify_email?email=' + encodeURIComponent(teamSignup.team.email) + '&teamname=' + encodeURIComponent(teamSignup.team.name)); } else { this.setState({serverError: err.message}); $('#finish-button').button('reset'); diff --git a/webapp/components/view_image.jsx b/webapp/components/view_image.jsx index 7572f88ae..3d3107d92 100644 --- a/webapp/components/view_image.jsx +++ b/webapp/components/view_image.jsx @@ -228,7 +228,7 @@ class ViewImageModal extends React.Component { } const filename = this.props.filenames[this.state.imgId]; - const fileUrl = Utils.getFileUrl(filename, true); + const fileUrl = Utils.getFileUrl(filename); var content; if (this.state.loaded[this.state.imgId]) { |