3 files changed, 66 insertions, 7 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/posts_view.jsx b/web/react/components/posts_view.jsx
index 087ca1df2..ec8223203 100644
--- a/web/react/components/posts_view.jsx
+++ b/web/react/components/posts_view.jsx
@@ -83,9 +83,14 @@ export default class PostsView extends React.Component {
             let hideProfilePic = false;
 
             if (prevPost) {
-                sameUser = prevPost.user_id === post.user_id && post.create_at - prevPost.create_at <= 1000 * 60 * 5;
+                const postIsComment = Utils.isComment(post);
+                const prevPostIsComment = Utils.isComment(prevPost);
+                const postFromWebhook = Boolean(post.props && post.props.from_webhook);
+                const prevPostFromWebhook = Boolean(prevPost.props && prevPost.props.from_webhook);
 
-                sameRoot = Utils.isComment(post) && (prevPost.id === post.root_id || prevPost.root_id === post.root_id);
+                sameUser = prevPost.user_id === post.user_id && postFromWebhook === prevPostFromWebhook &&
+                    post.create_at - prevPost.create_at <= 1000 * 60 * 5;
+                sameRoot = (postIsComment && (prevPost.id === post.root_id || prevPost.root_id === post.root_id)) || (!postIsComment && !prevPostIsComment && sameUser);
 
                 // hide the profile pic if:
                 //     the previous post was made by the same user as the current post,
@@ -94,10 +99,10 @@ export default class PostsView extends React.Component {
                 //     the current post is not from a webhook
                 //     and the previous post is not from a webhook
                 if ((prevPost.user_id === post.user_id) &&
-                        !Utils.isComment(prevPost) &&
-                        !Utils.isComment(post) &&
-                        (!post.props || !post.props.from_webhook) &&
-                        (!prevPost.props || !prevPost.props.from_webhook)) {
+                        !prevPostIsComment &&
+                        !postIsComment &&
+                        !postFromWebhook &&
+                        !prevPostFromWebhook) {
                     hideProfilePic = true;
                 }
             }
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>
         );