From 6a559febc292c272da24df440d80ae3b26a31d7f Mon Sep 17 00:00:00 2001
From: ralder <ralder@yandex.ru>
Date: Thu, 9 Jul 2015 03:32:03 -0700
Subject: fix BrowserStore bug in actionOnItemsWithPrefix and refactor
 BrowserStore

---
 web/react/components/delete_post_modal.jsx    |  4 ++--
 web/react/components/edit_post_modal.jsx      |  7 ++++---
 web/react/components/signup_team_complete.jsx | 11 +++--------
 web/react/components/signup_user_complete.jsx | 13 ++++---------
 4 files changed, 13 insertions(+), 22 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/delete_post_modal.jsx b/web/react/components/delete_post_modal.jsx
index fefac12d7..11970bc2b 100644
--- a/web/react/components/delete_post_modal.jsx
+++ b/web/react/components/delete_post_modal.jsx
@@ -56,13 +56,13 @@ module.exports = React.createClass({
         $(this.refs.modal.getDOMNode()).on('show.bs.modal', function(e) {
             var newState = {};
             if(BrowserStore.getItem('edit_state_transfer')) {
-                newState = JSON.parse(BrowserStore.getItem('edit_state_transfer'));
+                newState = BrowserStore.getItem('edit_state_transfer');
                 BrowserStore.removeItem('edit_state_transfer');
             } else {
                 var button = e.relatedTarget;
                 newState = { title: $(button).attr('data-title'), channel_id: $(button).attr('data-channelid'), post_id: $(button).attr('data-postid'), comments: $(button).attr('data-comments') };
             }
-            self.setState(newState)
+            self.setState(newState);
         });
         PostStore.addSelectedPostChangeListener(this._onChange);
     },
diff --git a/web/react/components/edit_post_modal.jsx b/web/react/components/edit_post_modal.jsx
index d741e189b..21b75bb6e 100644
--- a/web/react/components/edit_post_modal.jsx
+++ b/web/react/components/edit_post_modal.jsx
@@ -4,6 +4,7 @@
 var Client = require('../utils/client.jsx');
 var AsyncClient = require('../utils/async_client.jsx');
 var Textbox = require('./textbox.jsx');
+var BrowserStore = require('../stores/browser_store.jsx');
 
 module.exports = React.createClass({
     handleEdit: function(e) {
@@ -13,14 +14,14 @@ module.exports = React.createClass({
         if (updatedPost.message.length === 0) {
             var tempState = this.state;
             delete tempState.editText;
-            BrowserStore.setItem('edit_state_transfer', JSON.stringify(tempState));
+            BrowserStore.setItem('edit_state_transfer', tempState);
             $("#edit_post").modal('hide');
             $("#delete_post").modal('show');
             return;
         }
 
-        updatedPost.id = this.state.post_id
-        updatedPost.channel_id = this.state.channel_id
+        updatedPost.id = this.state.post_id;
+        updatedPost.channel_id = this.state.channel_id;
 
         Client.updatePost(updatedPost,
             function(data) {
diff --git a/web/react/components/signup_team_complete.jsx b/web/react/components/signup_team_complete.jsx
index 500ee231e..9e2a13955 100644
--- a/web/react/components/signup_team_complete.jsx
+++ b/web/react/components/signup_team_complete.jsx
@@ -596,19 +596,14 @@ PasswordPage = React.createClass({
 
 module.exports = React.createClass({
     updateParent: function(state, skipSet) {
-        BrowserStore.setGlobalItem(this.props.hash, JSON.stringify(state));
+        BrowserStore.setGlobalItem(this.props.hash, state);
 
         if (!skipSet) {
             this.setState(state);
         }
     },
     getInitialState: function() {
-        var props = null;
-        try {
-            props = JSON.parse(BrowserStore.getGlobalItem(this.props.hash));
-        }
-        catch(parse_error) {
-        }
+        var props = BrowserStore.getGlobalItem(this.props.hash);
 
         if (!props) {
             props = {};
@@ -628,7 +623,7 @@ module.exports = React.createClass({
             props.data = this.props.data;
         }
 
-        return props ;
+        return props;
     },
     render: function() {
         if (this.state.wizard == "welcome") {
diff --git a/web/react/components/signup_user_complete.jsx b/web/react/components/signup_user_complete.jsx
index fb96cc99f..fa0c26017 100644
--- a/web/react/components/signup_user_complete.jsx
+++ b/web/react/components/signup_user_complete.jsx
@@ -17,7 +17,7 @@ module.exports = React.createClass({
             return;
         }
 
-        var username_error = utils.isValidUsername(this.state.user.username)
+        var username_error = utils.isValidUsername(this.state.user.username);
         if (username_error === "Cannot use a reserved word as a username.") {
             this.setState({name_error: "This username is reserved, please choose a new one.", email_error: "", password_error: "", server_error: ""});
             return;
@@ -53,7 +53,7 @@ module.exports = React.createClass({
                             UserStore.setLastEmail(this.state.user.email);
                             UserStore.setCurrentUser(data);
                             if (this.props.hash > 0)
-                                BrowserStore.setGlobalItem(this.props.hash, JSON.stringify({wizard: "finished"}));
+                                BrowserStore.setGlobalItem(this.props.hash, {wizard: "finished"});
                             window.location.href = '/channels/town-square';
                         }.bind(this),
                         function(err) {
@@ -73,12 +73,7 @@ module.exports = React.createClass({
         );
     },
     getInitialState: function() {
-        var props = null;
-        try {
-            props = JSON.parse(BrowserStore.getGlobalItem(this.props.hash));
-        }
-        catch(parse_error) {
-        }
+        var props = BrowserStore.getGlobalItem(this.props.hash);
 
         if (!props) {
             props = {};
@@ -91,7 +86,7 @@ module.exports = React.createClass({
             props.original_email = this.props.email;
         }
 
-        return props ;
+        return props;
     },
     render: function() {
 
-- 
cgit v1.2.3-1-g7c22


From e79ade46b2c43c0a6ee1ecffac91ba348aac790d Mon Sep 17 00:00:00 2001
From: ralder <ralder@yandex.ru>
Date: Fri, 10 Jul 2015 12:20:00 -0700
Subject: [webui] fix incorrect height for mentions list for reply textbox

---
 web/react/components/mention_list.jsx | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index ba2c53612..103ff29bb 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -9,7 +9,12 @@ var Mention = require('./mention.jsx');
 var Constants = require('../utils/constants.jsx');
 var ActionTypes = Constants.ActionTypes;
 
+var MAX_HEIGHT_LIST = 292;
+var MAX_ITEMS_IN_LIST = 25;
+var ITEM_HEIGHT = 36;
+
 module.exports = React.createClass({
+    displayName: "MentionList",
     componentDidMount: function() {
         PostStore.addMentionDataChangeListener(this._onChange);
 
@@ -72,7 +77,7 @@ module.exports = React.createClass({
     },
     render: function() {
         var mentionText = this.state.mentionText;
-        if (mentionText === '-1') return (<div/>);
+        if (mentionText === '-1') return null;
 
         var profiles = UserStore.getActiveOnlyProfiles();
         var users = [];
@@ -100,8 +105,7 @@ module.exports = React.createClass({
         var mentions = {};
         var index = 0;
 
-        for (var i = 0; i < users.length; i++) {
-            if (Object.keys(mentions).length >= 25) break;
+        for (var i = 0; i < users.length && index < MAX_ITEMS_IN_LIST; i++) {
             if (this.alreadyMentioned(users[i].username)) continue;
 
             var firstName = "", lastName = "";
@@ -127,17 +131,20 @@ module.exports = React.createClass({
         }
         var numMentions = Object.keys(mentions).length;
 
-        if (numMentions < 1) return (<div/>);
+        if (numMentions < 1) return null;
 
-        var height = (numMentions*36) + 4;
-        var width = $('#'+this.props.id).parent().width();
-        var bottom = $(window).height() - $('#'+this.props.id).offset().top;
-        var left = $('#'+this.props.id).offset().left;
-        var max_height = $('#'+this.props.id).offset().top - 10;
+        var $mention_tab = $('#'+this.props.id);
+        var maxHeight = Math.min(MAX_HEIGHT_LIST, $mention_tab.offset().top - 10);
+        var style = {
+            height: Math.min(maxHeight, (numMentions*ITEM_HEIGHT) + 4),
+            width:  $mention_tab.parent().width(),
+            bottom: $(window).height() - $mention_tab.offset().top,
+            left:   $mention_tab.offset().left
+        };
 
         return (
-            <div className="mentions--top" style={{height: height, width: width, bottom: bottom, left: left}}>
-                <div ref="mentionlist" className="mentions-box" style={{height: height, width: width}}>
+            <div className="mentions--top" style={style}>
+                <div ref="mentionlist" className="mentions-box">
                     { mentions }
                 </div>
             </div>
-- 
cgit v1.2.3-1-g7c22


From 46d3515fad57f3c777b44d96077fec5a0ab944c1 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Fri, 10 Jul 2015 17:07:01 -0700
Subject: Changes to notifcation carriage return parsing

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

(limited to 'web/react/components')

diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index 2095978e8..4a57ec263 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -249,7 +249,7 @@ var SidebarLoggedIn = React.createClass({
 
                 var repRegex = new RegExp("<br>", "g");
                 var post = JSON.parse(msg.props.post);
-                var msg = post.message.replace(repRegex, "\n").split("\n")[0].replace("<mention>", "").replace("</mention>", "");
+                var msg = post.message.replace(repRegex, "\n").replace("\n", "").replace("<mention>", "").replace("</mention>", "");
                 if (msg.length > 50) {
                     msg = msg.substring(0,49) + "...";
                 }
-- 
cgit v1.2.3-1-g7c22


From dcea1de00661a9fba9129a35b4c6451234a18d9a Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Fri, 10 Jul 2015 17:32:13 -0700
Subject: Changed parser for desktop notifications to replace returns with a
 single space.

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

(limited to 'web/react/components')

diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index 4a57ec263..934a4d22a 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -249,7 +249,7 @@ var SidebarLoggedIn = React.createClass({
 
                 var repRegex = new RegExp("<br>", "g");
                 var post = JSON.parse(msg.props.post);
-                var msg = post.message.replace(repRegex, "\n").replace("\n", "").replace("<mention>", "").replace("</mention>", "");
+                var msg = post.message.replace(repRegex, "\n").replace(/\n+/g, " ").replace("<mention>", "").replace("</mention>", "");
                 if (msg.length > 50) {
                     msg = msg.substring(0,49) + "...";
                 }
-- 
cgit v1.2.3-1-g7c22


From 4cc9bfce5c8bf09f743f00421f47349b6519a25f Mon Sep 17 00:00:00 2001
From: ralder <ralder@yandex.ru>
Date: Sat, 11 Jul 2015 08:32:02 -0700
Subject: [webui] fix loading animation for ie

---
 web/react/components/loading_screen.jsx |  24 ++++++++
 web/react/components/more_channels.jsx  |  15 ++---
 web/react/components/post.jsx           |  13 ++--
 web/react/components/post_body.jsx      |   2 +-
 web/react/components/post_list.jsx      | 103 ++++++++++----------------------
 5 files changed, 64 insertions(+), 93 deletions(-)
 create mode 100644 web/react/components/loading_screen.jsx

(limited to 'web/react/components')

diff --git a/web/react/components/loading_screen.jsx b/web/react/components/loading_screen.jsx
new file mode 100644
index 000000000..5905e519b
--- /dev/null
+++ b/web/react/components/loading_screen.jsx
@@ -0,0 +1,24 @@
+// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+module.exports = React.createClass({
+    displayName: "LoadingScreen",
+    propTypes: {
+        position: React.PropTypes.oneOf(['absolute', 'fixed', 'relative', 'static', 'inherit'])
+    },
+    getDefaultProps: function() {
+        return { position: 'relative' };
+    },
+    render: function() {
+        return (
+            <div className="loading-screen" style={{position: this.props.position}}>
+                <div className="loading__content">
+                    <h3>Loading</h3>
+                    <div className="round round-1"></div>
+                    <div className="round round-2"></div>
+                    <div className="round round-3"></div>
+                </div>
+            </div>
+        );
+    }
+});
diff --git a/web/react/components/more_channels.jsx b/web/react/components/more_channels.jsx
index c3ddc76f3..007476f9b 100644
--- a/web/react/components/more_channels.jsx
+++ b/web/react/components/more_channels.jsx
@@ -7,6 +7,7 @@ var client = require('../utils/client.jsx');
 var asyncClient = require('../utils/async_client.jsx');
 var UserStore = require('../stores/user_store.jsx');
 var ChannelStore = require('../stores/channel_store.jsx');
+var LoadingScreen = require('./loading_screen.jsx');
 
 function getStateFromStores() {
   return {
@@ -16,6 +17,8 @@ function getStateFromStores() {
 }
 
 module.exports = React.createClass({
+    displayName: "MoreChannelsModal",
+
     componentDidMount: function() {
         ChannelStore.addMoreChangeListener(this._onChange);
         $(this.refs.modal.getDOMNode()).on('shown.bs.modal', function (e) {
@@ -90,7 +93,7 @@ module.exports = React.createClass({
                                                             <p className="more-channel-name">{channel.display_name}</p>
                                                             <p className="more-channel-description">{channel.description}</p>
                                                         </td>
-                                                        <td className="td--action"><button onClick={outter.handleJoin.bind(outter, channel.id)} className="pull-right btn btn-primary">Join</button></td>
+                                                        <td className="td--action"><button onClick={outter.handleJoin.bind(outter, channel.id)} className="btn btn-primary">Join</button></td>
                                                     </tr>
                                                 )
                                             })}
@@ -100,15 +103,7 @@ module.exports = React.createClass({
                                             <p className="primary-message">No more channels to join</p>
                                             <p className="secondary-message">Click 'Create New Channel' to make a new one</p>
                                         </div>)
-                                :   <div ref="loadingscreen" className="loading-screen loading-screen--channel">
-                                        <div className="loading__content">
-                                        <h3>Loading</h3>
-                                            <div id="round_1" className="round"></div>
-                                            <div id="round_2" className="round"></div>
-                                            <div id="round_3" className="round"></div>
-                                        </div>
-                                    </div>
-                                }
+                            :   <LoadingScreen /> }
                             { server_error }
                         </div>
                         <div className="modal-footer">
diff --git a/web/react/components/post.jsx b/web/react/components/post.jsx
index 04b5ba082..32e1759dd 100644
--- a/web/react/components/post.jsx
+++ b/web/react/components/post.jsx
@@ -10,6 +10,7 @@ var UserStore = require('../stores/user_store.jsx');
 var ActionTypes = Constants.ActionTypes;
 
 module.exports = React.createClass({
+    displayName: "Post",
     componentDidMount: function() {
         $('.modal').on('show.bs.modal', function () {
             $('.modal-body').css('overflow-y', 'auto');
@@ -19,7 +20,7 @@ module.exports = React.createClass({
     handleCommentClick: function(e) {
         e.preventDefault();
 
-        data = {};
+        var data = {};
         data.order = [this.props.post.id];
         data.posts = this.props.posts;
 
@@ -48,7 +49,6 @@ module.exports = React.createClass({
 
         var commentCount = 0;
         var commentRootId = parentPost ? post.root_id : post.id;
-        var rootUser = "";
         for (var postId in posts) {
             if (posts[postId].root_id == commentRootId) {
                 commentCount += 1;
@@ -57,12 +57,7 @@ module.exports = React.createClass({
 
         var error = this.state.error ? <div className='form-group has-error'><label className='control-label'>{ this.state.error }</label></div> : null;
 
-        if (this.props.sameRoot){
-            rootUser = "same--root";
-        }
-        else {
-            rootUser = "other--root";
-        }
+        var rootUser =  this.props.sameRoot ? "same--root" : "other--root";
 
         var postType = "";
         if (type != "Post"){
@@ -81,7 +76,7 @@ module.exports = React.createClass({
                     <div className="post-profile-img__container">
                         <img className="post-profile-img" src={"/api/v1/users/" + post.user_id + "/image"} height="36" width="36" />
                     </div>
-                    : "" }
+                    : null }
                     <div className="post__content">
                         <PostHeader post={post} sameRoot={this.props.sameRoot} commentCount={commentCount} handleCommentClick={this.handleCommentClick} isLastComment={this.props.isLastComment} />
                         <PostBody post={post} sameRoot={this.props.sameRoot} parentPost={parentPost} posts={posts} handleCommentClick={this.handleCommentClick} />
diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx
index 7d5ef4d33..cf542a98f 100644
--- a/web/react/components/post_body.jsx
+++ b/web/react/components/post_body.jsx
@@ -120,7 +120,7 @@ module.exports = React.createClass({
         return (
             <div className="post-body">
                 { comment }
-                <p key={post.Id+"_message"} className={postClass}><span>{inner}</span></p>
+                <p key={post.id+"_message"} className={postClass}><span>{inner}</span></p>
                 { filenames && filenames.length > 0 ?
                     <div className="post-image__columns">
                         { postFiles }
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index d6dc9ce30..9e1679717 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -8,6 +8,7 @@ var UserProfile = require( './user_profile.jsx' );
 var AsyncClient = require('../utils/async_client.jsx');
 var CreatePost = require('./create_post.jsx');
 var Post = require('./post.jsx');
+var LoadingScreen = require('./loading_screen.jsx');
 var SocketStore = require('../stores/socket_store.jsx');
 var utils = require('../utils/utils.jsx');
 var Client = require('../utils/client.jsx');
@@ -26,37 +27,8 @@ function getStateFromStores() {
     };
 }
 
-function changeColor(col, amt) {
-
-    var usePound = false;
-
-    if (col[0] == "#") {
-        col = col.slice(1);
-        usePound = true;
-    }
-
-    var num = parseInt(col,16);
-
-    var r = (num >> 16) + amt;
-
-    if (r > 255) r = 255;
-    else if  (r < 0) r = 0;
-
-    var b = ((num >> 8) & 0x00FF) + amt;
-
-    if (b > 255) b = 255;
-    else if  (b < 0) b = 0;
-
-    var g = (num & 0x0000FF) + amt;
-
-    if (g > 255) g = 255;
-    else if (g < 0) g = 0;
-
-    return (usePound?"#":"") + String("000000" + (g | (b << 8) | (r << 16)).toString(16)).slice(-6);
-
-}
-
 module.exports = React.createClass({
+    displayName: "PostList",
     scrollPosition: 0,
     preventScrollTrigger: false,
     gotMorePosts: false,
@@ -69,7 +41,7 @@ module.exports = React.createClass({
             utils.changeCss('a.theme', 'color:'+user.props.theme+'; fill:'+user.props.theme+'!important;');
             utils.changeCss('div.theme', 'background-color:'+user.props.theme+';');
             utils.changeCss('.btn.btn-primary', 'background: ' + user.props.theme+';');
-            utils.changeCss('.btn.btn-primary:hover, .btn.btn-primary:active, .btn.btn-primary:focus', 'background: ' + changeColor(user.props.theme, -10)  +';');
+            utils.changeCss('.btn.btn-primary:hover, .btn.btn-primary:active, .btn.btn-primary:focus', 'background: ' + utils.changeColor(user.props.theme, -10)  +';');
             utils.changeCss('.modal .modal-header', 'background: ' + user.props.theme+';');
             utils.changeCss('.mention', 'background: ' + user.props.theme+';');
             utils.changeCss('.mention-link', 'color: ' + user.props.theme+';');
@@ -161,24 +133,20 @@ module.exports = React.createClass({
         $('body').off('click.userpopover');
     },
     resize: function() {
+        var post_holder = $(".post-list-holder-by-time")[0];
+        this.preventScrollTrigger = true;
         if (this.gotMorePosts) {
             this.gotMorePosts = false;
-            var post_holder = $(".post-list-holder-by-time")[0];
-            this.preventScrollTrigger = true;
             $(post_holder).scrollTop($(post_holder).scrollTop() + (post_holder.scrollHeight-this.oldScrollHeight) );
-            $(post_holder).perfectScrollbar('update');
         } else {
-            var post_holder = $(".post-list-holder-by-time")[0];
-            this.preventScrollTrigger = true;
             if ($("#new_message")[0] && !this.scrolledToNew) {
                 $(post_holder).scrollTop($(post_holder).scrollTop() + $("#new_message").offset().top - 63);
-                $(post_holder).perfectScrollbar('update');
                 this.scrolledToNew = true;
             } else {
                 $(post_holder).scrollTop(post_holder.scrollHeight);
-                $(post_holder).perfectScrollbar('update');
             }
         }
+        $(post_holder).perfectScrollbar('update');
     },
     _onChange: function() {
         var newState = getStateFromStores();
@@ -347,7 +315,10 @@ module.exports = React.createClass({
                             <div className="channel-intro-profile">
                                 <strong><UserProfile userId={teammate.id} /></strong>
                             </div>
-                            <p className="channel-intro-text">{"This is the start of your private message history with " + teammate_name + "." }<br/>{"Private messages and files shared here are not shown to people outside this area."}</p>
+                            <p className="channel-intro-text">
+                                {"This is the start of your private message history with " + teammate_name + "." }<br/>
+                                {"Private messages and files shared here are not shown to people outside this area."}
+                            </p>
                         </div>
                     );
                 } else {
@@ -410,7 +381,7 @@ module.exports = React.createClass({
                                 { channel.type === 'P' ? " Only invited members can see this private group." : " Any member can join and read this channel." }
                                 <br/>
                                 <a className="intro-links" href="#" style={userStyle} data-toggle="modal" data-target="#edit_channel" data-desc={channel.description} data-title={channel.display_name} data-channelid={channel.id}><i className="fa fa-pencil"></i>Set a description</a>
-                                <a className="intro-links" style={userStyle} data-toggle="modal" data-target="#channel_invite"><i className="fa fa-user-plus"></i>Invite others to this {ui_type}</a>
+                                <a className="intro-links" href="#" style={userStyle} data-toggle="modal" data-target="#channel_invite"><i className="fa fa-user-plus"></i>Invite others to this {ui_type}</a>
                             </p>
                         </div>
                     );
@@ -420,37 +391,35 @@ module.exports = React.createClass({
 
         var postCtls = [];
 
-        if (posts != undefined) {
+        if (posts) {
             var previousPostDay = posts[order[order.length-1]] ? utils.getDateForUnixTicks(posts[order[order.length-1]].create_at): new Date();
-            var currentPostDay = new Date();
+            var currentPostDay;
 
             for (var i = order.length-1; i >= 0; i--) {
                 var post = posts[order[i]];
-                var parentPost;
+                var parentPost = post.parent_id ? posts[post.parent_id] : null;
 
-                if (post.parent_id) {
-                    parentPost = posts[post.parent_id];
-                } else {
-                    parentPost = null;
-                }
+                var sameUser = '';
+                var sameRoot = false;
+                var hideProfilePic = false;
+                var prevPost = (i < order.length - 1) ? posts[order[i + 1]] : null;
 
-                var sameUser = i < order.length-1 && posts[order[i+1]].user_id === post.user_id  && post.create_at - posts[order[i+1]].create_at <= 1000*60*5 ? "same--user" : "";
-                var sameRoot = i < order.length-1 && post.root_id != "" && (posts[order[i+1]].id === post.root_id || posts[order[i+1]].root_id === post.root_id) ? true : false;
+                if (prevPost) {
+                    sameUser = (prevPost.user_id === post.user_id) && (post.create_at - prevPost.create_at <= 1000*60*5) ? "same--user" : "";
+                    sameRoot = utils.isComment(post) && (prevPost.id === post.root_id || prevPost.root_id === post.root_id);
 
-                // we only hide the profile pic if the previous post is not a comment, the current post is not a comment, and the previous post was made by the same user as the current post
-                var hideProfilePic = i < order.length-1 && posts[order[i+1]].user_id === post.user_id && posts[order[i+1]].root_id === '' && post.root_id === '';
+                    // we only hide the profile pic if the previous post is not a comment, the current post is not a comment, and the previous post was made by the same user as the current post
+                    hideProfilePic = (prevPost.user_id === post.user_id) && !utils.isComment(prevPost) && !utils.isComment(post);
+                }
 
                 // check if it's the last comment in a consecutive string of comments on the same post
-                var isLastComment = false;
-                if (utils.isComment(post)) {
-                    // it is the last comment if it is last post in the channel or the next post has a different root post
-                    isLastComment = (i === 0 || posts[order[i-1]].root_id != post.root_id);
-                }
+                // it is the last comment if it is last post in the channel or the next post has a different root post
+                var isLastComment = utils.isComment(post) && (i === 0 || posts[order[i-1]].root_id != post.root_id);
 
                 var postCtl = <Post sameUser={sameUser} sameRoot={sameRoot} post={post} parentPost={parentPost} key={post.id} posts={posts} hideProfilePic={hideProfilePic} isLastComment={isLastComment} />;
 
                 currentPostDay = utils.getDateForUnixTicks(post.create_at);
-                if(currentPostDay.getDate() !== previousPostDay.getDate() || currentPostDay.getMonth() !== previousPostDay.getMonth() || currentPostDay.getFullYear() !== previousPostDay.getFullYear()) {
+                if (currentPostDay.toDateString() != previousPostDay.toDateString()) {
                     postCtls.push(
                         <div className="date-separator">
                             <hr className="separator__hr" />
@@ -469,20 +438,10 @@ module.exports = React.createClass({
                     );
                 }
                 postCtls.push(postCtl);
-                previousPostDay = utils.getDateForUnixTicks(post.create_at);
+                previousPostDay = currentPostDay;
             }
-        }
-        else {
-            postCtls.push(
-                <div ref="loadingscreen" className="loading-screen">
-                    <div className="loading__content">
-                    <h3>Loading</h3>
-                        <div id="round_1" className="round"></div>
-                        <div id="round_2" className="round"></div>
-                        <div id="round_3" className="round"></div>
-                    </div>
-                </div>
-            );
+        } else {
+            postCtls.push(<LoadingScreen position="absolute" />);
         }
 
         return (
@@ -497,5 +456,3 @@ module.exports = React.createClass({
         );
     }
 });
-
-
-- 
cgit v1.2.3-1-g7c22


From 252d0f3924dd19aa4dd1900c6c00c41c84755d1e Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Sun, 12 Jul 2015 23:36:52 -0800
Subject: Fixes mm-1415 adding email bypass flag

---
 web/react/components/signup_user_complete.jsx | 33 +++++++++++++--------------
 1 file changed, 16 insertions(+), 17 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/signup_user_complete.jsx b/web/react/components/signup_user_complete.jsx
index fb96cc99f..ef1eb1c62 100644
--- a/web/react/components/signup_user_complete.jsx
+++ b/web/react/components/signup_user_complete.jsx
@@ -46,25 +46,24 @@ module.exports = React.createClass({
             function(data) {
                 client.track('signup', 'signup_user_02_complete');
 
-                if (data.email_verified) {
-                    client.loginByEmail(this.props.domain, this.state.user.email, this.state.user.password,
-                        function(data) {
-                            UserStore.setLastDomain(this.props.domain);
-                            UserStore.setLastEmail(this.state.user.email);
-                            UserStore.setCurrentUser(data);
-                            if (this.props.hash > 0)
-                                BrowserStore.setGlobalItem(this.props.hash, JSON.stringify({wizard: "finished"}));
-                            window.location.href = '/channels/town-square';
-                        }.bind(this),
-                        function(err) {
+                client.loginByEmail(this.props.domain, this.state.user.email, this.state.user.password,
+                    function(data) {
+                        UserStore.setLastDomain(this.props.domain);
+                        UserStore.setLastEmail(this.state.user.email);
+                        UserStore.setCurrentUser(data);
+                        if (this.props.hash > 0)
+                            BrowserStore.setGlobalItem(this.props.hash, JSON.stringify({wizard: "finished"}));
+                        window.location.href = '/channels/town-square';
+                    }.bind(this),
+                    function(err) {
+                        if (err.message == "Login failed because email address has not been verified") {
+                            window.location.href = "/verify?email="+ encodeURIComponent(this.state.user.email) + "&domain=" + encodeURIComponent(this.props.domain);
+                        } else {
                             this.state.server_error = err.message;
                             this.setState(this.state);
-                        }.bind(this)
-                    );
-                }
-                else {
-                    window.location.href = "/verify?email="+ encodeURIComponent(this.state.user.email) + "&domain=" + encodeURIComponent(this.props.domain);
-                }
+                        }
+                    }.bind(this)
+                );
             }.bind(this),
             function(err) {
                 this.state.server_error = err.message;
-- 
cgit v1.2.3-1-g7c22


From b26bc73c7880e691e77e9ca4169e9ed7735e3bc9 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Mon, 13 Jul 2015 08:32:25 -0400
Subject: should fix scrolling on forceupdate

---
 web/react/components/post.jsx      |  2 +-
 web/react/components/post_list.jsx | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/post.jsx b/web/react/components/post.jsx
index 04b5ba082..2d25e31e0 100644
--- a/web/react/components/post.jsx
+++ b/web/react/components/post.jsx
@@ -85,7 +85,7 @@ module.exports = React.createClass({
                     <div className="post__content">
                         <PostHeader post={post} sameRoot={this.props.sameRoot} commentCount={commentCount} handleCommentClick={this.handleCommentClick} isLastComment={this.props.isLastComment} />
                         <PostBody post={post} sameRoot={this.props.sameRoot} parentPost={parentPost} posts={posts} handleCommentClick={this.handleCommentClick} />
-                        <PostInfo post={post} sameRoot={this.props.sameRoot} commentCount={commentCount} handleCommentClick={this.handleCommentClick} allowReply="true" />
+                        <PostInfo ref="info" post={post} sameRoot={this.props.sameRoot} commentCount={commentCount} handleCommentClick={this.handleCommentClick} allowReply="true" />
                     </div>
                 </div>
             </div>
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index 177e4a1db..3409bad28 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -63,6 +63,8 @@ module.exports = React.createClass({
     oldScrollHeight: 0,
     oldZoom: 0,
     scrolledToNew: false,
+    p: 0,
+    wasForced: false,
     componentDidMount: function() {
         var user = UserStore.getCurrentUser();
         if (user.props && user.props.theme) {
@@ -108,6 +110,12 @@ module.exports = React.createClass({
         });
 
         $(post_holder).scroll(function(e){
+            if (self.wasForced) {
+                console.log('hit');
+                $(post_holder).scrollTop(self.p);
+                $(post_holder).perfectScrollbar('update');
+                self.wasForced = false;
+            }
             if (!self.preventScrollTrigger) {
                 self.scrollPosition = $(post_holder).scrollTop() + $(post_holder).innerHeight();
             }
@@ -197,7 +205,10 @@ module.exports = React.createClass({
             this.setState(newState);
         } else {
             // Updates the timestamp on each post
+            this.wasForced = true;
+            this.p = $(".post-list-holder-by-time").scrollTop();
             this.forceUpdate()
+            //this.refs.post0.refs.info.forceUpdate();
         }
     },
     _onSocketChange: function(msg) {
@@ -452,7 +463,7 @@ module.exports = React.createClass({
                     isLastComment = (i === 0 || posts[order[i-1]].root_id != post.root_id);
                 }
 
-                var postCtl = <Post sameUser={sameUser} sameRoot={sameRoot} post={post} parentPost={parentPost} key={post.id} posts={posts} hideProfilePic={hideProfilePic} isLastComment={isLastComment} />;
+                var postCtl = <Post ref={"post"+(order.length-i-1)}sameUser={sameUser} sameRoot={sameRoot} post={post} parentPost={parentPost} key={post.id} posts={posts} hideProfilePic={hideProfilePic} isLastComment={isLastComment} />;
 
                 currentPostDay = utils.getDateForUnixTicks(post.create_at);
                 if(currentPostDay.getDate() !== previousPostDay.getDate() || currentPostDay.getMonth() !== previousPostDay.getMonth() || currentPostDay.getFullYear() !== previousPostDay.getFullYear()) {
-- 
cgit v1.2.3-1-g7c22


From 614992dcb7b4a4cdcedefe3ca813a03b758a97f0 Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Mon, 13 Jul 2015 08:34:34 -0700
Subject: Added timestamp updates to right side and cleaned code

---
 web/react/components/post.jsx       |  2 +-
 web/react/components/post_list.jsx  | 22 +++++++++++-----------
 web/react/components/post_right.jsx | 18 ++++++++++++++++--
 3 files changed, 28 insertions(+), 14 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/post.jsx b/web/react/components/post.jsx
index 2d25e31e0..04b5ba082 100644
--- a/web/react/components/post.jsx
+++ b/web/react/components/post.jsx
@@ -85,7 +85,7 @@ module.exports = React.createClass({
                     <div className="post__content">
                         <PostHeader post={post} sameRoot={this.props.sameRoot} commentCount={commentCount} handleCommentClick={this.handleCommentClick} isLastComment={this.props.isLastComment} />
                         <PostBody post={post} sameRoot={this.props.sameRoot} parentPost={parentPost} posts={posts} handleCommentClick={this.handleCommentClick} />
-                        <PostInfo ref="info" post={post} sameRoot={this.props.sameRoot} commentCount={commentCount} handleCommentClick={this.handleCommentClick} allowReply="true" />
+                        <PostInfo post={post} sameRoot={this.props.sameRoot} commentCount={commentCount} handleCommentClick={this.handleCommentClick} allowReply="true" />
                     </div>
                 </div>
             </div>
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index 59f33fb4d..e186fb706 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -63,7 +63,7 @@ module.exports = React.createClass({
     oldScrollHeight: 0,
     oldZoom: 0,
     scrolledToNew: false,
-    p: 0,
+    preForcePosision: 0,
     wasForced: false,
     componentDidMount: function() {
         var user = UserStore.getCurrentUser();
@@ -80,6 +80,7 @@ module.exports = React.createClass({
 
         PostStore.addChangeListener(this._onChange);
         ChannelStore.addChangeListener(this._onChange);
+        UserStore.addStatusesChangeListener(this._onTimeChange);
         SocketStore.addChangeListener(this._onSocketChange);
 
         $(".post-list-holder-by-time").perfectScrollbar();
@@ -110,8 +111,7 @@ module.exports = React.createClass({
 
         $(post_holder).scroll(function(e){
             if (self.wasForced) {
-                console.log('hit');
-                $(post_holder).scrollTop(self.p);
+                $(post_holder).scrollTop(self.preForcePosision);
                 $(post_holder).perfectScrollbar('update');
                 self.wasForced = false;
             }
@@ -165,6 +165,7 @@ module.exports = React.createClass({
     componentWillUnmount: function() {
         PostStore.removeChangeListener(this._onChange);
         ChannelStore.removeChangeListener(this._onChange);
+        UserStore.removeStatusesChangeListener(this._onTimeChange);
         SocketStore.removeChangeListener(this._onSocketChange);
         $('body').off('click.userpopover');
     },
@@ -201,13 +202,7 @@ module.exports = React.createClass({
                 this.scrolledToNew = false;
             }
             this.setState(newState);
-        } else {
-            // Updates the timestamp on each post
-            this.wasForced = true;
-            this.p = $(".post-list-holder-by-time").scrollTop();
-            this.forceUpdate()
-            //this.refs.post0.refs.info.forceUpdate();
-        }
+        } 
     },
     _onSocketChange: function(msg) {
         if (msg.action == "posted") {
@@ -271,6 +266,11 @@ module.exports = React.createClass({
             AsyncClient.getProfiles();
         }
     },
+    _onTimeChange: function() {
+        this.wasForced = true;
+        this.preForcePosision = $(".post-list-holder-by-time").scrollTop();
+        this.forceUpdate()
+    },
     getMorePosts: function(e) {
         e.preventDefault();
 
@@ -461,7 +461,7 @@ module.exports = React.createClass({
                     isLastComment = (i === 0 || posts[order[i-1]].root_id != post.root_id);
                 }
 
-                var postCtl = <Post ref={"post"+(order.length-i-1)}sameUser={sameUser} sameRoot={sameRoot} post={post} parentPost={parentPost} key={post.id} posts={posts} hideProfilePic={hideProfilePic} isLastComment={isLastComment} />;
+                var postCtl = <Post sameUser={sameUser} sameRoot={sameRoot} post={post} parentPost={parentPost} key={post.id} posts={posts} hideProfilePic={hideProfilePic} isLastComment={isLastComment} />;
 
                 currentPostDay = utils.getDateForUnixTicks(post.create_at);
                 if(currentPostDay.getDate() !== previousPostDay.getDate() || currentPostDay.getMonth() !== previousPostDay.getMonth() || currentPostDay.getFullYear() !== previousPostDay.getFullYear()) {
diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx
index 115ee87d4..89a616d27 100644
--- a/web/react/components/post_right.jsx
+++ b/web/react/components/post_right.jsx
@@ -279,9 +279,11 @@ function getStateFromStores() {
 }
 
 module.exports = React.createClass({
+    wasForced: false,
     componentDidMount: function() {
         PostStore.addSelectedPostChangeListener(this._onChange);
         PostStore.addChangeListener(this._onChangeAll);
+        UserStore.addStatusesChangeListener(this._onTimeChange);
         this.resize();
         var self = this;
         $(window).resize(function(){
@@ -289,11 +291,15 @@ module.exports = React.createClass({
         });
     },
     componentDidUpdate: function() {
-        this.resize();
+        if(!this.wasForced){
+            this.resize();
+            wasForced = false
+        }
     },
     componentWillUnmount: function() {
         PostStore.removeSelectedPostChangeListener(this._onChange);
         PostStore.removeChangeListener(this._onChangeAll);
+        UserStore.removeStatusesChangeListener(this._onTimeChange)
     },
     _onChange: function() {
         if (this.isMounted()) {
@@ -333,6 +339,14 @@ module.exports = React.createClass({
             this.setState(getStateFromStores());
         }
     },
+    _onTimeChange: function() {
+        this.wasForced = true;
+        for (var key in this.refs) {
+            if(this.refs[key].forceUpdate != undefined) {
+                this.refs[key].forceUpdate();
+            }
+        }
+    },
     getInitialState: function() {
         return getStateFromStores();
     },
@@ -392,7 +406,7 @@ module.exports = React.createClass({
                         <RootPost post={root_post} commentCount={posts_array.length}/>
                         <div className="post-right-comments-container">
                         { posts_array.map(function(cpost) {
-                                return <CommentPost key={cpost.id} post={cpost} selected={ (cpost.id == selected_post.id) } />
+                                return <CommentPost ref={cpost.id} key={cpost.id} post={cpost} selected={ (cpost.id == selected_post.id) } />
                         })}
                         </div>
                         <div className="post-create__container">
-- 
cgit v1.2.3-1-g7c22


From c3aed620316241eba48ecd2fd1f36a309bcfdff9 Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Thu, 9 Jul 2015 16:37:03 -0700
Subject: Added timestamps to pictures to stop caching

---
 web/react/components/post.jsx         | 4 +++-
 web/react/components/post_list.jsx    | 2 +-
 web/react/components/post_right.jsx   | 3 ++-
 web/react/components/user_profile.jsx | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/post.jsx b/web/react/components/post.jsx
index 04b5ba082..726fb1b02 100644
--- a/web/react/components/post.jsx
+++ b/web/react/components/post.jsx
@@ -74,12 +74,14 @@ module.exports = React.createClass({
             currentUserCss = "current--user";
         }
 
+        var timestamp = UserStore.getCurrentUser().update_at;
+
         return (
             <div>
                 <div id={post.id} className={"post " + this.props.sameUser + " " + rootUser + " " + postType + " " + currentUserCss}>
                     { !this.props.hideProfilePic ?
                     <div className="post-profile-img__container">
-                        <img className="post-profile-img" src={"/api/v1/users/" + post.user_id + "/image"} height="36" width="36" />
+                        <img className="post-profile-img" src={"/api/v1/users/" + post.user_id + "/image?time=" + timestamp} height="36" width="36" />
                     </div>
                     : "" }
                     <div className="post__content">
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index d6dc9ce30..e6e028209 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -342,7 +342,7 @@ module.exports = React.createClass({
                     more_messages = (
                         <div className="channel-intro">
                             <div className="post-profile-img__container channel-intro-img">
-                                <img className="post-profile-img" src={"/api/v1/users/" + teammate.id + "/image"} height="50" width="50" />
+                                <img className="post-profile-img" src={"/api/v1/users/" + teammate.id + "/image?time=" + teammate.update_at} height="50" width="50" />
                             </div>
                             <div className="channel-intro-profile">
                                 <strong><UserProfile userId={teammate.id} /></strong>
diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx
index 115ee87d4..d48b0f0ef 100644
--- a/web/react/components/post_right.jsx
+++ b/web/react/components/post_right.jsx
@@ -67,6 +67,7 @@ RootPost = React.createClass({
         var message = utils.textToJsx(this.props.post.message);
         var filenames = this.props.post.filenames;
         var isOwner = UserStore.getCurrentId() == this.props.post.user_id;
+        var timestamp = UserStore.getProfile(this.props.post.user_id).update_at;
 
         var type = "Post";
         if (this.props.post.root_id.length > 0) {
@@ -118,7 +119,7 @@ RootPost = React.createClass({
         return (
             <div className={"post post--root " + currentUserCss}>
                 <div className="post-profile-img__container">
-                    <img className="post-profile-img" src={"/api/v1/users/" + this.props.post.user_id + "/image"} height="36" width="36" />
+                    <img className="post-profile-img" src={"/api/v1/users/" + this.props.post.user_id + "/image?time=" + timestamp} height="36" width="36" />
                 </div>
                 <div className="post__content">
                     <ul className="post-header">
diff --git a/web/react/components/user_profile.jsx b/web/react/components/user_profile.jsx
index 648960471..89d0a80ff 100644
--- a/web/react/components/user_profile.jsx
+++ b/web/react/components/user_profile.jsx
@@ -53,7 +53,7 @@ module.exports = React.createClass({
         var name = this.props.overwriteName ? this.props.overwriteName : this.state.profile.username;
 
 
-        var data_content = "<img style='margin: 10px' src='/api/v1/users/" + this.state.profile.id + "/image' height='128' width='128' />";
+        var data_content = "<img style='margin: 10px' src='/api/v1/users/" + this.state.profile.id + "/image?time=" + this.state.profile.update_at + "' height='128' width='128' />";
         if (!config.ShowEmail) {
             data_content += "<div class='text-nowrap'>Email not shared</div>";
         } else {
-- 
cgit v1.2.3-1-g7c22


From c485dad84f9a94c3d1261f7e2207baf071c2d3ca Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Mon, 13 Jul 2015 09:22:42 -0700
Subject: Added update function to image update and fixed corner cases

---
 web/react/components/member_list_item.jsx | 3 ++-
 web/react/components/member_list_team.jsx | 5 +++--
 web/react/components/mention.jsx          | 4 +++-
 web/react/components/post_right.jsx       | 3 ++-
 web/react/components/search_results.jsx   | 3 ++-
 5 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/member_list_item.jsx b/web/react/components/member_list_item.jsx
index 357fd49a8..cf8c71d7e 100644
--- a/web/react/components/member_list_item.jsx
+++ b/web/react/components/member_list_item.jsx
@@ -23,6 +23,7 @@ module.exports = React.createClass({
         var member = this.props.member;
         var isAdmin = this.props.isAdmin;
         var isMemberAdmin = member.roles.indexOf("admin") > -1;
+        var timestamp = UserStore.getCurrentUser().update_at;
 
         var invite;
         if (member.invited && this.props.handleInvite) {
@@ -53,7 +54,7 @@ module.exports = React.createClass({
 
         return (
             <div className="row member-div">
-                <img className="post-profile-img pull-left" src={"/api/v1/users/" + member.id + "/image"} height="36" width="36" />
+                <img className="post-profile-img pull-left" src={"/api/v1/users/" + member.id + "/image?time=" + timestamp} height="36" width="36" />
                 <span className="member-name">{member.username}</span>
                 <span className="member-email">{member.email}</span>
                 { invite }
diff --git a/web/react/components/member_list_team.jsx b/web/react/components/member_list_team.jsx
index cfb473e5e..aa53c5db6 100644
--- a/web/react/components/member_list_team.jsx
+++ b/web/react/components/member_list_team.jsx
@@ -61,7 +61,8 @@ var MemberListTeamItem = React.createClass({
     render: function() {
         var server_error = this.state.server_error ? <div style={{ clear: "both" }} className="has-error"><label className='has-error control-label'>{this.state.server_error}</label></div> : null;
         var user = this.props.user;
-        var currentRoles = "Member"
+        var currentRoles = "Member";
+        var timestamp = UserStore.getCurrentUser().update_at;
 
         if (user.roles.length > 0) {
             currentRoles = user.roles.charAt(0).toUpperCase() + user.roles.slice(1);
@@ -83,7 +84,7 @@ var MemberListTeamItem = React.createClass({
 
         return (
             <div className="row member-div">
-                <img className="post-profile-img pull-left" src={"/api/v1/users/" + user.id + "/image"} height="36" width="36" />
+                <img className="post-profile-img pull-left" src={"/api/v1/users/" + user.id + "/image?time=" + timestamp} height="36" width="36" />
                 <span className="member-name">{user.full_name.trim() ? user.full_name : user.username}</span>
                 <span className="member-email">{user.full_name.trim() ? user.username : email}</span>
                 <div className="dropdown member-drop">
diff --git a/web/react/components/mention.jsx b/web/react/components/mention.jsx
index 3c33ddf49..520b81cbb 100644
--- a/web/react/components/mention.jsx
+++ b/web/react/components/mention.jsx
@@ -1,5 +1,6 @@
 // Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
 // See License.txt for license information.
+var UserStore = require("../stores/user_store.jsx");
 
 module.exports = React.createClass({
     handleClick: function() {
@@ -7,8 +8,9 @@ module.exports = React.createClass({
     },
     render: function() {
         var icon;
+        var timestamp = UserStore.getCurrentUser().update_at;
         if (this.props.id != null) {
-            icon = <span><img className="mention-img" src={"/api/v1/users/" + this.props.id + "/image"}/></span>;
+            icon = <span><img className="mention-img" src={"/api/v1/users/" + this.props.id + "/image?time=" + timestamp}/></span>;
         } else {
             icon = <span><i className="mention-img fa fa-users fa-2x"></i></span>;
         }
diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx
index d48b0f0ef..408fbf83a 100644
--- a/web/react/components/post_right.jsx
+++ b/web/react/components/post_right.jsx
@@ -228,11 +228,12 @@ CommentPost = React.createClass({
         }
 
         var message = utils.textToJsx(this.props.post.message);
+        var timestamp = UserStore.getCurrentUser().update_at;
 
         return (
             <div className={commentClass + " " + currentUserCss}>
                 <div className="post-profile-img__container">
-                    <img className="post-profile-img" src={"/api/v1/users/" + this.props.post.user_id + "/image"} height="36" width="36" />
+                    <img className="post-profile-img" src={"/api/v1/users/" + this.props.post.user_id + "/image?time=" + timestamp} height="36" width="36" />
                 </div>
                 <div className="post__content">
                     <ul className="post-header">
diff --git a/web/react/components/search_results.jsx b/web/react/components/search_results.jsx
index 003a38b7e..156cf0120 100644
--- a/web/react/components/search_results.jsx
+++ b/web/react/components/search_results.jsx
@@ -76,6 +76,7 @@ SearchItem = React.createClass({
         var message = utils.textToJsx(this.props.post.message, {searchTerm: this.props.term, noMentionHighlight: !this.props.isMentionSearch});
         var channelName = "";
         var channel = ChannelStore.get(this.props.post.channel_id)
+        var timestamp = UserStore.getCurrentUser().update_at;
 
         if (channel) {
             if (channel.type === 'D') {
@@ -89,7 +90,7 @@ SearchItem = React.createClass({
             <div className="search-item-container post" onClick={this.handleClick}>
                 <div className="search-channel__name">{ channelName }</div>
                 <div className="post-profile-img__container">
-                    <img className="post-profile-img" src={"/api/v1/users/" + this.props.post.user_id + "/image"} height="36" width="36" />
+                    <img className="post-profile-img" src={"/api/v1/users/" + this.props.post.user_id + "/image?time=" + timestamp} height="36" width="36" />
                 </div>
                 <div className="post__content">
                     <ul className="post-header">
-- 
cgit v1.2.3-1-g7c22


From 8595b915afae9c494f09bd45692102ae86306ffe Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Mon, 13 Jul 2015 11:24:39 -0700
Subject: Fixed 'this' typo and added semicolon

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

(limited to 'web/react/components')

diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx
index 89a616d27..0c3754529 100644
--- a/web/react/components/post_right.jsx
+++ b/web/react/components/post_right.jsx
@@ -293,7 +293,7 @@ module.exports = React.createClass({
     componentDidUpdate: function() {
         if(!this.wasForced){
             this.resize();
-            wasForced = false
+            this.wasForced = false;
         }
     },
     componentWillUnmount: function() {
-- 
cgit v1.2.3-1-g7c22


From f406beca8b501dad508d1ffb900bf994c4192086 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Fri, 10 Jul 2015 18:41:42 -0700
Subject: If a message has no text but has an attached image or file the
 desktop notification now says uploaded an image or uploaded a file
 respectively (if both, defaults to image)

---
 web/react/components/sidebar.jsx | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'web/react/components')

diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index 934a4d22a..cae9425d3 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -249,11 +249,27 @@ var SidebarLoggedIn = React.createClass({
 
                 var repRegex = new RegExp("<br>", "g");
                 var post = JSON.parse(msg.props.post);
+                var msgProps = msg.props;
                 var msg = post.message.replace(repRegex, "\n").replace(/\n+/g, " ").replace("<mention>", "").replace("</mention>", "");
+                
                 if (msg.length > 50) {
                     msg = msg.substring(0,49) + "...";
                 }
-                utils.notifyMe(title, username + " wrote: " + msg, channel);
+
+                if (msg.length === 0) {
+                    if (msgProps.image) {
+                        utils.notifyMe(title, username + " uploaded an image", channel);
+                    }
+                    else if (msgProps.otherFile) {
+                        utils.notifyMe(title, username + " uploaded a file", channel);
+                    }
+                    else {
+                        utils.notifyMe(title, username + " did something new", channel);
+                    }
+                }
+                else {
+                    utils.notifyMe(title, username + " wrote: " + msg, channel);
+                }
                 if (!user.notify_props || user.notify_props.desktop_sound === "true") {
                     utils.ding();
                 }
-- 
cgit v1.2.3-1-g7c22


From 6e5126ba1d273e9576923a65d5b614314970f99f Mon Sep 17 00:00:00 2001
From: ralder <ralder@yandex.ru>
Date: Mon, 13 Jul 2015 04:23:24 -0700
Subject: fix incorrect call for AsyncClient.dispatchError

---
 web/react/components/channel_header.jsx | 103 ++++++++++++--------------------
 web/react/components/post_list.jsx      |   2 +-
 web/react/components/search_bar.jsx     |  37 +++++++-----
 web/react/components/search_results.jsx |  73 ++++++++++------------
 4 files changed, 92 insertions(+), 123 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index 68de80228..fe381a59e 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -1,6 +1,7 @@
 // Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
 // See License.txt for license information.
 
+
 var ChannelStore = require('../stores/channel_store.jsx');
 var UserStore = require('../stores/user_store.jsx');
 var PostStore = require('../stores/post_store.jsx');
@@ -16,7 +17,7 @@ var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
 var Constants = require('../utils/constants.jsx');
 var ActionTypes = Constants.ActionTypes;
 
-var ExtraMembers = React.createClass({
+var PopoverListMembers = React.createClass({
     componentDidMount: function() {
         var originalLeave = $.fn.popover.Constructor.prototype.leave;
         $.fn.popover.Constructor.prototype.leave = function(obj) {
@@ -35,30 +36,29 @@ var ExtraMembers = React.createClass({
 
         $("#member_popover").popover({placement : 'bottom', trigger: 'click', html: true});
         $('body').on('click', function (e) {
-            if ($(e.target.parentNode.parentNode)[0] !== $("#member_popover")[0] && $(e.target).parents('.popover.in').length === 0) { 
+            if ($(e.target.parentNode.parentNode)[0] !== $("#member_popover")[0] && $(e.target).parents('.popover.in').length === 0) {
                 $("#member_popover").popover('hide');
             }
         });
-
     },
+
     render: function() {
-        var count = this.props.members.length == 0 ? "-" : this.props.members.length;
-        count = this.props.members.length > 19 ? "20+" : count;
-        var data_content = "";
-        var sortedMembers = this.props.members;
+        var popoverHtml = '';
+        var members = this.props.members;
+        var count = (members.length > 20) ? "20+" : (members.length || '-');
 
-        if(sortedMembers) {
-            sortedMembers.sort(function(a,b) {
+        if (members) {
+            members.sort(function(a,b) {
                 return a.username.localeCompare(b.username);
-            })
+            });
 
-            sortedMembers.forEach(function(m) {
-                data_content += "<div style='white-space: nowrap'>" + m.username + "</div>";
+            members.forEach(function(m) {
+                popoverHtml += "<div style='white-space: nowrap'>" + m.username + "</div>";
             });
         }
 
         return (
-            <div style={{"cursor" : "pointer"}} id="member_popover" data-toggle="popover" data-content={data_content} data-original-title="Members" >
+            <div style={{cursor : "pointer"}} id="member_popover" data-toggle="popover" data-content={popoverHtml} data-original-title="Members" >
                 <div id="member_tooltip" data-toggle="tooltip" title="View Channel Members">
                     {count} <span className="glyphicon glyphicon-user" aria-hidden="true"></span>
                 </div>
@@ -78,6 +78,7 @@ function getStateFromStores() {
 }
 
 module.exports = React.createClass({
+    displayName: 'ChannelHeader',
     componentDidMount: function() {
         ChannelStore.addChangeListener(this._onChange);
         ChannelStore.addExtraInfoChangeListener(this._onChange);
@@ -99,7 +100,7 @@ module.exports = React.createClass({
         $(".channel-header__info .description").popover({placement : 'bottom', trigger: 'hover', html: true, delay: {show: 500, hide: 500}});
     },
     _onSocketChange: function(msg) {
-        if(msg.action === "new_user") {
+        if (msg.action === "new_user") {
             AsyncClient.getChannelExtraInfo(true);
         }
     },
@@ -107,15 +108,14 @@ module.exports = React.createClass({
         return getStateFromStores();
     },
     handleLeave: function(e) {
-        var self = this;
         Client.leaveChannel(this.state.channel.id,
             function(data) {
                 var townsquare = ChannelStore.getByName('town-square');
                 utils.switchChannel(townsquare);
-            }.bind(this),
+            },
             function(err) {
                 AsyncClient.dispatchError(err, "handleLeave");
-            }.bind(this)
+            }
         );
     },
     searchMentions: function(e) {
@@ -131,52 +131,29 @@ module.exports = React.createClass({
         AppDispatcher.handleServerAction({
             type: ActionTypes.RECIEVED_SEARCH_TERM,
             term: terms,
-            do_search: false
+            do_search: true,
+            is_mention_search: true
         });
-
-        Client.search(
-            terms,
-            function(data) {
-                AppDispatcher.handleServerAction({
-                    type: ActionTypes.RECIEVED_SEARCH,
-                    results: data,
-                    is_mention_search: true
-                });
-            },
-            function(err) {
-                dispatchError(err, "search");
-            }
-        );
     },
+
     render: function() {
 
         if (this.state.channel == null) {
-            return (
-                <div></div>
-            );
+            return null;
         }
 
         var description = utils.textToJsx(this.state.channel.description, {"singleline": true, "noMentionHighlight": true});
         var popoverContent = React.renderToString(<MessageWrapper message={this.state.channel.description}/>);
-        var channelTitle = "";
+        var channelTitle = this.state.channel.display_name;
         var channelName = this.state.channel.name;
         var currentId = UserStore.getCurrentId();
         var isAdmin = this.state.memberChannel.roles.indexOf("admin") > -1 || this.state.memberTeam.roles.indexOf("admin") > -1;
-        var searchForm = <th className="search-bar__container"><NavbarSearchBox /></th>;
-        var isDirect = false;
-
-        if (this.state.channel.type === 'O') {
-            channelTitle = this.state.channel.display_name;
-        } else if (this.state.channel.type === 'P') {
-            channelTitle = this.state.channel.display_name;
-        } else if (this.state.channel.type === 'D') {
-            isDirect = true;
+        var isDirect = (this.state.channel.type === 'D');
+
+        if (isDirect) {
             if (this.state.users.length > 1) {
-                if (this.state.users[0].id === UserStore.getCurrentId()) {
-                    channelTitle = <UserProfile userId={this.state.users[1].id} overwriteName={this.state.users[1].full_name ? this.state.users[1].full_name : this.state.users[1].username} />;
-                } else {
-                    channelTitle = <UserProfile userId={this.state.users[0].id} overwriteName={this.state.users[0].full_name ? this.state.users[0].full_name : this.state.users[0].username} />;
-                }
+                var contact = this.state.users[((this.state.users[0].id === currentId) ? 1 : 0)];
+                channelTitle = <UserProfile userId={contact.id} overwriteName={contact.full_name || contact.username} />;
             }
         }
 
@@ -196,21 +173,21 @@ module.exports = React.createClass({
                                     <li role="presentation"><a role="menuitem" data-toggle="modal" data-target="#channel_invite" href="#">Add Members</a></li>
                                     { isAdmin ?
                                         <li role="presentation"><a role="menuitem" data-toggle="modal" data-target="#channel_members" href="#">Manage Members</a></li>
-                                        : ""
+                                        : null
                                     }
-                                    <li role="presentation"><a role="menuitem" href="#" data-toggle="modal" data-target="#edit_channel" data-desc={this.state.channel.description} data-title={this.state.channel.display_name} data-channelid={this.state.channel.id}>Set Channel Description...</a></li>
-                                    <li role="presentation"><a role="menuitem" href="#" data-toggle="modal" data-target="#channel_notifications" data-title={this.state.channel.display_name} data-channelid={this.state.channel.id}>Notification Preferences</a></li>
+                                    <li role="presentation"><a role="menuitem" href="#" data-toggle="modal" data-target="#edit_channel" data-desc={this.state.channel.description} data-title={channelTitle} data-channelid={this.state.channel.id}>Set Channel Description...</a></li>
+                                    <li role="presentation"><a role="menuitem" href="#" data-toggle="modal" data-target="#channel_notifications" data-title={channelTitle} data-channelid={this.state.channel.id}>Notification Preferences</a></li>
                                     { isAdmin && channelName != Constants.DEFAULT_CHANNEL ?
-                                        <li role="presentation"><a role="menuitem" href="#" data-toggle="modal" data-target="#rename_channel" data-display={this.state.channel.display_name} data-name={this.state.channel.name} data-channelid={this.state.channel.id}>Rename Channel...</a></li>
-                                        : ""
+                                        <li role="presentation"><a role="menuitem" href="#" data-toggle="modal" data-target="#rename_channel" data-display={channelTitle} data-name={this.state.channel.name} data-channelid={this.state.channel.id}>Rename Channel...</a></li>
+                                        : null
                                     }
                                     { isAdmin && channelName != Constants.DEFAULT_CHANNEL ?
-                                        <li role="presentation"><a role="menuitem" href="#" data-toggle="modal" data-target="#delete_channel" data-title={this.state.channel.display_name} data-channelid={this.state.channel.id}>Delete Channel...</a></li>
-                                        : ""
+                                        <li role="presentation"><a role="menuitem" href="#" data-toggle="modal" data-target="#delete_channel" data-title={channelTitle} data-channelid={this.state.channel.id}>Delete Channel...</a></li>
+                                        : null
                                     }
                                     { channelName != Constants.DEFAULT_CHANNEL ?
                                         <li role="presentation"><a role="menuitem" href="#" onClick={this.handleLeave}>Leave Channel</a></li>
-                                        : ""
+                                        : null
                                     }
                                 </ul>
                             </div>
@@ -220,14 +197,14 @@ module.exports = React.createClass({
                         <a href="#"><strong className="heading">{channelTitle}</strong></a>
                     }
                     </th>
-                    <th><ExtraMembers members={this.state.users} channelId={this.state.channel.id} /></th>
-                    { searchForm }
+                    <th><PopoverListMembers members={this.state.users} channelId={this.state.channel.id} /></th>
+                    <th className="search-bar__container"><NavbarSearchBox /></th>
                     <th>
-                        <div className="dropdown" style={{"marginLeft":"5px", "marginRight":"10px"}}>
+                        <div className="dropdown" style={{marginLeft:5, marginRight:10}}>
                             <a href="#" className="dropdown-toggle theme" type="button" id="channel_header_right_dropdown" data-toggle="dropdown" aria-expanded="true">
                                 <i className="fa fa-caret-down"></i>
                             </a>
-                            <ul className="dropdown-menu" role="menu" aria-labelledby="channel_header_right_dropdown" style={{"left": "-150px"}}>
+                            <ul className="dropdown-menu" role="menu" aria-labelledby="channel_header_right_dropdown" style={{left: "-150px"}}>
                                 <li role="presentation"><a role="menuitem" href="#" onClick={this.searchMentions}>Recent Mentions</a></li>
                             </ul>
                         </div>
@@ -237,5 +214,3 @@ module.exports = React.createClass({
         );
     }
 });
-
-
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index e6e028209..2a01b8089 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -297,7 +297,7 @@ module.exports = React.createClass({
                 },
                 function(err) {
                     $(self.refs.loadmore.getDOMNode()).text("Load more messages");
-                    dispatchError(err, "getPosts");
+                    AsyncClient.dispatchError(err, "getPosts");
                 }
             );
     },
diff --git a/web/react/components/search_bar.jsx b/web/react/components/search_bar.jsx
index cddb738f9..ab7e99d60 100644
--- a/web/react/components/search_bar.jsx
+++ b/web/react/components/search_bar.jsx
@@ -3,6 +3,7 @@
 
 
 var client = require('../utils/client.jsx');
+var AsyncClient = require('../utils/async_client.jsx');
 var PostStore = require('../stores/post_store.jsx');
 var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
 var utils = require('../utils/utils.jsx');
@@ -10,14 +11,14 @@ var Constants = require('../utils/constants.jsx');
 var ActionTypes = Constants.ActionTypes;
 
 function getSearchTermStateFromStores() {
-    term = PostStore.getSearchTerm();
-    if (!term) term = "";
+    var term = PostStore.getSearchTerm() || '';
     return {
         search_term: term
     };
 }
 
 module.exports = React.createClass({
+    displayName: 'SearchBar',
     componentDidMount: function() {
         PostStore.addSearchTermChangeListener(this._onChange);
     },
@@ -58,14 +59,14 @@ module.exports = React.createClass({
         e.target.select();
     },
     performSearch: function(terms, isMentionSearch) {
-        if (terms.length > 0) {
-            $("#search-spinner").removeClass("hidden");
+        if (terms.length) {
+            this.setState({isSearching: true});
             client.search(
                 terms,
                 function(data) {
-                    $("#search-spinner").addClass("hidden");
-                    if(utils.isMobile()) {
-                        $('#search')[0].value = "";
+                    this.setState({isSearching: false});
+                    if (utils.isMobile()) {
+                        React.findDOMNode(this.refs.search).value = '';
                     }
 
                     AppDispatcher.handleServerAction({
@@ -73,18 +74,17 @@ module.exports = React.createClass({
                         results: data,
                         is_mention_search: isMentionSearch
                     });
-                },
+                }.bind(this),
                 function(err) {
-                    $("#search-spinner").addClass("hidden");
-                    dispatchError(err, "search");
-                }
+                    this.setState({isSearching: false});
+                    AsyncClient.dispatchError(err, "search");
+                }.bind(this)
             );
         }
     },
     handleSubmit: function(e) {
         e.preventDefault();
-        terms = this.state.search_term.trim();
-        this.performSearch(terms);
+        this.performSearch(this.state.search_term.trim());
     },
     getInitialState: function() {
         return getSearchTermStateFromStores();
@@ -95,8 +95,15 @@ module.exports = React.createClass({
                 <div className="sidebar__collapse" onClick={this.handleClose}></div>
                 <span className="glyphicon glyphicon-search sidebar__search-icon"></span>
                 <form role="form" className="search__form relative-div" onSubmit={this.handleSubmit}>
-                    <input type="text" className="form-control search-bar-box" ref="search" id="search" placeholder="Search" value={this.state.search_term} onFocus={this.handleUserFocus} onChange={this.handleUserInput} />
-                    <span id="search-spinner" className="glyphicon glyphicon-refresh glyphicon-refresh-animate hidden"></span>
+                    <input
+                        type="text"
+                        ref="search"
+                        className="form-control search-bar-box"
+                        placeholder="Search"
+                        value={this.state.search_term}
+                        onFocus={this.handleUserFocus}
+                        onChange={this.handleUserInput} />
+                    {this.state.isSearching ? <span className={"glyphicon glyphicon-refresh glyphicon-refresh-animate"}></span> : null}
                 </form>
             </div>
         );
diff --git a/web/react/components/search_results.jsx b/web/react/components/search_results.jsx
index 156cf0120..1fd974642 100644
--- a/web/react/components/search_results.jsx
+++ b/web/react/components/search_results.jsx
@@ -8,12 +8,13 @@ var UserStore = require('../stores/user_store.jsx');
 var UserProfile = require( './user_profile.jsx' );
 var SearchBox =require('./search_bar.jsx');
 var utils = require('../utils/utils.jsx');
-var client =require('../utils/client.jsx');
+var client = require('../utils/client.jsx');
+var AsyncClient = require('../utils/async_client.jsx');
 var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
 var Constants = require('../utils/constants.jsx');
 var ActionTypes = Constants.ActionTypes;
 
-RhsHeaderSearch = React.createClass({
+var RhsHeaderSearch = React.createClass({
     handleClose: function(e) {
         e.preventDefault();
 
@@ -32,13 +33,13 @@ RhsHeaderSearch = React.createClass({
         return (
             <div className="sidebar--right__header">
                 <span className="sidebar--right__title">{title}</span>
-                <button type="button" className="sidebar--right__close" aria-label="Close" onClick={this.handleClose}></button>
+                <button type="button" className="sidebar--right__close" aria-label="Close" title="Close" onClick={this.handleClose}></button>
             </div>
         );
     }
 });
 
-SearchItem = React.createClass({
+var SearchItem = React.createClass({
     handleClick: function(e) {
         e.preventDefault();
 
@@ -62,15 +63,16 @@ SearchItem = React.createClass({
                 });
             },
             function(err) {
-                dispatchError(err, "getPost");
+                AsyncClient.dispatchError(err, "getPost");
             }
         );
 
-    var postChannel = ChannelStore.get(this.props.post.channel_id);
-    var teammate = postChannel.type === 'D' ? utils.getDirectTeammate(this.props.post.channel_id).username : "";
+        var postChannel = ChannelStore.get(this.props.post.channel_id);
+        var teammate = postChannel.type === 'D' ? utils.getDirectTeammate(this.props.post.channel_id).username : "";
 
-    utils.switchChannel(postChannel,teammate);
+        utils.switchChannel(postChannel, teammate);
     },
+
     render: function() {
 
         var message = utils.textToJsx(this.props.post.message, {searchTerm: this.props.term, noMentionHighlight: !this.props.isMentionSearch});
@@ -79,14 +81,10 @@ SearchItem = React.createClass({
         var timestamp = UserStore.getCurrentUser().update_at;
 
         if (channel) {
-            if (channel.type === 'D') {
-                channelName = "Private Message";
-            } else {
-                channelName = channel.display_name;
-            }
+            channelName = (channel.type === 'D') ? "Private Message" : channel.display_name;
         }
 
-    return (
+        return (
             <div className="search-item-container post" onClick={this.handleClick}>
                 <div className="search-channel__name">{ channelName }</div>
                 <div className="post-profile-img__container">
@@ -95,7 +93,11 @@ SearchItem = React.createClass({
                 <div className="post__content">
                     <ul className="post-header">
                         <li className="post-header-col"><strong><UserProfile userId={this.props.post.user_id} /></strong></li>
-                        <li className="post-header-col"><time className="search-item-time">{ utils.displayDate(this.props.post.create_at)+' '+utils.displayTime(this.props.post.create_at) }</time></li>
+                        <li className="post-header-col">
+                            <time className="search-item-time">
+                                { utils.displayDate(this.props.post.create_at) + ' ' + utils.displayTime(this.props.post.create_at) }
+                            </time>
+                        </li>
                     </ul>
                     <div className="search-item-snippet"><span>{message}</span></div>
                 </div>
@@ -104,11 +106,13 @@ SearchItem = React.createClass({
     }
 });
 
+
 function getStateFromStores() {
   return { results: PostStore.getSearchResults() };
 }
 
 module.exports = React.createClass({
+    displayName: 'SearchResults',
     componentDidMount: function() {
         PostStore.addSearchChangeListener(this._onChange);
         this.resize();
@@ -144,41 +148,24 @@ module.exports = React.createClass({
 
         var results = this.state.results;
         var currentId = UserStore.getCurrentId();
-        var searchForm = currentId == null ? null : <SearchBox />;
-
-        if (results == null) {
-            return (
-                <div className="sidebar--right__header">
-                    <div className="sidebar__heading">Search Results</div>
-                </div>
-            );
-        }
+        var searchForm = currentId ? <SearchBox /> : null;
+        var noResults = (!results || !results.order || !results.order.length);
+        var searchTerm = PostStore.getSearchTerm();
 
-        if (!results.order || results.order.length == 0) {
-            return (
-                <div className="sidebar--right__content">
-                    <div className="search-bar__container">{searchForm}</div>
-                    <div className="sidebar-right__body">
-                        <RhsHeaderSearch />
-                        <div id="search-items-container" className="search-items-container">
-                            <div className="sidebar--right__subheader">No results</div>
-                        </div>
-                    </div>
-                </div>
-            );
-        }
-
-        var self = this;
         return (
             <div className="sidebar--right__content">
                 <div className="search-bar__container sidebar--right__search-header">{searchForm}</div>
                 <div className="sidebar-right__body">
                     <RhsHeaderSearch isMentionSearch={this.props.isMentionSearch} />
                     <div id="search-items-container" className="search-items-container">
-                    {results.order.map(function(id) {
-                        var post = results.posts[id];
-                        return <SearchItem key={post.id} post={post} term={PostStore.getSearchTerm()} isMentionSearch={self.props.isMentionSearch} />
-                    })}
+
+                        { noResults ? <div className="sidebar--right__subheader">No results</div>
+                                    : results.order.map(function(id) {
+                                          var post = results.posts[id];
+                                          return <SearchItem key={post.id} post={post} term={searchTerm} isMentionSearch={this.props.isMentionSearch} />
+                                    }, this)
+                        }
+
                     </div>
                 </div>
             </div>
-- 
cgit v1.2.3-1-g7c22


From 0a166572c12e3e13fefee02e79ab9eca6f4d2229 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Tue, 14 Jul 2015 02:30:55 +0500
Subject: Merge branch 'MM-1302' of https://github.com/nickago/platform into
 mm-1302

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
---
 web/react/components/sidebar_header.jsx | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'web/react/components')

diff --git a/web/react/components/sidebar_header.jsx b/web/react/components/sidebar_header.jsx
index 0b59d2036..7f8fe3d52 100644
--- a/web/react/components/sidebar_header.jsx
+++ b/web/react/components/sidebar_header.jsx
@@ -121,9 +121,12 @@ module.exports = React.createClass({
     },
     render: function() {
         var teamName = this.props.teamName ? this.props.teamName : config.SiteName;
+        var me = UserStore.getCurrentUser()
 
         return (
             <div className="team__header theme">
+                <img className="profile-picture" src={"/api/v1/users/" + me.id + "/image?time=" + me.update_at} />
+                <span className="user_name">{me.username}</span>
                 <a className="team__name" href="/channels/town-square">{ teamName }</a>
                 <NavbarDropdown teamType={this.props.teamType} />
             </div>
-- 
cgit v1.2.3-1-g7c22


From 3d56d9b2411fdf6db6228dee5dab3fad377a31c4 Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Mon, 13 Jul 2015 14:56:54 -0700
Subject: Add processing for messageless image posts w/ pluralization

---
 web/react/components/post_body.jsx | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx
index 7d5ef4d33..2febcfa04 100644
--- a/web/react/components/post_body.jsx
+++ b/web/react/components/post_body.jsx
@@ -71,11 +71,22 @@ module.exports = React.createClass({
                 name = <a className="theme" onClick={function(){ utils.searchForTerm(profile.username); }}>{profile.username}</a>;
             }
 
-            var message = parentPost.message;
+            var message = ""
+            if(parentPost.message) {
+                message = utils.replaceHtmlEntities(parentPost.message)
+            } else if (parentPost.filenames.length) {
+                message = <a parentPost.filenames[0].split('/').pop();
+
+                if (parentPost.filenames.length === 2) {
+                    message += " plus 1 other file";
+                } else if (parentPost.filenames.length > 2) {
+                    message += " plus " + (parentPost.filenames.length - 1) + " other files";
+                }
+            }
 
             comment = (
                 <p className="post-link">
-                    <span>Commented on {name}{apostrophe} message: <a className="theme" onClick={this.props.handleCommentClick}>{utils.replaceHtmlEntities(message)}</a></span>
+                    <span>Commented on {name}{apostrophe} message: <a className="theme" onClick={this.props.handleCommentClick}>{message}</a></span>
                 </p>
             );
 
-- 
cgit v1.2.3-1-g7c22


From d1cb7d35fb178916c9aecef8ecc703f2a364197b Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Tue, 14 Jul 2015 03:26:04 +0500
Subject: mm-1302 - Adding profile pick in LHS Header

---
 web/react/components/sidebar_header.jsx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/sidebar_header.jsx b/web/react/components/sidebar_header.jsx
index 7f8fe3d52..54858a04d 100644
--- a/web/react/components/sidebar_header.jsx
+++ b/web/react/components/sidebar_header.jsx
@@ -77,7 +77,7 @@ var NavbarDropdown = React.createClass({
             for (var i = 0; i < this.state.teams.length; i++) {
                 var domain = this.state.teams[i];
 
-                if (domain == utils.getSubDomain()) 
+                if (domain == utils.getSubDomain())
                     continue;
 
                 if (teams.length == 0)
@@ -125,9 +125,11 @@ module.exports = React.createClass({
 
         return (
             <div className="team__header theme">
-                <img className="profile-picture" src={"/api/v1/users/" + me.id + "/image?time=" + me.update_at} />
-                <span className="user_name">{me.username}</span>
-                <a className="team__name" href="/channels/town-square">{ teamName }</a>
+                <img className="user__picture" src={"/api/v1/users/" + me.id + "/image?time=" + me.update_at} />
+                <div className="header__info">
+                    <div className="user__name">@{me.username}</div>
+                    <a className="team__name" href="/channels/town-square">{ teamName }</a>
+                </div>
                 <NavbarDropdown teamType={this.props.teamType} />
             </div>
         );
-- 
cgit v1.2.3-1-g7c22


From 634df1c6242772e44fed5f64ac238adf2d0503a0 Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Tue, 14 Jul 2015 07:54:09 -0700
Subject: Added semicolons

---
 web/react/components/post_list.jsx  | 2 +-
 web/react/components/post_right.jsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index e186fb706..99b1b514a 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -269,7 +269,7 @@ module.exports = React.createClass({
     _onTimeChange: function() {
         this.wasForced = true;
         this.preForcePosision = $(".post-list-holder-by-time").scrollTop();
-        this.forceUpdate()
+        this.forceUpdate();
     },
     getMorePosts: function(e) {
         e.preventDefault();
diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx
index 0c3754529..ab818c1bd 100644
--- a/web/react/components/post_right.jsx
+++ b/web/react/components/post_right.jsx
@@ -299,7 +299,7 @@ module.exports = React.createClass({
     componentWillUnmount: function() {
         PostStore.removeSelectedPostChangeListener(this._onChange);
         PostStore.removeChangeListener(this._onChangeAll);
-        UserStore.removeStatusesChangeListener(this._onTimeChange)
+        UserStore.removeStatusesChangeListener(this._onTimeChange);
     },
     _onChange: function() {
         if (this.isMounted()) {
-- 
cgit v1.2.3-1-g7c22


From d9afa47ef803f3069427192acf839d21bb5a8d93 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Tue, 14 Jul 2015 08:07:01 -0400
Subject: Revert "MM-831 Time change ping riding on the status interupt for
 timestamp update"

---
 web/react/components/post_list.jsx  | 16 +---------------
 web/react/components/post_right.jsx | 18 ++----------------
 2 files changed, 3 insertions(+), 31 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index e73bc10cc..9349d0240 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -35,8 +35,6 @@ module.exports = React.createClass({
     oldScrollHeight: 0,
     oldZoom: 0,
     scrolledToNew: false,
-    preForcePosision: 0,
-    wasForced: false,
     componentDidMount: function() {
         var user = UserStore.getCurrentUser();
         if (user.props && user.props.theme) {
@@ -52,7 +50,6 @@ module.exports = React.createClass({
 
         PostStore.addChangeListener(this._onChange);
         ChannelStore.addChangeListener(this._onChange);
-        UserStore.addStatusesChangeListener(this._onTimeChange);
         SocketStore.addChangeListener(this._onSocketChange);
 
         $(".post-list-holder-by-time").perfectScrollbar();
@@ -82,11 +79,6 @@ module.exports = React.createClass({
         });
 
         $(post_holder).scroll(function(e){
-            if (self.wasForced) {
-                $(post_holder).scrollTop(self.preForcePosision);
-                $(post_holder).perfectScrollbar('update');
-                self.wasForced = false;
-            }
             if (!self.preventScrollTrigger) {
                 self.scrollPosition = $(post_holder).scrollTop() + $(post_holder).innerHeight();
             }
@@ -137,7 +129,6 @@ module.exports = React.createClass({
     componentWillUnmount: function() {
         PostStore.removeChangeListener(this._onChange);
         ChannelStore.removeChangeListener(this._onChange);
-        UserStore.removeStatusesChangeListener(this._onTimeChange);
         SocketStore.removeChangeListener(this._onSocketChange);
         $('body').off('click.userpopover');
     },
@@ -170,7 +161,7 @@ module.exports = React.createClass({
                 this.scrolledToNew = false;
             }
             this.setState(newState);
-        } 
+        }
     },
     _onSocketChange: function(msg) {
         if (msg.action == "posted") {
@@ -234,11 +225,6 @@ module.exports = React.createClass({
             AsyncClient.getProfiles();
         }
     },
-    _onTimeChange: function() {
-        this.wasForced = true;
-        this.preForcePosision = $(".post-list-holder-by-time").scrollTop();
-        this.forceUpdate();
-    },
     getMorePosts: function(e) {
         e.preventDefault();
 
diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx
index 27195dfba..408fbf83a 100644
--- a/web/react/components/post_right.jsx
+++ b/web/react/components/post_right.jsx
@@ -281,11 +281,9 @@ function getStateFromStores() {
 }
 
 module.exports = React.createClass({
-    wasForced: false,
     componentDidMount: function() {
         PostStore.addSelectedPostChangeListener(this._onChange);
         PostStore.addChangeListener(this._onChangeAll);
-        UserStore.addStatusesChangeListener(this._onTimeChange);
         this.resize();
         var self = this;
         $(window).resize(function(){
@@ -293,15 +291,11 @@ module.exports = React.createClass({
         });
     },
     componentDidUpdate: function() {
-        if(!this.wasForced){
-            this.resize();
-            this.wasForced = false;
-        }
+        this.resize();
     },
     componentWillUnmount: function() {
         PostStore.removeSelectedPostChangeListener(this._onChange);
         PostStore.removeChangeListener(this._onChangeAll);
-        UserStore.removeStatusesChangeListener(this._onTimeChange);
     },
     _onChange: function() {
         if (this.isMounted()) {
@@ -341,14 +335,6 @@ module.exports = React.createClass({
             this.setState(getStateFromStores());
         }
     },
-    _onTimeChange: function() {
-        this.wasForced = true;
-        for (var key in this.refs) {
-            if(this.refs[key].forceUpdate != undefined) {
-                this.refs[key].forceUpdate();
-            }
-        }
-    },
     getInitialState: function() {
         return getStateFromStores();
     },
@@ -408,7 +394,7 @@ module.exports = React.createClass({
                         <RootPost post={root_post} commentCount={posts_array.length}/>
                         <div className="post-right-comments-container">
                         { posts_array.map(function(cpost) {
-                                return <CommentPost ref={cpost.id} key={cpost.id} post={cpost} selected={ (cpost.id == selected_post.id) } />
+                                return <CommentPost key={cpost.id} post={cpost} selected={ (cpost.id == selected_post.id) } />
                         })}
                         </div>
                         <div className="post-create__container">
-- 
cgit v1.2.3-1-g7c22


From fa4ac0c7890aa148122407feb2575470336099e1 Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Tue, 14 Jul 2015 12:08:00 -0700
Subject: Fixed minor typo

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

(limited to 'web/react/components')

diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx
index 2febcfa04..5f7dbe6c9 100644
--- a/web/react/components/post_body.jsx
+++ b/web/react/components/post_body.jsx
@@ -75,7 +75,7 @@ module.exports = React.createClass({
             if(parentPost.message) {
                 message = utils.replaceHtmlEntities(parentPost.message)
             } else if (parentPost.filenames.length) {
-                message = <a parentPost.filenames[0].split('/').pop();
+                message = parentPost.filenames[0].split('/').pop();
 
                 if (parentPost.filenames.length === 2) {
                     message += " plus 1 other file";
-- 
cgit v1.2.3-1-g7c22


From cb2bff28ee7a43b3d3c52d3c448d3f15d12830ba Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Tue, 14 Jul 2015 13:09:14 -0700
Subject: Team admin can now delete any post

---
 web/react/components/post_info.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'web/react/components')

diff --git a/web/react/components/post_info.jsx b/web/react/components/post_info.jsx
index cf01747f0..48efa95ba 100644
--- a/web/react/components/post_info.jsx
+++ b/web/react/components/post_info.jsx
@@ -11,6 +11,7 @@ module.exports = React.createClass({
     render: function() {
         var post = this.props.post;
         var isOwner = UserStore.getCurrentId() == post.user_id;
+        var isAdmin = UserStore.getCurrentUser().roles.indexOf("admin") > -1
 
         var type = "Post"
         if (post.root_id.length > 0) {
@@ -36,7 +37,7 @@ module.exports = React.createClass({
                                 <ul className="dropdown-menu" role="menu">
                                     { isOwner ? <li role="presentation"><a href="#" role="menuitem" data-toggle="modal" data-target="#edit_post" data-title={type} data-message={post.message} data-postid={post.id} data-channelid={post.channel_id} data-comments={type === "Post" ? this.props.commentCount : 0}>Edit</a></li>
                                     : "" }
-                                    { isOwner ? <li role="presentation"><a href="#" role="menuitem" data-toggle="modal" data-target="#delete_post" data-title={type} data-postid={post.id} data-channelid={post.channel_id} data-comments={type === "Post" ? this.props.commentCount : 0}>Delete</a></li>
+                                    { isOwner || isAdmin ? <li role="presentation"><a href="#" role="menuitem" data-toggle="modal" data-target="#delete_post" data-title={type} data-postid={post.id} data-channelid={post.channel_id} data-comments={type === "Post" ? this.props.commentCount : 0}>Delete</a></li>
                                     : "" }
                                     { this.props.allowReply === "true" ? <li role="presentation"><a className="reply-link theme" href="#" onClick={this.props.handleCommentClick}>Reply</a></li>
                                     : "" }
-- 
cgit v1.2.3-1-g7c22


From 46e076529a15da3b5dd63070fbb8e887dba9b436 Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Wed, 15 Jul 2015 08:45:17 -0700
Subject: Fixed typo, returned password flow to standard model

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

(limited to 'web/react/components')

diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx
index b4c3747af..06d8d0208 100644
--- a/web/react/components/user_settings.jsx
+++ b/web/react/components/user_settings.jsx
@@ -626,7 +626,7 @@ var SecurityTab = React.createClass({
 
         client.updatePassword(data,
             function(data) {
-                this.updateSection("");
+                this.props.updateSection("");
                 AsyncClient.getMe();
                 this.setState({ current_password: '', new_password: '', confirm_password: '' });
             }.bind(this),
-- 
cgit v1.2.3-1-g7c22


From 56db6ad08cf23dbdcee326fa39bda8bcdcdecf9e Mon Sep 17 00:00:00 2001
From: ralder <ralder@yandex.ru>
Date: Wed, 15 Jul 2015 09:03:28 -0700
Subject: remove admin's ability to manage members of default channel (fixes
 #172)

---
 web/react/components/channel_header.jsx |  33 ++++---
 web/react/components/navbar.jsx         | 159 ++++++++++++++++----------------
 web/react/components/post_list.jsx      |   3 +-
 web/react/components/sidebar_header.jsx |  48 ++++------
 4 files changed, 116 insertions(+), 127 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index fe381a59e..6791233d5 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -142,10 +142,10 @@ module.exports = React.createClass({
             return null;
         }
 
-        var description = utils.textToJsx(this.state.channel.description, {"singleline": true, "noMentionHighlight": true});
-        var popoverContent = React.renderToString(<MessageWrapper message={this.state.channel.description}/>);
-        var channelTitle = this.state.channel.display_name;
-        var channelName = this.state.channel.name;
+        var channel = this.state.channel;
+        var description = utils.textToJsx(channel.description, {"singleline": true, "noMentionHighlight": true});
+        var popoverContent = React.renderToString(<MessageWrapper message={channel.description}/>);
+        var channelTitle = channel.display_name;
         var currentId = UserStore.getCurrentId();
         var isAdmin = this.state.memberChannel.roles.indexOf("admin") > -1 || this.state.memberTeam.roles.indexOf("admin") > -1;
         var isDirect = (this.state.channel.type === 'D');
@@ -169,23 +169,26 @@ module.exports = React.createClass({
                                     <span className="glyphicon glyphicon-chevron-down header-dropdown__icon"></span>
                                 </a>
                                 <ul className="dropdown-menu" role="menu" aria-labelledby="channel_header_dropdown">
-                                    <li role="presentation"><a role="menuitem" data-toggle="modal" data-target="#channel_info" data-channelid={this.state.channel.id} href="#">View Info</a></li>
-                                    <li role="presentation"><a role="menuitem" data-toggle="modal" data-target="#channel_invite" href="#">Add Members</a></li>
-                                    { isAdmin ?
+                                    <li role="presentation"><a role="menuitem" data-toggle="modal" data-target="#channel_info" data-channelid={channel.id} href="#">View Info</a></li>
+                                    { !ChannelStore.isDefault(channel) ?
+                                        <li role="presentation"><a role="menuitem" data-toggle="modal" data-target="#channel_invite" href="#">Add Members</a></li>
+                                        : null
+                                    }
+                                    { isAdmin && !ChannelStore.isDefault(channel) ?
                                         <li role="presentation"><a role="menuitem" data-toggle="modal" data-target="#channel_members" href="#">Manage Members</a></li>
                                         : null
                                     }
-                                    <li role="presentation"><a role="menuitem" href="#" data-toggle="modal" data-target="#edit_channel" data-desc={this.state.channel.description} data-title={channelTitle} data-channelid={this.state.channel.id}>Set Channel Description...</a></li>
-                                    <li role="presentation"><a role="menuitem" href="#" data-toggle="modal" data-target="#channel_notifications" data-title={channelTitle} data-channelid={this.state.channel.id}>Notification Preferences</a></li>
-                                    { isAdmin && channelName != Constants.DEFAULT_CHANNEL ?
-                                        <li role="presentation"><a role="menuitem" href="#" data-toggle="modal" data-target="#rename_channel" data-display={channelTitle} data-name={this.state.channel.name} data-channelid={this.state.channel.id}>Rename Channel...</a></li>
+                                    <li role="presentation"><a role="menuitem" href="#" data-toggle="modal" data-target="#edit_channel" data-desc={channel.description} data-title={channel.display_name} data-channelid={channel.id}>Set Channel Description...</a></li>
+                                    <li role="presentation"><a role="menuitem" href="#" data-toggle="modal" data-target="#channel_notifications" data-title={channel.display_name} data-channelid={channel.id}>Notification Preferences</a></li>
+                                    { isAdmin && !ChannelStore.isDefault(channel) ?
+                                        <li role="presentation"><a role="menuitem" href="#" data-toggle="modal" data-target="#rename_channel" data-display={channel.display_name} data-name={channel.name} data-channelid={channel.id}>Rename Channel...</a></li>
                                         : null
                                     }
-                                    { isAdmin && channelName != Constants.DEFAULT_CHANNEL ?
-                                        <li role="presentation"><a role="menuitem" href="#" data-toggle="modal" data-target="#delete_channel" data-title={channelTitle} data-channelid={this.state.channel.id}>Delete Channel...</a></li>
+                                    { isAdmin && !ChannelStore.isDefault(channel) ?
+                                        <li role="presentation"><a role="menuitem" href="#" data-toggle="modal" data-target="#delete_channel" data-title={channel.display_name} data-channelid={channel.id}>Delete Channel...</a></li>
                                         : null
                                     }
-                                    { channelName != Constants.DEFAULT_CHANNEL ?
+                                    { !ChannelStore.isDefault(channel) ?
                                         <li role="presentation"><a role="menuitem" href="#" onClick={this.handleLeave}>Leave Channel</a></li>
                                         : null
                                     }
@@ -197,7 +200,7 @@ module.exports = React.createClass({
                         <a href="#"><strong className="heading">{channelTitle}</strong></a>
                     }
                     </th>
-                    <th><PopoverListMembers members={this.state.users} channelId={this.state.channel.id} /></th>
+                    <th><PopoverListMembers members={this.state.users} channelId={channel.id} /></th>
                     <th className="search-bar__container"><NavbarSearchBox /></th>
                     <th>
                         <div className="dropdown" style={{marginLeft:5, marginRight:10}}>
diff --git a/web/react/components/navbar.jsx b/web/react/components/navbar.jsx
index 35f7d9044..78cf7d8b8 100644
--- a/web/react/components/navbar.jsx
+++ b/web/react/components/navbar.jsx
@@ -2,21 +2,20 @@
 // See License.txt for license information.
 
 
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
 var utils = require('../utils/utils.jsx');
 var client = require('../utils/client.jsx');
 var AsyncClient = require('../utils/async_client.jsx');
-var Sidebar = require('./sidebar.jsx');
 var UserStore = require('../stores/user_store.jsx');
-var SocketStore = require('../stores/socket_store.jsx');
 var ChannelStore = require('../stores/channel_store.jsx');
-var Constants = require('../utils/constants.jsx');
+
 var UserProfile = require('./user_profile.jsx');
 var MessageWrapper = require('./message_wrapper.jsx');
+
+var Constants = require('../utils/constants.jsx');
 var ActionTypes = Constants.ActionTypes;
+var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
 
 function getCountsStateFromStores() {
-
     var count = 0;
     var channels = ChannelStore.getAll();
     var members = ChannelStore.getAllMembers();
@@ -34,7 +33,7 @@ function getCountsStateFromStores() {
         }
     });
 
-    return { count: count }
+    return { count: count };
 }
 
 var NotifyCounts =  React.createClass({
@@ -54,11 +53,10 @@ var NotifyCounts =  React.createClass({
         return getCountsStateFromStores();
     },
     render: function() {
-        if (this.state.count == 0) {
-            return (<span></span>);
-        }
-        else {
-            return (<span className="badge badge-notify">{ this.state.count }</span>);
+        if (this.state.count) {
+            return <span className="badge badge-notify">{ this.state.count }</span>;
+        } else {
+            return null;
         }
     }
 });
@@ -66,25 +64,25 @@ var NotifyCounts =  React.createClass({
 var NavbarLoginForm = React.createClass({
     handleSubmit: function(e) {
         e.preventDefault();
-        var state = { }
+        var state = { };
 
         var domain = this.refs.domain.getDOMNode().value.trim();
         if (!domain) {
-            state.server_error = "A domain is required"
+            state.server_error = "A domain is required";
             this.setState(state);
             return;
         }
 
        var email = this.refs.email.getDOMNode().value.trim();
         if (!email) {
-            state.server_error = "An email is required"
+            state.server_error = "An email is required";
             this.setState(state);
             return;
         }
 
         var password = this.refs.password.getDOMNode().value.trim();
         if (!password) {
-            state.server_error = "A password is required"
+            state.server_error = "A password is required";
             this.setState(state);
             return;
         }
@@ -105,7 +103,7 @@ var NavbarLoginForm = React.createClass({
                     window.location.href = '/channels/town-square';
                 }
 
-            }.bind(this),
+            },
             function(err) {
                 if (err.message == "Login failed because email address has not been verified") {
                     window.location.href = '/verify?domain=' + encodeURIComponent(domain) + '&email=' + encodeURIComponent(email);
@@ -159,13 +157,14 @@ function getStateFromStores() {
 }
 
 module.exports = React.createClass({
+    displayName: 'Navbar',
+
     componentDidMount: function() {
         ChannelStore.addChangeListener(this._onChange);
         ChannelStore.addExtraInfoChangeListener(this._onChange);
-        var self = this;
-        $('.inner__wrap').click(self.hideSidebars);
+        $('.inner__wrap').click(this.hideSidebars);
 
-        $('body').on('click.infopopover', function(e){
+        $('body').on('click.infopopover', function(e) {
             if ($(e.target).attr('data-toggle') !== 'popover'
                 && $(e.target).parents('.popover.in').length === 0) {
                 $('.info-popover').popover('hide');
@@ -181,13 +180,13 @@ module.exports = React.createClass({
     },
     handleLeave: function(e) {
         client.leaveChannel(this.state.channel.id,
-            function(data) {
+            function() {
                 AsyncClient.getChannels(true);
                 window.location.href = '/channels/town-square';
-            }.bind(this),
+            },
             function(err) {
                 AsyncClient.dispatchError(err, "handleLeave");
-            }.bind(this)
+            }
         );
     },
     hideSidebars: function(e) {
@@ -204,7 +203,7 @@ module.exports = React.createClass({
             });
 
             if (e.target.className != 'navbar-toggle' && e.target.className != 'icon-bar') {
-                $('.inner__wrap').removeClass('move--right').removeClass('move--left').removeClass('move--left-small');
+                $('.inner__wrap').removeClass('move--right move--left move--left-small');
                 $('.sidebar--left').removeClass('move--right');
                 $('.sidebar--right').removeClass('move--left');
                 $('.sidebar--menu').removeClass('move--left');
@@ -229,24 +228,22 @@ module.exports = React.createClass({
     render: function() {
 
         var currentId = UserStore.getCurrentId();
-        var channelName = "";
         var popoverContent = "";
         var channelTitle = this.props.teamName;
         var isAdmin = false;
         var isDirect = false;
         var description = ""
+        var channel = this.state.channel;
 
-        if (this.state.channel) {
-            var channel = this.state.channel;
-            description = utils.textToJsx(this.state.channel.description, {"singleline": true, "noMentionHighlight": true});
-            popoverContent = React.renderToString(<MessageWrapper message={this.state.channel.description}/>);
-            channelName = this.state.channel.name;
+        if (channel) {
+            description = utils.textToJsx(channel.description, {"singleline": true, "noMentionHighlight": true});
+            popoverContent = React.renderToString(<MessageWrapper message={channel.description}/>);
             isAdmin = this.state.member.roles.indexOf("admin") > -1;
 
             if (channel.type === 'O') {
-                channelTitle = this.state.channel.display_name;
+                channelTitle = channel.display_name;
             } else if (channel.type === 'P') {
-                channelTitle = this.state.channel.display_name;
+                channelTitle = channel.display_name;
             } else if (channel.type === 'D') {
                 isDirect = true;
                 if (this.state.users.length > 1) {
@@ -258,12 +255,11 @@ module.exports = React.createClass({
                 }
             }
 
-            if(this.state.channel.description.length == 0){
-                popoverContent = React.renderToString(<div>No channel description yet. <br /><a href='#' data-toggle='modal' data-desc={this.state.channel.description} data-title={this.state.channel.display_name} data-channelid={this.state.channel.id} data-target='#edit_channel'>Click here</a> to add one.</div>);
+            if (channel.description.length == 0) {
+                popoverContent = React.renderToString(<div>No channel description yet. <br /><a href='#' data-toggle='modal' data-desc={channel.description} data-title={channel.display_name} data-channelid={channel.id} data-target='#edit_channel'>Click here</a> to add one.</div>);
             }
         }
 
-        var loginForm = currentId == null ? <NavbarLoginForm /> : null;
         var navbar_collapse_button = currentId != null ? null :
                         <button type="button" className="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
                             <span className="sr-only">Toggle sidebar</span>
@@ -292,60 +288,61 @@ module.exports = React.createClass({
                         { navbar_collapse_button }
                         { sidebar_collapse_button }
                         { right_sidebar_collapse_button }
-                    { !isDirect && this.state.channel ?
-                        <div className="navbar-brand">
-                            <div className="dropdown">
-                                <div data-toggle="popover" data-content={popoverContent} className="description info-popover"></div>
-                                <a href="#" className="dropdown-toggle theme" type="button" id="channel_header_dropdown" data-toggle="dropdown" aria-expanded="true">
-                                    <strong className="heading">{channelTitle} </strong>
-                                    <span className="glyphicon glyphicon-chevron-down header-dropdown__icon"></span>
-                                </a>
-                                <ul className="dropdown-menu" role="menu" aria-labelledby="channel_header_dropdown">
-                                    <li role="presentation"><a role="menuitem" data-toggle="modal" data-target="#channel_invite" href="#">Add Members</a></li>
-                                    { isAdmin ?
-                                        <li role="presentation"><a role="menuitem" data-toggle="modal" data-target="#channel_members" href="#">Manage Members</a></li>
-                                        : ""
-                                    }
-                                    <li role="presentation"><a role="menuitem" href="#" data-toggle="modal" data-target="#edit_channel" data-desc={this.state.channel.description} data-title={this.state.channel.display_name} data-channelid={this.state.channel.id}>Set Channel Description...</a></li>
-                                    <li role="presentation"><a role="menuitem" href="#" data-toggle="modal" data-target="#channel_notifications" data-title={this.state.channel.display_name} data-channelid={this.state.channel.id}>Notification Preferences</a></li>
-                                    { isAdmin && channelName != Constants.DEFAULT_CHANNEL ?
-                                        <li role="presentation"><a role="menuitem" href="#" data-toggle="modal" data-target="#rename_channel" data-display={this.state.channel.display_name} data-name={this.state.channel.name} data-channelid={this.state.channel.id}>Rename Channel...</a></li>
-                                        : ""
-                                    }
-                                    { isAdmin && channelName != Constants.DEFAULT_CHANNEL ?
-                                        <li role="presentation"><a role="menuitem" href="#" data-toggle="modal" data-target="#delete_channel" data-title={this.state.channel.display_name} data-channelid={this.state.channel.id}>Delete Channel...</a></li>
-                                        : ""
-                                    }
-                                    { channelName != Constants.DEFAULT_CHANNEL ?
-                                        <li role="presentation"><a role="menuitem" href="#" onClick={this.handleLeave}>Leave Channel</a></li>
-                                        : ""
-                                    }
-                                </ul>
+                        { !isDirect && channel ?
+                            <div className="navbar-brand">
+                                <div className="dropdown">
+                                    <div data-toggle="popover" data-content={popoverContent} className="description info-popover"></div>
+                                    <a href="#" className="dropdown-toggle theme" type="button" id="channel_header_dropdown" data-toggle="dropdown" aria-expanded="true">
+                                        <span className="heading">{channelTitle} </span>
+                                        <span className="glyphicon glyphicon-chevron-down header-dropdown__icon"></span>
+                                    </a>
+                                    <ul className="dropdown-menu" role="menu" aria-labelledby="channel_header_dropdown">
+                                        { !ChannelStore.isDefault(channel) ?
+                                            <li role="presentation"><a role="menuitem" data-toggle="modal" data-target="#channel_invite" href="#">Add Members</a></li>
+                                            : null
+                                        }
+                                        { isAdmin && !ChannelStore.isDefault(channel) ?
+                                            <li role="presentation"><a role="menuitem" data-toggle="modal" data-target="#channel_members" href="#">Manage Members</a></li>
+                                            : null
+                                        }
+                                        <li role="presentation"><a role="menuitem" href="#" data-toggle="modal" data-target="#edit_channel" data-desc={channel.description} data-title={channel.display_name} data-channelid={channel.id}>Set Channel Description...</a></li>
+                                        <li role="presentation"><a role="menuitem" href="#" data-toggle="modal" data-target="#channel_notifications" data-title={channel.display_name} data-channelid={channel.id}>Notification Preferences</a></li>
+                                        { isAdmin && !ChannelStore.isDefault(channel) ?
+                                            <li role="presentation"><a role="menuitem" href="#" data-toggle="modal" data-target="#rename_channel" data-display={channel.display_name} data-name={channel.name} data-channelid={channel.id}>Rename Channel...</a></li>
+                                            : null
+                                        }
+                                        { isAdmin && !ChannelStore.isDefault(channel) ?
+                                            <li role="presentation"><a role="menuitem" href="#" data-toggle="modal" data-target="#delete_channel" data-title={channel.display_name} data-channelid={channel.id}>Delete Channel...</a></li>
+                                            : null
+                                        }
+                                        { !ChannelStore.isDefault(channel) ?
+                                            <li role="presentation"><a role="menuitem" href="#" onClick={this.handleLeave}>Leave Channel</a></li>
+                                            : null
+                                        }
+                                    </ul>
+                                </div>
                             </div>
-                        </div>
-                        : "" }
-                        { isDirect && this.state.channel ?
+                            : null
+                        }
+                        { isDirect && channel ?
                             <div className="navbar-brand">
-                                <strong>
-                                    <a href="#"><strong className="heading">{channelTitle}</strong></a>
-                                </strong>
+                                <a href="#" className="heading">{ channelTitle }</a>
                             </div>
-                        : "" }
-                        { !this.state.channel ?
+                        : null }
+                        { !channel ?
                             <div className="navbar-brand">
-                                <strong>
-                                    <a href="/"><strong className="heading">{ channelTitle }</strong></a>
-                                </strong>
+                                <a href="/" className="heading">{ channelTitle }</a>
                             </div>
-                        : "" }
-                    </div>
-                    <div className="collapse navbar-collapse" id="navbar-collapse-1">
-                        { loginForm }
+                        : null }
                     </div>
+                    { !currentId ?
+                        <div className="collapse navbar-collapse" id="navbar-collapse-1">
+                            <NavbarLoginForm />
+                        </div>
+                        : null
+                    }
                 </div>
             </nav>
         );
-}
+    }
 });
-
-
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index 98491976f..573799a19 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -6,7 +6,6 @@ var ChannelStore = require('../stores/channel_store.jsx');
 var UserStore = require('../stores/user_store.jsx');
 var UserProfile = require( './user_profile.jsx' );
 var AsyncClient = require('../utils/async_client.jsx');
-var CreatePost = require('./create_post.jsx');
 var Post = require('./post.jsx');
 var LoadingScreen = require('./loading_screen.jsx');
 var SocketStore = require('../stores/socket_store.jsx');
@@ -341,7 +340,7 @@ module.exports = React.createClass({
                     }
                 }
 
-                if (channel.name === Constants.DEFAULT_CHANNEL) {
+                if (ChannelStore.isDefault(channel)) {
                     more_messages = (
                         <div className="channel-intro">
                             <h4 className="channel-intro-title">Welcome</h4>
diff --git a/web/react/components/sidebar_header.jsx b/web/react/components/sidebar_header.jsx
index 54858a04d..334fc6780 100644
--- a/web/react/components/sidebar_header.jsx
+++ b/web/react/components/sidebar_header.jsx
@@ -37,17 +37,13 @@ var NavbarDropdown = React.createClass({
         var invite_link = "";
         var manage_link = "";
         var rename_link = "";
-        var currentUser = UserStore.getCurrentUser()
+        var currentUser = UserStore.getCurrentUser();
         var isAdmin = false;
 
         if (currentUser != null) {
             isAdmin = currentUser.roles.indexOf("admin") > -1;
 
-            invite_link = (
-                <li>
-                    <a href="#" data-toggle="modal" data-target="#invite_member">Invite New Member</a>
-                </li>
-            );
+            invite_link = ( <li> <a href="#" data-toggle="modal" data-target="#invite_member">Invite New Member</a> </li>);
 
             if (this.props.teamType == "O") {
                 team_link = (
@@ -59,16 +55,8 @@ var NavbarDropdown = React.createClass({
         }
 
         if (isAdmin) {
-            manage_link = (
-                <li>
-                    <a href="#" data-toggle="modal" data-target="#team_members">Manage Team</a>
-                </li>
-            );
-            rename_link = (
-                <li>
-                    <a href="#" data-toggle="modal" data-target="#rename_team_link">Rename</a>
-                </li>
-            );
+            manage_link = ( <li> <a href="#" data-toggle="modal" data-target="#team_members">Manage Team</a> </li>);
+            rename_link = ( <li> <a href="#" data-toggle="modal" data-target="#rename_team_link">Rename</a> </li>);
         }
 
         var teams = [];
@@ -95,7 +83,7 @@ var NavbarDropdown = React.createClass({
                     </a>
                     <ul className="dropdown-menu" role="menu">
                         <li><a href="#" data-toggle="modal" data-target="#user_settings1">Account Settings</a></li>
-                        { isAdmin ? <li><a href="#" data-toggle="modal" data-target="#team_settings">Team Settings</a></li> : "" }
+                        { isAdmin ? <li><a href="#" data-toggle="modal" data-target="#team_settings">Team Settings</a></li> : null }
                         { invite_link }
                         { team_link }
                         { manage_link }
@@ -113,28 +101,30 @@ var NavbarDropdown = React.createClass({
 });
 
 module.exports = React.createClass({
-    handleSubmit: function(e) {
-        e.preventDefault();
-    },
-    getInitialState: function() {
-        return { };
+    displayName: 'SidebarHeader',
+
+    getDefaultProps: function() {
+        return {
+            teamName: config.SiteName
+        };
     },
+
     render: function() {
-        var teamName = this.props.teamName ? this.props.teamName : config.SiteName;
-        var me = UserStore.getCurrentUser()
+        var me = UserStore.getCurrentUser();
+
+        if (!me) {
+            return null;
+        }
 
         return (
             <div className="team__header theme">
                 <img className="user__picture" src={"/api/v1/users/" + me.id + "/image?time=" + me.update_at} />
                 <div className="header__info">
-                    <div className="user__name">@{me.username}</div>
-                    <a className="team__name" href="/channels/town-square">{ teamName }</a>
+                    <div className="user__name">{'@' + me.username}</div>
+                    <a className="team__name" href="/channels/town-square">{this.props.teamName}</a>
                 </div>
                 <NavbarDropdown teamType={this.props.teamType} />
             </div>
         );
     }
 });
-
-
-
-- 
cgit v1.2.3-1-g7c22


From 6e67be40544f537d624f7f4449b8fcb97e338fb3 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Fri, 19 Jun 2015 16:04:33 -0700
Subject: Added framework for handling up and down arrow key presses to move
 between different @mention choices

---
 web/react/components/mention_list.jsx | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'web/react/components')

diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index 103ff29bb..3796d465f 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -56,6 +56,22 @@ module.exports = React.createClass({
 
         this.setState({ mentionText: '-1' });
     },
+    handleKeyDown: function(e) {
+        var selectedMention = this.state.selectedMention ? this.state.selectedMention : 1;
+
+        // Need to be able to know number of mentions, use in conditionals & still
+        // need to figure out how to highlight the mention I want every time.
+        // Remember separate Mention Ref within for, second if statement in render
+        // Maybe have the call there instead? Ehhh maybe not but need that to be able
+        // to "select" it maybe...
+        if (e.key === "ArrowUp") {
+            selectedMention = selectedMention === ? 1 : selectedMention++;
+        } 
+        else if (e.key === "ArrowDown") {
+            selectedMention = selectedMention === 1 ? : selectedMention--;
+        }
+        this.setState({selectedMention: selectedMention});
+    }
     addFirstMention: function() {
         if (!this.refs.mention0) return;
         this.refs.mention0.handleClick();
@@ -144,7 +160,7 @@ module.exports = React.createClass({
 
         return (
             <div className="mentions--top" style={style}>
-                <div ref="mentionlist" className="mentions-box">
+                <div ref="mentionlist" className="mentions-box" onKeyDown={this.handleKeyDown}>
                     { mentions }
                 </div>
             </div>
-- 
cgit v1.2.3-1-g7c22


From f635376aa45e2fbaa30698949a0c991ea06aa320 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Fri, 19 Jun 2015 16:04:56 -0700
Subject: Added comma

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

(limited to 'web/react/components')

diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index 3796d465f..a2c6f0ff7 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -71,7 +71,7 @@ module.exports = React.createClass({
             selectedMention = selectedMention === 1 ? : selectedMention--;
         }
         this.setState({selectedMention: selectedMention});
-    }
+    },
     addFirstMention: function() {
         if (!this.refs.mention0) return;
         this.refs.mention0.handleClick();
-- 
cgit v1.2.3-1-g7c22


From 924fd8609bb0b512cd60c1f345ec22dcb6bf0612 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Mon, 22 Jun 2015 17:39:55 -0700
Subject: Changed parts of framework

---
 web/react/components/mention_list.jsx | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index a2c6f0ff7..115ab1b2a 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -56,8 +56,8 @@ module.exports = React.createClass({
 
         this.setState({ mentionText: '-1' });
     },
-    handleKeyDown: function(e) {
-        var selectedMention = this.state.selectedMention ? this.state.selectedMention : 1;
+    handleKeyDown: function(e, numMentions) {
+        var selectedMention = this.state.selectedMention <= nunMentions ? this.state.selectedMention : 1;
 
         // Need to be able to know number of mentions, use in conditionals & still
         // need to figure out how to highlight the mention I want every time.
@@ -65,10 +65,10 @@ module.exports = React.createClass({
         // Maybe have the call there instead? Ehhh maybe not but need that to be able
         // to "select" it maybe...
         if (e.key === "ArrowUp") {
-            selectedMention = selectedMention === ? 1 : selectedMention++;
+            selectedMention = selectedMention === numMentions ? 1 : selectedMention++;
         } 
         else if (e.key === "ArrowDown") {
-            selectedMention = selectedMention === 1 ? : selectedMention--;
+            selectedMention = selectedMention === 1 ? numMentions : selectedMention--;
         }
         this.setState({selectedMention: selectedMention});
     },
@@ -89,7 +89,7 @@ module.exports = React.createClass({
         return false;
     },
     getInitialState: function() {
-        return { excludeUsers: [], mentionText: "-1" };
+        return { excludeUsers: [], mentionText: "-1", selectedMention: 1 };
     },
     render: function() {
         var mentionText = this.state.mentionText;
@@ -158,9 +158,11 @@ module.exports = React.createClass({
             left:   $mention_tab.offset().left
         };
 
+        //mentions[this.state.selectedMention].focus();
+
         return (
             <div className="mentions--top" style={style}>
-                <div ref="mentionlist" className="mentions-box" onKeyDown={this.handleKeyDown}>
+                <div ref="mentionlist" className="mentions-box" onKeyDown={this.handleKeyDown.bind(this, numMentions)}>
                     { mentions }
                 </div>
             </div>
-- 
cgit v1.2.3-1-g7c22


From 63b9dd85b6efd9d292d4d79240e00b7d27e6616c Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Fri, 10 Jul 2015 09:49:44 -0700
Subject: Changed model of handling key down and focus change

---
 web/react/components/mention.jsx      | 19 +++++++++++++++++-
 web/react/components/mention_list.jsx | 38 ++++++++++++++++++++---------------
 2 files changed, 40 insertions(+), 17 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/mention.jsx b/web/react/components/mention.jsx
index 520b81cbb..7a8045134 100644
--- a/web/react/components/mention.jsx
+++ b/web/react/components/mention.jsx
@@ -6,6 +6,23 @@ module.exports = React.createClass({
     handleClick: function() {
         this.props.handleClick(this.props.username);
     },
+    handleKeyDown: function(e) {
+        var selectedMention = this.state.selectedMention <= nunMentions ? this.state.selectedMention : 1;
+
+        console.log("Here: keyDown");
+
+        if (e.key === "ArrowUp") {
+            //selectedMention = selectedMention === numMentions ? 1 : selectedMention++;
+            this.props.handleFocus(this.props.listId);
+        } 
+        else if (e.key === "ArrowDown") {
+            //selectedMention = selectedMention === 1 ? numMentions : selectedMention--;
+            this.props.handleFocus(this.props.listId);
+        }
+        else if (e.key === "Enter") {
+            this.handleClick();
+        }
+    },
     render: function() {
         var icon;
         var timestamp = UserStore.getCurrentUser().update_at;
@@ -15,7 +32,7 @@ module.exports = React.createClass({
             icon = <span><i className="mention-img fa fa-users fa-2x"></i></span>;
         }
         return (
-            <div className="mentions-name" onClick={this.handleClick}>
+            <div className="mentions-name" ref="mention" onClick={this.handleClick} onKeyDown={this.handleKeyDown}>
                 <div className="pull-left">{icon}</div>
                 <div className="pull-left mention-align"><span>@{this.props.username}</span><span className="mention-fullname">{this.props.secondary_text}</span></div>
             </div>
diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index 115ab1b2a..c5b4030c8 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -18,6 +18,8 @@ module.exports = React.createClass({
     componentDidMount: function() {
         PostStore.addMentionDataChangeListener(this._onChange);
 
+        console.log("here!");
+
         var self = this;
         $('body').on('keypress.mentionlist', '#'+this.props.id,
             function(e) {
@@ -26,6 +28,16 @@ module.exports = React.createClass({
                     e.preventDefault();
                     self.addFirstMention();
                 }
+                if (!self.isEmpty() && self.state.mentionText != '-1' && e.which === 38) {
+                    e.stopPropagation();
+                    e.preventDefault();
+                    self.handleFocus(0);
+                }
+                if (!self.isEmpty() && self.state.mentionText != '-1' && e.which === 40) {
+                    e.stopPropagation();
+                    e.preventDefault();
+                    self.addFirstMention(UserStore.getActiveOnlyProfiles().length - 1);
+                }
             }
         );
         $(document).click(function(e) {
@@ -56,21 +68,13 @@ module.exports = React.createClass({
 
         this.setState({ mentionText: '-1' });
     },
-    handleKeyDown: function(e, numMentions) {
-        var selectedMention = this.state.selectedMention <= nunMentions ? this.state.selectedMention : 1;
-
-        // Need to be able to know number of mentions, use in conditionals & still
-        // need to figure out how to highlight the mention I want every time.
-        // Remember separate Mention Ref within for, second if statement in render
-        // Maybe have the call there instead? Ehhh maybe not but need that to be able
-        // to "select" it maybe...
-        if (e.key === "ArrowUp") {
-            selectedMention = selectedMention === numMentions ? 1 : selectedMention++;
-        } 
-        else if (e.key === "ArrowDown") {
-            selectedMention = selectedMention === 1 ? numMentions : selectedMention--;
-        }
-        this.setState({selectedMention: selectedMention});
+    handleFocus: function(listId) {
+        console.log("here! 1");
+        var mention = this.refs['mention' + index];
+        if (!mention) return;
+        var mentionRef = mention.refs.mention;
+        mentionRef.getDOMNode().focus();
+        console.log("here! 2");
     },
     addFirstMention: function() {
         if (!this.refs.mention0) return;
@@ -140,6 +144,8 @@ module.exports = React.createClass({
                         username={users[i].username}
                         secondary_text={users[i].secondary_text}
                         id={users[i].id}
+                        listId={index}
+                        handleFocus={this.handleFocus}
                         handleClick={this.handleClick} />
                 );
                 index++;
@@ -162,7 +168,7 @@ module.exports = React.createClass({
 
         return (
             <div className="mentions--top" style={style}>
-                <div ref="mentionlist" className="mentions-box" onKeyDown={this.handleKeyDown.bind(this, numMentions)}>
+                <div ref="mentionlist" className="mentions-box">
                     { mentions }
                 </div>
             </div>
-- 
cgit v1.2.3-1-g7c22


From 59b2a42ac89ca03a196bf5d20d617174a5bc30bb Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Sat, 11 Jul 2015 12:57:28 -0700
Subject: Have arrow key selection working, but visually does not highlight
 correct mention.  Also if user continues to type things might get weird.

---
 web/react/components/mention.jsx      | 23 ++++++++++++--
 web/react/components/mention_list.jsx | 56 ++++++++++++++++++++++++-----------
 2 files changed, 59 insertions(+), 20 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/mention.jsx b/web/react/components/mention.jsx
index 7a8045134..abb6ae5c6 100644
--- a/web/react/components/mention.jsx
+++ b/web/react/components/mention.jsx
@@ -6,22 +6,41 @@ module.exports = React.createClass({
     handleClick: function() {
         this.props.handleClick(this.props.username);
     },
-    handleKeyDown: function(e) {
+    /*handleUp: function(e) {
         var selectedMention = this.state.selectedMention <= nunMentions ? this.state.selectedMention : 1;
 
         console.log("Here: keyDown");
 
         if (e.key === "ArrowUp") {
             //selectedMention = selectedMention === numMentions ? 1 : selectedMention++;
+            e.preventDefault();
             this.props.handleFocus(this.props.listId);
         } 
         else if (e.key === "ArrowDown") {
             //selectedMention = selectedMention === 1 ? numMentions : selectedMention--;
+            e.preventDefault();
             this.props.handleFocus(this.props.listId);
         }
         else if (e.key === "Enter") {
+            e.preventDefault();
             this.handleClick();
         }
+    },*/
+    handleFocus: function() {
+        console.log("Entering " + this.props.listId);
+        this.setState({ isFocused: "mentions-focus" })
+    },
+    handleBlur: function() {
+        console.log("Leaving " + this.props.listId);
+        this.setState({ isFocused: "" });
+    },
+    getInitialState: function() {
+        if (this.props.isFocus) {
+            return { isFocused: "mentions-focus" };
+        }
+        else {
+            return { isFocused: "" };
+        }
     },
     render: function() {
         var icon;
@@ -32,7 +51,7 @@ module.exports = React.createClass({
             icon = <span><i className="mention-img fa fa-users fa-2x"></i></span>;
         }
         return (
-            <div className="mentions-name" ref="mention" onClick={this.handleClick} onKeyDown={this.handleKeyDown}>
+            <div className={"mentions-name " + this.state.isFocused} tabIndex={this.props.id} onClick={this.handleClick} onFocus={this.handleFocus} onBlur={this.handleBlur}>
                 <div className="pull-left">{icon}</div>
                 <div className="pull-left mention-align"><span>@{this.props.username}</span><span className="mention-fullname">{this.props.secondary_text}</span></div>
             </div>
diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index c5b4030c8..882b0d6ad 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -17,26 +17,44 @@ module.exports = React.createClass({
     displayName: "MentionList",
     componentDidMount: function() {
         PostStore.addMentionDataChangeListener(this._onChange);
-
-        console.log("here!");
-
         var self = this;
         $('body').on('keypress.mentionlist', '#'+this.props.id,
             function(e) {
-                if (!self.isEmpty() && self.state.mentionText != '-1' && e.which === 13) {
+                if (!self.isEmpty() && self.state.mentionText != '-1' && (e.which === 13 || e.which === 9)) {
+                    e.stopPropagation();
+                    e.preventDefault();
+                    self.addCurrentMention();
+                }
+            }
+        );
+        $('body').on('keydown.mentionlist', '#'+this.props.id,
+            function(e) {
+                console.log("here! top");
+                if (!self.isEmpty() && self.state.mentionText != '-1' && (e.which === 13 || e.which === 9)) {
                     e.stopPropagation();
                     e.preventDefault();
-                    self.addFirstMention();
+                    self.addCurrentMention();
                 }
                 if (!self.isEmpty() && self.state.mentionText != '-1' && e.which === 38) {
+                    console.log("here! 38");
                     e.stopPropagation();
                     e.preventDefault();
-                    self.handleFocus(0);
+
+                    if (self.handleSelection(self.state.selectedMention - 1))
+                        self.setState({ selectedMention: self.state.selectedMention - 1 });
+                    else {
+                        self.setState({ selectedMention: 0});
+                    }
                 }
                 if (!self.isEmpty() && self.state.mentionText != '-1' && e.which === 40) {
+                    console.log("here! 40");
                     e.stopPropagation();
                     e.preventDefault();
-                    self.addFirstMention(UserStore.getActiveOnlyProfiles().length - 1);
+
+                    if (self.handleSelection(self.state.selectedMention + 1))
+                        self.setState({ selectedMention: self.state.selectedMention + 1 });
+                    else
+                        self.setState({ selectedMention: 0 });
                 }
             }
         );
@@ -68,13 +86,17 @@ module.exports = React.createClass({
 
         this.setState({ mentionText: '-1' });
     },
-    handleFocus: function(listId) {
+    handleSelection: function(listId) {
         console.log("here! 1");
-        var mention = this.refs['mention' + index];
-        if (!mention) return;
-        var mentionRef = mention.refs.mention;
-        mentionRef.getDOMNode().focus();
-        console.log("here! 2");
+        var mention = this.refs['mention' + listId];
+        if (!mention) 
+            return false;
+        else
+            return true;
+    },
+    addCurrentMention: function() {
+        if (!this.refs['mention' + this.state.selectedMention]) return;
+        this.refs['mention' + this.state.selectedMention].handleClick();
     },
     addFirstMention: function() {
         if (!this.refs.mention0) return;
@@ -93,7 +115,7 @@ module.exports = React.createClass({
         return false;
     },
     getInitialState: function() {
-        return { excludeUsers: [], mentionText: "-1", selectedMention: 1 };
+        return { excludeUsers: [], mentionText: "-1", selectedMention: 0 };
     },
     render: function() {
         var mentionText = this.state.mentionText;
@@ -138,14 +160,14 @@ module.exports = React.createClass({
 
             if (firstName.lastIndexOf(mentionText,0) === 0
                     || lastName.lastIndexOf(mentionText,0) === 0 || users[i].username.lastIndexOf(mentionText,0) === 0) {
-                mentions[i+1] = (
+                mentions[index] = (
                     <Mention
                         ref={'mention' + index}
                         username={users[i].username}
                         secondary_text={users[i].secondary_text}
                         id={users[i].id}
                         listId={index}
-                        handleFocus={this.handleFocus}
+                        isFocus={this.state.selectedMention === index ? true : false}
                         handleClick={this.handleClick} />
                 );
                 index++;
@@ -164,8 +186,6 @@ module.exports = React.createClass({
             left:   $mention_tab.offset().left
         };
 
-        //mentions[this.state.selectedMention].focus();
-
         return (
             <div className="mentions--top" style={style}>
                 <div ref="mentionlist" className="mentions-box">
-- 
cgit v1.2.3-1-g7c22


From 9cc3d3428521fbc3a31def4f4780275d763a4011 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Sat, 11 Jul 2015 14:25:18 -0700
Subject: Highlighting now occurs as you arrow key thru mention list.  However
 some small bugs remain.

---
 web/react/components/mention.jsx      | 28 ++----------------
 web/react/components/mention_list.jsx | 55 +++++++++++++++++------------------
 2 files changed, 30 insertions(+), 53 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/mention.jsx b/web/react/components/mention.jsx
index abb6ae5c6..4abf8d0df 100644
--- a/web/react/components/mention.jsx
+++ b/web/react/components/mention.jsx
@@ -6,32 +6,10 @@ module.exports = React.createClass({
     handleClick: function() {
         this.props.handleClick(this.props.username);
     },
-    /*handleUp: function(e) {
-        var selectedMention = this.state.selectedMention <= nunMentions ? this.state.selectedMention : 1;
-
-        console.log("Here: keyDown");
-
-        if (e.key === "ArrowUp") {
-            //selectedMention = selectedMention === numMentions ? 1 : selectedMention++;
-            e.preventDefault();
-            this.props.handleFocus(this.props.listId);
-        } 
-        else if (e.key === "ArrowDown") {
-            //selectedMention = selectedMention === 1 ? numMentions : selectedMention--;
-            e.preventDefault();
-            this.props.handleFocus(this.props.listId);
-        }
-        else if (e.key === "Enter") {
-            e.preventDefault();
-            this.handleClick();
-        }
-    },*/
-    handleFocus: function() {
-        console.log("Entering " + this.props.listId);
+    select: function() {
         this.setState({ isFocused: "mentions-focus" })
     },
-    handleBlur: function() {
-        console.log("Leaving " + this.props.listId);
+    deselect: function() {
         this.setState({ isFocused: "" });
     },
     getInitialState: function() {
@@ -51,7 +29,7 @@ module.exports = React.createClass({
             icon = <span><i className="mention-img fa fa-users fa-2x"></i></span>;
         }
         return (
-            <div className={"mentions-name " + this.state.isFocused} tabIndex={this.props.id} onClick={this.handleClick} onFocus={this.handleFocus} onBlur={this.handleBlur}>
+            <div className={"mentions-name " + this.state.isFocused} onClick={this.handleClick}>
                 <div className="pull-left">{icon}</div>
                 <div className="pull-left mention-align"><span>@{this.props.username}</span><span className="mention-fullname">{this.props.secondary_text}</span></div>
             </div>
diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index 882b0d6ad..0bef41905 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -18,43 +18,42 @@ module.exports = React.createClass({
     componentDidMount: function() {
         PostStore.addMentionDataChangeListener(this._onChange);
         var self = this;
-        $('body').on('keypress.mentionlist', '#'+this.props.id,
-            function(e) {
-                if (!self.isEmpty() && self.state.mentionText != '-1' && (e.which === 13 || e.which === 9)) {
-                    e.stopPropagation();
-                    e.preventDefault();
-                    self.addCurrentMention();
-                }
-            }
-        );
+
         $('body').on('keydown.mentionlist', '#'+this.props.id,
             function(e) {
-                console.log("here! top");
                 if (!self.isEmpty() && self.state.mentionText != '-1' && (e.which === 13 || e.which === 9)) {
                     e.stopPropagation();
                     e.preventDefault();
                     self.addCurrentMention();
                 }
-                if (!self.isEmpty() && self.state.mentionText != '-1' && e.which === 38) {
-                    console.log("here! 38");
+                else if (!self.isEmpty() && self.state.mentionText != '-1' && (e.which === 38 || e.which === 40)) {
                     e.stopPropagation();
                     e.preventDefault();
 
-                    if (self.handleSelection(self.state.selectedMention - 1))
-                        self.setState({ selectedMention: self.state.selectedMention - 1 });
+                    if (!self.getSelection(self.state.selectedMention)) {
+                        self.setState({ selectedMention: 0 });
+                        self.refs['mention' + self.state.selectedMention].deselect();
+                    }
                     else {
-                        self.setState({ selectedMention: 0});
+                        self.refs['mention' + self.state.selectedMention].deselect();
+                        if (e.which === 38) {    
+                            if (self.getSelection(self.state.selectedMention - 1))
+                                self.setState({ selectedMention: self.state.selectedMention - 1 });
+                            else {
+                                var tempSelectedMention = -1;
+                                while (self.getSelection(++tempSelectedMention))
+                                    ;
+                                self.setState({ selectedMention: tempSelectedMention - 1 });
+                            }
+                        }
+                        else {
+                            if (self.getSelection(self.state.selectedMention + 1))
+                                self.setState({ selectedMention: self.state.selectedMention + 1 });
+                            else
+                                self.setState({ selectedMention: 0 });
+                        }
                     }
-                }
-                if (!self.isEmpty() && self.state.mentionText != '-1' && e.which === 40) {
-                    console.log("here! 40");
-                    e.stopPropagation();
-                    e.preventDefault();
-
-                    if (self.handleSelection(self.state.selectedMention + 1))
-                        self.setState({ selectedMention: self.state.selectedMention + 1 });
-                    else
-                        self.setState({ selectedMention: 0 });
+                    self.refs['mention' + self.state.selectedMention].select();
                 }
             }
         );
@@ -86,8 +85,7 @@ module.exports = React.createClass({
 
         this.setState({ mentionText: '-1' });
     },
-    handleSelection: function(listId) {
-        console.log("here! 1");
+    getSelection: function(listId) {
         var mention = this.refs['mention' + listId];
         if (!mention) 
             return false;
@@ -95,7 +93,7 @@ module.exports = React.createClass({
             return true;
     },
     addCurrentMention: function() {
-        if (!this.refs['mention' + this.state.selectedMention]) return;
+        if (!this.refs['mention' + this.state.selectedMention]) this.addFirstMention();
         this.refs['mention' + this.state.selectedMention].handleClick();
     },
     addFirstMention: function() {
@@ -173,6 +171,7 @@ module.exports = React.createClass({
                 index++;
             }
         }
+
         var numMentions = Object.keys(mentions).length;
 
         if (numMentions < 1) return null;
-- 
cgit v1.2.3-1-g7c22


From ce9756e44dcdc1dedb46337f492f4ede8719fdd8 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Sun, 12 Jul 2015 12:34:51 -0700
Subject: Improved selection logic when using both the mouse and arrow keys

---
 web/react/components/mention.jsx      |  3 ++-
 web/react/components/mention_list.jsx | 23 +++++++++++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/mention.jsx b/web/react/components/mention.jsx
index 4abf8d0df..1f6d1bcf1 100644
--- a/web/react/components/mention.jsx
+++ b/web/react/components/mention.jsx
@@ -21,6 +21,7 @@ module.exports = React.createClass({
         }
     },
     render: function() {
+        var self = this;
         var icon;
         var timestamp = UserStore.getCurrentUser().update_at;
         if (this.props.id != null) {
@@ -29,7 +30,7 @@ module.exports = React.createClass({
             icon = <span><i className="mention-img fa fa-users fa-2x"></i></span>;
         }
         return (
-            <div className={"mentions-name " + this.state.isFocused} onClick={this.handleClick}>
+            <div className={"mentions-name " + this.state.isFocused} onClick={this.handleClick} onMouseEnter={function(){self.props.handleMouseEnter(self.props.listId)}}>
                 <div className="pull-left">{icon}</div>
                 <div className="pull-left mention-align"><span>@{this.props.username}</span><span className="mention-fullname">{this.props.secondary_text}</span></div>
             </div>
diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index 0bef41905..6b1d98cf6 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -32,7 +32,7 @@ module.exports = React.createClass({
 
                     if (!self.getSelection(self.state.selectedMention)) {
                         self.setState({ selectedMention: 0 });
-                        self.refs['mention' + self.state.selectedMention].deselect();
+                        //self.refs['mention' + self.state.selectedMention].deselect();
                     }
                     else {
                         self.refs['mention' + self.state.selectedMention].deselect();
@@ -54,6 +54,8 @@ module.exports = React.createClass({
                         }
                     }
                     self.refs['mention' + self.state.selectedMention].select();
+
+                    //self.checkIfInView('#'+self.props.id);
                 }
             }
         );
@@ -85,6 +87,13 @@ module.exports = React.createClass({
 
         this.setState({ mentionText: '-1' });
     },
+    handleMouseEnter: function(listId) {
+        if (this.getSelection(this.state.selectedMention)) {
+            this.refs['mention' + this.state.selectedMention].deselect();
+        }
+        this.setState({ selectedMention: listId });
+        this.refs['mention' + listId].select();
+    },
     getSelection: function(listId) {
         var mention = this.refs['mention' + listId];
         if (!mention) 
@@ -103,6 +112,15 @@ module.exports = React.createClass({
     isEmpty: function() {
         return (!this.refs.mention0);
     },
+    checkIfInView: function(element) {
+        var offset = element.offset().top - $(window).scrollTop();
+        if(offset > window.innerHeight){
+            // Not in view so scroll to it
+            $('body').animate({scrollTop: offset}, 1000);
+            return false;
+        }
+       return true;
+    },
     alreadyMentioned: function(username) {
         var excludeUsers = this.state.excludeUsers;
         for (var i = 0; i < excludeUsers.length; i++) {
@@ -113,7 +131,7 @@ module.exports = React.createClass({
         return false;
     },
     getInitialState: function() {
-        return { excludeUsers: [], mentionText: "-1", selectedMention: 0 };
+        return { excludeUsers: [], mentionText: "-1", selectedMention: 0, selectedUsername: "" };
     },
     render: function() {
         var mentionText = this.state.mentionText;
@@ -166,6 +184,7 @@ module.exports = React.createClass({
                         id={users[i].id}
                         listId={index}
                         isFocus={this.state.selectedMention === index ? true : false}
+                        handleMouseEnter={this.handleMouseEnter}
                         handleClick={this.handleClick} />
                 );
                 index++;
-- 
cgit v1.2.3-1-g7c22


From 6f93cbb490b41ec206b66018090f34e690a145a3 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Sun, 12 Jul 2015 12:49:33 -0700
Subject: When moving from a mention lower in the list to one higher in the
 list by typing more, now properly highlights

---
 web/react/components/mention_list.jsx | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'web/react/components')

diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index 6b1d98cf6..e6b2f5e04 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -70,6 +70,11 @@ module.exports = React.createClass({
         PostStore.removeMentionDataChangeListener(this._onChange);
         $('body').off('keypress.mentionlist', '#'+this.props.id);
     },
+    componentDidUpdate: function() {
+        if (this.state.mentionText != "-1" && !this.getSelection(this.state.selectedMention)) {
+            this.refs.mention0.select();
+        }
+    },
     _onChange: function(id, mentionText, excludeList) {
         if (id !== this.props.id) return;
 
-- 
cgit v1.2.3-1-g7c22


From da228fc167494962dd222835510ff3a7db2e3a24 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Sun, 12 Jul 2015 18:39:14 -0700
Subject: Minor changes towards getting interior scrolling working with arrow
 keys

---
 web/react/components/mention_list.jsx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index e6b2f5e04..92a843bc5 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -55,7 +55,8 @@ module.exports = React.createClass({
                     }
                     self.refs['mention' + self.state.selectedMention].select();
 
-                    //self.checkIfInView('#'+self.props.id);
+                    self.checkIfInView($('#'+self.props.id));
+                    self.checkIfInView($('#'+self.refs['mention' + self.state.selectedMention].props.id));
                 }
             }
         );
@@ -118,10 +119,10 @@ module.exports = React.createClass({
         return (!this.refs.mention0);
     },
     checkIfInView: function(element) {
-        var offset = element.offset().top - $(window).scrollTop();
+        var offset = element.offset().top - $(window).scrollTop(); //$(this.props.id) ??
         if(offset > window.innerHeight){
             // Not in view so scroll to it
-            $('body').animate({scrollTop: offset}, 1000);
+            $('body').animate({scrollTop: offset}, 1000); //$(this.props.id) ??
             return false;
         }
        return true;
@@ -136,7 +137,7 @@ module.exports = React.createClass({
         return false;
     },
     getInitialState: function() {
-        return { excludeUsers: [], mentionText: "-1", selectedMention: 0, selectedUsername: "" };
+        return { excludeUsers: [], mentionText: "-1", selectedMention: 0 };
     },
     render: function() {
         var mentionText = this.state.mentionText;
-- 
cgit v1.2.3-1-g7c22


From 346f727949866083d8fd94763c6df5660424c850 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Mon, 13 Jul 2015 09:53:39 -0700
Subject: Better handling of previous highlight when you backspace (therefore
 re-enlarging the number of mentions)

---
 web/react/components/mention_list.jsx | 57 +++++++++++++++++++++++++++--------
 1 file changed, 45 insertions(+), 12 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index 92a843bc5..9dd80ebd5 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -31,32 +31,40 @@ module.exports = React.createClass({
                     e.preventDefault();
 
                     if (!self.getSelection(self.state.selectedMention)) {
-                        self.setState({ selectedMention: 0 });
+                        //self.setState({ selectedMention: 0, selectedUsername: self.refs.mention0.props.username });
                         //self.refs['mention' + self.state.selectedMention].deselect();
+                        var tempSelectedMention = -1
+                        while (self.getSelection(++tempSelectedMention)) {
+                            if (self.state.selectedUsername === self.refs['mention' + tempSelectedMention].props.username) {
+                                this.refs['mention' + tempSelectedMention].select();
+                                this.setState({ selectedMention: tempSelectedMention });
+                                break;
+                            }
+                        }
                     }
                     else {
                         self.refs['mention' + self.state.selectedMention].deselect();
                         if (e.which === 38) {    
                             if (self.getSelection(self.state.selectedMention - 1))
-                                self.setState({ selectedMention: self.state.selectedMention - 1 });
+                                self.setState({ selectedMention: self.state.selectedMention - 1, selectedUsername: self.refs['mention' + (self.state.selectedMention - 1)].props.username });
                             else {
                                 var tempSelectedMention = -1;
                                 while (self.getSelection(++tempSelectedMention))
                                     ;
-                                self.setState({ selectedMention: tempSelectedMention - 1 });
+                                self.setState({ selectedMention: tempSelectedMention - 1, selectedUsername: self.refs['mention' + (tempSelectedMention - 1)].props.username });
                             }
                         }
                         else {
                             if (self.getSelection(self.state.selectedMention + 1))
-                                self.setState({ selectedMention: self.state.selectedMention + 1 });
+                                self.setState({ selectedMention: self.state.selectedMention + 1, selectedUsername: self.refs['mention' + (self.state.selectedMention + 1)].props.username });
                             else
-                                self.setState({ selectedMention: 0 });
+                                self.setState({ selectedMention: 0, selectedUsername: self.refs.mention0.props.username });
                         }
                     }
                     self.refs['mention' + self.state.selectedMention].select();
 
-                    self.checkIfInView($('#'+self.props.id));
-                    self.checkIfInView($('#'+self.refs['mention' + self.state.selectedMention].props.id));
+                    //self.checkIfInView($('#'+self.props.id));
+                    //self.checkIfInView($('#'+self.refs['mention' + self.state.selectedMention].props.id));
                 }
             }
         );
@@ -69,11 +77,36 @@ module.exports = React.createClass({
     },
     componentWillUnmount: function() {
         PostStore.removeMentionDataChangeListener(this._onChange);
-        $('body').off('keypress.mentionlist', '#'+this.props.id);
+        $('body').off('keydown.mentionlist', '#'+this.props.id);
+    },
+    componentWillUpdate: function() {
+        if (this.state.mentionText != "-1" && this.getSelection(this.state.selectedMention)) {
+            this.refs['mention' + this.state.selectedMention].deselect();
+        }
     },
     componentDidUpdate: function() {
-        if (this.state.mentionText != "-1" && !this.getSelection(this.state.selectedMention)) {
-            this.refs.mention0.select();
+        /*if (this.state.mentionText != "-1" && !this.getSelection(this.state.selectedMention)) {
+        }*/
+        if (this.state.mentionText != "-1" /*&& this.getSelection(this.state.selectedMention)*/) {
+            if (this.state.selectedUsername !== "" && (!this.getSelection(this.state.selectedMention) || this.state.selectedUsername !== this.refs['mention' + this.state.selectedMention].props.username)) {
+                var tempSelectedMention = -1;
+                var foundMatch = false;
+                while (this.getSelection(++tempSelectedMention)) {
+                    if (this.state.selectedUsername === this.refs['mention' + tempSelectedMention].props.username) {
+                        this.refs['mention' + tempSelectedMention].select();
+                        this.setState({ selectedMention: tempSelectedMention });
+                        foundMatch = true;
+                        break;
+                    }
+                }
+                if (!foundMatch) {
+                    this.refs.mention0.select();
+                    this.setState({ selectedMention: 0, selectedUsername: this.refs.mention0.props.username });
+                }
+            }
+            else {
+                this.refs['mention' + this.state.selectedMention].select();
+            }
         }
     },
     _onChange: function(id, mentionText, excludeList) {
@@ -97,7 +130,7 @@ module.exports = React.createClass({
         if (this.getSelection(this.state.selectedMention)) {
             this.refs['mention' + this.state.selectedMention].deselect();
         }
-        this.setState({ selectedMention: listId });
+        this.setState({ selectedMention: listId, selectedUsername: this.refs['mention' + listId].props.username });
         this.refs['mention' + listId].select();
     },
     getSelection: function(listId) {
@@ -137,7 +170,7 @@ module.exports = React.createClass({
         return false;
     },
     getInitialState: function() {
-        return { excludeUsers: [], mentionText: "-1", selectedMention: 0 };
+        return { excludeUsers: [], mentionText: "-1", selectedMention: 0, selectedUsername: "" };
     },
     render: function() {
         var mentionText = this.state.mentionText;
-- 
cgit v1.2.3-1-g7c22


From 4bb2451bd5ac7f570e510a0cb96c14f0b17e4fab Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Mon, 13 Jul 2015 13:11:03 -0700
Subject: Minor changes and tweaks trying to get scrolling to work

---
 web/react/components/mention_list.jsx | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index 9dd80ebd5..ab511e424 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -50,7 +50,7 @@ module.exports = React.createClass({
                             else {
                                 var tempSelectedMention = -1;
                                 while (self.getSelection(++tempSelectedMention))
-                                    ;
+                                    ; //Need to find the top of the list
                                 self.setState({ selectedMention: tempSelectedMention - 1, selectedUsername: self.refs['mention' + (tempSelectedMention - 1)].props.username });
                             }
                         }
@@ -64,7 +64,10 @@ module.exports = React.createClass({
                     self.refs['mention' + self.state.selectedMention].select();
 
                     //self.checkIfInView($('#'+self.props.id));
-                    //self.checkIfInView($('#'+self.refs['mention' + self.state.selectedMention].props.id));
+                    self.checkIfInView();
+                    //console.log('#'+self.refs['mention' + self.state.selectedMention].props.id);
+                    //console.log($('#'+self.refs['mention' + self.state.selectedMention].props.id));
+                    //console.log($('#'+self.props.id));
                 }
             }
         );
@@ -85,9 +88,7 @@ module.exports = React.createClass({
         }
     },
     componentDidUpdate: function() {
-        /*if (this.state.mentionText != "-1" && !this.getSelection(this.state.selectedMention)) {
-        }*/
-        if (this.state.mentionText != "-1" /*&& this.getSelection(this.state.selectedMention)*/) {
+        if (this.state.mentionText != "-1") {
             if (this.state.selectedUsername !== "" && (!this.getSelection(this.state.selectedMention) || this.state.selectedUsername !== this.refs['mention' + this.state.selectedMention].props.username)) {
                 var tempSelectedMention = -1;
                 var foundMatch = false;
@@ -141,8 +142,10 @@ module.exports = React.createClass({
             return true;
     },
     addCurrentMention: function() {
-        if (!this.refs['mention' + this.state.selectedMention]) this.addFirstMention();
-        this.refs['mention' + this.state.selectedMention].handleClick();
+        if (!this.refs['mention' + this.state.selectedMention]) 
+            this.addFirstMention();
+        else
+            this.refs['mention' + this.state.selectedMention].handleClick();
     },
     addFirstMention: function() {
         if (!this.refs.mention0) return;
@@ -151,14 +154,20 @@ module.exports = React.createClass({
     isEmpty: function() {
         return (!this.refs.mention0);
     },
-    checkIfInView: function(element) {
-        var offset = element.offset().top - $(window).scrollTop(); //$(this.props.id) ??
-        if(offset > window.innerHeight){
+    checkIfInView: function() {
+        var element = $('#'+this.refs['mention' + this.state.selectedMention].props.id);
+        //var top = $('.mentions-box').position().bottom;
+        //$(".mentions-box").css("bottom", top+303);
+        //$("#"+this.props.id).scrollTop($("#"+this.props.id).scrollTop() + $("div.mentions-name.mentions-focused").position().top);
+        console.log(element.length);
+        console.log(element + " " + element.offset());
+        var offset = element.offset().bottom - $('#'+this.props.id).scrollTop(); //$(this.props.id) ??
+        if(offset > $('#'+this.props.id).innerHeight){
             // Not in view so scroll to it
             $('body').animate({scrollTop: offset}, 1000); //$(this.props.id) ??
             return false;
         }
-       return true;
+        return true;
     },
     alreadyMentioned: function(username) {
         var excludeUsers = this.state.excludeUsers;
-- 
cgit v1.2.3-1-g7c22


From 61e7b9b2be969212dbb3577ef734a27620a525be Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Tue, 14 Jul 2015 16:13:31 -0700
Subject: Getting scrolling working with the arrow keys

---
 web/react/components/mention.jsx      |  2 +-
 web/react/components/mention_list.jsx | 57 ++++++++++++++++++++++++++---------
 2 files changed, 43 insertions(+), 16 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/mention.jsx b/web/react/components/mention.jsx
index 1f6d1bcf1..3f6ec4a7b 100644
--- a/web/react/components/mention.jsx
+++ b/web/react/components/mention.jsx
@@ -30,7 +30,7 @@ module.exports = React.createClass({
             icon = <span><i className="mention-img fa fa-users fa-2x"></i></span>;
         }
         return (
-            <div className={"mentions-name " + this.state.isFocused} onClick={this.handleClick} onMouseEnter={function(){self.props.handleMouseEnter(self.props.listId)}}>
+            <div className={"mentions-name " + this.state.isFocused} id={this.props.id + "_mentions"} onClick={this.handleClick} onMouseEnter={function(){self.props.handleMouseEnter(self.props.listId)}}>
                 <div className="pull-left">{icon}</div>
                 <div className="pull-left mention-align"><span>@{this.props.username}</span><span className="mention-fullname">{this.props.secondary_text}</span></div>
             </div>
diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index ab511e424..2f4f92e24 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -30,6 +30,8 @@ module.exports = React.createClass({
                     e.stopPropagation();
                     e.preventDefault();
 
+                    var tempSelectedMention = -1
+
                     if (!self.getSelection(self.state.selectedMention)) {
                         //self.setState({ selectedMention: 0, selectedUsername: self.refs.mention0.props.username });
                         //self.refs['mention' + self.state.selectedMention].deselect();
@@ -64,7 +66,7 @@ module.exports = React.createClass({
                     self.refs['mention' + self.state.selectedMention].select();
 
                     //self.checkIfInView($('#'+self.props.id));
-                    self.checkIfInView();
+                    self.checkIfInView(e.which, tempSelectedMention);
                     //console.log('#'+self.refs['mention' + self.state.selectedMention].props.id);
                     //console.log($('#'+self.refs['mention' + self.state.selectedMention].props.id));
                     //console.log($('#'+self.props.id));
@@ -154,20 +156,43 @@ module.exports = React.createClass({
     isEmpty: function() {
         return (!this.refs.mention0);
     },
-    checkIfInView: function() {
-        var element = $('#'+this.refs['mention' + this.state.selectedMention].props.id);
-        //var top = $('.mentions-box').position().bottom;
-        //$(".mentions-box").css("bottom", top+303);
-        //$("#"+this.props.id).scrollTop($("#"+this.props.id).scrollTop() + $("div.mentions-name.mentions-focused").position().top);
-        console.log(element.length);
-        console.log(element + " " + element.offset());
-        var offset = element.offset().bottom - $('#'+this.props.id).scrollTop(); //$(this.props.id) ??
-        if(offset > $('#'+this.props.id).innerHeight){
-            // Not in view so scroll to it
-            $('body').animate({scrollTop: offset}, 1000); //$(this.props.id) ??
-            return false;
+    checkIfInView: function(keyPressed, ifLoopUp) {
+        var element = $('#'+this.refs['mention' + this.state.selectedMention].props.id +"_mentions");
+        var offset = element.offset().top - $("#mentionsbox").scrollTop();
+        var direction = keyPressed === 38 ? "up" : "down";
+        console.log("element offset top: " + $(element).offset().top + " box offset top: " + $("#mentionsbox").offset().top);
+        var scrollAmount;
+        if (direction === "up" && ifLoopUp !== -1) {
+            /*$("#mentionsbox").animate({
+                scrollTop: ("#mentionsbox").offset().top
+            }, 50);*/
+            scrollAmount = $("#mentionsbox").offset().top;
+        }
+        else if (direction === "down" && !this.refs['mention' + this.state.selectedMention].props.listId) {
+            /*$("#mentionsbox").animate({
+                scrollTop: 0
+            }, 50);*/
+            scrollAmount = 0;
+        }
+        else if (direction === "up") {
+            /*$("#mentionsbox").animate({
+                scrollTop: '-=28'
+            }, 50);*/
+            scrollAmount = "-=28";
+        }
+        else if (direction === "down") {
+            /*$("#mentionsbox").animate({
+                scrollTop: '+=28'
+            }, 50);*/
+            scrollAmount = "+=28";
         }
-        return true;
+        $("#mentionsbox").animate({
+            scrollTop: scrollAmount
+        }, 50);
+        /*$("#mentionsbox").animate({
+            scrollTop: $(element).offset().top - $("#mentionsbox").offset().top
+            //scrollTop: $(element).offset().top - $("#mentionsbox").offset().top
+        }, 50);*/
     },
     alreadyMentioned: function(username) {
         var excludeUsers = this.state.excludeUsers;
@@ -195,12 +220,14 @@ module.exports = React.createClass({
         all.username = "all";
         all.full_name = "";
         all.secondary_text = "Notifies everyone in the team";
+        all.id = "allmention";
         users.push(all);
 
         var channel = {};
         channel.username = "channel";
         channel.full_name = "";
         channel.secondary_text = "Notifies everyone in the channel";
+        channel.id = "channelmention";
         users.push(channel);
 
         users.sort(function(a,b) {
@@ -254,7 +281,7 @@ module.exports = React.createClass({
 
         return (
             <div className="mentions--top" style={style}>
-                <div ref="mentionlist" className="mentions-box">
+                <div ref="mentionlist" className="mentions-box" id="mentionsbox">
                     { mentions }
                 </div>
             </div>
-- 
cgit v1.2.3-1-g7c22


From 9747053a4e017e64a21278981fe43573385488a0 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Tue, 14 Jul 2015 18:36:54 -0700
Subject: Fixes not selecting an element that hasn't been scrolled to

---
 web/react/components/mention.jsx      |  4 +-
 web/react/components/mention_list.jsx | 70 ++++++++++++-----------------------
 2 files changed, 27 insertions(+), 47 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/mention.jsx b/web/react/components/mention.jsx
index 3f6ec4a7b..24098516e 100644
--- a/web/react/components/mention.jsx
+++ b/web/react/components/mention.jsx
@@ -24,7 +24,9 @@ module.exports = React.createClass({
         var self = this;
         var icon;
         var timestamp = UserStore.getCurrentUser().update_at;
-        if (this.props.id != null) {
+        if (this.props.id === "allmention" || this.props.id === "channelmention") {
+            icon = <span><i className="mention-img fa fa-users fa-2x"></i></span>;
+        } else if (this.props.id != null) {
             icon = <span><img className="mention-img" src={"/api/v1/users/" + this.props.id + "/image?time=" + timestamp}/></span>;
         } else {
             icon = <span><i className="mention-img fa fa-users fa-2x"></i></span>;
diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index 2f4f92e24..7cc90e36f 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -33,9 +33,6 @@ module.exports = React.createClass({
                     var tempSelectedMention = -1
 
                     if (!self.getSelection(self.state.selectedMention)) {
-                        //self.setState({ selectedMention: 0, selectedUsername: self.refs.mention0.props.username });
-                        //self.refs['mention' + self.state.selectedMention].deselect();
-                        var tempSelectedMention = -1
                         while (self.getSelection(++tempSelectedMention)) {
                             if (self.state.selectedUsername === self.refs['mention' + tempSelectedMention].props.username) {
                                 this.refs['mention' + tempSelectedMention].select();
@@ -50,7 +47,6 @@ module.exports = React.createClass({
                             if (self.getSelection(self.state.selectedMention - 1))
                                 self.setState({ selectedMention: self.state.selectedMention - 1, selectedUsername: self.refs['mention' + (self.state.selectedMention - 1)].props.username });
                             else {
-                                var tempSelectedMention = -1;
                                 while (self.getSelection(++tempSelectedMention))
                                     ; //Need to find the top of the list
                                 self.setState({ selectedMention: tempSelectedMention - 1, selectedUsername: self.refs['mention' + (tempSelectedMention - 1)].props.username });
@@ -65,11 +61,10 @@ module.exports = React.createClass({
                     }
                     self.refs['mention' + self.state.selectedMention].select();
 
-                    //self.checkIfInView($('#'+self.props.id));
-                    self.checkIfInView(e.which, tempSelectedMention);
-                    //console.log('#'+self.refs['mention' + self.state.selectedMention].props.id);
-                    //console.log($('#'+self.refs['mention' + self.state.selectedMention].props.id));
-                    //console.log($('#'+self.props.id));
+                    self.scrollToMention(e.which, tempSelectedMention);
+                }
+                else if (e.which === 46 || e.which === 8) {
+                    self.setState({ lessText: true });
                 }
             }
         );
@@ -94,7 +89,7 @@ module.exports = React.createClass({
             if (this.state.selectedUsername !== "" && (!this.getSelection(this.state.selectedMention) || this.state.selectedUsername !== this.refs['mention' + this.state.selectedMention].props.username)) {
                 var tempSelectedMention = -1;
                 var foundMatch = false;
-                while (this.getSelection(++tempSelectedMention)) {
+                while (!this.state.lessText && this.getSelection(++tempSelectedMention)) {
                     if (this.state.selectedUsername === this.refs['mention' + tempSelectedMention].props.username) {
                         this.refs['mention' + tempSelectedMention].select();
                         this.setState({ selectedMention: tempSelectedMention });
@@ -102,15 +97,18 @@ module.exports = React.createClass({
                         break;
                     }
                 }
-                if (!foundMatch) {
+                if (this.refs.mention0 != undefined && !foundMatch) {
                     this.refs.mention0.select();
-                    this.setState({ selectedMention: 0, selectedUsername: this.refs.mention0.props.username });
+                    this.setState({ selectedMention: 0, selectedUsername: this.refs.mention0.props.username, lessText: false });
                 }
             }
-            else {
+            else if (this.refs['mention' + this.state.selectedMention] != undefined) {
                 this.refs['mention' + this.state.selectedMention].select();
             }
         }
+        else if (this.state.selectedMention !== 0) {
+            this.setState({ selectedMention: 0, selectedUsername: "" });
+        }
     },
     _onChange: function(id, mentionText, excludeList) {
         if (id !== this.props.id) return;
@@ -118,6 +116,7 @@ module.exports = React.createClass({
         var newState = this.state;
         if (mentionText != null) newState.mentionText = mentionText;
         if (excludeList != null) newState.excludeUsers = excludeList;
+
         this.setState(newState);
     },
     handleClick: function(name) {
@@ -156,43 +155,22 @@ module.exports = React.createClass({
     isEmpty: function() {
         return (!this.refs.mention0);
     },
-    checkIfInView: function(keyPressed, ifLoopUp) {
-        var element = $('#'+this.refs['mention' + this.state.selectedMention].props.id +"_mentions");
-        var offset = element.offset().top - $("#mentionsbox").scrollTop();
+    scrollToMention: function(keyPressed, ifLoopUp) {
         var direction = keyPressed === 38 ? "up" : "down";
-        console.log("element offset top: " + $(element).offset().top + " box offset top: " + $("#mentionsbox").offset().top);
-        var scrollAmount;
-        if (direction === "up" && ifLoopUp !== -1) {
-            /*$("#mentionsbox").animate({
-                scrollTop: ("#mentionsbox").offset().top
-            }, 50);*/
-            scrollAmount = $("#mentionsbox").offset().top;
-        }
-        else if (direction === "down" && !this.refs['mention' + this.state.selectedMention].props.listId) {
-            /*$("#mentionsbox").animate({
-                scrollTop: 0
-            }, 50);*/
+        var scrollAmount = 0;
+
+        if (direction === "up" && ifLoopUp !== -1)
+            scrollAmount = $("#mentionsbox").innerHeight() + 10000000; //innerHeight is not the real height of the box in the RHS sometimes; this compensates as it should always go to the bottom anyway
+        else if (direction === "down" && this.refs['mention' + this.state.selectedMention].props.listId === 0)
             scrollAmount = 0;
-        }
-        else if (direction === "up") {
-            /*$("#mentionsbox").animate({
-                scrollTop: '-=28'
-            }, 50);*/
-            scrollAmount = "-=28";
-        }
-        else if (direction === "down") {
-            /*$("#mentionsbox").animate({
-                scrollTop: '+=28'
-            }, 50);*/
-            scrollAmount = "+=28";
-        }
+        else if (direction === "up") 
+            scrollAmount = "-=" + ($('#'+this.refs['mention' + this.state.selectedMention].props.id +"_mentions").innerHeight() - 5);
+        else if (direction === "down")
+            scrollAmount = "+=" + ($('#'+this.refs['mention' + this.state.selectedMention].props.id +"_mentions").innerHeight() - 5);
+
         $("#mentionsbox").animate({
             scrollTop: scrollAmount
         }, 50);
-        /*$("#mentionsbox").animate({
-            scrollTop: $(element).offset().top - $("#mentionsbox").offset().top
-            //scrollTop: $(element).offset().top - $("#mentionsbox").offset().top
-        }, 50);*/
     },
     alreadyMentioned: function(username) {
         var excludeUsers = this.state.excludeUsers;
@@ -204,7 +182,7 @@ module.exports = React.createClass({
         return false;
     },
     getInitialState: function() {
-        return { excludeUsers: [], mentionText: "-1", selectedMention: 0, selectedUsername: "" };
+        return { excludeUsers: [], mentionText: "-1", selectedMention: 0, selectedUsername: "", lessText: false };
     },
     render: function() {
         var mentionText = this.state.mentionText;
-- 
cgit v1.2.3-1-g7c22


From c5c4c0b4de6275ca3f4188c07d2d0d88ba230bd1 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Tue, 14 Jul 2015 19:59:09 -0700
Subject: Few minor bug fixes

---
 web/react/components/mention_list.jsx | 50 ++++++++++++-----------------------
 1 file changed, 17 insertions(+), 33 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index 7cc90e36f..17c513714 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -31,41 +31,26 @@ module.exports = React.createClass({
                     e.preventDefault();
 
                     var tempSelectedMention = -1
-
-                    if (!self.getSelection(self.state.selectedMention)) {
-                        while (self.getSelection(++tempSelectedMention)) {
-                            if (self.state.selectedUsername === self.refs['mention' + tempSelectedMention].props.username) {
-                                this.refs['mention' + tempSelectedMention].select();
-                                this.setState({ selectedMention: tempSelectedMention });
-                                break;
-                            }
+                    self.refs['mention' + self.state.selectedMention].deselect();
+                    if (e.which === 38) {    
+                        if (self.getSelection(self.state.selectedMention - 1))
+                            self.setState({ selectedMention: self.state.selectedMention - 1, selectedUsername: self.refs['mention' + (self.state.selectedMention - 1)].props.username });
+                        else {
+                            while (self.getSelection(++tempSelectedMention))
+                                ; //Need to find the top of the list
+                            self.setState({ selectedMention: tempSelectedMention - 1, selectedUsername: self.refs['mention' + (tempSelectedMention - 1)].props.username });
                         }
                     }
                     else {
-                        self.refs['mention' + self.state.selectedMention].deselect();
-                        if (e.which === 38) {    
-                            if (self.getSelection(self.state.selectedMention - 1))
-                                self.setState({ selectedMention: self.state.selectedMention - 1, selectedUsername: self.refs['mention' + (self.state.selectedMention - 1)].props.username });
-                            else {
-                                while (self.getSelection(++tempSelectedMention))
-                                    ; //Need to find the top of the list
-                                self.setState({ selectedMention: tempSelectedMention - 1, selectedUsername: self.refs['mention' + (tempSelectedMention - 1)].props.username });
-                            }
-                        }
-                        else {
-                            if (self.getSelection(self.state.selectedMention + 1))
-                                self.setState({ selectedMention: self.state.selectedMention + 1, selectedUsername: self.refs['mention' + (self.state.selectedMention + 1)].props.username });
-                            else
-                                self.setState({ selectedMention: 0, selectedUsername: self.refs.mention0.props.username });
-                        }
+                        if (self.getSelection(self.state.selectedMention + 1))
+                            self.setState({ selectedMention: self.state.selectedMention + 1, selectedUsername: self.refs['mention' + (self.state.selectedMention + 1)].props.username });
+                        else
+                            self.setState({ selectedMention: 0, selectedUsername: self.refs.mention0.props.username });
                     }
-                    self.refs['mention' + self.state.selectedMention].select();
 
+                    self.refs['mention' + self.state.selectedMention].select();
                     self.scrollToMention(e.which, tempSelectedMention);
                 }
-                else if (e.which === 46 || e.which === 8) {
-                    self.setState({ lessText: true });
-                }
             }
         );
         $(document).click(function(e) {
@@ -89,7 +74,7 @@ module.exports = React.createClass({
             if (this.state.selectedUsername !== "" && (!this.getSelection(this.state.selectedMention) || this.state.selectedUsername !== this.refs['mention' + this.state.selectedMention].props.username)) {
                 var tempSelectedMention = -1;
                 var foundMatch = false;
-                while (!this.state.lessText && this.getSelection(++tempSelectedMention)) {
+                while (tempSelectedMention < this.state.selectedMention && this.getSelection(++tempSelectedMention)) {
                     if (this.state.selectedUsername === this.refs['mention' + tempSelectedMention].props.username) {
                         this.refs['mention' + tempSelectedMention].select();
                         this.setState({ selectedMention: tempSelectedMention });
@@ -99,7 +84,7 @@ module.exports = React.createClass({
                 }
                 if (this.refs.mention0 != undefined && !foundMatch) {
                     this.refs.mention0.select();
-                    this.setState({ selectedMention: 0, selectedUsername: this.refs.mention0.props.username, lessText: false });
+                    this.setState({ selectedMention: 0, selectedUsername: this.refs.mention0.props.username });
                 }
             }
             else if (this.refs['mention' + this.state.selectedMention] != undefined) {
@@ -136,8 +121,7 @@ module.exports = React.createClass({
         this.refs['mention' + listId].select();
     },
     getSelection: function(listId) {
-        var mention = this.refs['mention' + listId];
-        if (!mention) 
+        if (!this.refs['mention' + listId]) 
             return false;
         else
             return true;
@@ -182,7 +166,7 @@ module.exports = React.createClass({
         return false;
     },
     getInitialState: function() {
-        return { excludeUsers: [], mentionText: "-1", selectedMention: 0, selectedUsername: "", lessText: false };
+        return { excludeUsers: [], mentionText: "-1", selectedMention: 0, selectedUsername: "" };
     },
     render: function() {
         var mentionText = this.state.mentionText;
-- 
cgit v1.2.3-1-g7c22


From cbcf44ac8506d316d57a7e0bb30baad258618bdb Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Tue, 14 Jul 2015 20:14:23 -0700
Subject: Minor changes to scroll 'feel' and logic flow

---
 web/react/components/mention_list.jsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index 17c513714..1852a3ebc 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -41,7 +41,7 @@ module.exports = React.createClass({
                             self.setState({ selectedMention: tempSelectedMention - 1, selectedUsername: self.refs['mention' + (tempSelectedMention - 1)].props.username });
                         }
                     }
-                    else {
+                    else if (e.which === 40) {
                         if (self.getSelection(self.state.selectedMention + 1))
                             self.setState({ selectedMention: self.state.selectedMention + 1, selectedUsername: self.refs['mention' + (self.state.selectedMention + 1)].props.username });
                         else
@@ -82,12 +82,12 @@ module.exports = React.createClass({
                         break;
                     }
                 }
-                if (this.refs.mention0 != undefined && !foundMatch) {
+                if (this.getSelection(0) && !foundMatch) {
                     this.refs.mention0.select();
                     this.setState({ selectedMention: 0, selectedUsername: this.refs.mention0.props.username });
                 }
             }
-            else if (this.refs['mention' + this.state.selectedMention] != undefined) {
+            else if (this.getSelection(this.state.selectedMention)) {
                 this.refs['mention' + this.state.selectedMention].select();
             }
         }
@@ -144,7 +144,7 @@ module.exports = React.createClass({
         var scrollAmount = 0;
 
         if (direction === "up" && ifLoopUp !== -1)
-            scrollAmount = $("#mentionsbox").innerHeight() + 10000000; //innerHeight is not the real height of the box in the RHS sometimes; this compensates as it should always go to the bottom anyway
+            scrollAmount = $("#mentionsbox").height() * 100; //Makes sure that it scrolls all the way to the bottom
         else if (direction === "down" && this.refs['mention' + this.state.selectedMention].props.listId === 0)
             scrollAmount = 0;
         else if (direction === "up") 
@@ -154,7 +154,7 @@ module.exports = React.createClass({
 
         $("#mentionsbox").animate({
             scrollTop: scrollAmount
-        }, 50);
+        }, 75);
     },
     alreadyMentioned: function(username) {
         var excludeUsers = this.state.excludeUsers;
-- 
cgit v1.2.3-1-g7c22


From 15b90ff72f7db4d611c5c5035e2d8cd310d4deff Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Tue, 14 Jul 2015 20:35:52 -0700
Subject: Added missing semi-colons

---
 web/react/components/mention.jsx      | 2 +-
 web/react/components/mention_list.jsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/mention.jsx b/web/react/components/mention.jsx
index 24098516e..f5ca4ce6d 100644
--- a/web/react/components/mention.jsx
+++ b/web/react/components/mention.jsx
@@ -7,7 +7,7 @@ module.exports = React.createClass({
         this.props.handleClick(this.props.username);
     },
     select: function() {
-        this.setState({ isFocused: "mentions-focus" })
+        this.setState({ isFocused: "mentions-focus" });
     },
     deselect: function() {
         this.setState({ isFocused: "" });
diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index 1852a3ebc..1df7a8298 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -30,7 +30,7 @@ module.exports = React.createClass({
                     e.stopPropagation();
                     e.preventDefault();
 
-                    var tempSelectedMention = -1
+                    var tempSelectedMention = -1;
                     self.refs['mention' + self.state.selectedMention].deselect();
                     if (e.which === 38) {    
                         if (self.getSelection(self.state.selectedMention - 1))
-- 
cgit v1.2.3-1-g7c22


From 139f6611d6162158ea88c679aee710f7a6c76c49 Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Thu, 16 Jul 2015 08:55:37 -0700
Subject: Added last updated for pictures

---
 web/react/components/user_settings.jsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx
index 06d8d0208..b1ccd125a 100644
--- a/web/react/components/user_settings.jsx
+++ b/web/react/components/user_settings.jsx
@@ -820,6 +820,7 @@ var GeneralTab = React.createClass({
         client.uploadProfileImage(formData,
             function(data) {
                 this.submitActive = false;
+                AsyncClient.getMe();
                 window.location.reload();
             }.bind(this),
             function(err) {
@@ -989,7 +990,7 @@ var GeneralTab = React.createClass({
                 <SettingPicture
                     title="Profile Picture"
                     submit={this.submitPicture}
-                    src={"/api/v1/users/" + user.id + "/image"}
+                    src={"/api/v1/users/" + user.id + "/image?time=" + user.last_picture_update}
                     server_error={server_error}
                     client_error={client_error}
                     updateSection={function(e){self.updateSection("");e.preventDefault();}}
@@ -1000,10 +1001,14 @@ var GeneralTab = React.createClass({
             );
 
         } else {
+            var minMessage = "Click Edit to upload an image.";
+            if (user.last_picture_update) {
+                minMessage = "Image last updated " + utils.displayDate(user.last_picture_update)
+            }
             pictureSection = (
                 <SettingItemMin
                     title="Profile Picture"
-                    describe="Picture inside."
+                    describe={minMessage}
                     updateSection={function(){self.updateSection("picture");}}
                 />
             );
-- 
cgit v1.2.3-1-g7c22


From cb4cd741a45fc86a7c2d96e61abd65ad4bd728e1 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Thu, 16 Jul 2015 09:21:51 -0700
Subject: Code simplification and rebasing

---
 web/react/components/mention.jsx      | 15 ++-------------
 web/react/components/mention_list.jsx | 23 ++++-------------------
 2 files changed, 6 insertions(+), 32 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/mention.jsx b/web/react/components/mention.jsx
index f5ca4ce6d..114dc183f 100644
--- a/web/react/components/mention.jsx
+++ b/web/react/components/mention.jsx
@@ -6,19 +6,8 @@ module.exports = React.createClass({
     handleClick: function() {
         this.props.handleClick(this.props.username);
     },
-    select: function() {
-        this.setState({ isFocused: "mentions-focus" });
-    },
-    deselect: function() {
-        this.setState({ isFocused: "" });
-    },
     getInitialState: function() {
-        if (this.props.isFocus) {
-            return { isFocused: "mentions-focus" };
-        }
-        else {
-            return { isFocused: "" };
-        }
+        return null;
     },
     render: function() {
         var self = this;
@@ -32,7 +21,7 @@ module.exports = React.createClass({
             icon = <span><i className="mention-img fa fa-users fa-2x"></i></span>;
         }
         return (
-            <div className={"mentions-name " + this.state.isFocused} id={this.props.id + "_mentions"} onClick={this.handleClick} onMouseEnter={function(){self.props.handleMouseEnter(self.props.listId)}}>
+            <div className={"mentions-name " + this.props.isFocused} id={this.props.id + "_mentions"} onClick={this.handleClick} onMouseEnter={this.props.handleMouseEnter}>
                 <div className="pull-left">{icon}</div>
                 <div className="pull-left mention-align"><span>@{this.props.username}</span><span className="mention-fullname">{this.props.secondary_text}</span></div>
             </div>
diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index 1df7a8298..fff0c10b8 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -31,7 +31,6 @@ module.exports = React.createClass({
                     e.preventDefault();
 
                     var tempSelectedMention = -1;
-                    self.refs['mention' + self.state.selectedMention].deselect();
                     if (e.which === 38) {    
                         if (self.getSelection(self.state.selectedMention - 1))
                             self.setState({ selectedMention: self.state.selectedMention - 1, selectedUsername: self.refs['mention' + (self.state.selectedMention - 1)].props.username });
@@ -48,7 +47,6 @@ module.exports = React.createClass({
                             self.setState({ selectedMention: 0, selectedUsername: self.refs.mention0.props.username });
                     }
 
-                    self.refs['mention' + self.state.selectedMention].select();
                     self.scrollToMention(e.which, tempSelectedMention);
                 }
             }
@@ -64,11 +62,6 @@ module.exports = React.createClass({
         PostStore.removeMentionDataChangeListener(this._onChange);
         $('body').off('keydown.mentionlist', '#'+this.props.id);
     },
-    componentWillUpdate: function() {
-        if (this.state.mentionText != "-1" && this.getSelection(this.state.selectedMention)) {
-            this.refs['mention' + this.state.selectedMention].deselect();
-        }
-    },
     componentDidUpdate: function() {
         if (this.state.mentionText != "-1") {
             if (this.state.selectedUsername !== "" && (!this.getSelection(this.state.selectedMention) || this.state.selectedUsername !== this.refs['mention' + this.state.selectedMention].props.username)) {
@@ -76,20 +69,15 @@ module.exports = React.createClass({
                 var foundMatch = false;
                 while (tempSelectedMention < this.state.selectedMention && this.getSelection(++tempSelectedMention)) {
                     if (this.state.selectedUsername === this.refs['mention' + tempSelectedMention].props.username) {
-                        this.refs['mention' + tempSelectedMention].select();
                         this.setState({ selectedMention: tempSelectedMention });
                         foundMatch = true;
                         break;
                     }
                 }
                 if (this.getSelection(0) && !foundMatch) {
-                    this.refs.mention0.select();
                     this.setState({ selectedMention: 0, selectedUsername: this.refs.mention0.props.username });
                 }
             }
-            else if (this.getSelection(this.state.selectedMention)) {
-                this.refs['mention' + this.state.selectedMention].select();
-            }
         }
         else if (this.state.selectedMention !== 0) {
             this.setState({ selectedMention: 0, selectedUsername: "" });
@@ -114,11 +102,7 @@ module.exports = React.createClass({
         this.setState({ mentionText: '-1' });
     },
     handleMouseEnter: function(listId) {
-        if (this.getSelection(this.state.selectedMention)) {
-            this.refs['mention' + this.state.selectedMention].deselect();
-        }
         this.setState({ selectedMention: listId, selectedUsername: this.refs['mention' + listId].props.username });
-        this.refs['mention' + listId].select();
     },
     getSelection: function(listId) {
         if (!this.refs['mention' + listId]) 
@@ -127,7 +111,7 @@ module.exports = React.createClass({
             return true;
     },
     addCurrentMention: function() {
-        if (!this.refs['mention' + this.state.selectedMention]) 
+        if (!this.getSelection(this.state.selectedMention)) 
             this.addFirstMention();
         else
             this.refs['mention' + this.state.selectedMention].handleClick();
@@ -169,6 +153,7 @@ module.exports = React.createClass({
         return { excludeUsers: [], mentionText: "-1", selectedMention: 0, selectedUsername: "" };
     },
     render: function() {
+        var self = this;
         var mentionText = this.state.mentionText;
         if (mentionText === '-1') return null;
 
@@ -220,8 +205,8 @@ module.exports = React.createClass({
                         secondary_text={users[i].secondary_text}
                         id={users[i].id}
                         listId={index}
-                        isFocus={this.state.selectedMention === index ? true : false}
-                        handleMouseEnter={this.handleMouseEnter}
+                        isFocused={this.state.selectedMention === index ? "mentions-focus" : ""}
+                        handleMouseEnter={function(value) { return function() { self.handleMouseEnter(value); } }(index)}
                         handleClick={this.handleClick} />
                 );
                 index++;
-- 
cgit v1.2.3-1-g7c22


From 1f87c46360b434335ee4b8eae5162b8d37de6f4b Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Thu, 16 Jul 2015 09:27:18 -0700
Subject: Minor code change for clarity

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

(limited to 'web/react/components')

diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index fff0c10b8..c5ff82346 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -129,7 +129,7 @@ module.exports = React.createClass({
 
         if (direction === "up" && ifLoopUp !== -1)
             scrollAmount = $("#mentionsbox").height() * 100; //Makes sure that it scrolls all the way to the bottom
-        else if (direction === "down" && this.refs['mention' + this.state.selectedMention].props.listId === 0)
+        else if (direction === "down" && this.state.selectedMention === 0)
             scrollAmount = 0;
         else if (direction === "up") 
             scrollAmount = "-=" + ($('#'+this.refs['mention' + this.state.selectedMention].props.id +"_mentions").innerHeight() - 5);
-- 
cgit v1.2.3-1-g7c22


From 43368061d5bfd433c8bbb71fba5da45faf8119d9 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Fri, 17 Jul 2015 01:30:30 +0500
Subject: MM-1401 - Removing most inline styles and other UI changes

---
 web/react/components/channel_header.jsx     | 11 +++++------
 web/react/components/edit_channel_modal.jsx |  2 +-
 web/react/components/get_link_modal.jsx     |  2 +-
 web/react/components/member_list_item.jsx   |  2 +-
 web/react/components/member_list_team.jsx   |  2 +-
 web/react/components/new_channel.jsx        |  2 +-
 web/react/components/post_right.jsx         |  2 +-
 web/react/components/sidebar_header.jsx     |  2 +-
 web/react/components/user_profile.jsx       |  4 ++--
 web/react/components/user_settings.jsx      | 12 ++++++------
 10 files changed, 20 insertions(+), 21 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index fe381a59e..836454b46 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -53,12 +53,12 @@ var PopoverListMembers = React.createClass({
             });
 
             members.forEach(function(m) {
-                popoverHtml += "<div style='white-space: nowrap'>" + m.username + "</div>";
+                popoverHtml += "<div class='text--nowrap'>" + m.username + "</div>";
             });
         }
 
         return (
-            <div style={{cursor : "pointer"}} id="member_popover" data-toggle="popover" data-content={popoverHtml} data-original-title="Members" >
+            <div id="member_popover" data-toggle="popover" data-content={popoverHtml} data-original-title="Members" >
                 <div id="member_tooltip" data-toggle="tooltip" title="View Channel Members">
                     {count} <span className="glyphicon glyphicon-user" aria-hidden="true"></span>
                 </div>
@@ -200,11 +200,10 @@ module.exports = React.createClass({
                     <th><PopoverListMembers members={this.state.users} channelId={this.state.channel.id} /></th>
                     <th className="search-bar__container"><NavbarSearchBox /></th>
                     <th>
-                        <div className="dropdown" style={{marginLeft:5, marginRight:10}}>
+                        <div className="dropdown channel-header__links">
                             <a href="#" className="dropdown-toggle theme" type="button" id="channel_header_right_dropdown" data-toggle="dropdown" aria-expanded="true">
-                                <i className="fa fa-caret-down"></i>
-                            </a>
-                            <ul className="dropdown-menu" role="menu" aria-labelledby="channel_header_right_dropdown" style={{left: "-150px"}}>
+                                <span dangerouslySetInnerHTML={{__html: " <svg version='1.1' id='Layer_1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' x='0px' y='0px'width='4px' height='16px' viewBox='0 0 8 32' enable-background='new 0 0 8 32' xml:space='preserve'> <g> <circle cx='4' cy='4.062' r='4'/> <circle cx='4' cy='16' r='4'/> <circle cx='4' cy='28' r='4'/> </g> </svg>"}} /> </a>
+                            <ul className="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="channel_header_right_dropdown">
                                 <li role="presentation"><a role="menuitem" href="#" onClick={this.searchMentions}>Recent Mentions</a></li>
                             </ul>
                         </div>
diff --git a/web/react/components/edit_channel_modal.jsx b/web/react/components/edit_channel_modal.jsx
index 255654fd5..c0818959a 100644
--- a/web/react/components/edit_channel_modal.jsx
+++ b/web/react/components/edit_channel_modal.jsx
@@ -43,7 +43,7 @@ module.exports = React.createClass({
                     <h4 className="modal-title" ref="title">Edit {this.state.title} Description</h4>
                   </div>
                   <div className="modal-body">
-                    <textarea className="form-control" style={{resize: "none"}} rows="6" ref="channelDesc" maxLength="1024" value={this.state.description} onChange={this.handleUserInput}></textarea>
+                    <textarea className="form-control no-resize" rows="6" ref="channelDesc" maxLength="1024" value={this.state.description} onChange={this.handleUserInput}></textarea>
                   </div>
                   <div className="modal-footer">
                     <button type="button" className="btn btn-default" data-dismiss="modal">Close</button>
diff --git a/web/react/components/get_link_modal.jsx b/web/react/components/get_link_modal.jsx
index bbfdce63a..af5314e64 100644
--- a/web/react/components/get_link_modal.jsx
+++ b/web/react/components/get_link_modal.jsx
@@ -38,7 +38,7 @@ module.exports = React.createClass({
                         <div className="modal-body">
                           <p>{"The link below is used for open " + strings.TeamPlural + " or if you allowed your " + strings.Team + " members to sign up using their " + strings.Company + " email addresses."}
                           </p>
-                          <textarea className="form-control" style={{resize: "none"}} readOnly="true" value={this.state.value}></textarea>
+                          <textarea className="form-control no-resize" readOnly="true" value={this.state.value}></textarea>
                         </div>
                         <div className="modal-footer">
                           <button type="button" className="btn btn-default" data-dismiss="modal">Close</button>
diff --git a/web/react/components/member_list_item.jsx b/web/react/components/member_list_item.jsx
index cf8c71d7e..a5279909b 100644
--- a/web/react/components/member_list_item.jsx
+++ b/web/react/components/member_list_item.jsx
@@ -49,7 +49,7 @@ module.exports = React.createClass({
                         </div>
                     );
         } else {
-            invite = <div className="member-role text-capitalize" style={{marginRight: 15}}>{member.roles || 'Member'}</div>;
+            invite = <div className="member-role text-capitalize">{member.roles || 'Member'}<span className="caret hidden"></span></div>;
         }
 
         return (
diff --git a/web/react/components/member_list_team.jsx b/web/react/components/member_list_team.jsx
index aa53c5db6..89b5e49d5 100644
--- a/web/react/components/member_list_team.jsx
+++ b/web/react/components/member_list_team.jsx
@@ -59,7 +59,7 @@ var MemberListTeamItem = React.createClass({
         return {};
     },
     render: function() {
-        var server_error = this.state.server_error ? <div style={{ clear: "both" }} className="has-error"><label className='has-error control-label'>{this.state.server_error}</label></div> : null;
+        var server_error = this.state.server_error ? <div className="has-error"><label className='has-error control-label'>{this.state.server_error}</label></div> : null;
         var user = this.props.user;
         var currentRoles = "Member";
         var timestamp = UserStore.getCurrentUser().update_at;
diff --git a/web/react/components/new_channel.jsx b/web/react/components/new_channel.jsx
index 160241c1c..069e0d6b1 100644
--- a/web/react/components/new_channel.jsx
+++ b/web/react/components/new_channel.jsx
@@ -122,7 +122,7 @@ module.exports = React.createClass({
                                 </div>
                                 <div className="form-group">
                                     <label className='control-label'>Description</label>
-                                    <textarea className="form-control" style={{resize: "none"}} ref="channel_desc" rows="3" placeholder="Description" maxLength="1024"></textarea>
+                                    <textarea className="form-control no-resize" ref="channel_desc" rows="3" placeholder="Description" maxLength="1024"></textarea>
                                 </div>
                                 { server_error }
                             </form>
diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx
index 408fbf83a..dca05051d 100644
--- a/web/react/components/post_right.jsx
+++ b/web/react/components/post_right.jsx
@@ -43,7 +43,7 @@ RhsHeaderPost = React.createClass({
         });
     },
     render: function() {
-        var back = this.props.fromSearch ? <a href="#" onClick={this.handleBack} style={{color:"black"}}>{"< "}</a> : "";
+        var back = this.props.fromSearch ? <a href="#" onClick={this.handleBack} className="sidebar--right__back"><i className="fa fa-chevron-left"></i></a> : "";
 
         return (
             <div className="sidebar--right__header">
diff --git a/web/react/components/sidebar_header.jsx b/web/react/components/sidebar_header.jsx
index 54858a04d..83ad4470e 100644
--- a/web/react/components/sidebar_header.jsx
+++ b/web/react/components/sidebar_header.jsx
@@ -91,7 +91,7 @@ var NavbarDropdown = React.createClass({
             <ul className="nav navbar-nav navbar-right">
                 <li className="dropdown">
                     <a href="#" className="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
-                        <i className="dropdown__icon"></i>
+                        <span className="dropdown__icon" dangerouslySetInnerHTML={{__html: " <svg version='1.1' id='Layer_1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' x='0px' y='0px'width='4px' height='16px' viewBox='0 0 8 32' enable-background='new 0 0 8 32' xml:space='preserve'> <g> <circle cx='4' cy='4.062' r='4'/> <circle cx='4' cy='16' r='4'/> <circle cx='4' cy='28' r='4'/> </g> </svg>"}} />
                     </a>
                     <ul className="dropdown-menu" role="menu">
                         <li><a href="#" data-toggle="modal" data-target="#user_settings1">Account Settings</a></li>
diff --git a/web/react/components/user_profile.jsx b/web/react/components/user_profile.jsx
index 89d0a80ff..65f025919 100644
--- a/web/react/components/user_profile.jsx
+++ b/web/react/components/user_profile.jsx
@@ -53,7 +53,7 @@ module.exports = React.createClass({
         var name = this.props.overwriteName ? this.props.overwriteName : this.state.profile.username;
 
 
-        var data_content = "<img style='margin: 10px' src='/api/v1/users/" + this.state.profile.id + "/image?time=" + this.state.profile.update_at + "' height='128' width='128' />";
+        var data_content = "<img class='user-popover__image' src='/api/v1/users/" + this.state.profile.id + "/image?time=" + this.state.profile.update_at + "' height='128' width='128' />";
         if (!config.ShowEmail) {
             data_content += "<div class='text-nowrap'>Email not shared</div>";
         } else {
@@ -61,7 +61,7 @@ module.exports = React.createClass({
         }
 
         return (
-            <div style={{"cursor" : "pointer", "display" : "inline-block"}} className="user-popover" id={"profile_" + this.uniqueId} data-toggle="popover" data-content={data_content} data-original-title={this.state.profile.username} >
+            <div className="user-popover" id={"profile_" + this.uniqueId} data-toggle="popover" data-content={data_content} data-original-title={this.state.profile.username} >
                 { name }
             </div>
         );
diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx
index 06d8d0208..17afadce2 100644
--- a/web/react/components/user_settings.jsx
+++ b/web/react/components/user_settings.jsx
@@ -560,7 +560,7 @@ var AuditTab = React.createClass({
                 <div className="user-settings">
                     <h3 className="tab-header">Activity Log</h3>
                     <div className="divider-dark first"/>
-                    <div className="table-responsive" style={{ maxWidth: "560px", maxHeight: "300px" }}>
+                    <div className="table-responsive">
                         <table className="table-condensed small">
                             <thead>
                                 <tr>
@@ -576,11 +576,11 @@ var AuditTab = React.createClass({
                                 this.state.audits.map(function(value, index) {
                                     return (
                                         <tr key={ "" + index }>
-                                            <td style={{ whiteSpace: "nowrap" }}>{ new Date(value.create_at).toLocaleString() }</td>
-                                            <td style={{ whiteSpace: "nowrap" }}>{ value.action.replace("/api/v1", "") }</td>
-                                            <td style={{ whiteSpace: "nowrap" }}>{ value.ip_address }</td>
-                                            <td style={{ whiteSpace: "nowrap" }}>{ value.session_id }</td>
-                                            <td style={{ whiteSpace: "nowrap" }}>{ value.extra_info }</td>
+                                            <td className="text-nowrap">{ new Date(value.create_at).toLocaleString() }</td>
+                                            <td className="text-nowrap">{ value.action.replace("/api/v1", "") }</td>
+                                            <td className="text-nowrap">{ value.ip_address }</td>
+                                            <td className="text-nowrap">{ value.session_id }</td>
+                                            <td className="text-nowrap">{ value.extra_info }</td>
                                         </tr>
                                     );
                                 }, this)
-- 
cgit v1.2.3-1-g7c22


From 4329437ea690fc07f3727325c54a349eada8aa11 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Fri, 17 Jul 2015 03:53:58 +0500
Subject: Improving search header for mobile layouts and other UI changes

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

(limited to 'web/react/components')

diff --git a/web/react/components/search_bar.jsx b/web/react/components/search_bar.jsx
index ab7e99d60..f21f0cd58 100644
--- a/web/react/components/search_bar.jsx
+++ b/web/react/components/search_bar.jsx
@@ -92,7 +92,7 @@ module.exports = React.createClass({
     render: function() {
         return (
             <div>
-                <div className="sidebar__collapse" onClick={this.handleClose}></div>
+                <div className="sidebar__collapse" onClick={this.handleClose}>Cancel</div>
                 <span className="glyphicon glyphicon-search sidebar__search-icon"></span>
                 <form role="form" className="search__form relative-div" onSubmit={this.handleSubmit}>
                     <input
-- 
cgit v1.2.3-1-g7c22


From 8ead147ebc2c56705c1896586782553dcb30e271 Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Fri, 17 Jul 2015 07:52:56 -0700
Subject: Changed javascript to CSS method

---
 web/react/components/post_info.jsx  | 4 +---
 web/react/components/post_right.jsx | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/post_info.jsx b/web/react/components/post_info.jsx
index cf01747f0..17746655d 100644
--- a/web/react/components/post_info.jsx
+++ b/web/react/components/post_info.jsx
@@ -30,9 +30,7 @@ module.exports = React.createClass({
                         <div className="dropdown">
                         { isOwner || (this.props.allowReply === "true" && type != "Comment") ?
                             <div>
-                                <a href="#" className="dropdown-toggle theme" type="button" data-toggle="dropdown" aria-expanded="false">
-                                    [...]
-                                </a>
+                                <a href="#" className="dropdown-toggle theme" type="button" data-toggle="dropdown" aria-expanded="false" />
                                 <ul className="dropdown-menu" role="menu">
                                     { isOwner ? <li role="presentation"><a href="#" role="menuitem" data-toggle="modal" data-target="#edit_post" data-title={type} data-message={post.message} data-postid={post.id} data-channelid={post.channel_id} data-comments={type === "Post" ? this.props.commentCount : 0}>Edit</a></li>
                                     : "" }
diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx
index dca05051d..cc6751738 100644
--- a/web/react/components/post_right.jsx
+++ b/web/react/components/post_right.jsx
@@ -129,9 +129,7 @@ RootPost = React.createClass({
                             <div className="dropdown">
                             { isOwner ?
                                 <div>
-                                <a href="#" className="dropdown-toggle theme" type="button" data-toggle="dropdown" aria-expanded="false">
-                                    [...]
-                                </a>
+                                <a href="#" className="dropdown-toggle theme" type="button" data-toggle="dropdown" aria-expanded="false" />
                                 <ul className="dropdown-menu" role="menu">
                                     <li role="presentation"><a href="#" role="menuitem" data-toggle="modal" data-target="#edit_post" data-title={type} data-message={this.props.post.message} data-postid={this.props.post.id} data-channelid={this.props.post.channel_id}>Edit</a></li>
                                     <li role="presentation"><a href="#" role="menuitem" data-toggle="modal" data-target="#delete_post" data-title={type} data-postid={this.props.post.id} data-channelid={this.props.post.channel_id} data-comments={this.props.commentCount}>Delete</a></li>
-- 
cgit v1.2.3-1-g7c22


From af56bed1a33cc4b5af696b04e156f23dbd25a369 Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Fri, 17 Jul 2015 12:09:12 -0700
Subject: Even on error, submission stop, updated to relect that

---
 web/react/components/create_comment.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'web/react/components')

diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx
index 9e3feb25c..6ed0f0b34 100644
--- a/web/react/components/create_comment.jsx
+++ b/web/react/components/create_comment.jsx
@@ -43,7 +43,7 @@ module.exports = React.createClass({
 
         client.createPost(post, ChannelStore.getCurrent(),
             function(data) {
-                this.setState({ messageText: '', submitting: false, post_error: null });
+                this.setState({ messageText: '', submitting: false, post_error: null, server_error: null });
                 this.clearPreviews();
                 AsyncClient.getPosts(true, this.props.channelId);
 
@@ -57,6 +57,7 @@ module.exports = React.createClass({
             function(err) {
                 var state = {};
                 state.server_error = err.message;
+                state.submitting = false;
 
                 if (err.message === "Invalid RootId parameter") {
                     if ($('#post_deleted').length > 0) $('#post_deleted').modal('show');
-- 
cgit v1.2.3-1-g7c22


From 1c7f0be268046d2b509e23268eebcbbef78c5a24 Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Thu, 9 Jul 2015 15:49:23 -0400
Subject: Renamed all clientside references from full_name to nickname

---
 web/react/components/channel_header.jsx   |  2 +-
 web/react/components/member_list_team.jsx |  4 ++--
 web/react/components/mention_list.jsx     | 10 +++++-----
 web/react/components/post_list.jsx        |  2 +-
 web/react/components/sidebar.jsx          |  4 ++--
 web/react/components/user_settings.jsx    | 14 +++++++-------
 6 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index 2e430489f..30435dc08 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -153,7 +153,7 @@ module.exports = React.createClass({
         if (isDirect) {
             if (this.state.users.length > 1) {
                 var contact = this.state.users[((this.state.users[0].id === currentId) ? 1 : 0)];
-                channelTitle = <UserProfile userId={contact.id} overwriteName={contact.full_name || contact.username} />;
+                channelTitle = <UserProfile userId={contact.id} overwriteName={contact.nickname || contact.username} />;
             }
         }
 
diff --git a/web/react/components/member_list_team.jsx b/web/react/components/member_list_team.jsx
index 89b5e49d5..8d69a36d3 100644
--- a/web/react/components/member_list_team.jsx
+++ b/web/react/components/member_list_team.jsx
@@ -85,8 +85,8 @@ var MemberListTeamItem = React.createClass({
         return (
             <div className="row member-div">
                 <img className="post-profile-img pull-left" src={"/api/v1/users/" + user.id + "/image?time=" + timestamp} height="36" width="36" />
-                <span className="member-name">{user.full_name.trim() ? user.full_name : user.username}</span>
-                <span className="member-email">{user.full_name.trim() ? user.username : email}</span>
+                <span className="member-name">{user.nickname.trim() ? user.nickname : user.username}</span>
+                <span className="member-email">{user.nickname.trim() ? user.username : email}</span>
                 <div className="dropdown member-drop">
                     <a href="#" className="dropdown-toggle theme" type="button" id="channel_header_dropdown" data-toggle="dropdown" aria-expanded="true">
                         <span>{currentRoles}  </span>
diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index c5ff82346..c04e28849 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -165,14 +165,14 @@ module.exports = React.createClass({
 
         var all = {};
         all.username = "all";
-        all.full_name = "";
+        all.nickname = "";
         all.secondary_text = "Notifies everyone in the team";
         all.id = "allmention";
         users.push(all);
 
         var channel = {};
         channel.username = "channel";
-        channel.full_name = "";
+        channel.nickname = "";
         channel.secondary_text = "Notifies everyone in the channel";
         channel.id = "channelmention";
         users.push(channel);
@@ -189,11 +189,11 @@ module.exports = React.createClass({
             if (this.alreadyMentioned(users[i].username)) continue;
 
             var firstName = "", lastName = "";
-            if (users[i].full_name.length > 0) {
-                var splitName = users[i].full_name.split(' ');
+            if (users[i].nickname.length > 0) {
+                var splitName = users[i].nickname.split(' ');
                 firstName = splitName[0].toLowerCase();
                 lastName = splitName.length > 1 ? splitName[splitName.length-1].toLowerCase() : "";
-                users[i].secondary_text = users[i].full_name;
+                users[i].secondary_text = users[i].nickname;
             }
 
             if (firstName.lastIndexOf(mentionText,0) === 0
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index 573799a19..5439ca43d 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -305,7 +305,7 @@ module.exports = React.createClass({
                 var teammate = utils.getDirectTeammate(channel.id)
 
                 if (teammate) {
-                    var teammate_name = teammate.full_name.length > 0 ? teammate.full_name : teammate.username;
+                    var teammate_name = teammate.nickname.length > 0 ? teammate.nickname : teammate.username;
                     more_messages = (
                         <div className="channel-intro">
                             <div className="post-profile-img__container channel-intro-img">
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index cae9425d3..742720048 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -131,7 +131,7 @@ function getStateFromStores() {
         var channel = ChannelStore.getByName(channelName);
 
         if (channel != null) {
-            channel.display_name = teammate.full_name.trim() != "" ? teammate.full_name : teammate.username;
+            channel.display_name = teammate.nickname.trim() != "" ? teammate.nickname : teammate.username;
             channel.teammate_username = teammate.username;
 
             channel.status = UserStore.getStatus(teammate.id);
@@ -150,7 +150,7 @@ function getStateFromStores() {
             var tempChannel = {};
             tempChannel.fake = true;
             tempChannel.name = channelName;
-            tempChannel.display_name = teammate.full_name.trim() != "" ? teammate.full_name : teammate.username;
+            tempChannel.display_name = teammate.nickname.trim() != "" ? teammate.nickname : teammate.username;
             tempChannel.status = UserStore.getStatus(teammate.id);
             tempChannel.last_post_at = 0;
             readDirectChannels.push(tempChannel);
diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx
index 38e4b1aea..9ec7f64c9 100644
--- a/web/react/components/user_settings.jsx
+++ b/web/react/components/user_settings.jsx
@@ -316,8 +316,8 @@ var NotificationsTab = React.createClass({
         if (this.props.activeSection === 'keys') {
             var user = this.props.user;
             var first_name = "";
-            if (user.full_name.length > 0) {
-                first_name = user.full_name.split(' ')[0];
+            if (user.nickname.length > 0) {
+                first_name = user.nickname.split(' ')[0];
             }
 
             var inputs = [];
@@ -399,7 +399,7 @@ var NotificationsTab = React.createClass({
             if (this.state.first_name_key) {
                 var first_name = "";
                 var user = this.props.user;
-                if (user.full_name.length > 0) first_name = user.full_name.split(' ')[0];
+                if (user.nickname.length > 0) first_name = user.nickname.split(' ')[0];
                 if (first_name != "") keys.push(first_name);
             }
             if (this.state.username_key) keys.push(this.props.user.username);
@@ -761,12 +761,12 @@ var GeneralTab = React.createClass({
 
         var fullName = firstName + ' ' + lastName;
 
-        if (user.full_name === fullName) {
+        if (user.nickname === fullName) {
             this.setState({client_error: "You must submit a new name"})
             return;
         }
 
-        user.full_name = fullName;
+        user.nickname = fullName;
 
         this.submitUser(user);
     },
@@ -861,7 +861,7 @@ var GeneralTab = React.createClass({
     getInitialState: function() {
         var user = this.props.user;
 
-        var splitStr = user.full_name.split(' ');
+        var splitStr = user.nickname.split(' ');
         var firstName = splitStr.shift();
         var lastName = splitStr.join(' ');
 
@@ -913,7 +913,7 @@ var GeneralTab = React.createClass({
             nameSection = (
                 <SettingItemMin
                     title="Name"
-                    describe={UserStore.getCurrentUser().full_name}
+                    describe={UserStore.getCurrentUser().nickname}
                     updateSection={function(){self.updateSection("name");}}
                 />
             );
-- 
cgit v1.2.3-1-g7c22


From 8dbf03bd10a440db3896c046de7332806f96e889 Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Thu, 9 Jul 2015 17:20:18 -0400
Subject: Add interface to edit a user's nickname directly

---
 web/react/components/user_settings.jsx | 55 +++++++++++++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

(limited to 'web/react/components')

diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx
index 9ec7f64c9..c1ea367f2 100644
--- a/web/react/components/user_settings.jsx
+++ b/web/react/components/user_settings.jsx
@@ -752,6 +752,21 @@ var GeneralTab = React.createClass({
 
         this.submitUser(user);
     },
+    submitNickname: function(e) {
+        e.preventDefault();
+
+        var user = UserStore.getCurrentUser();
+        var nickname = this.state.nickname.trim();
+
+        if (user.nickname === nickname) {
+            this.setState({client_error: "You must submit a new nickname"})
+            return;
+        }
+
+        user.nickname = nickname;
+
+        this.submitUser(user);
+    },
     submitName: function(e) {
         e.preventDefault();
 
@@ -839,6 +854,9 @@ var GeneralTab = React.createClass({
     updateLastName: function(e) {
         this.setState({ last_name: e.target.value});
     },
+    updateNickname: function(e) {
+        this.setState({nickname: e.target.value});
+    },
     updateEmail: function(e) {
         this.setState({ email: e.target.value});
     },
@@ -865,7 +883,7 @@ var GeneralTab = React.createClass({
         var firstName = splitStr.shift();
         var lastName = splitStr.join(' ');
 
-        return { username: user.username, first_name: firstName, last_name: lastName,
+        return { username: user.username, first_name: firstName, last_name: lastName, nickname: user.nickname,
                  email: user.email, picture: null };
     },
     render: function() {
@@ -919,6 +937,39 @@ var GeneralTab = React.createClass({
             );
         }
 
+        var nicknameSection;
+        if (this.props.activeSection === 'nickname') {
+            var inputs = [];
+
+            inputs.push(
+                <div className="form-group">
+                    <label className="col-sm-5 control-label">{utils.isMobile() ? "": "Nickname"}</label>
+                    <div className="col-sm-7">
+                        <input className="form-control" type="text" onChange={this.updateNickname} value={this.state.nickname}/>
+                    </div>
+                </div>
+            );
+
+            nicknameSection = (
+                <SettingItemMax
+                    title="Nickname"
+                    inputs={inputs}
+                    submit={this.submitNickname}
+                    server_error={server_error}
+                    client_error={client_error}
+                    updateSection={function(e){self.updateSection("");e.preventDefault();}}
+                />
+            );
+        } else {
+            nicknameSection = (
+                <SettingItemMin
+                    title="Nickname"
+                    describe={UserStore.getCurrentUser().nickname}
+                    updateSection={function(){self.updateSection("nickname");}}
+                />
+            );
+        }
+
         var usernameSection;
         if (this.props.activeSection === 'username') {
             var inputs = [];
@@ -1026,6 +1077,8 @@ var GeneralTab = React.createClass({
                     <div className="divider-light"/>
                     {usernameSection}
                     <div className="divider-light"/>
+                    {nicknameSection}
+                    <div className="divider-light"/>
                     {emailSection}
                     <div className="divider-light"/>
                     {pictureSection}
-- 
cgit v1.2.3-1-g7c22


From b620960cdefe87d9e96958ab526c294ee6502a90 Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Fri, 10 Jul 2015 15:51:45 -0400
Subject: Fix migration code so that LastName is populated correctly for users
 who only have one word in their FullName

---
 web/react/components/user_settings.jsx | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx
index c1ea367f2..e6eb2b451 100644
--- a/web/react/components/user_settings.jsx
+++ b/web/react/components/user_settings.jsx
@@ -774,14 +774,13 @@ var GeneralTab = React.createClass({
         var firstName = this.state.first_name.trim();
         var lastName = this.state.last_name.trim();
 
-        var fullName = firstName + ' ' + lastName;
-
-        if (user.nickname === fullName) {
-            this.setState({client_error: "You must submit a new name"})
+        if (user.first_name === firstName && user.last_name === lastName) {
+            this.setState({client_error: "You must submit a new first or last name"})
             return;
         }
 
-        user.nickname = fullName;
+        user.first_name = firstName;
+        user.last_name = lastName;
 
         this.submitUser(user);
     },
@@ -879,11 +878,7 @@ var GeneralTab = React.createClass({
     getInitialState: function() {
         var user = this.props.user;
 
-        var splitStr = user.nickname.split(' ');
-        var firstName = splitStr.shift();
-        var lastName = splitStr.join(' ');
-
-        return { username: user.username, first_name: firstName, last_name: lastName, nickname: user.nickname,
+        return { username: user.username, first_name: user.first_name, last_name: user.last_name, nickname: user.nickname,
                  email: user.email, picture: null };
     },
     render: function() {
@@ -919,7 +914,7 @@ var GeneralTab = React.createClass({
 
             nameSection = (
                 <SettingItemMax
-                    title="Name"
+                    title="Full Name"
                     inputs={inputs}
                     submit={this.submitName}
                     server_error={server_error}
@@ -928,10 +923,20 @@ var GeneralTab = React.createClass({
                 />
             );
         } else {
+            var full_name = "";
+
+            if (user.first_name && user.last_name) {
+                full_name = user.first_name + " " + user.last_name;
+            } else if (user.first_name) {
+                full_name = user.first_name;
+            } else if (user.last_name) {
+                full_name = user.last_name;
+            }
+
             nameSection = (
                 <SettingItemMin
-                    title="Name"
-                    describe={UserStore.getCurrentUser().nickname}
+                    title="Full Name"
+                    describe={full_name}
                     updateSection={function(){self.updateSection("name");}}
                 />
             );
-- 
cgit v1.2.3-1-g7c22


From 079538d9e7d22cd8d5f782f4f7434858bd80d914 Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Mon, 13 Jul 2015 15:39:53 -0400
Subject: Use User.FirstName for notifications instead of trying to determine
 it from User.Nickname

---
 web/react/components/mention_list.jsx  | 14 +++-----------
 web/react/components/user_settings.jsx | 23 +++++++----------------
 2 files changed, 10 insertions(+), 27 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index c04e28849..524f1b337 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -188,21 +188,13 @@ module.exports = React.createClass({
         for (var i = 0; i < users.length && index < MAX_ITEMS_IN_LIST; i++) {
             if (this.alreadyMentioned(users[i].username)) continue;
 
-            var firstName = "", lastName = "";
-            if (users[i].nickname.length > 0) {
-                var splitName = users[i].nickname.split(' ');
-                firstName = splitName[0].toLowerCase();
-                lastName = splitName.length > 1 ? splitName[splitName.length-1].toLowerCase() : "";
-                users[i].secondary_text = users[i].nickname;
-            }
-
-            if (firstName.lastIndexOf(mentionText,0) === 0
-                    || lastName.lastIndexOf(mentionText,0) === 0 || users[i].username.lastIndexOf(mentionText,0) === 0) {
+            if (users[i].first_name.lastIndexOf(mentionText,0) === 0
+                    || users[i].last_name.lastIndexOf(mentionText,0) === 0 || users[i].username.lastIndexOf(mentionText,0) === 0) {
                 mentions[index] = (
                     <Mention
                         ref={'mention' + index}
                         username={users[i].username}
-                        secondary_text={users[i].secondary_text}
+                        secondary_text={users[i].first_name + " " + users[i].last_name}
                         id={users[i].id}
                         listId={index}
                         isFocused={this.state.selectedMention === index ? "mentions-focus" : ""}
diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx
index e6eb2b451..59c97c309 100644
--- a/web/react/components/user_settings.jsx
+++ b/web/react/components/user_settings.jsx
@@ -156,6 +156,8 @@ var NotificationsTab = React.createClass({
 
         var self = this;
 
+        var user = this.props.user;
+
         var desktopSection;
         if (this.props.activeSection === 'desktop') {
             var notifyActive = [false, false, false];
@@ -314,20 +316,14 @@ var NotificationsTab = React.createClass({
 
         var keysSection;
         if (this.props.activeSection === 'keys') {
-            var user = this.props.user;
-            var first_name = "";
-            if (user.nickname.length > 0) {
-                first_name = user.nickname.split(' ')[0];
-            }
-
             var inputs = [];
 
-            if (first_name != "") {
+            if (user.first_name) {
                 inputs.push(
                     <div>
                         <div className="checkbox">
                             <label>
-                                <input type="checkbox" checked={this.state.first_name_key} onChange={function(e){self.updateFirstNameKey(e.target.checked);}}>{'Your case sensitive first name "' + first_name + '"'}</input>
+                                <input type="checkbox" checked={this.state.first_name_key} onChange={function(e){self.updateFirstNameKey(e.target.checked);}}>{'Your case sensitive first name "' + user.first_name + '"'}</input>
                             </label>
                         </div>
                     </div>
@@ -396,14 +392,9 @@ var NotificationsTab = React.createClass({
             );
         } else {
             var keys = [];
-            if (this.state.first_name_key) {
-                var first_name = "";
-                var user = this.props.user;
-                if (user.nickname.length > 0) first_name = user.nickname.split(' ')[0];
-                if (first_name != "") keys.push(first_name);
-            }
-            if (this.state.username_key) keys.push(this.props.user.username);
-            if (this.state.mention_key) keys.push('@'+this.props.user.username);
+            if (this.state.first_name_key) keys.push(user.first_name);
+            if (this.state.username_key) keys.push(user.username);
+            if (this.state.mention_key) keys.push('@'+user.username);
             if (this.state.all_key) keys.push('@all');
             if (this.state.channel_key) keys.push('@channel');
             if (this.state.custom_keys.length > 0) keys = keys.concat(this.state.custom_keys.split(','));
-- 
cgit v1.2.3-1-g7c22


From 098cbcdc21effeebe7e57fbd912a785e85cbfc5d Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Mon, 13 Jul 2015 17:47:57 -0400
Subject: Unify all locations where we determine a user's display named based
 off of their nickname/username into a helper function

---
 web/react/components/member_list_team.jsx | 4 ++--
 web/react/components/sidebar.jsx          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/member_list_team.jsx b/web/react/components/member_list_team.jsx
index 8d69a36d3..6f1d83193 100644
--- a/web/react/components/member_list_team.jsx
+++ b/web/react/components/member_list_team.jsx
@@ -85,8 +85,8 @@ var MemberListTeamItem = React.createClass({
         return (
             <div className="row member-div">
                 <img className="post-profile-img pull-left" src={"/api/v1/users/" + user.id + "/image?time=" + timestamp} height="36" width="36" />
-                <span className="member-name">{user.nickname.trim() ? user.nickname : user.username}</span>
-                <span className="member-email">{user.nickname.trim() ? user.username : email}</span>
+                <span className="member-name">{utils.getDisplayName(user)}</span>
+                <span className="member-email">{email}</span>
                 <div className="dropdown member-drop">
                     <a href="#" className="dropdown-toggle theme" type="button" id="channel_header_dropdown" data-toggle="dropdown" aria-expanded="true">
                         <span>{currentRoles}  </span>
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index 742720048..65727c597 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -131,7 +131,7 @@ function getStateFromStores() {
         var channel = ChannelStore.getByName(channelName);
 
         if (channel != null) {
-            channel.display_name = teammate.nickname.trim() != "" ? teammate.nickname : teammate.username;
+            channel.display_name = utils.getDisplayName(teammate);
             channel.teammate_username = teammate.username;
 
             channel.status = UserStore.getStatus(teammate.id);
@@ -150,7 +150,7 @@ function getStateFromStores() {
             var tempChannel = {};
             tempChannel.fake = true;
             tempChannel.name = channelName;
-            tempChannel.display_name = teammate.nickname.trim() != "" ? teammate.nickname : teammate.username;
+            tempChannel.display_name = utils.getDisplayName(teammate);
             tempChannel.status = UserStore.getStatus(teammate.id);
             tempChannel.last_post_at = 0;
             readDirectChannels.push(tempChannel);
-- 
cgit v1.2.3-1-g7c22


From 876ad10f6f14579336a89c36b4937311326149d4 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Fri, 17 Jul 2015 15:41:55 -0800
Subject: Fixes javascript console errors

---
 web/react/components/mention_list.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index 524f1b337..7e939812d 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -188,8 +188,8 @@ module.exports = React.createClass({
         for (var i = 0; i < users.length && index < MAX_ITEMS_IN_LIST; i++) {
             if (this.alreadyMentioned(users[i].username)) continue;
 
-            if (users[i].first_name.lastIndexOf(mentionText,0) === 0
-                    || users[i].last_name.lastIndexOf(mentionText,0) === 0 || users[i].username.lastIndexOf(mentionText,0) === 0) {
+            if ((users[i].first_name && users[i].first_name.lastIndexOf(mentionText,0) === 0)
+                    || (users[i].last_name && users[i].last_name.lastIndexOf(mentionText,0) === 0) || users[i].username.lastIndexOf(mentionText,0) === 0) {
                 mentions[index] = (
                     <Mention
                         ref={'mention' + index}
-- 
cgit v1.2.3-1-g7c22


From d0e4d71ac39bfdbe6d714c6693d3d803bfa811a2 Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Sat, 18 Jul 2015 16:32:22 -0400
Subject: Fixed the labels on the mention list for users without their
 first/last name configured

---
 web/react/components/mention_list.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'web/react/components')

diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index 7e939812d..71a6083d2 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -7,6 +7,7 @@ var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
 var Mention = require('./mention.jsx');
 
 var Constants = require('../utils/constants.jsx');
+var Utils = require('../utils/utils.jsx');
 var ActionTypes = Constants.ActionTypes;
 
 var MAX_HEIGHT_LIST = 292;
@@ -194,7 +195,7 @@ module.exports = React.createClass({
                     <Mention
                         ref={'mention' + index}
                         username={users[i].username}
-                        secondary_text={users[i].first_name + " " + users[i].last_name}
+                        secondary_text={Utils.getFullName(users[i])}
                         id={users[i].id}
                         listId={index}
                         isFocused={this.state.selectedMention === index ? "mentions-focus" : ""}
-- 
cgit v1.2.3-1-g7c22


From 196ae3227e6f79ba2d10ac2b714e705f20663883 Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Sat, 18 Jul 2015 16:50:44 -0700
Subject: Removed remenant of non-hover system

---
 web/react/components/post_right.jsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx
index cc6751738..f1ced7b25 100644
--- a/web/react/components/post_right.jsx
+++ b/web/react/components/post_right.jsx
@@ -240,9 +240,7 @@ CommentPost = React.createClass({
                         <li className="post-header-col post-header__reply">
                         { isOwner ?
                         <div className="dropdown" onClick={function(e){$('.post-list-holder-by-time').scrollTop($(".post-list-holder-by-time").scrollTop() + 50);}}>
-                            <a href="#" className="dropdown-toggle theme" type="button" data-toggle="dropdown" aria-expanded="false">
-                                [...]
-                            </a>
+                            <a href="#" className="dropdown-toggle theme" type="button" data-toggle="dropdown" aria-expanded="false" />
                             <ul className="dropdown-menu" role="menu">
                                 <li role="presentation"><a href="#" role="menuitem" data-toggle="modal" data-target="#edit_post" data-title={type} data-message={this.props.post.message} data-postid={this.props.post.id} data-channelid={this.props.post.channel_id}>Edit</a></li>
                                 <li role="presentation"><a href="#" role="menuitem" data-toggle="modal" data-target="#delete_post" data-title={type} data-postid={this.props.post.id} data-channelid={this.props.post.channel_id} data-comments={0}>Delete</a></li>
-- 
cgit v1.2.3-1-g7c22


From 12c19e3390fa501b25b1b746ddc3f48e525d7fff Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Sun, 19 Jul 2015 20:31:37 -0700
Subject: Added channel name to RHS comment threads; minor css changes to
 compensate for addition

---
 web/react/components/post_right.jsx     | 6 ++++++
 web/react/components/search_results.jsx | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'web/react/components')

diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx
index cc6751738..9ec9d8eaf 100644
--- a/web/react/components/post_right.jsx
+++ b/web/react/components/post_right.jsx
@@ -68,6 +68,7 @@ RootPost = React.createClass({
         var filenames = this.props.post.filenames;
         var isOwner = UserStore.getCurrentId() == this.props.post.user_id;
         var timestamp = UserStore.getProfile(this.props.post.user_id).update_at;
+        var channel = ChannelStore.get(this.props.post.channel_id);
 
         var type = "Post";
         if (this.props.post.root_id.length > 0) {
@@ -79,6 +80,10 @@ RootPost = React.createClass({
             currentUserCss = "current--user";
         }
 
+        if (channel) {
+            channelName = (channel.type === 'D') ? "Private Message" : channel.display_name;
+        }
+
         if (filenames) {
             var postFiles = [];
             var images = [];
@@ -118,6 +123,7 @@ RootPost = React.createClass({
 
         return (
             <div className={"post post--root " + currentUserCss}>
+                <div className="post-right-channel__name">{ channelName }</div>
                 <div className="post-profile-img__container">
                     <img className="post-profile-img" src={"/api/v1/users/" + this.props.post.user_id + "/image?time=" + timestamp} height="36" width="36" />
                 </div>
diff --git a/web/react/components/search_results.jsx b/web/react/components/search_results.jsx
index 1fd974642..643ad112b 100644
--- a/web/react/components/search_results.jsx
+++ b/web/react/components/search_results.jsx
@@ -77,7 +77,7 @@ var SearchItem = React.createClass({
 
         var message = utils.textToJsx(this.props.post.message, {searchTerm: this.props.term, noMentionHighlight: !this.props.isMentionSearch});
         var channelName = "";
-        var channel = ChannelStore.get(this.props.post.channel_id)
+        var channel = ChannelStore.get(this.props.post.channel_id);
         var timestamp = UserStore.getCurrentUser().update_at;
 
         if (channel) {
-- 
cgit v1.2.3-1-g7c22


From 5e27bb3e618d94075e4fb198a937e24338bb0612 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Mon, 20 Jul 2015 08:58:18 -0400
Subject: fixes mm-831 post timestamps now update

---
 web/react/components/post.jsx       |  8 ++++++--
 web/react/components/post_list.jsx  | 16 ++++++++++------
 web/react/components/post_right.jsx | 11 +++++++++--
 3 files changed, 25 insertions(+), 10 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/post.jsx b/web/react/components/post.jsx
index 5457e1cd3..e72a2d001 100644
--- a/web/react/components/post.jsx
+++ b/web/react/components/post.jsx
@@ -34,6 +34,10 @@ module.exports = React.createClass({
             results: null
         });
     },
+    forceUpdateInfo: function() {
+        this.refs.info.forceUpdate();
+        this.refs.header.forceUpdate();
+    },
     getInitialState: function() {
         return { };
     },
@@ -80,9 +84,9 @@ module.exports = React.createClass({
                     </div>
                     : null }
                     <div className="post__content">
-                        <PostHeader post={post} sameRoot={this.props.sameRoot} commentCount={commentCount} handleCommentClick={this.handleCommentClick} isLastComment={this.props.isLastComment} />
+                        <PostHeader ref="header" post={post} sameRoot={this.props.sameRoot} commentCount={commentCount} handleCommentClick={this.handleCommentClick} isLastComment={this.props.isLastComment} />
                         <PostBody post={post} sameRoot={this.props.sameRoot} parentPost={parentPost} posts={posts} handleCommentClick={this.handleCommentClick} />
-                        <PostInfo post={post} sameRoot={this.props.sameRoot} commentCount={commentCount} handleCommentClick={this.handleCommentClick} allowReply="true" />
+                        <PostInfo ref="info" post={post} sameRoot={this.props.sameRoot} commentCount={commentCount} handleCommentClick={this.handleCommentClick} allowReply="true" />
                     </div>
                 </div>
             </div>
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index 5439ca43d..c058455ba 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -49,6 +49,7 @@ module.exports = React.createClass({
 
         PostStore.addChangeListener(this._onChange);
         ChannelStore.addChangeListener(this._onChange);
+        UserStore.addStatusesChangeListener(this._onTimeChange);
         SocketStore.addChangeListener(this._onSocketChange);
 
         $(".post-list-holder-by-time").perfectScrollbar();
@@ -128,6 +129,7 @@ module.exports = React.createClass({
     componentWillUnmount: function() {
         PostStore.removeChangeListener(this._onChange);
         ChannelStore.removeChangeListener(this._onChange);
+        UserStore.removeStatusesChangeListener(this._onTimeChange);
         SocketStore.removeChangeListener(this._onSocketChange);
         $('body').off('click.userpopover');
     },
@@ -206,12 +208,8 @@ module.exports = React.createClass({
                 var index = post_list.order.indexOf(msg.props.post_id);
                 if (index > -1) post_list.order.splice(index, 1);
 
-                var scrollSave = $(".post-list-holder-by-time").scrollTop();
-
                 this.setState({ post_list: post_list });
 
-                $(".post-list-holder-by-time").scrollTop(scrollSave)
-
                 PostStore.storePosts(msg.channel_id, post_list);
             } else {
                 AsyncClient.getPosts(true, msg.channel_id);
@@ -220,10 +218,16 @@ module.exports = React.createClass({
             if (activeRootPostId === msg.props.post_id && UserStore.getCurrentId() != msg.user_id) {
                 $('#post_deleted').modal('show');
             }
-        } else if(msg.action == "new_user") {
+        } else if (msg.action == "new_user") {
             AsyncClient.getProfiles();
         }
     },
+    _onTimeChange: function() {
+        for (var id in this.state.post_list.posts) {
+            if (!this.refs[id]) continue;
+            this.refs[id].forceUpdateInfo();
+        }
+    },
     getMorePosts: function(e) {
         e.preventDefault();
 
@@ -415,7 +419,7 @@ module.exports = React.createClass({
                 // it is the last comment if it is last post in the channel or the next post has a different root post
                 var isLastComment = utils.isComment(post) && (i === 0 || posts[order[i-1]].root_id != post.root_id);
 
-                var postCtl = <Post sameUser={sameUser} sameRoot={sameRoot} post={post} parentPost={parentPost} key={post.id} posts={posts} hideProfilePic={hideProfilePic} isLastComment={isLastComment} />;
+                var postCtl = <Post ref={post.id} sameUser={sameUser} sameRoot={sameRoot} post={post} parentPost={parentPost} key={post.id} posts={posts} hideProfilePic={hideProfilePic} isLastComment={isLastComment} />;
 
                 currentPostDay = utils.getDateForUnixTicks(post.create_at);
                 if (currentPostDay.toDateString() != previousPostDay.toDateString()) {
diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx
index f1ced7b25..024bff26c 100644
--- a/web/react/components/post_right.jsx
+++ b/web/react/components/post_right.jsx
@@ -280,6 +280,7 @@ module.exports = React.createClass({
     componentDidMount: function() {
         PostStore.addSelectedPostChangeListener(this._onChange);
         PostStore.addChangeListener(this._onChangeAll);
+        UserStore.addStatusesChangeListener(this._onTimeChange);
         this.resize();
         var self = this;
         $(window).resize(function(){
@@ -292,6 +293,7 @@ module.exports = React.createClass({
     componentWillUnmount: function() {
         PostStore.removeSelectedPostChangeListener(this._onChange);
         PostStore.removeChangeListener(this._onChangeAll);
+        UserStore.removeStatusesChangeListener(this._onTimeChange);
     },
     _onChange: function() {
         if (this.isMounted()) {
@@ -302,7 +304,6 @@ module.exports = React.createClass({
         }
     },
     _onChangeAll: function() {
-
         if (this.isMounted()) {
 
             // if something was changed in the channel like adding a
@@ -331,6 +332,12 @@ module.exports = React.createClass({
             this.setState(getStateFromStores());
         }
     },
+    _onTimeChange: function() {
+        for (var id in this.state.post_list.posts) {
+            if (!this.refs[id]) continue;
+            this.refs[id].forceUpdate();
+        }
+    },
     getInitialState: function() {
         return getStateFromStores();
     },
@@ -390,7 +397,7 @@ module.exports = React.createClass({
                         <RootPost post={root_post} commentCount={posts_array.length}/>
                         <div className="post-right-comments-container">
                         { posts_array.map(function(cpost) {
-                                return <CommentPost key={cpost.id} post={cpost} selected={ (cpost.id == selected_post.id) } />
+                                return <CommentPost ref={cpost.id} key={cpost.id} post={cpost} selected={ (cpost.id == selected_post.id) } />
                         })}
                         </div>
                         <div className="post-create__container">
-- 
cgit v1.2.3-1-g7c22


From c6fb95912bb481791c1ca370a46a4da9c05d05ad Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Wed, 8 Jul 2015 11:50:10 -0400
Subject: Changing the way we mattermost handles URLs. team.domain.com becomes
 domain.com/team. Renaming team.Name to team.DisplayName and team.Domain to
 team.Name. So: team.Name -> url safe name. team.DisplayName -> nice name for
 users

---
 web/react/components/delete_channel_modal.jsx |   2 +-
 web/react/components/login.jsx                | 130 +++++---------------------
 web/react/components/msg_typing.jsx           |   2 +-
 web/react/components/navbar.jsx               | 104 ++-------------------
 web/react/components/new_channel.jsx          |   6 +-
 web/react/components/password_reset.jsx       |  79 +++++-----------
 web/react/components/rename_channel_modal.jsx |   6 +-
 web/react/components/rename_team_modal.jsx    |   8 +-
 web/react/components/sidebar.jsx              | 116 +----------------------
 web/react/components/sidebar_header.jsx       |  28 +++---
 web/react/components/sidebar_right_menu.jsx   |   4 +-
 web/react/components/signup_team.jsx          |  11 ++-
 web/react/components/signup_team_complete.jsx | 130 ++++++++++++++++----------
 web/react/components/signup_user_complete.jsx |   7 +-
 web/react/components/team_members.jsx         |   2 +-
 15 files changed, 177 insertions(+), 458 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/delete_channel_modal.jsx b/web/react/components/delete_channel_modal.jsx
index a8c690789..e23a37740 100644
--- a/web/react/components/delete_channel_modal.jsx
+++ b/web/react/components/delete_channel_modal.jsx
@@ -12,7 +12,7 @@ module.exports = React.createClass({
         Client.deleteChannel(this.state.channel_id,
             function(data) {
                 AsyncClient.getChannels(true);
-                window.location.href = '/channels/town-square';
+                window.location.href = '/';
             }.bind(this),
             function(err) {
                 AsyncClient.dispatchError(err, "handleDelete");
diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx
index 74c7d4065..71fefff5b 100644
--- a/web/react/components/login.jsx
+++ b/web/react/components/login.jsx
@@ -1,102 +1,21 @@
 // Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-
-
-
 var utils = require('../utils/utils.jsx');
 var client = require('../utils/client.jsx');
 var UserStore = require('../stores/user_store.jsx');
+var TeamStore = require('../stores/team_store.jsx');
 var BrowserStore = require('../stores/browser_store.jsx');
-
-
-var FindTeamDomain = React.createClass({
-    handleSubmit: function(e) {
-        e.preventDefault();
-        var state = { }
-
-        var domain = this.refs.domain.getDOMNode().value.trim();
-        if (!domain) {
-            state.server_error = "A domain is required"
-            this.setState(state);
-            return;
-        }
-
-        if (!BrowserStore.isLocalStorageSupported()) {
-            state.server_error = "This service requires local storage to be enabled. Please enable it or exit private browsing.";
-            this.setState(state);
-            return;
-        }
-
-        state.server_error = "";
-        this.setState(state);
-
-        client.findTeamByDomain(domain,
-            function(data) {
-                console.log(data);
-                if (data) {
-                    window.location.href = window.location.protocol + "//" + domain + "." + utils.getDomainWithOutSub();
-                }
-                else {
-                    this.state.server_error = "We couldn't find your " + strings.Team + ".";
-                    this.setState(this.state);
-                }
-            }.bind(this),
-            function(err) {
-                this.state.server_error = err.message;
-                this.setState(this.state);
-            }.bind(this)
-        );
-    },
-    getInitialState: function() {
-        return { };
-    },
-    render: function() {
-        var server_error = this.state.server_error ? <label className="control-label">{this.state.server_error}</label> : null;
-
-        return (
-            <div className="signup-team__container">
-                <div>
-                    <span className="signup-team__name">{ config.SiteName }</span>
-                    <br/>
-                    <span className="signup-team__subdomain">Enter your {strings.Team}'s domain.</span>
-                    <br/>
-                    <br/>
-                </div>
-                <form onSubmit={this.handleSubmit}>
-                    <div className={server_error ? 'form-group has-error' : 'form-group'}>
-                        { server_error }
-                        <input type="text" className="form-control" name="domain" ref="domain" placeholder="team domain" />
-                    </div>
-                    <div className="form-group">
-                        <button type="submit" className="btn btn-primary">Continue</button>
-                    </div>
-                    <div>
-                        <span>Don't remember your {strings.Team}'s domain? <a href="/find_team">Find it here</a></span>
-                    </div>
-                    <br/>
-                    <br/>
-                    <br/>
-                    <br/>
-                    <br/>
-                    <br/>
-                    <div>
-                        <span>{"Want to create your own " + strings.Team + "?"} <a href={utils.getHomeLink()} className="signup-team-login">Sign up now</a></span>
-                    </div>
-                </form>
-            </div>
-        );
-    }
-});
+var Constants = require('../utils/constants.jsx');
 
 module.exports = React.createClass({
     handleSubmit: function(e) {
         e.preventDefault();
         var state = { }
 
-        var domain = this.refs.domain.getDOMNode().value.trim();
-        if (!domain) {
-            state.server_error = "A domain is required"
+        var name = this.props.teamName
+        if (!name) {
+            state.server_error = "Bad team name"
             this.setState(state);
             return;
         }
@@ -124,23 +43,22 @@ module.exports = React.createClass({
         state.server_error = "";
         this.setState(state);
 
-        client.loginByEmail(domain, email, password,
+        client.loginByEmail(name, email, password,
             function(data) {
-                UserStore.setLastDomain(domain);
-                UserStore.setLastEmail(email);
                 UserStore.setCurrentUser(data);
+                UserStore.setLastEmail(email);
 
                 var redirect = utils.getUrlParameter("redirect");
                 if (redirect) {
-                    window.location.href = decodeURI(redirect);
+                    window.location.pathname = decodeURI(redirect);
                 } else {
-                    window.location.href = '/channels/town-square';
+                    window.location.pathname = '/' + name + '/channels/town-square';
                 }
 
             }.bind(this),
             function(err) {
                 if (err.message == "Login failed because email address has not been verified") {
-                    window.location.href = '/verify?domain=' + encodeURIComponent(domain) + '&email=' + encodeURIComponent(email);
+                    window.location.href = '/verify_email?name=' + encodeURIComponent(name) + '&email=' + encodeURIComponent(email);
                     return;
                 }
                 state.server_error = err.message;
@@ -161,35 +79,35 @@ module.exports = React.createClass({
             priorEmail = decodeURIComponent(emailParam);
         }
 
-        var subDomainClass = "form-control hidden";
-        var subDomain = utils.getSubDomain();
+        var teamDisplayName = this.props.teamDisplayName;
+        var teamName = this.props.teamName;
 
-        if (utils.isTestDomain()) {
-            subDomainClass = "form-control";
-            subDomain = UserStore.getLastDomain();
-        } else if (subDomain == "") {
-            return (<FindTeamDomain />);
+        var focusEmail = false;
+        var focusPassword = false;
+        if (priorEmail != "") {
+            focusPassword = true;
+        } else {
+            focusEmail = true;
         }
 
         return (
             <div className="signup-team__container">
                 <div>
-                    <span className="signup-team__name">{ subDomain }</span>
+                    <span className="signup-team__name">{ teamDisplayName }</span>
                     <br/>
-                    <span className="signup-team__subdomain">{ utils.getDomainWithOutSub() }</span>
+                    <span className="signup-team__subdomain">/{ teamName }/</span>
                     <br/>
                     <br/>
                 </div>
                 <form onSubmit={this.handleSubmit}>
                     <div className={server_error ? 'form-group has-error' : 'form-group'}>
                         { server_error }
-                        <input type="text" className={subDomainClass} name="domain" defaultValue={subDomain} ref="domain" placeholder="Domain" />
                     </div>
                     <div className={server_error ? 'form-group has-error' : 'form-group'}>
-                        <input type="email" className="form-control" name="email" defaultValue={priorEmail}  ref="email" placeholder="Email" />
+                        <input autoFocus={focusEmail} type="email" className="form-control" name="email" defaultValue={priorEmail}  ref="email" placeholder="Email" />
                     </div>
                     <div className={server_error ? 'form-group has-error' : 'form-group'}>
-                        <input type="password" className="form-control" name="password" ref="password" placeholder="Password" />
+                        <input autoFocus={focusPassword} type="password" className="form-control" name="password" ref="password" placeholder="Password" />
                     </div>
                     <div className="form-group">
                         <button type="submit" className="btn btn-primary">Sign in</button>
@@ -198,10 +116,10 @@ module.exports = React.createClass({
                         <span><a href="/find_team">{"Find other " + strings.TeamPlural}</a></span>
                     </div>
                     <div className="form-group">
-                        <a href="/reset_password">I forgot my password</a>
+                        <a href={"/" + teamName + "/reset_password"}>I forgot my password</a>
                     </div>
                     <div className="external-link">
-                        <span>{"Want to create your own " + strings.Team + "?"} <a href={utils.getHomeLink()} className="signup-team-login">Sign up now</a></span>
+                        <span>{"Want to create your own " + strings.Team + "?"} <a href="/" className="signup-team-login">Sign up now</a></span>
                     </div>
                 </form>
             </div>
diff --git a/web/react/components/msg_typing.jsx b/web/react/components/msg_typing.jsx
index a6953028f..aacb315dd 100644
--- a/web/react/components/msg_typing.jsx
+++ b/web/react/components/msg_typing.jsx
@@ -51,7 +51,7 @@ module.exports = React.createClass({
     },
     render: function() {
         return (
-        	<span className="msg-typing">{ this.state.text }</span>
+            <span className="msg-typing">{ this.state.text }</span>
         );
     }
 });
diff --git a/web/react/components/navbar.jsx b/web/react/components/navbar.jsx
index 78cf7d8b8..34c65c34f 100644
--- a/web/react/components/navbar.jsx
+++ b/web/react/components/navbar.jsx
@@ -7,6 +7,7 @@ var client = require('../utils/client.jsx');
 var AsyncClient = require('../utils/async_client.jsx');
 var UserStore = require('../stores/user_store.jsx');
 var ChannelStore = require('../stores/channel_store.jsx');
+var TeamStore = require('../stores/team_store.jsx');
 
 var UserProfile = require('./user_profile.jsx');
 var MessageWrapper = require('./message_wrapper.jsx');
@@ -61,93 +62,6 @@ var NotifyCounts =  React.createClass({
     }
 });
 
-var NavbarLoginForm = React.createClass({
-    handleSubmit: function(e) {
-        e.preventDefault();
-        var state = { };
-
-        var domain = this.refs.domain.getDOMNode().value.trim();
-        if (!domain) {
-            state.server_error = "A domain is required";
-            this.setState(state);
-            return;
-        }
-
-       var email = this.refs.email.getDOMNode().value.trim();
-        if (!email) {
-            state.server_error = "An email is required";
-            this.setState(state);
-            return;
-        }
-
-        var password = this.refs.password.getDOMNode().value.trim();
-        if (!password) {
-            state.server_error = "A password is required";
-            this.setState(state);
-            return;
-        }
-
-        state.server_error = "";
-        this.setState(state);
-
-        client.loginByEmail(domain, email, password,
-            function(data) {
-                UserStore.setLastDomain(domain);
-                UserStore.setLastEmail(email);
-                UserStore.setCurrentUser(data);
-
-                var redirect = utils.getUrlParameter("redirect");
-                if (redirect) {
-                    window.location.href = decodeURI(redirect);
-                } else {
-                    window.location.href = '/channels/town-square';
-                }
-
-            },
-            function(err) {
-                if (err.message == "Login failed because email address has not been verified") {
-                    window.location.href = '/verify?domain=' + encodeURIComponent(domain) + '&email=' + encodeURIComponent(email);
-                    return;
-                }
-                state.server_error = err.message;
-                this.valid = false;
-                this.setState(state);
-            }.bind(this)
-        );
-    },
-    getInitialState: function() {
-        return { };
-    },
-    render: function() {
-        var server_error = this.state.server_error ? <label className="control-label">{this.state.server_error}</label> : null;
-
-        var subDomain = utils.getSubDomain();
-        var subDomainClass = "form-control hidden";
-
-        if (subDomain == "") {
-            subDomain = UserStore.getLastDomain();
-            subDomainClass = "form-control";
-        }
-
-        return (
-            <form className="navbar-form navbar-right" onSubmit={this.handleSubmit}>
-                <a href="/find_team">Find your team</a>
-                <div className={server_error ? 'form-group has-error' : 'form-group'}>
-                    { server_error }
-                    <input type="text" className={subDomainClass} name="domain" defaultValue={subDomain} ref="domain" placeholder="Domain" />
-                </div>
-                <div className={server_error ? 'form-group has-error' : 'form-group'}>
-                    <input type="text" className="form-control" name="email" defaultValue={UserStore.getLastEmail()}  ref="email" placeholder="Email" />
-                </div>
-                <div className={server_error ? 'form-group has-error' : 'form-group'}>
-                    <input type="password" className="form-control" name="password" ref="password" placeholder="Password" />
-                </div>
-                <button type="submit" className="btn btn-default">Login</button>
-            </form>
-        );
-    }
-});
-
 function getStateFromStores() {
   return {
     channel: ChannelStore.getCurrent(),
@@ -180,10 +94,10 @@ module.exports = React.createClass({
     },
     handleLeave: function(e) {
         client.leaveChannel(this.state.channel.id,
-            function() {
+            function(data, text, req) {
                 AsyncClient.getChannels(true);
-                window.location.href = '/channels/town-square';
-            },
+                window.location.href = TeamStore.getCurrentTeamUrl() + '/channels/town-square';
+            }.bind(this),
             function(err) {
                 AsyncClient.dispatchError(err, "handleLeave");
             }
@@ -229,7 +143,7 @@ module.exports = React.createClass({
 
         var currentId = UserStore.getCurrentId();
         var popoverContent = "";
-        var channelTitle = this.props.teamName;
+        var channelTitle = this.props.teamDisplayName;
         var isAdmin = false;
         var isDirect = false;
         var description = ""
@@ -333,14 +247,8 @@ module.exports = React.createClass({
                             <div className="navbar-brand">
                                 <a href="/" className="heading">{ channelTitle }</a>
                             </div>
-                        : null }
+                        : "" }
                     </div>
-                    { !currentId ?
-                        <div className="collapse navbar-collapse" id="navbar-collapse-1">
-                            <NavbarLoginForm />
-                        </div>
-                        : null
-                    }
                 </div>
             </nav>
         );
diff --git a/web/react/components/new_channel.jsx b/web/react/components/new_channel.jsx
index 069e0d6b1..49e088458 100644
--- a/web/react/components/new_channel.jsx
+++ b/web/react/components/new_channel.jsx
@@ -6,6 +6,8 @@ var utils = require('../utils/utils.jsx');
 var client = require('../utils/client.jsx');
 var asyncClient = require('../utils/async_client.jsx');
 var UserStore = require('../stores/user_store.jsx');
+var TeamStore = require('../stores/team_store.jsx');
+var Constants = require('../utils/constants.jsx');
 
 module.exports = React.createClass({
     handleSubmit: function(e) {
@@ -60,13 +62,13 @@ module.exports = React.createClass({
 
         var self = this;
         client.createChannel(channel,
-            function(data) {
+            function() {
                 this.refs.display_name.getDOMNode().value = "";
                 this.refs.channel_name.getDOMNode().value = "";
                 this.refs.channel_desc.getDOMNode().value = "";
 
                 $(self.refs.modal.getDOMNode()).modal('hide');
-                window.location.href = "/channels/" + channel.name;
+                window.location = TeamStore.getCurrentTeamUrl() + "/channels/" + channel.name;
                 asyncClient.getChannels(true);
             }.bind(this),
             function(err) {
diff --git a/web/react/components/password_reset.jsx b/web/react/components/password_reset.jsx
index 24566c7b1..b2edea620 100644
--- a/web/react/components/password_reset.jsx
+++ b/web/react/components/password_reset.jsx
@@ -10,13 +10,6 @@ SendResetPasswordLink = React.createClass({
         e.preventDefault();
         var state = {};
 
-        var domain = this.refs.domain.getDOMNode().value.trim();
-        if (!domain) {
-            state.error = "A domain is required"
-            this.setState(state);
-            return;
-        }
-
         var email = this.refs.email.getDOMNode().value.trim();
         if (!email) {
             state.error = "Please enter a valid email address."
@@ -29,17 +22,17 @@ SendResetPasswordLink = React.createClass({
 
         data = {};
         data['email'] = email;
-        data['domain'] = domain;
+        data['name'] = this.props.teamName;
 
         client.sendPasswordReset(data,
-            function(data) {
-                this.setState({ error: null, update_text: <p>A password reset link has been sent to <b>{email}</b> for your <b>{this.props.teamName}</b> team on {config.SiteName}.com.</p>, more_update_text: "Please check your inbox." });
-                $(this.refs.reset_form.getDOMNode()).hide();
-            }.bind(this),
-            function(err) {
-                this.setState({ error: err.message, update_text: null, more_update_text: null });
-            }.bind(this)
-        );
+             function(data) {
+                 this.setState({ error: null, update_text: <p>A password reset link has been sent to <b>{email}</b> for your <b>{this.props.teamDisplayName}</b> team on {window.location.hostname}.</p>, more_update_text: "Please check your inbox." });
+                 $(this.refs.reset_form.getDOMNode()).hide();
+             }.bind(this),
+             function(err) {
+                 this.setState({ error: err.message, update_text: null, more_update_text: null });
+             }.bind(this)
+            );
     },
     getInitialState: function() {
         return {};
@@ -48,24 +41,13 @@ SendResetPasswordLink = React.createClass({
         var update_text = this.state.update_text ? <div className="reset-form alert alert-success">{this.state.update_text}{this.state.more_update_text}</div> : null;
         var error = this.state.error ? <div className="form-group has-error"><label className="control-label">{this.state.error}</label></div> : null;
 
-        var subDomain = utils.getSubDomain();
-        var subDomainClass = "form-control hidden";
-
-        if (subDomain == "") {
-            subDomain = UserStore.getLastDomain();
-            subDomainClass = "form-control";
-        }
-
         return (
             <div className="col-sm-12">
                 <div className="signup-team__container">
                     <h3>Password Reset</h3>
                     { update_text }
                     <form onSubmit={this.handleSendLink} ref="reset_form">
-                        <p>{"To reset your password, enter the email address you used to sign up for " + this.props.teamName + "."}</p>
-                        <div className="form-group">
-                            <input type="text" className={subDomainClass} name="domain" defaultValue={subDomain} ref="domain" placeholder="Domain" />
-                        </div>
+                        <p>{"To reset your password, enter the email address you used to sign up for " + this.props.teamDisplayName + "."}</p>
                         <div className={error ? 'form-group has-error' : 'form-group'}>
                             <input type="text" className="form-control" name="email" ref="email" placeholder="Email" />
                         </div>
@@ -83,13 +65,6 @@ ResetPassword = React.createClass({
         e.preventDefault();
         var state = {};
 
-        var domain = this.refs.domain.getDOMNode().value.trim();
-        if (!domain) {
-            state.error = "A domain is required"
-            this.setState(state);
-            return;
-        }
-
         var password = this.refs.password.getDOMNode().value.trim();
         if (!password || password.length < 5) {
             state.error = "Please enter at least 5 characters."
@@ -104,41 +79,30 @@ ResetPassword = React.createClass({
         data['new_password'] = password;
         data['hash'] = this.props.hash;
         data['data'] = this.props.data;
-        data['domain'] = domain;
+        data['name'] = this.props.teamName;
 
         client.resetPassword(data,
-            function(data) {
-                this.setState({ error: null, update_text: "Your password has been updated successfully." });
-            }.bind(this),
-            function(err) {
-                this.setState({ error: err.message, update_text: null });
-            }.bind(this)
-        );
+             function(data) {
+                 this.setState({ error: null, update_text: "Your password has been updated successfully." });
+             }.bind(this),
+             function(err) {
+                 this.setState({ error: err.message, update_text: null });
+             }.bind(this)
+            );
     },
     getInitialState: function() {
         return {};
     },
     render: function() {
-        var update_text = this.state.update_text ? <div className="form-group"><br/><label className="control-label reset-form">{this.state.update_text} Click <a href="/login">here</a> to log in.</label></div> : null;
+        var update_text = this.state.update_text ? <div className="form-group"><br/><label className="control-label reset-form">{this.state.update_text} Click <a href={"/" + this.props.teamName + "/login"}>here</a> to log in.</label></div> : null;
         var error = this.state.error ? <div className="form-group has-error"><label className="control-label">{this.state.error}</label></div> : null;
 
-        var subDomain = this.props.domain != "" ? this.props.domain : utils.getSubDomain();
-        var subDomainClass = "form-control hidden";
-
-        if (subDomain == "") {
-            subDomain = UserStore.getLastDomain();
-            subDomainClass = "form-control";
-        }
-
         return (
             <div className="col-sm-12">
                 <div className="signup-team__container">
                     <h3>Password Reset</h3>
                     <form onSubmit={this.handlePasswordReset}>
-                        <p>{"Enter a new password for your " + this.props.teamName + " " + config.SiteName + " account."}</p>
-                        <div className="form-group">
-                            <input type="text" className={subDomainClass} name="domain" defaultValue={subDomain} ref="domain" placeholder="Domain" />
-                        </div>
+                        <p>{"Enter a new password for your " + this.props.teamDisplayName + " " + config.SiteName + " account."}</p>
                         <div className={error ? 'form-group has-error' : 'form-group'}>
                             <input type="password" className="form-control" name="password" ref="password" placeholder="Password" />
                         </div>
@@ -161,14 +125,15 @@ module.exports = React.createClass({
         if (this.props.isReset === "false") {
             return (
                 <SendResetPasswordLink
+                    teamDisplayName={this.props.teamDisplayName}
                     teamName={this.props.teamName}
                 />
             );
         } else {
             return (
                 <ResetPassword
+                    teamDisplayName={this.props.teamDisplayName}
                     teamName={this.props.teamName}
-                    domain={this.props.domain}
                     hash={this.props.hash}
                     data={this.props.data}
                 />
diff --git a/web/react/components/rename_channel_modal.jsx b/web/react/components/rename_channel_modal.jsx
index b4ccb2937..2ae331626 100644
--- a/web/react/components/rename_channel_modal.jsx
+++ b/web/react/components/rename_channel_modal.jsx
@@ -6,6 +6,8 @@ var utils = require('../utils/utils.jsx');
 var Client = require('../utils/client.jsx');
 var AsyncClient = require('../utils/async_client.jsx');
 var ChannelStore = require('../stores/channel_store.jsx');
+var TeamStore = require('../stores/team_store.jsx');
+var Constants = require('../utils/constants.jsx');
 
 module.exports = React.createClass({
     handleSubmit: function(e) {
@@ -60,12 +62,12 @@ module.exports = React.createClass({
             return;
 
         Client.updateChannel(channel,
-            function(data) {
+            function(data, text, req) {
                 this.refs.display_name.getDOMNode().value = "";
                 this.refs.channel_name.getDOMNode().value = "";
 
                 $('#' + this.props.modalId).modal('hide');
-                window.location.href = '/channels/' + this.state.channel_name;
+                window.location.href = TeamStore.getCurrentTeamUrl() + '/channels/' + this.state.channel_name;
                 AsyncClient.getChannels(true);
             }.bind(this),
             function(err) {
diff --git a/web/react/components/rename_team_modal.jsx b/web/react/components/rename_team_modal.jsx
index 67a150b9d..a6da57b67 100644
--- a/web/react/components/rename_team_modal.jsx
+++ b/web/react/components/rename_team_modal.jsx
@@ -24,13 +24,13 @@ module.exports = React.createClass({
         if (!valid)
             return;
 
-        if (this.props.teamName === name)
+        if (this.props.teamDisplayName === name)
             return;
 
         var data = {};
         data["new_name"] = name;
 
-        Client.updateTeamName(data,
+        Client.updateTeamDisplayName(data,
             function(data) {
                 $('#rename_team_link').modal('hide');
                 window.location.reload();
@@ -47,11 +47,11 @@ module.exports = React.createClass({
     componentDidMount: function() {
         var self = this;
         $(this.refs.modal.getDOMNode()).on('hidden.bs.modal', function(e) {
-            self.setState({ name: self.props.teamName });
+            self.setState({ name: self.props.teamDisplayName });
         });
     },
     getInitialState: function() {
-        return { name: this.props.teamName };
+        return { name: this.props.teamDisplayName };
     },
     render: function() {
 
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index 65727c597..3cf67e410 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -6,6 +6,7 @@ var ChannelStore = require('../stores/channel_store.jsx');
 var AsyncClient = require('../utils/async_client.jsx');
 var SocketStore = require('../stores/socket_store.jsx');
 var UserStore = require('../stores/user_store.jsx');
+var TeamStore = require('../stores/team_store.jsx');
 var utils = require('../utils/utils.jsx');
 var SidebarHeader = require('./sidebar_header.jsx');
 var SearchBox = require('./search_bar.jsx');
@@ -13,93 +14,6 @@ var SearchBox = require('./search_bar.jsx');
 var Constants = require('../utils/constants.jsx');
 var ActionTypes = Constants.ActionTypes;
 
-var SidebarLoginForm = React.createClass({
-    handleSubmit: function(e) {
-        e.preventDefault();
-        var state = { }
-
-        var domain = this.refs.domain.getDOMNode().value.trim();
-        if (!domain) {
-            state.server_error = "A domain is required"
-            this.setState(state);
-            return;
-        }
-
-       var email = this.refs.email.getDOMNode().value.trim();
-        if (!email) {
-            state.server_error = "An email is required"
-            this.setState(state);
-            return;
-        }
-
-        var password = this.refs.password.getDOMNode().value.trim();
-        if (!password) {
-            state.server_error = "A password is required"
-            this.setState(state);
-            return;
-        }
-
-        state.server_error = "";
-        this.setState(state);
-
-        client.loginByEmail(domain, email, password,
-            function(data) {
-                UserStore.setLastDomain(domain);
-                UserStore.setLastEmail(email);
-                UserStore.setCurrentUser(data);
-
-                var redirect = utils.getUrlParameter("redirect");
-                if (redirect) {
-                    window.location.href = decodeURI(redirect);
-                } else {
-                    window.location.href = '/channels/town-square';
-                }
-
-            }.bind(this),
-            function(err) {
-                if (err.message == "Login failed because email address has not been verified") {
-                    window.location.href = '/verify?domain=' + encodeURIComponent(domain) + '&email=' + encodeURIComponent(email);
-                    return;
-                }
-                state.server_error = err.message;
-                this.valid = false;
-                this.setState(state);
-            }.bind(this)
-        );
-    },
-    getInitialState: function() {
-        return { };
-    },
-    render: function() {
-        var server_error = this.state.server_error ? <label className="control-label">{this.state.server_error}</label> : null;
-
-        var subDomain = utils.getSubDomain();
-        var subDomainClass = "form-control hidden";
-
-        if (subDomain == "") {
-            subDomain = UserStore.getLastDomain();
-            subDomainClass = "form-control";
-        }
-
-        return (
-            <form className="" onSubmit={this.handleSubmit}>
-                <a href="/find_team">{"Find your " + strings.Team}</a>
-                <div className={server_error ? 'form-group has-error' : 'form-group'}>
-                    { server_error }
-                    <input type="text" className={subDomainClass} name="domain" defaultValue={subDomain} ref="domain" placeholder="Domain" />
-                </div>
-                <div className={server_error ? 'form-group has-error' : 'form-group'}>
-                    <input type="text" className="form-control" name="email" defaultValue={UserStore.getLastEmail()}  ref="email" placeholder="Email" />
-                </div>
-                <div className={server_error ? 'form-group has-error' : 'form-group'}>
-                    <input type="password" className="form-control" name="password" ref="password" placeholder="Password" />
-                </div>
-                <button type="submit" className="btn btn-default">Login</button>
-            </form>
-        );
-    }
-});
-
 function getStateFromStores() {
     var members = ChannelStore.getAllMembers();
     var team_member_map = UserStore.getActiveOnlyProfiles();
@@ -192,7 +106,7 @@ function getStateFromStores() {
     };
 }
 
-var SidebarLoggedIn = React.createClass({
+module.exports = React.createClass({
     componentDidMount: function() {
         ChannelStore.addChangeListener(this._onChange);
         UserStore.addChangeListener(this._onChange);
@@ -383,7 +297,7 @@ var SidebarLoggedIn = React.createClass({
                 );
             } else {
                 return (
-                    <li key={channel.name} className={active}><a className={"sidebar-channel " + titleClass} href={"/channels/"+channel.name}><span className="status" dangerouslySetInnerHTML={{__html: statusIcon}} /> {badge}{channel.display_name}</a></li>
+                    <li key={channel.name} className={active}><a className={"sidebar-channel " + titleClass} href={TeamStore.getCurrentTeamUrl() + "/channels/"+channel.name}><span className="status" dangerouslySetInnerHTML={{__html: statusIcon}} /> {badge}{channel.display_name}</a></li>
                 );
             }
 
@@ -414,7 +328,7 @@ var SidebarLoggedIn = React.createClass({
         }
         return (
             <div>
-                <SidebarHeader teamName={this.props.teamName} teamType={this.props.teamType} />
+                <SidebarHeader teamDisplayName={this.props.teamDisplayName} teamType={this.props.teamType} />
                 <SearchBox />
 
                 <div className="nav-pills__container">
@@ -440,25 +354,3 @@ var SidebarLoggedIn = React.createClass({
         );
     }
 });
-
-var SidebarLoggedOut = React.createClass({
-    render: function() {
-        return (
-            <div>
-                <SidebarHeader teamName={this.props.teamName} />
-                <SidebarLoginForm />
-            </div>
-        );
-    }
-});
-
-module.exports = React.createClass({
-    render: function() {
-        var currentId = UserStore.getCurrentId();
-        if (currentId != null) {
-            return <SidebarLoggedIn teamName={this.props.teamName} teamType={this.props.teamType} />;
-        } else {
-            return <SidebarLoggedOut teamName={this.props.teamName} />;
-        }
-    }
-});
diff --git a/web/react/components/sidebar_header.jsx b/web/react/components/sidebar_header.jsx
index 45c9ca629..bab2897b6 100644
--- a/web/react/components/sidebar_header.jsx
+++ b/web/react/components/sidebar_header.jsx
@@ -61,19 +61,15 @@ var NavbarDropdown = React.createClass({
 
         var teams = [];
 
+        teams.push(<li className="divider" key="div"></li>);
         if (this.state.teams.length > 1) {
             for (var i = 0; i < this.state.teams.length; i++) {
-                var domain = this.state.teams[i];
+                var teamName = this.state.teams[i];
 
-                if (domain == utils.getSubDomain())
-                    continue;
-
-                if (teams.length == 0)
-                    teams.push(<li className="divider" key="div"></li>);
-
-                teams.push(<li key={ domain }><a href={window.location.protocol + "//" + domain + "." + utils.getDomainWithOutSub() }>Switch to { domain }</a></li>);
+                teams.push(<li key={ teamName }><a href={window.location.origin + "/" + teamName }>Switch to { teamName }</a></li>);
             }
         }
+        teams.push(<li><a href={window.location.origin + "/signup_team" }>Create a New Team</a></li>);
 
         return (
             <ul className="nav navbar-nav navbar-right">
@@ -110,19 +106,21 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        var me = UserStore.getCurrentUser();
-
+        var teamDisplayName = this.props.teamDisplayName ? this.props.teamDisplayName : config.SiteName;
+        var me = UserStore.getCurrentUser()
         if (!me) {
             return null;
         }
 
         return (
             <div className="team__header theme">
-                <img className="user__picture" src={"/api/v1/users/" + me.id + "/image?time=" + me.update_at} />
-                <div className="header__info">
-                    <div className="user__name">{'@' + me.username}</div>
-                    <a className="team__name" href="/channels/town-square">{this.props.teamName}</a>
-                </div>
+                <a className="settings_link" href="#" data-toggle="modal" data-target="#user_settings1">
+                    <img className="user__picture" src={"/api/v1/users/" + me.id + "/image?time=" + me.update_at} />
+                    <div className="header__info">
+                        <div className="user__name">{ '@' + me.username}</div>
+                        <div className="team__name">{ teamDisplayName }</div>
+                    </div>
+                </a>
                 <NavbarDropdown teamType={this.props.teamType} />
             </div>
         );
diff --git a/web/react/components/sidebar_right_menu.jsx b/web/react/components/sidebar_right_menu.jsx
index 22d1d9ad2..15306a499 100644
--- a/web/react/components/sidebar_right_menu.jsx
+++ b/web/react/components/sidebar_right_menu.jsx
@@ -49,12 +49,12 @@ module.exports = React.createClass({
         }
 
         var siteName = config.SiteName != null ? config.SiteName : "";
-        var teamName = this.props.teamName ? this.props.teamName : siteName;
+        var teamDisplayName = this.props.teamDisplayName ? this.props.teamDisplayName : siteName;
 
         return (
             <div>
                 <div className="team__header theme">
-                    <a className="team__name" href="/channels/town-square">{ teamName }</a>
+                    <a className="team__name" href="/channels/town-square">{ teamDisplayName }</a>
                 </div>
 
                 <div className="nav-pills__container">
diff --git a/web/react/components/signup_team.jsx b/web/react/components/signup_team.jsx
index 22086250c..cf982cc1e 100644
--- a/web/react/components/signup_team.jsx
+++ b/web/react/components/signup_team.jsx
@@ -20,8 +20,8 @@ module.exports = React.createClass({
             state.email_error = "";
         }
 
-        team.name = this.refs.name.getDOMNode().value.trim();
-        if (!team.name) {
+        team.display_name = this.refs.name.getDOMNode().value.trim();
+        if (!team.display_name) {
             state.name_error = "This field is required";
             state.inValid = true;
         }
@@ -34,7 +34,7 @@ module.exports = React.createClass({
             return;
         }
 
-        client.signupTeam(team.email, team.name,
+        client.signupTeam(team.email, team.display_name,
             function(data) {
                 if (data["follow_link"]) {
                     window.location.href = data["follow_link"];
@@ -61,7 +61,7 @@ module.exports = React.createClass({
         return (
             <form role="form" onSubmit={this.handleSubmit}>
                 <div className={ email_error ? "form-group has-error" : "form-group" }>
-                    <input type="email" ref="email" className="form-control" placeholder="Email Address" maxLength="128" />
+                    <input autoFocus={true} type="email" ref="email" className="form-control" placeholder="Email Address" maxLength="128" />
                     { email_error }
                 </div>
                 <div className={ name_error ? "form-group has-error" : "form-group" }>
@@ -70,6 +70,9 @@ module.exports = React.createClass({
                 </div>
                 { server_error }
                 <button className="btn btn-md btn-primary" type="submit">Sign up for Free</button>
+                <div className="form-group form-group--small">
+                    <span><a href="/find_team">{"Find my " + strings.Team}</a></span>
+                </div>
             </form>
         );
     }
diff --git a/web/react/components/signup_team_complete.jsx b/web/react/components/signup_team_complete.jsx
index 9e2a13955..9ceeb6324 100644
--- a/web/react/components/signup_team_complete.jsx
+++ b/web/react/components/signup_team_complete.jsx
@@ -15,7 +15,7 @@ WelcomePage = React.createClass({
             return;
         }
         e.preventDefault();
-        this.props.state.wizard = "team_name";
+        this.props.state.wizard = "team_display_name";
         this.props.updateParent(this.props.state);
     },
     handleDiffEmail: function (e) {
@@ -57,6 +57,17 @@ WelcomePage = React.createClass({
     getInitialState: function() {
         return { use_diff: false };
     },
+    handleKeyPress: function(event) {
+        if (event.keyCode == 13) {
+            this.submitNext(event);
+        }
+    },
+    componentWillMount: function() {
+        document.addEventListener("keyup", this.handleKeyPress, false);
+    },
+    componentWillUnmount: function() {
+        document.removeEventListener("keyup", this.handleKeyPress, false);
+    },
     render: function() {
 
         client.track('signup', 'signup_team_01_welcome');
@@ -77,7 +88,7 @@ WelcomePage = React.createClass({
                     <span className="black">{ this.props.state.team.email }</span><br />
                 </p>
                 <div className="form-group">
-                    <button className="btn-primary btn form-group" onClick={this.submitNext}><i className="glyphicon glyphicon-ok"></i>Yes, this address is correct</button>
+                    <button className="btn-primary btn form-group" type="submit" onClick={this.submitNext}><i className="glyphicon glyphicon-ok"></i>Yes, this address is correct</button>
                     { storage_error }
                 </div>
                 <hr />
@@ -92,15 +103,15 @@ WelcomePage = React.createClass({
                         { email_error }
                     </div>
                     { server_error }
-                    <button className="btn btn-md btn-primary" onClick={this.handleDiffSubmit} type="submit">Use this instead</button>
+                    <button className="btn btn-md btn-primary" type="button" onClick={this.handleDiffSubmit} type="submit">Use this instead</button>
                 </div>
-                <button onClick={this.handleDiffEmail} className={ this.state.use_diff ? "btn-default btn hidden" : "btn-default btn" }>Use a different address</button>
+                <button type="button" onClick={this.handleDiffEmail} className={ this.state.use_diff ? "btn-default btn hidden" : "btn-default btn" }>Use a different address</button>
             </div>
         );
     }
 });
 
-TeamNamePage = React.createClass({
+TeamDisplayNamePage = React.createClass({
     submitBack: function (e) {
         e.preventDefault();
         this.props.state.wizard = "welcome";
@@ -109,19 +120,24 @@ TeamNamePage = React.createClass({
     submitNext: function (e) {
         e.preventDefault();
 
-        var name = this.refs.name.getDOMNode().value.trim();
-        if (!name) {
+        var display_name = this.refs.name.getDOMNode().value.trim();
+        if (!display_name) {
             this.setState({name_error: "This field is required"});
             return;
         }
 
         this.props.state.wizard = "team_url";
-        this.props.state.team.name = name;
+        this.props.state.team.display_name = display_name;
         this.props.updateParent(this.props.state);
     },
     getInitialState: function() {
         return {  };
     },
+    handleFocus: function(e) {
+        e.preventDefault();
+
+        e.currentTarget.select();
+    },
     render: function() {
 
         client.track('signup', 'signup_team_02_name');
@@ -130,29 +146,31 @@ TeamNamePage = React.createClass({
 
         return (
             <div>
+                <form>
                 <img className="signup-team-logo" src="/static/images/logo.png" />
 
                 <h2>{utils.toTitleCase(strings.Team) + " Name"}</h2>
                 <div className={ name_error ? "form-group has-error" : "form-group" }>
                 <div className="row">
                     <div className="col-sm-9">
-                        <input type="text" ref="name" className="form-control" placeholder="" maxLength="128" defaultValue={this.props.state.team.name} />
+                        <input type="text" ref="name" className="form-control" placeholder="" maxLength="128" defaultValue={this.props.state.team.display_name} autoFocus={true} onFocus={this.handleFocus} />
                     </div>
                 </div>
                 { name_error }
                 </div>
                 <p>{"Your " + strings.Team + " name shows in menus and headings. It may include the name of your " + strings.Company + ", but it's not required."}</p>
-                <button className="btn btn-default" onClick={this.submitBack}><i className="glyphicon glyphicon-chevron-left"></i> Back</button>&nbsp;
-                <button className="btn-primary btn" onClick={this.submitNext}>Next<i className="glyphicon glyphicon-chevron-right"></i></button>
+                <button type="button" className="btn btn-default" onClick={this.submitBack}><i className="glyphicon glyphicon-chevron-left"></i> Back</button>&nbsp;
+                <button type="submit" className="btn-primary btn" onClick={this.submitNext}>Next<i className="glyphicon glyphicon-chevron-right"></i></button>
+            </form>
             </div>
         );
     }
 });
 
-TeamUrlPage = React.createClass({
+TeamURLPage = React.createClass({
     submitBack: function (e) {
         e.preventDefault();
-        this.props.state.wizard = "team_name";
+        this.props.state.wizard = "team_display_name";
         this.props.updateParent(this.props.state);
     },
     submitNext: function (e) {
@@ -172,18 +190,18 @@ TeamUrlPage = React.createClass({
             return;
         }
         else if (cleaned_name.length <= 3 || cleaned_name.length > 15) {
-            this.setState({name_error: "Domain must be 4 or more characters up to a maximum of 15"})
+            this.setState({name_error: "Name must be 4 or more characters up to a maximum of 15"})
             return;
         }
 
-        for (var index = 0; index < constants.RESERVED_DOMAINS.length; index++) {
-            if (cleaned_name.indexOf(constants.RESERVED_DOMAINS[index]) == 0) {
-                this.setState({name_error: "This Team URL name is unavailable"})
+        for (var index = 0; index < constants.RESERVED_TEAM_NAMES.length; index++) {
+            if (cleaned_name.indexOf(constants.RESERVED_TEAM_NAMES[index]) == 0) {
+                this.setState({name_error: "This team name is unavailable"})
                 return;
             }
         }
 
-        client.findTeamByDomain(name,
+        client.findTeamByName(name,
             function(data) {
                 if (!data) {
                     if (config.AllowSignupDomainsWizard) {
@@ -193,7 +211,7 @@ TeamUrlPage = React.createClass({
                         this.props.state.team.type = 'O';
                     }
 
-                    this.props.state.team.domain = name;
+                    this.props.state.team.name = name;
                     this.props.updateParent(this.props.state);
                 }
                 else {
@@ -210,6 +228,11 @@ TeamUrlPage = React.createClass({
     getInitialState: function() {
         return { };
     },
+    handleFocus: function(e) {
+        e.preventDefault();
+
+        e.currentTarget.select();
+    },
     render: function() {
 
         client.track('signup', 'signup_team_03_url');
@@ -218,14 +241,15 @@ TeamUrlPage = React.createClass({
 
         return (
             <div>
+                <form>
                 <img className="signup-team-logo" src="/static/images/logo.png" />
                 <h2>{utils.toTitleCase(strings.Team) + " URL"}</h2>
                 <div className={ name_error ? "form-group has-error" : "form-group" }>
                <div className="row">
                     <div className="col-sm-9">
                         <div className="input-group">
-                            <input type="text" ref="name" className="form-control text-right" placeholder="" maxLength="128" defaultValue={this.props.state.team.domain} />
-                            <span className="input-group-addon">.{ utils.getDomainWithOutSub() }</span>
+                            <span className="input-group-addon">{ window.location.origin + "/" }</span>
+                            <input type="text" ref="name" className="form-control" placeholder="" maxLength="128" defaultValue={this.props.state.team.name} autoFocus={true} onFocus={this.handleFocus}/>
                         </div>
                     </div>
                 </div>
@@ -233,8 +257,9 @@ TeamUrlPage = React.createClass({
                 </div>
                 <p className="black">{"Pick something short and memorable for your " + strings.Team + "'s web address."}</p>
                 <p>{"Your " + strings.Team + " URL can only contain lowercase letters, numbers and dashes. Also, it needs to start with a letter and cannot end in a dash."}</p>
-                <button className="btn btn-default" onClick={this.submitBack}><i className="glyphicon glyphicon-chevron-left"></i> Back</button>&nbsp;
-                <button className="btn-primary btn" onClick={this.submitNext}>Next<i className="glyphicon glyphicon-chevron-right"></i></button>
+                <button type="button" className="btn btn-default" onClick={this.submitBack}><i className="glyphicon glyphicon-chevron-left"></i> Back</button>&nbsp;
+                <button type="submit" className="btn-primary btn" onClick={this.submitNext}>Next<i className="glyphicon glyphicon-chevron-right"></i></button>
+            </form>
             </div>
         );
     }
@@ -291,6 +316,7 @@ AllowedDomainsPage = React.createClass({
 
         return (
             <div>
+                <form>
                 <img className="signup-team-logo" src="/static/images/logo.png" />
                 <h2>Email Domain</h2>
                 <p>
@@ -303,7 +329,7 @@ AllowedDomainsPage = React.createClass({
                     <div className="col-sm-9">
                         <div className="input-group">
                             <span className="input-group-addon">@</span>
-                            <input type="text" ref="name" className="form-control" placeholder="" maxLength="128" defaultValue={this.props.state.team.allowed_domains} />
+                            <input type="text" ref="name" className="form-control" placeholder="" maxLength="128" defaultValue={this.props.state.team.allowed_domains} autoFocus={true} onFocus={this.handleFocus}/>
                         </div>
                     </div>
                 </div>
@@ -313,8 +339,9 @@ AllowedDomainsPage = React.createClass({
                 <p>
                 <div className="checkbox"><label><input type="checkbox" ref="open_network" defaultChecked={this.props.state.team.type == 'O'} /> Allow anyone to signup to this domain without an invitation.</label></div>
                 </p>
-                <button className="btn btn-default" onClick={this.submitBack}><i className="glyphicon glyphicon-chevron-left"></i> Back</button>&nbsp;
-                <button className="btn-primary btn" onClick={this.submitNext}>Next<i className="glyphicon glyphicon-chevron-right"></i></button>
+                <button type="button" className="btn btn-default" onClick={this.submitBack}><i className="glyphicon glyphicon-chevron-left"></i> Back</button>&nbsp;
+                <button type="submit" className="btn-primary btn" onClick={this.submitNext}>Next<i className="glyphicon glyphicon-chevron-right"></i></button>
+            </form>
             </div>
         );
     }
@@ -356,7 +383,7 @@ EmailItem = React.createClass({
 
         return (
             <div className={ email_error ? "form-group has-error" : "form-group" }>
-                <input type="email" ref="email" className="form-control" placeholder="Email Address" defaultValue={this.props.email} maxLength="128" />
+                <input autoFocus={this.props.focus} type="email" ref="email" className="form-control" placeholder="Email Address" defaultValue={this.props.email} maxLength="128" />
                 { email_error }
             </div>
         );
@@ -424,16 +451,22 @@ SendInivtesPage = React.createClass({
         var emails = [];
 
         for (var i = 0; i < this.props.state.invites.length; i++) {
-            emails.push(<EmailItem key={i} ref={'email_' + i} email={this.props.state.invites[i]} />);
+            if (i == 0) {
+                emails.push(<EmailItem focus={true} key={i} ref={'email_' + i} email={this.props.state.invites[i]} />);
+            } else {
+                emails.push(<EmailItem focus={false} key={i} ref={'email_' + i} email={this.props.state.invites[i]} />);
+            }
         }
 
         return (
             <div>
+                <form>
                 <img className="signup-team-logo" src="/static/images/logo.png" />
                 <h2>Send Invitations</h2>
                 { emails }
-                <div className="form-group"><button className="btn-default btn" onClick={this.submitAddInvite}>Add Invitation</button></div>
-                <div className="form btn-default-group"><button className="btn btn-default" onClick={this.submitBack}><i className="glyphicon glyphicon-chevron-left"></i> Back</button>&nbsp;<button className="btn-primary btn" onClick={this.submitNext}>Next<i className="glyphicon glyphicon-chevron-right"></i></button></div>
+                <div className="form-group"><button type="button" className="btn-default btn" onClick={this.submitAddInvite}>Add Invitation</button></div>
+                <div className="form btn-default-group"><button type="button" className="btn btn-default" onClick={this.submitBack}><i className="glyphicon glyphicon-chevron-left"></i> Back</button>&nbsp;<button type="submit" className="btn-primary btn" onClick={this.submitNext}>Next<i className="glyphicon glyphicon-chevron-right"></i></button></div>
+            </form>
                 <p>{"If you'd prefer, you can send invitations after you finish setting up the "+ strings.Team + "."}</p>
                 <div><a href="#" onClick={this.submitSkip}>Skip this step</a></div>
             </div>
@@ -477,20 +510,22 @@ UsernamePage = React.createClass({
 
         return (
             <div>
+                <form>
                 <img className="signup-team-logo" src="/static/images/logo.png" />
                 <h2>Choose a username</h2>
                 <div className={ name_error ? "form-group has-error" : "form-group" }>
                 <div className="row">
                     <div className="col-sm-9">
-                        <input type="text" ref="name" className="form-control" placeholder="" defaultValue={this.props.state.user.username} maxLength="128" />
+                        <input autoFocus={true} type="text" ref="name" className="form-control" placeholder="" defaultValue={this.props.state.user.username} maxLength="128" />
                     </div>
                 </div>
                 { name_error }
                 </div>
                 <p>{"Pick something " + strings.Team + "mates will recognize. Your username is how you will appear to others."}</p>
                 <p>It can be made of lowercase letters and numbers.</p>
-                <button className="btn btn-default" onClick={this.submitBack}><i className="glyphicon glyphicon-chevron-left"></i> Back</button>&nbsp;
-                <button className="btn-primary btn" onClick={this.submitNext}>Next<i className="glyphicon glyphicon-chevron-right"></i></button>
+                <button type="button" className="btn btn-default" onClick={this.submitBack}><i className="glyphicon glyphicon-chevron-left"></i> Back</button>&nbsp;
+                <button type="submit" className="btn-primary btn" onClick={this.submitNext}>Next<i className="glyphicon glyphicon-chevron-right"></i></button>
+            </form>
             </div>
         );
     }
@@ -531,18 +566,11 @@ PasswordPage = React.createClass({
                     props.state.wizard = "finished";
                     props.updateParent(props.state, true);
 
-                    if (utils.isTestDomain()) {
-                        UserStore.setLastDomain(teamSignup.team.domain);
-                        UserStore.setLastEmail(teamSignup.team.email);
-                        window.location.href = window.location.protocol  + '//' + utils.getDomainWithOutSub() + '/login?email=' + encodeURIComponent(teamSignup.team.email);
-                    }
-                    else {
-                        window.location.href = window.location.protocol + '//' + teamSignup.team.domain + '.' + utils.getDomainWithOutSub() + '/login?email=' + encodeURIComponent(teamSignup.team.email);
-                    }
+                    window.location.href = window.location.origin + '/' + props.state.team.name + '/login?email=' + encodeURIComponent(teamSignup.team.email);
 
                     // client.loginByEmail(teamSignup.team.domain, teamSignup.team.email, teamSignup.user.password,
                     //     function(data) {
-                    //         UserStore.setLastDomain(teamSignup.team.domain);
+                    //         TeamStore.setLastName(teamSignup.team.domain);
                     //         UserStore.setLastEmail(teamSignup.team.email);
                     //         UserStore.setCurrentUser(data);
                     //         window.location.href = '/channels/town-square';
@@ -570,13 +598,14 @@ PasswordPage = React.createClass({
 
         return (
             <div>
+                <form>
                 <img className="signup-team-logo" src="/static/images/logo.png" />
                 <h2>Choose a password</h2>
                 <p>You'll use your email address ({this.props.state.team.email}) and password to log into {config.SiteName}.</p>
                 <div className={ name_error ? "form-group has-error" : "form-group" }>
                 <div className="row">
                     <div className="col-sm-9">
-                        <input type="password" ref="password" className="form-control" placeholder="" maxLength="128" />
+                        <input autoFocus={true} type="password" ref="password" className="form-control" placeholder="" maxLength="128" />
                     </div>
                 </div>
                     { name_error }
@@ -585,10 +614,11 @@ PasswordPage = React.createClass({
                     <label><input type="checkbox" ref="email_service" /> It's ok to send me occassional email with updates about the {config.SiteName} service.</label>
                 </div>
                 <div className="form-group">
-                    <button className="btn btn-default" onClick={this.submitBack}><i className="glyphicon glyphicon-chevron-left"></i> Back</button>&nbsp;
-                    <button className="btn-primary btn" id="finish-button" data-loading-text={"<span class='glyphicon glyphicon-refresh glyphicon-refresh-animate'></span> Creating "+strings.Team+"..."} onClick={this.submitNext}>Finish</button>
+                    <button type="button" className="btn btn-default" onClick={this.submitBack}><i className="glyphicon glyphicon-chevron-left"></i> Back</button>&nbsp;
+                    <button type="submit" className="btn-primary btn" id="finish-button" data-loading-text={"<span class='glyphicon glyphicon-refresh glyphicon-refresh-animate'></span> Creating "+strings.Team+"..."} onClick={this.submitNext}>Finish</button>
                 </div>
                 <p>By proceeding to create your account and use { config.SiteName }, you agree to our <a href={ config.TermsLink }>Terms of Service</a> and <a href={ config.PrivacyLink }>Privacy Policy</a>. If you do not agree, you cannot use {config.SiteName}.</p>
+            </form>
             </div>
         );
     }
@@ -610,9 +640,9 @@ module.exports = React.createClass({
             props.wizard = "welcome";
             props.team = {};
             props.team.email = this.props.email;
-            props.team.name = this.props.name;
+            props.team.display_name = this.props.name;
             props.team.company_name = this.props.name;
-            props.team.domain = utils.cleanUpUrlable(this.props.name);
+            props.team.name = utils.cleanUpUrlable(this.props.name);
             props.team.allowed_domains = "";
             props.invites = [];
             props.invites.push("");
@@ -630,12 +660,12 @@ module.exports = React.createClass({
             return <WelcomePage state={this.state} updateParent={this.updateParent} />
         }
 
-        if (this.state.wizard == "team_name") {
-            return <TeamNamePage state={this.state} updateParent={this.updateParent} />
+        if (this.state.wizard == "team_display_name") {
+            return <TeamDisplayNamePage state={this.state} updateParent={this.updateParent} />
         }
 
         if (this.state.wizard == "team_url") {
-            return <TeamUrlPage state={this.state} updateParent={this.updateParent} />
+            return <TeamURLPage state={this.state} updateParent={this.updateParent} />
         }
 
         if (this.state.wizard == "allowed_domains") {
diff --git a/web/react/components/signup_user_complete.jsx b/web/react/components/signup_user_complete.jsx
index d1053c778..eed323d1f 100644
--- a/web/react/components/signup_user_complete.jsx
+++ b/web/react/components/signup_user_complete.jsx
@@ -48,16 +48,17 @@ module.exports = React.createClass({
 
                 client.loginByEmail(this.props.domain, this.state.user.email, this.state.user.password,
                     function(data) {
-                        UserStore.setLastDomain(this.props.domain);
                         UserStore.setLastEmail(this.state.user.email);
                         UserStore.setCurrentUser(data);
                         if (this.props.hash > 0)
+                        {
                             BrowserStore.setGlobalItem(this.props.hash, JSON.stringify({wizard: "finished"}));
-                        window.location.href = '/channels/town-square';
+                        }
+                        window.location.href = '/';
                     }.bind(this),
                     function(err) {
                         if (err.message == "Login failed because email address has not been verified") {
-                            window.location.href = "/verify?email="+ encodeURIComponent(this.state.user.email) + "&domain=" + encodeURIComponent(this.props.domain);
+                            window.location.href = "/verify_email?email="+ encodeURIComponent(this.state.user.email) + "&domain=" + encodeURIComponent(this.props.domain);
                         } else {
                             this.state.server_error = err.message;
                             this.setState(this.state);
diff --git a/web/react/components/team_members.jsx b/web/react/components/team_members.jsx
index 6b978f88b..616fd2c99 100644
--- a/web/react/components/team_members.jsx
+++ b/web/react/components/team_members.jsx
@@ -57,7 +57,7 @@ module.exports = React.createClass({
                   <div className="modal-content">
                     <div className="modal-header">
                       <button type="button" className="close" data-dismiss="modal" aria-label="Close" data-reactid=".5.0.0.0.0"><span aria-hidden="true" data-reactid=".5.0.0.0.0.0">×</span></button>
-                      <h4 className="modal-title" id="myModalLabel">{this.props.teamName + " Members"}</h4>
+                      <h4 className="modal-title" id="myModalLabel">{this.props.teamDisplayName + " Members"}</h4>
                     </div>
                     <div ref="modalBody" className="modal-body">
                         <div className="channel-settings">
-- 
cgit v1.2.3-1-g7c22


From 4b7fda14ba76fc4244204f8d2b95753f4b46ea22 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Tue, 21 Jul 2015 16:47:08 +0500
Subject: mm-1631 - Fixing image previewer bug

---
 web/react/components/create_post.jsx | 2 +-
 web/react/components/view_image.jsx  | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/create_post.jsx b/web/react/components/create_post.jsx
index 0c23dcfac..d38a6798f 100644
--- a/web/react/components/create_post.jsx
+++ b/web/react/components/create_post.jsx
@@ -234,7 +234,7 @@ module.exports = React.createClass({
     },
     render: function() {
 
-        var server_error = this.state.server_error ? <div className='form-group has-error'><label className='control-label'>{ this.state.server_error }</label></div> : null;
+        var server_error = this.state.server_error ? <div className='has-error'><label className='control-label'>{ this.state.server_error }</label></div> : null;
         var post_error = this.state.post_error ? <label className='control-label'>{this.state.post_error}</label> : null;
         var limit_error = this.state.limit_error ? <div className='has-error'><label className='control-label'>{this.state.limit_error}</label></div> : null;
 
diff --git a/web/react/components/view_image.jsx b/web/react/components/view_image.jsx
index 38f439946..2274f3f2e 100644
--- a/web/react/components/view_image.jsx
+++ b/web/react/components/view_image.jsx
@@ -25,7 +25,11 @@ module.exports = React.createClass({
         this.setState({ imgId: nextProps.startId });
     },
     loadImage: function(id) {
-        if (this.state.loaded[id] || this.state.images[id]) return;
+        var imgHeight = $(window).height()-100;
+        if (this.state.loaded[id] || this.state.images[id]){
+            $('.modal .modal-image .image-wrapper img').css("max-height",imgHeight);
+            return;
+        };
 
         var src = "";
         if (this.props.imgCount > 0) {
@@ -48,6 +52,7 @@ module.exports = React.createClass({
                 var loaded = self.state.loaded;
                 loaded[imgid] = true;
                 self.setState({ loaded: loaded });
+                $(self.refs.image.getDOMNode()).css("max-height",imgHeight);
             };
         }(id);
         var images = this.state.images;
@@ -56,10 +61,8 @@ module.exports = React.createClass({
     },
     componentDidUpdate: function() {
         if (this.refs.image) {
-            var height = $(window).height()-100;
             if (this.state.loaded[this.state.imgId]) {
                 $(this.refs.imageWrap.getDOMNode()).removeClass("default");
-                $(this.refs.image.getDOMNode()).css("max-height",height);
             }
         }
     },
-- 
cgit v1.2.3-1-g7c22


From cf3bfd24fdf9b51f0215c87eafc34ad9aa0f6132 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Tue, 21 Jul 2015 10:49:37 -0400
Subject: quick fix to get manage team modal working again

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

(limited to 'web/react/components')

diff --git a/web/react/components/member_list_team.jsx b/web/react/components/member_list_team.jsx
index 6f1d83193..cb48e5cc5 100644
--- a/web/react/components/member_list_team.jsx
+++ b/web/react/components/member_list_team.jsx
@@ -5,6 +5,7 @@ var ChannelStore = require('../stores/channel_store.jsx');
 var UserStore = require('../stores/user_store.jsx');
 var Client = require('../utils/client.jsx');
 var AsyncClient = require('../utils/async_client.jsx');
+var utils = require('../utils/utils.jsx');
 
 var MemberListTeamItem = React.createClass({
     handleMakeMember: function() {
-- 
cgit v1.2.3-1-g7c22