From 6a1755d2e32c3f3bcaa67c33f32cb5eb5ab76ea2 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Fri, 16 Oct 2015 09:10:54 -0700
Subject: Inital support for multi-tab loging

---
 web/react/components/post.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/react/components/post.jsx')

diff --git a/web/react/components/post.jsx b/web/react/components/post.jsx
index 64d6776b4..3b3b0383c 100644
--- a/web/react/components/post.jsx
+++ b/web/react/components/post.jsx
@@ -159,7 +159,7 @@ export default class Post extends React.Component {
         var profilePic = null;
         if (!this.props.hideProfilePic) {
             let src = '/api/v1/users/' + post.user_id + '/image?time=' + timestamp;
-            if (post.props && post.props.from_webhook && global.window.config.EnablePostIconOverride === 'true') {
+            if (post.props && post.props.from_webhook && global.window.mm_config.EnablePostIconOverride === 'true') {
                 if (post.props.override_icon_url) {
                     src = post.props.override_icon_url;
                 }
-- 
cgit v1.2.3-1-g7c22


From 1fc12dd8ba2238eba7d154eee55e1381e7415372 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Tue, 20 Oct 2015 14:49:42 -0700
Subject: Multi-session login

---
 web/react/components/post.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/react/components/post.jsx')

diff --git a/web/react/components/post.jsx b/web/react/components/post.jsx
index 3b3b0383c..bc3144dbc 100644
--- a/web/react/components/post.jsx
+++ b/web/react/components/post.jsx
@@ -158,7 +158,7 @@ export default class Post extends React.Component {
 
         var profilePic = null;
         if (!this.props.hideProfilePic) {
-            let src = '/api/v1/users/' + post.user_id + '/image?time=' + timestamp;
+            let src = '/api/v1/users/' + post.user_id + '/image?time=' + timestamp + '&' + utils.getSessionIndex();
             if (post.props && post.props.from_webhook && global.window.mm_config.EnablePostIconOverride === 'true') {
                 if (post.props.override_icon_url) {
                     src = post.props.override_icon_url;
-- 
cgit v1.2.3-1-g7c22


From d4f1f981a5143663e03a1daab8105cc11b39820d Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Thu, 22 Oct 2015 08:45:28 -0400
Subject: Auto-embed gifs from .gif links

---
 web/react/components/post.jsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'web/react/components/post.jsx')

diff --git a/web/react/components/post.jsx b/web/react/components/post.jsx
index bc3144dbc..dedac8951 100644
--- a/web/react/components/post.jsx
+++ b/web/react/components/post.jsx
@@ -120,6 +120,10 @@ export default class Post extends React.Component {
         var parentPost = this.props.parentPost;
         var posts = this.props.posts;
 
+        if (!post.props) {
+            post.props = {};
+        }
+
         var type = 'Post';
         if (post.root_id && post.root_id.length > 0) {
             type = 'Comment';
@@ -140,7 +144,7 @@ export default class Post extends React.Component {
         }
 
         var currentUserCss = '';
-        if (UserStore.getCurrentId() === post.user_id) {
+        if (UserStore.getCurrentId() === post.user_id && !post.props.from_webhook) {
             currentUserCss = 'current--user';
         }
 
@@ -200,6 +204,7 @@ export default class Post extends React.Component {
                             posts={posts}
                             handleCommentClick={this.handleCommentClick}
                             retryPost={this.retryPost}
+                            resize={this.props.resize}
                         />
                         <PostInfo
                             ref='info'
@@ -223,5 +228,6 @@ Post.propTypes = {
     sameUser: React.PropTypes.bool,
     sameRoot: React.PropTypes.bool,
     hideProfilePic: React.PropTypes.bool,
-    isLastComment: React.PropTypes.bool
+    isLastComment: React.PropTypes.bool,
+    resize: React.PropTypes.func
 };
-- 
cgit v1.2.3-1-g7c22