6 files changed, 80 insertions, 12 deletions

diff --git a/web/react/components/docs.jsx b/web/react/components/docs.jsx
new file mode 100644
index 000000000..68baa6dad
--- /dev/null
+++ b/web/react/components/docs.jsx
@@ -0,0 +1,41 @@
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+const TextFormatting = require('../utils/text_formatting.jsx');
+const UserStore = require('../stores/user_store.jsx');
+
+export default class Docs extends React.Component {
+    constructor(props) {
+        super(props);
+        UserStore.setCurrentUser(global.window.mm_user || {});
+
+        this.state = {text: ''};
+        const errorState = {text: '## 404'};
+
+        if (props.site) {
+            $.get('/static/help/' + props.site + '.md').then((response) => {
+                this.setState({text: response});
+            }, () => {
+                this.setState(errorState);
+            });
+        } else {
+            this.setState(errorState);
+        }
+    }
+
+    render() {
+        return (
+            <div
+                dangerouslySetInnerHTML={{__html: TextFormatting.formatText(this.state.text)}}
+            >
+            </div>
+        );
+    }
+}
+
+Docs.defaultProps = {
+    site: ''
+};
+Docs.propTypes = {
+    site: React.PropTypes.string
+};
diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx
index 423ba9067..7f8820d9f 100644
--- a/web/react/components/login.jsx
+++ b/web/react/components/login.jsx
@@ -201,14 +201,12 @@ export default class Login extends React.Component {
         if (global.window.mm_config.EnableTeamCreation === 'true') {
             teamSignUp = (
                 <div className='margin--extra'>
-                    <span>{'Want to create your own team? '}
-                        <a
-                            href='/'
-                            className='signup-team-login'
-                        >
-                            {'Create one now'}
-                        </a>
-                    </span>
+                    <a
+                        href='/'
+                        className='signup-team-login'
+                    >
+                        {'Create a new team'}
+                    </a>
                 </div>
             );
         }
@@ -227,7 +225,7 @@ export default class Login extends React.Component {
                     {emailSignup}
                     {userSignUp}
                     <div className='form-group margin--extra form-group--small'>
-                        <span><a href='/find_team'>{'Find other teams'}</a></span>
+                        <span><a href='/find_team'>{'Find your other teams'}</a></span>
                     </div>
                     {forgotPassword}
                     {teamSignUp}
diff --git a/web/react/components/textbox.jsx b/web/react/components/textbox.jsx
index e6530b941..1a5269baa 100644
--- a/web/react/components/textbox.jsx
+++ b/web/react/components/textbox.jsx
@@ -295,6 +295,13 @@ export default class Textbox extends React.Component {
         this.resize();
     }
 
+    showHelp(e) {
+        e.preventDefault();
+        e.target.blur();
+
+        global.window.open('/docs/Messaging');
+    }
+
     render() {
         const previewLinkVisible = this.props.messageText.length > 0;
 
@@ -336,11 +343,17 @@ export default class Textbox extends React.Component {
                 >
                 </div>
                 <a
+                    onClick={this.showHelp}
+                    className='textbox-help-link'
+                >
+                    {'Help'}
+                </a>
+                <a
                     style={{visibility: previewLinkVisible ? 'visible' : 'hidden'}}
                     onClick={this.showPreview}
                     className='textbox-preview-link'
                 >
-                    {this.state.preview ? 'Edit message' : 'Preview'}
+                    {this.state.preview ? 'Edit' : 'Preview'}
                 </a>
             </div>
         );
diff --git a/web/react/pages/docs.jsx b/web/react/pages/docs.jsx
new file mode 100644
index 000000000..ed2b6d0c9
--- /dev/null
+++ b/web/react/pages/docs.jsx
@@ -0,0 +1,16 @@
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+var Docs = require('../components/docs.jsx');
+
+function setupDocumentationPage(props) {
+    ReactDOM.render(
+        <Docs
+            site={props.Site}
+        />,
+        document.getElementById('docs')
+    );
+}
+
+global.window.mm_user = global.window.mm_user || {};
+global.window.setup_documentation_page = setupDocumentationPage;
diff --git a/web/react/stores/browser_store.jsx b/web/react/stores/browser_store.jsx
index 8e86ce32f..2e3a26cff 100644
--- a/web/react/stores/browser_store.jsx
+++ b/web/react/stores/browser_store.jsx
@@ -72,7 +72,7 @@ class BrowserStoreClass {
             console.log('An error occurred while setting local storage, clearing all props'); //eslint-disable-line no-console
             localStorage.clear();
             sessionStorage.clear();
-            window.location.href = window.location.href;
+            window.location.reload(true);
         }
     }
 
diff --git a/web/react/utils/async_client.jsx b/web/react/utils/async_client.jsx
index 205c7461c..b39648bf0 100644
--- a/web/react/utils/async_client.jsx
+++ b/web/react/utils/async_client.jsx
@@ -63,7 +63,7 @@ export function getChannels(force, updateLastViewed, checkVersion) {
 
                     if (serverVersion !== BrowserStore.getLastServerVersion()) {
                         BrowserStore.setLastServerVersion(serverVersion);
-                        window.location.href = window.location.href;
+                        window.location.reload(true);
                         console.log('Detected version update refreshing the page'); //eslint-disable-line no-console
                     }
                 }