summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-09-06 08:29:14 -0400
committerGitHub <noreply@github.com>2016-09-06 08:29:14 -0400
commitdda0ea355283623cf9bf3f5d16f3a3c3033106ae (patch)
tree83e51c84873f38a05407592b050c726ff76fb6b3 /webapp
parenta3ea88441986c4c655e4590b96ebdc2712ae7028 (diff)
downloadchat-dda0ea355283623cf9bf3f5d16f3a3c3033106ae.tar.gz
chat-dda0ea355283623cf9bf3f5d16f3a3c3033106ae.tar.bz2
chat-dda0ea355283623cf9bf3f5d16f3a3c3033106ae.zip
PLT-3875 Update error page to use Markdown and add error for missing OAuth code (#3934)
* Update error page to use Markdown and add error for missing OAuth code * Add line breaks to error messages This is to make the error message easier to read. * Update en.json
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/error_page.jsx3
1 files changed, 2 insertions, 1 deletions
diff --git a/webapp/components/error_page.jsx b/webapp/components/error_page.jsx
index f498c4e8e..d4d04bf12 100644
--- a/webapp/components/error_page.jsx
+++ b/webapp/components/error_page.jsx
@@ -7,6 +7,7 @@ import React from 'react';
import {Link} from 'react-router/es6';
import * as Utils from 'utils/utils.jsx';
+import * as TextFormatting from 'utils/text_formatting.jsx';
export default class ErrorPage extends React.Component {
componentDidMount() {
@@ -43,7 +44,7 @@ export default class ErrorPage extends React.Component {
<i className='fa fa-exclamation-triangle'/>
</div>
<h2>{title}</h2>
- <p>{message}</p>
+ <div dangerouslySetInnerHTML={{__html: TextFormatting.formatText(message)}}/>
<Link to={link}>{linkMessage}</Link>
</div>
</div>