From 009df5bad5f55c7e4c698f9dab8420d00a7ae71e Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Mon, 22 Jun 2015 08:35:24 -0400
Subject: fixes mm-1318 only allow 5 files to be uploaded at a time

---
 web/react/components/create_comment.jsx | 28 +++++++++++++++++----------
 web/react/components/create_post.jsx    | 34 ++++++++++++++++++++-------------
 web/react/components/file_upload.jsx    | 18 ++++++++---------
 web/react/utils/constants.jsx           |  1 +
 4 files changed, 49 insertions(+), 32 deletions(-)

(limited to 'web')

diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx
index 9bcbad079..bb7027115 100644
--- a/web/react/components/create_comment.jsx
+++ b/web/react/components/create_comment.jsx
@@ -112,13 +112,28 @@ module.exports = React.createClass({
         return { messageText: '', uploadsInProgress: 0, previews: [], submitting: false };
     },
     setUploads: function(val) {
-        var num = this.state.uploadsInProgress + val;
-        this.setState({uploadsInProgress: num});
+        var oldInProgress = this.state.uploadsInProgress
+        var newInProgress = oldInProgress + val;
+
+        if (newInProgress + this.state.previews.length > Constants.MAX_UPLOAD_FILES) {
+            newInProgress = Constants.MAX_UPLOAD_FILES - this.state.previews.length;
+            this.setState({limit_error: "Uploads limited to " + Constants.MAX_UPLOAD_FILES + " files maximum. Please use additional comments for more files."});
+        } else {
+            this.setState({limit_error: null});
+        }
+
+        var numToUpload = newInProgress - oldInProgress;
+        if (numToUpload <= 0) return 0;
+
+        this.setState({uploadsInProgress: newInProgress});
+
+        return numToUpload;
     },
     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 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;
 
         var preview = <div/>;
         if (this.state.previews.length > 0 || this.state.uploadsInProgress > 0) {
@@ -129,13 +144,6 @@ module.exports = React.createClass({
                     uploadsInProgress={this.state.uploadsInProgress} />
             );
         }
-        var limit_previews = ""
-        if (this.state.previews.length > 5) {
-            limit_previews = <div className='has-error'><label className='control-label'>{ "Note: While all files will be available, only first five will show thumbnails." }</label></div>
-        }
-        if (this.state.previews.length > 20) {
-            limit_previews = <div className='has-error'><label className='control-label'>{ "Note: Uploads limited to 20 files maximum. Please use additional posts for more files." }</label></div>
-        }
 
         return (
             <form onSubmit={this.handleSubmit}>
@@ -159,7 +167,7 @@ module.exports = React.createClass({
                         <input type="button" className="btn btn-primary comment-btn pull-right" value="Add Comment" onClick={this.handleSubmit} />
                         { post_error }
                         { server_error }
-                        { limit_previews }
+                        { limit_error }
                     </div>
                 </div>
                 { preview }
diff --git a/web/react/components/create_post.jsx b/web/react/components/create_post.jsx
index a534e495d..e7cd661fb 100644
--- a/web/react/components/create_post.jsx
+++ b/web/react/components/create_post.jsx
@@ -51,7 +51,7 @@ module.exports = React.createClass({
                 false,
                 function(data) {
                     PostStore.storeDraft(data.channel_id, user_id, null);
-                    this.setState({ messageText: '', submitting: false, post_error: null, previews: [], server_error: null });
+                    this.setState({ messageText: '', submitting: false, post_error: null, previews: [], server_error: null, limit_error: null });
 
                     if (data.goto_location.length > 0) {
                         window.location.href = data.goto_location;
@@ -71,7 +71,7 @@ module.exports = React.createClass({
             client.createPost(post, ChannelStore.getCurrent(),
                 function(data) {
                     PostStore.storeDraft(data.channel_id, data.user_id, null);
-                    this.setState({ messageText: '', submitting: false, post_error: null, previews: [], server_error: null });
+                    this.setState({ messageText: '', submitting: false, post_error: null, previews: [], server_error: null, limit_error: null });
                     this.resizePostHolder();
                     AsyncClient.getPosts(true);
 
@@ -207,21 +207,36 @@ module.exports = React.createClass({
         return { channel_id: ChannelStore.getCurrentId(), messageText: messageText, uploadsInProgress: 0, previews: previews, submitting: false, initialText: messageText };
     },
     setUploads: function(val) {
-        var num = this.state.uploadsInProgress + val;
+        var oldInProgress = this.state.uploadsInProgress
+        var newInProgress = oldInProgress + val;
+
+        if (newInProgress + this.state.previews.length > Constants.MAX_UPLOAD_FILES) {
+            newInProgress = Constants.MAX_UPLOAD_FILES - this.state.previews.length;
+            this.setState({limit_error: "Uploads limited to " + Constants.MAX_UPLOAD_FILES + " files maximum. Please use additional posts for more files."});
+        } else {
+            this.setState({limit_error: null});
+        }
+
+        var numToUpload = newInProgress - oldInProgress;
+        if (numToUpload <= 0) return 0;
+
         var draft = PostStore.getCurrentDraft();
         if (!draft) {
             draft = {}
             draft['message'] = '';
             draft['previews'] = [];
         }
-        draft['uploadsInProgress'] = num;
+        draft['uploadsInProgress'] = newInProgress;
         PostStore.storeCurrentDraft(draft);
-        this.setState({uploadsInProgress: num});
+        this.setState({uploadsInProgress: newInProgress});
+
+        return numToUpload;
     },
     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 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;
 
         var preview = <div/>;
         if (this.state.previews.length > 0 || this.state.uploadsInProgress > 0) {
@@ -232,13 +247,6 @@ module.exports = React.createClass({
                     uploadsInProgress={this.state.uploadsInProgress} />
             );
         }
-        var limit_previews = ""
-        if (this.state.previews.length > 5) {
-            limit_previews = <div className='has-error'><label className='control-label'>{ "Note: While all files will be available, only first five will show thumbnails." }</label></div>
-        }
-        if (this.state.previews.length > 20) {
-            limit_previews = <div className='has-error'><label className='control-label'>{ "Note: Uploads limited to 20 files maximum. Please use additional posts for more files." }</label></div>
-        }
 
         return (
             <form id="create_post" ref="topDiv" role="form" onSubmit={this.handleSubmit}>
@@ -260,7 +268,7 @@ module.exports = React.createClass({
                     <div className={post_error ? 'post-create-footer has-error' : 'post-create-footer'}>
                         { post_error }
                         { server_error }
-                        { limit_previews }
+                        { limit_error }
                         { preview }
                         <MsgTyping channelId={this.state.channel_id} parentId=""/>
                     </div>
diff --git a/web/react/components/file_upload.jsx b/web/react/components/file_upload.jsx
index c03a61c63..f2429f17e 100644
--- a/web/react/components/file_upload.jsx
+++ b/web/react/components/file_upload.jsx
@@ -12,18 +12,18 @@ module.exports = React.createClass({
 
         this.props.onUploadError(null);
 
-        //This looks redundant, but must be done this way due to
-        //setState being an asynchronous call
+        // This looks redundant, but must be done this way due to
+        // setState being an asynchronous call
         var numFiles = 0;
-        for(var i = 0; i < files.length && i <= 20 ; i++) {
+        for(var i = 0; i < files.length && i < Constants.MAX_UPLOAD_FILES; i++) {
             if (files[i].size <= Constants.MAX_FILE_SIZE) {
                 numFiles++;
             }
         }
 
-        this.props.setUploads(numFiles);
+        var numToUpload = this.props.setUploads(numFiles);
 
-        for (var i = 0; i < files.length && i <= 20; i++) {
+        for (var i = 0; i < files.length && i < numToUpload; i++) {
             if (files[i].size > Constants.MAX_FILE_SIZE) {
                 this.props.onUploadError("Files must be no more than " + Constants.MAX_FILE_SIZE/1000000 + " MB");
                 continue;
@@ -70,8 +70,8 @@ module.exports = React.createClass({
 
             self.props.onUploadError(null);
 
-            //This looks redundant, but must be done this way due to
-            //setState being an asynchronous call
+            // This looks redundant, but must be done this way due to
+            // setState being an asynchronous call
             var items = e.clipboardData.items;
             var numItems = 0;
             if (items) {
@@ -87,9 +87,9 @@ module.exports = React.createClass({
                     }
                 }
 
-                self.props.setUploads(numItems);
+                var numToUpload = self.props.setUploads(numItems);
 
-                for (var i = 0; i < items.length; i++) {
+                for (var i = 0; i < items.length && i < numToUpload; i++) {
                     if (items[i].type.indexOf("image") !== -1) {
                         var file = items[i].getAsFile();
 
diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx
index deb07409b..6d129106b 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -45,6 +45,7 @@ module.exports = {
   PATCH_TYPES: ['patch'],
   ICON_FROM_TYPE: {'audio': 'audio', 'video': 'video', 'spreadsheet': 'ppt', 'pdf': 'pdf', 'code': 'code' , 'word': 'word' , 'excel': 'excel' , 'patch': 'patch', 'other': 'generic'},
   MAX_DISPLAY_FILES: 5,
+  MAX_UPLOAD_FILES: 5,
   MAX_FILE_SIZE: 50000000, // 50 MB
   DEFAULT_CHANNEL: 'town-square',
   POST_CHUNK_SIZE: 60,
-- 
cgit v1.2.3-1-g7c22


From f2401dd91f7e0ae005e1efddd1132d91bf4dad02 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Fri, 26 Jun 2015 03:07:20 +0500
Subject: MM-1184 - Updating image preview

---
 web/sass-files/sass/partials/_modal.scss      | 13 +++++++------
 web/sass-files/sass/partials/_responsive.scss |  1 -
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'web')

diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index 43dbdc077..22013aa4f 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -129,15 +129,16 @@
 		width:100%;
 		margin: 0 auto;
 		.image-wrapper {
-			padding: 4px;
 			background: #FFF;
 			position: relative;
 			max-width: 80%;
-			min-height: 280px;
 			min-width: 280px;
-			@include border-radius(4px);
+			@include border-radius(3px);
 			display: table;
 			margin: 0 auto;
+			&:hover {
+				@include border-radius(3px 3px 0 0);
+			}
 			&:hover .modal-close {
 				@include opacity(1);
 			}
@@ -217,10 +218,11 @@
 		}
 		.modal-button-bar {
 			position:absolute;
-			bottom:0px;
+			bottom:-40px;
 			left:0px;
 			right:0px;
-			background-color:rgba(0, 0, 0, 0.8);
+			background-color: #222;
+			@include border-radius(0 0 3px 3px);
 			@include opacity(0);
 			-webkit-transition: opacity 0.6s;
 			-moz-transition: opacity 0.6s;
@@ -228,7 +230,6 @@
 			transition: opacity 0.6s;
 			line-height: 40px;
 			padding: 0 10px;
-			margin: 4px;
 			&.footer--show {
 				@include opacity(1);
 			}
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index bed2f6324..3949fc064 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -538,7 +538,6 @@
     .modal {
         .modal-image {
             .image-wrapper {
-                padding-bottom: 40px;
                 .modal-close {
                     @include opacity(1);
                 }
-- 
cgit v1.2.3-1-g7c22


From febb6e3b656f0a5e48c928f26d071d2f1baf5b33 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Fri, 26 Jun 2015 23:19:29 +0500
Subject: mm-1256 - Improving view modal and close modal button

---
 web/react/components/channel_info_modal.jsx   | 15 ++++++++++++---
 web/sass-files/sass/partials/_modal.scss      | 23 +++++++++++++++++++++--
 web/sass-files/sass/partials/_responsive.scss | 11 ++++-------
 3 files changed, 37 insertions(+), 12 deletions(-)

(limited to 'web')

diff --git a/web/react/components/channel_info_modal.jsx b/web/react/components/channel_info_modal.jsx
index 191297ce4..18addb52f 100644
--- a/web/react/components/channel_info_modal.jsx
+++ b/web/react/components/channel_info_modal.jsx
@@ -35,9 +35,18 @@ module.exports = React.createClass({
                       <h4 className="modal-title" id="myModalLabel">{channel.display_name}</h4>
                     </div>
                     <div className="modal-body">
-                      <p><strong>Channel Name: </strong>{channel.display_name}</p>
-                      <p><strong>Channel Handle: </strong>{channel.name}</p>
-                      <p><strong>Channel ID: </strong>{channel.id}</p>
+                      <div className="row form-group">
+                        <div className="col-sm-3 info__label">Channel Name: </div>
+                        <div className="col-sm-9">{channel.display_name}</div>
+                      </div>
+                      <div className="row form-group">
+                        <div className="col-sm-3 info__label">Channel Handle:</div>
+                        <div className="col-sm-9">{channel.name}</div>
+                      </div>
+                      <div className="row">
+                        <div className="col-sm-3 info__label">Channel ID:</div>
+                        <div className="col-sm-9">{channel.id}</div>
+                      </div>
                     </div>
                     <div className="modal-footer">
                       <button type="button" className="btn btn-default" data-dismiss="modal">Close</button>
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index 22013aa4f..9009dd768 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -1,9 +1,17 @@
+.modal-body {
+	padding: 20px 15px;
+}
 .modal {
 	&.image_modal {
 		.modal-backdrop.in {
 			@include opacity(0.7);
 		}
 	}
+	.info__label {
+		font-weight: bold;
+		text-align: right;
+		padding-right: 0;
+	}
 	.remove__member {
 		float: right;
 	}
@@ -29,7 +37,7 @@
 		border-radius: 0;
 		background: $primary-color;
 		color: #FFF;
-	  	padding: 15px 15px 11px;
+		padding: 15px 15px 11px;
 		border: none;
 		min-height: 56px;
 		@include clearfix;
@@ -41,11 +49,22 @@
 			margin: 0;
 		}
 		button.close {
-			margin-top: 0;
+			margin: -2px -2px 0 0;
 			color: #fff;
 			@include opacity(1);
 			z-index: 5;
+			width: 30px;
+			height: 30px;
+			line-height: 30px;
+			@include single-transition(all, 0.25s, ease-in);
 			position: relative;
+			&:hover {
+				background: rgba(0, 0, 0, 0.1);
+			}
+			span {
+				position: relative;
+				top: -1px;
+			}
 		}
 		.btn {
 			margin-right: 10px;
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index 3949fc064..509c764b3 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -231,17 +231,14 @@
         }
     }
     .modal {
+        .info__label {
+            text-align: left;
+            padding-bottom: 5px;
+        }
         .modal-header {
-            padding-left: 20px;
-            padding-right: 20px;
             .modal-action {
                 margin-top: 10px;
             }
-            button.close {
-                width: 35px;
-                height: 32px;
-                margin: -5px -10px 0;
-            }
             .modal-title {
                 float: none;
             }
-- 
cgit v1.2.3-1-g7c22


From 0104bf822c70eef7793b8a31b78d5c72c0f1514e Mon Sep 17 00:00:00 2001
From: test <test@test.com>
Date: Fri, 26 Jun 2015 11:07:22 -0700
Subject: gui: fix mentions dropdown

---
 web/react/components/mention.jsx            |  4 ++--
 web/sass-files/sass/partials/_mentions.scss | 25 ++++++++++++++-----------
 2 files changed, 16 insertions(+), 13 deletions(-)

(limited to 'web')

diff --git a/web/react/components/mention.jsx b/web/react/components/mention.jsx
index ba758688b..86a423138 100644
--- a/web/react/components/mention.jsx
+++ b/web/react/components/mention.jsx
@@ -8,8 +8,8 @@ module.exports = React.createClass({
     render: function() {
         return (
             <div className="mentions-name" onClick={this.handleClick}>
-                <img className="pull-left mention-img" src={"/api/v1/users/" + this.props.id + "/image"}/>
-                <span>@{this.props.username}</span><span style={{'color':'grey', 'marginLeft':'10px'}}>{this.props.name}</span>
+                <img className="mention-img" src={"/api/v1/users/" + this.props.id + "/image"}/>
+                <span>@{this.props.username}</span><span className="mention-fullname">{this.props.name}</span>
             </div>
         );
     }
diff --git a/web/sass-files/sass/partials/_mentions.scss b/web/sass-files/sass/partials/_mentions.scss
index 11cd4e9e4..cb6ff16c5 100644
--- a/web/sass-files/sass/partials/_mentions.scss
+++ b/web/sass-files/sass/partials/_mentions.scss
@@ -3,21 +3,19 @@
 	background: $primary-color;
 	position: relative;
 	z-index: 10;
-	padding-bottom: 1px;
+	padding-bottom: 2px;
 	@include border-radius(3px);
-	-moz-box-sizing: border-box;
-	-webkit-box-sizing: border-box;
-	box-sizing: border-box;
 }
 
 .mentions--top {
 	position: absolute;
-    z-index:99999;
+    z-index: 1040;
 	.mentions-box {
 		position:absolute;
 		background-color:#fff;
-		border:1px solid #ddd;
-        overflow:scroll;
+		border: $border-gray;
+        overflow-x: hidden;
+        overflow-y: scroll;
         bottom:0;
 	}
 }
@@ -29,10 +27,10 @@
 	height:37px;
 	padding:2px;
 	z-index:101;
-}
-
-.mentions-name:hover {
-	background-color:#e8eaed;
+    cursor: pointer;
+    &:hover {
+        background-color:#e8eaed;
+    }
 }
 
 .mentions-text {
@@ -46,6 +44,11 @@
 	border-radius: 10%;
 }
 
+.mention-fullname {
+    color: grey;
+    padding-left: 10px;
+}
+
 .mention-highlight {
 	background-color:#fff2bb;
 }
-- 
cgit v1.2.3-1-g7c22


From 9e7ba4aa5dec9882e6fcf747b464cd8d5cee1e98 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Sat, 27 Jun 2015 00:29:37 +0500
Subject: Removing relative from span

---
 web/sass-files/sass/partials/_modal.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'web')

diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index 9009dd768..4427cb7dd 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -62,8 +62,7 @@
 				background: rgba(0, 0, 0, 0.1);
 			}
 			span {
-				position: relative;
-				top: -1px;
+				line-height: 10px;
 			}
 		}
 		.btn {
-- 
cgit v1.2.3-1-g7c22


From f25cdbdb08c11fc9cd3e6bbf0748b67d2635ff47 Mon Sep 17 00:00:00 2001
From: ralder <ralder@yandex.ru>
Date: Fri, 26 Jun 2015 15:58:34 -0700
Subject: gui: fix broken mailto link in user-popover

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

(limited to 'web')

diff --git a/web/react/components/user_profile.jsx b/web/react/components/user_profile.jsx
index 8ffad737d..648960471 100644
--- a/web/react/components/user_profile.jsx
+++ b/web/react/components/user_profile.jsx
@@ -10,8 +10,7 @@ function getStateFromStores(userId) {
 
     if (profile == null) {
         return { profile: { id: "0", username: "..."} };
-    }
-    else {
+    } else {
         return { profile: profile };
     }
 }
@@ -54,12 +53,11 @@ module.exports = React.createClass({
         var name = this.props.overwriteName ? this.props.overwriteName : this.state.profile.username;
 
 
-        var data_content = ""
-        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' height='128' width='128' />";
         if (!config.ShowEmail) {
-            data_content += "<div><span style='white-space:nowrap;'>Email not shared</span></div>";
+            data_content += "<div class='text-nowrap'>Email not shared</div>";
         } else {
-            data_content += "<div><a href='mailto:'" + this.state.profile.email + "'' style='white-space:nowrap;text-transform:lowercase;'>" + this.state.profile.email + "</a></div>";
+            data_content += "<div><a href='mailto:" + this.state.profile.email + "' class='text-nowrap text-lowercase'>" + this.state.profile.email + "</a></div>";
         }
 
         return (
-- 
cgit v1.2.3-1-g7c22


From e1714eaa3f3363c0e38c947c2cc438b201a16a02 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Sun, 28 Jun 2015 04:18:24 +0500
Subject: Updating settings UI

---
 web/react/components/setting_item_max.jsx |  2 +-
 web/react/components/user_settings.jsx    | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'web')

diff --git a/web/react/components/setting_item_max.jsx b/web/react/components/setting_item_max.jsx
index 03f05b0cf..b8b667e1a 100644
--- a/web/react/components/setting_item_max.jsx
+++ b/web/react/components/setting_item_max.jsx
@@ -13,7 +13,7 @@ module.exports = React.createClass({
                 <li className="col-sm-12 section-title">{this.props.title}</li>
                 <li className="col-sm-9 col-sm-offset-3">
                     <ul className="setting-list">
-                        <li className="row setting-list-item form-group">
+                        <li className="setting-list-item">
                             {inputs}
                         </li>
                         <li className="setting-list-item">
diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx
index 7d542a8b7..147973fb7 100644
--- a/web/react/components/user_settings.jsx
+++ b/web/react/components/user_settings.jsx
@@ -155,7 +155,7 @@ var NotificationsTab = React.createClass({
             var inputs = [];
 
             inputs.push(
-                <div className="col-sm-12">
+                <div>
                     <div className="radio">
                         <label>
                             <input type="radio" checked={notifyActive[0]} onClick={function(){self.handleNotifyRadio("all")}}>For all activity</input>
@@ -216,7 +216,7 @@ var NotificationsTab = React.createClass({
             var inputs = [];
 
             inputs.push(
-                <div className="col-sm-12">
+                <div>
                     <div className="btn-group" data-toggle="buttons-radio">
                         <button className={"btn btn-default "+soundActive[0]} onClick={function(){self.handleSoundRadio("true")}}>On</button>
                         <button className={"btn btn-default "+soundActive[1]} onClick={function(){self.handleSoundRadio("false")}}>Off</button>
@@ -262,7 +262,7 @@ var NotificationsTab = React.createClass({
             var inputs = [];
 
             inputs.push(
-                <div className="col-sm-12">
+                <div>
                     <div className="btn-group" data-toggle="buttons-radio">
                         <button className={"btn btn-default "+emailActive[0]} onClick={function(){self.handleEmailRadio("true")}}>On</button>
                         <button className={"btn btn-default "+emailActive[1]} onClick={function(){self.handleEmailRadio("false")}}>Off</button>
@@ -309,7 +309,7 @@ var NotificationsTab = React.createClass({
 
             if (first_name != "") {
                 inputs.push(
-                    <div className="col-sm-12">
+                    <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>
@@ -320,7 +320,7 @@ var NotificationsTab = React.createClass({
             }
 
             inputs.push(
-                <div className="col-sm-12">
+                <div>
                     <div className="checkbox">
                         <label>
                             <input type="checkbox" checked={this.state.username_key} onChange={function(e){self.updateUsernameKey(e.target.checked);}}>{'Your non-case sensitive username "' + user.username + '"'}</input>
@@ -330,7 +330,7 @@ var NotificationsTab = React.createClass({
             );
 
             inputs.push(
-                <div className="col-sm-12">
+                <div>
                     <div className="checkbox">
                         <label>
                             <input type="checkbox" checked={this.state.mention_key} onChange={function(e){self.updateMentionKey(e.target.checked);}}>{'Your username mentioned "@' + user.username + '"'}</input>
@@ -340,7 +340,7 @@ var NotificationsTab = React.createClass({
             );
 
             inputs.push(
-                <div className="col-sm-12">
+                <div>
                     <div className="checkbox">
                         <label>
                             <input ref="customcheck" type="checkbox" checked={this.state.custom_keys_checked} onChange={this.updateCustomMentionKeys}>{'Other non-case sensitive words, separated by commas:'}</input>
@@ -622,7 +622,7 @@ var SecurityTab = React.createClass({
             var inputs = [];
 
             inputs.push(
-                <div>
+                <div className="form-group">
                     <label className="col-sm-5 control-label">Current Password</label>
                     <div className="col-sm-7">
                         <input className="form-control" type="password" onChange={this.updateCurrentPassword} value={this.state.current_password}/>
@@ -630,7 +630,7 @@ var SecurityTab = React.createClass({
                 </div>
             );
             inputs.push(
-                <div>
+                <div className="form-group">
                     <label className="col-sm-5 control-label">New Password</label>
                     <div className="col-sm-7">
                         <input className="form-control" type="password" onChange={this.updateNewPassword} value={this.state.new_password}/>
@@ -638,7 +638,7 @@ var SecurityTab = React.createClass({
                 </div>
             );
             inputs.push(
-                <div>
+                <div className="form-group">
                     <label className="col-sm-5 control-label">Retype New Password</label>
                     <div className="col-sm-7">
                         <input className="form-control" type="password" onChange={this.updateConfirmPassword} value={this.state.confirm_password}/>
@@ -837,7 +837,7 @@ var GeneralTab = React.createClass({
             var inputs = [];
 
             inputs.push(
-                <div>
+                <div className="form-group">
                     <label className="col-sm-5 control-label">First Name</label>
                     <div className="col-sm-7">
                         <input className="form-control" type="text" onChange={this.updateFirstName} value={this.state.first_name}/>
@@ -846,7 +846,7 @@ var GeneralTab = React.createClass({
             );
 
             inputs.push(
-                <div>
+                <div className="form-group">
                     <label className="col-sm-5 control-label">Last Name</label>
                     <div className="col-sm-7">
                         <input className="form-control" type="text" onChange={this.updateLastName} value={this.state.last_name}/>
@@ -879,7 +879,7 @@ var GeneralTab = React.createClass({
             var inputs = [];
 
             inputs.push(
-                <div>
+                <div className="form-group">
                     <label className="col-sm-5 control-label">{utils.isMobile() ? "": "Username"}</label>
                     <div className="col-sm-7">
                         <input className="form-control" type="text" onChange={this.updateUsername} value={this.state.username}/>
@@ -911,7 +911,7 @@ var GeneralTab = React.createClass({
             var inputs = [];
 
             inputs.push(
-                <div>
+                <div className="form-group">
                     <label className="col-sm-5 control-label">Primary Email</label>
                     <div className="col-sm-7">
                         <input className="form-control" type="text" onChange={this.updateEmail} value={this.state.email}/>
@@ -1048,7 +1048,7 @@ var AppearanceTab = React.createClass({
                 var inputs = [];
 
                 inputs.push(
-                    <li className="row setting-list-item form-group">
+                    <li className="setting-list-item">
                         <div className="btn-group" data-toggle="buttons-radio">
                             { theme_buttons }
                         </div>
-- 
cgit v1.2.3-1-g7c22


From ce74e4a7288c1edded736f1315beb8b1909a4641 Mon Sep 17 00:00:00 2001
From: ralder <ralder@yandex.ru>
Date: Mon, 29 Jun 2015 01:39:31 +0300
Subject: fix pr #82 mention list inside modal

---
 web/sass-files/sass/partials/_mentions.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web')

diff --git a/web/sass-files/sass/partials/_mentions.scss b/web/sass-files/sass/partials/_mentions.scss
index cb6ff16c5..86fe400c9 100644
--- a/web/sass-files/sass/partials/_mentions.scss
+++ b/web/sass-files/sass/partials/_mentions.scss
@@ -9,7 +9,7 @@
 
 .mentions--top {
 	position: absolute;
-    z-index: 1040;
+	z-index: 1060;
 	.mentions-box {
 		position:absolute;
 		background-color:#fff;
-- 
cgit v1.2.3-1-g7c22


From 2cd5f3629ff2410127a8fdc5df92fb16f52fa457 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Sun, 28 Jun 2015 19:25:39 -0700
Subject: Fixed typo in team domain look-up page

---
 web/react/components/login.jsx | 2 +-
 web/react/utils/utils.jsx      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'web')

diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx
index 85df5f797..3b6f96c2d 100644
--- a/web/react/components/login.jsx
+++ b/web/react/components/login.jsx
@@ -37,7 +37,7 @@ var FindTeamDomain = React.createClass({
                     window.location.href = window.location.protocol + "//" + domain + "." + utils.getDomainWithOutSub();
                 }
                 else {
-                    this.state.server_error = "We couldn't find your " + strings.TeamPlural + ".";
+                    this.state.server_error = "We couldn't find your " + strings.Team + ".";
                     this.setState(this.state);
                 }
             }.bind(this),
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 75c583c8f..128d9d1e7 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -25,7 +25,7 @@ module.exports.cleanUpUrlable = function(input) {
 
 module.exports.isTestDomain = function() {
 
-    if ((/^localhost/).test(window.location.hostname))
+    /*if ((/^localhost/).test(window.location.hostname))
         return true;
 
     if ((/^dockerhost/).test(window.location.hostname))
@@ -44,7 +44,7 @@ module.exports.isTestDomain = function() {
         return true;
 
     if ((/^176./).test(window.location.hostname))
-        return true;
+        return true;*/
 
     return false;
 };
-- 
cgit v1.2.3-1-g7c22


From e621950364c93365fad4dbbbb6e94360d2fce809 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Sun, 28 Jun 2015 19:38:19 -0700
Subject: Removed test code

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

(limited to 'web')

diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 128d9d1e7..75c583c8f 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -25,7 +25,7 @@ module.exports.cleanUpUrlable = function(input) {
 
 module.exports.isTestDomain = function() {
 
-    /*if ((/^localhost/).test(window.location.hostname))
+    if ((/^localhost/).test(window.location.hostname))
         return true;
 
     if ((/^dockerhost/).test(window.location.hostname))
@@ -44,7 +44,7 @@ module.exports.isTestDomain = function() {
         return true;
 
     if ((/^176./).test(window.location.hostname))
-        return true;*/
+        return true;
 
     return false;
 };
-- 
cgit v1.2.3-1-g7c22


From 2b4888d062d65546325470d2d9181f4a66a2fb00 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Mon, 22 Jun 2015 14:23:59 -0400
Subject: fixes mm-1316 improves channel notifications UI and updates
 channellist etag

---
 web/react/components/channel_header.jsx        |  30 +---
 web/react/components/channel_notifications.jsx | 208 +++++++++++++++++++------
 2 files changed, 165 insertions(+), 73 deletions(-)

(limited to 'web')

diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index ade58a10a..428d3ed81 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -15,17 +15,8 @@ var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
 var Constants = require('../utils/constants.jsx');
 var ActionTypes = Constants.ActionTypes;
 
-function getExtraInfoStateFromStores() {
-  return {
-    extra_info: ChannelStore.getCurrentExtraInfo()
-  };
-}
-
 var ExtraMembers = React.createClass({
     componentDidMount: function() {
-        ChannelStore.addExtraInfoChangeListener(this._onChange);
-        ChannelStore.addChangeListener(this._onChange);
-
         var originalLeave = $.fn.popover.Constructor.prototype.leave;
         $.fn.popover.Constructor.prototype.leave = function(obj) {
             var self = obj instanceof this.constructor ? obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type);
@@ -49,25 +40,12 @@ var ExtraMembers = React.createClass({
         });
 
     },
-    componentWillUnmount: function() {
-        ChannelStore.removeExtraInfoChangeListener(this._onChange);
-        ChannelStore.removeChangeListener(this._onChange);
-    },
-    _onChange: function() {
-        var newState = getExtraInfoStateFromStores();
-        if (!utils.areStatesEqual(newState, this.state)) {
-            this.setState(newState);
-        }
-    },
-    getInitialState: function() {
-        return getExtraInfoStateFromStores();
-    },
     render: function() {
-        var count = this.state.extra_info.members.length == 0 ? "-" : this.state.extra_info.members.length;
-        count = this.state.extra_info.members.length > 19 ? "20+" : count;
+        var count = this.props.members.length == 0 ? "-" : this.props.members.length;
+        count = this.props.members.length > 19 ? "20+" : count;
         var data_content = "";
 
-        this.state.extra_info.members.forEach(function(m) {
+        this.props.members.forEach(function(m) {
             data_content += "<div style='white-space: nowrap'>" + m.username + "</div>";
         });
 
@@ -228,7 +206,7 @@ module.exports = React.createClass({
                         <a href="#"><strong className="heading">{channelTitle}</strong></a>
                     }
                     </th>
-                    <th><ExtraMembers channelId={this.state.channel.id} /></th>
+                    <th><ExtraMembers members={this.state.users} channelId={this.state.channel.id} /></th>
                     { searchForm }
                     <th>
                         <div className="dropdown" style={{"marginLeft":"5px", "marginRight":"10px"}}>
diff --git a/web/react/components/channel_notifications.jsx b/web/react/components/channel_notifications.jsx
index 085536a0a..fa9ab42ae 100644
--- a/web/react/components/channel_notifications.jsx
+++ b/web/react/components/channel_notifications.jsx
@@ -1,6 +1,8 @@
 // Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
 // See License.txt for license information.
 
+var SettingItemMin = require('./setting_item_min.jsx');
+var SettingItemMax = require('./setting_item_max.jsx');
 
 var utils = require('../utils/utils.jsx');
 var client = require('../utils/client.jsx');
@@ -9,26 +11,50 @@ var ChannelStore = require('../stores/channel_store.jsx');
 
 module.exports = React.createClass({
     componentDidMount: function() {
+        ChannelStore.addChangeListener(this._onChange);
+
         var self = this;
         $(this.refs.modal.getDOMNode()).on('show.bs.modal', function(e) {
             var button = e.relatedTarget;
             var channel_id = button.dataset.channelid;
 
             var notifyLevel = ChannelStore.getMember(channel_id).notify_level;
-            self.setState({ notify_level: notifyLevel, title: button.dataset.title, channel_id: channel_id });
+            var quietMode = false;
+            if (notifyLevel === "quiet") quietMode = true;
+            self.setState({ notify_level: notifyLevel, quiet_mode: quietMode, title: button.dataset.title, channel_id: channel_id });
         });
     },
+    componentWillUnmount: function() {
+        ChannelStore.removeChangeListener(this._onChange);
+    },
+    _onChange: function() {
+        if (!this.state.channel_id) return;
+        var notifyLevel = ChannelStore.getMember(this.state.channel_id).notify_level;
+        var quietMode = false;
+        if (notifyLevel === "quiet") quietMode = true;
+
+        var newState = this.state;
+        newState.notify_level = notifyLevel;
+        newState.quiet_mode = quietMode;
+
+        if (!utils.areStatesEqual(this.state, newState)) {
+            this.setState(newState);
+        }
+    },
+    updateSection: function(section) {
+        this.setState({ activeSection: section });
+    },
     getInitialState: function() {
-        return { notify_level: "", title: "", channel_id: "" };
+        return { notify_level: "", title: "", channel_id: "", activeSection: "" };
     },
-    handleUpdate: function(e) {
+    handleUpdate: function() {
         var channel_id = this.state.channel_id;
-        var notify_level = this.state.notify_level;
+        var notify_level = this.state.quiet_mode ? "quiet" : this.state.notify_level;
 
         var data = {};
         data["channel_id"] = channel_id;
         data["user_id"] = UserStore.getCurrentId();
-        data["notify_level"] = this.state.notify_level;
+        data["notify_level"] = notify_level;
 
         if (!data["notify_level"] || data["notify_level"].length === 0) return;
 
@@ -37,7 +63,7 @@ module.exports = React.createClass({
                 var member = ChannelStore.getMember(channel_id);
                 member.notify_level = notify_level;
                 ChannelStore.setChannelMember(member);
-                $(this.refs.modal.getDOMNode()).modal('hide');
+                this.updateSection("");
             }.bind(this),
             function(err) {
                 this.setState({ server_error: err.message });
@@ -45,42 +71,138 @@ module.exports = React.createClass({
         );
     },
     handleRadioClick: function(notifyLevel) {
-        this.setState({ notify_level: notifyLevel });
+        this.setState({ notify_level: notifyLevel, quiet_mode: false });
         this.refs.modal.getDOMNode().focus();
     },
-    handleQuietToggle: function() {
-        if (this.state.notify_level === "quiet") {
-            this.setState({ notify_level: "none" });
-            this.refs.modal.getDOMNode().focus();
-        } else {
-            this.setState({ notify_level: "quiet" });
-            this.refs.modal.getDOMNode().focus();
-        }
+    handleQuietToggle: function(quietMode) {
+        this.setState({ notify_level: "none", quiet_mode: quietMode });
+        this.refs.modal.getDOMNode().focus();
     },
     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 allActive = "";
-        var mentionActive = "";
-        var noneActive = "";
-        var quietActive = "";
-        var desktopHidden = "";
-
-        if (this.state.notify_level === "quiet") {
-            desktopHidden = "hidden";
-            quietActive = "active";
-        } else if (this.state.notify_level === "mention") {
-            mentionActive = "active";
-        } else if (this.state.notify_level === "none") {
-            noneActive = "active";
+        var self = this;
+
+        var desktopSection;
+        if (this.state.activeSection === 'desktop') {
+            var notifyActive = [false, false, false];
+            if (this.state.notify_level === "mention") {
+                notifyActive[1] = true;
+            } else if (this.state.notify_level === "all") {
+                notifyActive[0] = true;
+            } else {
+                notifyActive[2] = true;
+            }
+
+            var inputs = [];
+
+            inputs.push(
+                <div className="col-sm-12">
+                    <div className="radio">
+                        <label>
+                            <input type="radio" checked={notifyActive[0]} onClick={function(){self.handleRadioClick("all")}}>For all activity</input>
+                        </label>
+                        <br/>
+                    </div>
+                    <div className="radio">
+                        <label>
+                            <input type="radio" checked={notifyActive[1]} onClick={function(){self.handleRadioClick("mention")}}>Only for mentions</input>
+                        </label>
+                        <br/>
+                    </div>
+                    <div className="radio">
+                        <label>
+                            <input type="radio" checked={notifyActive[2]} onClick={function(){self.handleRadioClick("none")}}>Never</input>
+                        </label>
+                    </div>
+                </div>
+            );
+
+            desktopSection = (
+                <SettingItemMax
+                    title="Send desktop notifications"
+                    inputs={inputs}
+                    submit={this.handleUpdate}
+                    server_error={server_error}
+                    updateSection={function(e){self.updateSection("");self._onChange();e.preventDefault();}}
+                />
+            );
+        } else {
+            var describe = "";
+            if (this.state.notify_level === "mention") {
+                describe = "Only for mentions";
+            } else if (this.state.notify_level === "all") {
+                describe = "For all activity";
+            } else {
+                describe = "Never";
+            }
+
+            desktopSection = (
+                <SettingItemMin
+                    title="Send desktop notifications"
+                    describe={describe}
+                    updateSection={function(e){self.updateSection("desktop");e.preventDefault();}}
+                />
+            );
+        }
+
+        var quietSection;
+        if (this.state.activeSection === 'quiet') {
+            var quietActive = ["",""];
+            if (this.state.quiet_mode) {
+                quietActive[0] = "active";
+            } else {
+                quietActive[1] = "active";
+            }
+
+            var inputs = [];
+
+            inputs.push(
+                <div className="col-sm-12">
+                    <div className="btn-group" data-toggle="buttons-radio">
+                        <button className={"btn btn-default "+quietActive[0]} onClick={function(){self.handleQuietToggle(true)}}>On</button>
+                        <button className={"btn btn-default "+quietActive[1]} onClick={function(){self.handleQuietToggle(false)}}>Off</button>
+                    </div>
+                </div>
+            );
+
+            inputs.push(
+                <div className="col-sm-12">
+                    <br/>
+                    Enabling quiet mode will turn off desktop notifications and only mark the channel as unread if you have been mentioned.
+                </div>
+            );
+
+            quietSection = (
+                <SettingItemMax
+                    title="Quiet mode"
+                    inputs={inputs}
+                    submit={this.handleUpdate}
+                    server_error={server_error}
+                    updateSection={function(e){self.updateSection("");self._onChange();e.preventDefault();}}
+                />
+            );
         } else {
-            allActive = "active";
+            var describe = "";
+            if (this.state.quiet_mode) {
+                describe = "On";
+            } else {
+                describe = "Off";
+            }
+
+            quietSection = (
+                <SettingItemMin
+                    title="Quiet mode"
+                    describe={describe}
+                    updateSection={function(e){self.updateSection("quiet");e.preventDefault();}}
+                />
+            );
         }
 
         var self = this;
         return (
             <div className="modal fade" id="channel_notifications" ref="modal" tabIndex="-1" role="dialog" aria-hidden="true">
-                <div className="modal-dialog">
+                <div className="modal-dialog settings-modal">
                     <div className="modal-content">
                         <div className="modal-header">
                             <button type="button" className="close" data-dismiss="modal">
@@ -90,31 +212,23 @@ module.exports = React.createClass({
                             <h4 className="modal-title">{"Notification Preferences for " + this.state.title}</h4>
                         </div>
                         <div className="modal-body">
-                            <div className={desktopHidden}>
-                                <span>Desktop Notifications</span>
-                                <br/>
-                                <div className="btn-group" data-toggle="buttons-radio">
-                                    <button className={"btn btn-default "+allActive} onClick={function(){self.handleRadioClick("all")}}>Any activity (default)</button>
-                                    <button className={"btn btn-default "+mentionActive} onClick={function(){self.handleRadioClick("mention")}}>Mentions of my name</button>
-                                    <button className={"btn btn-default "+noneActive} onClick={function(){self.handleRadioClick("none")}}>Nothing</button>
+                            <div className="settings-table">
+                            <div className="settings-content">
+                                <div ref="wrapper" className="user-settings">
+                                    <br/>
+                                    <div className="divider-dark first"/>
+                                    {desktopSection}
+                                    <div className="divider-light"/>
+                                    {quietSection}
+                                    <div className="divider-dark"/>
                                 </div>
-                                <br/>
-                                <br/>
                             </div>
-                            <span>Quiet Mode</span>
-                            <br/>
-                            <div className="btn-group" data-toggle="buttons-checkbox">
-                                <button className={"btn btn-default "+quietActive} onClick={this.handleQuietToggle}>Quiet Mode</button>
                             </div>
                             { server_error }
                         </div>
-                        <div className="modal-footer">
-                            <button type="button" className="btn btn-primary" onClick={this.handleUpdate}>Done</button>
-                        </div>
                     </div>
                 </div>
             </div>
-
         );
     }
 });
-- 
cgit v1.2.3-1-g7c22


From ffe1e36a55035298ee5b5b7401347d2abdf2bcec Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Mon, 22 Jun 2015 14:51:20 -0400
Subject: make channel notifications modal visible in mobile mode

---
 web/react/components/team_settings_modal.jsx  | 2 +-
 web/sass-files/sass/partials/_responsive.scss | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'web')

diff --git a/web/react/components/team_settings_modal.jsx b/web/react/components/team_settings_modal.jsx
index 08a952d2e..e50378b7f 100644
--- a/web/react/components/team_settings_modal.jsx
+++ b/web/react/components/team_settings_modal.jsx
@@ -45,7 +45,7 @@ module.exports = React.createClass({
                                 updateTab={this.updateTab}
                             />
                         </div>
-                        <div className="settings-content">
+                        <div className="settings-content minimize-settings">
                             <TeamSettings
                                 activeTab={this.state.active_tab}
                                 activeSection={this.state.active_section}
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index 509c764b3..d28d23f67 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -258,11 +258,13 @@
             .settings-table {
                 display: block;
                 .settings-content {
+                 &.minimize-settings {
                     display: block;
                     .section-edit {
                         text-align: left;
                     }
                 }
+                }
                 .settings-links {
                     display: none;
                 }
@@ -284,12 +286,14 @@
         }
         .settings-table {
             .settings-content {
+             &.minimize-settings {
                 padding: 0;
                 display: none;
                 .user-settings {
                     padding: 70px 20px 30px;
                 }
             }
+            }
             .settings-links {
                 background: #fff;
             }
-- 
cgit v1.2.3-1-g7c22


From a8089fec3a1ece728408cbaf015d1ea1a33926fd Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Mon, 22 Jun 2015 14:52:56 -0400
Subject: fixed CSS indenting

---
 web/sass-files/sass/partials/_responsive.scss | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'web')

diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index d28d23f67..25533c770 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -258,13 +258,13 @@
             .settings-table {
                 display: block;
                 .settings-content {
-                 &.minimize-settings {
-                    display: block;
-                    .section-edit {
-                        text-align: left;
+                    &.minimize-settings {
+                        display: block;
+                        .section-edit {
+                            text-align: left;
+                        }
                     }
                 }
-                }
                 .settings-links {
                     display: none;
                 }
@@ -286,14 +286,14 @@
         }
         .settings-table {
             .settings-content {
-             &.minimize-settings {
-                padding: 0;
-                display: none;
-                .user-settings {
-                    padding: 70px 20px 30px;
+                &.minimize-settings {
+                    padding: 0;
+                    display: none;
+                    .user-settings {
+                        padding: 70px 20px 30px;
+                    }
                 }
             }
-            }
             .settings-links {
                 background: #fff;
             }
-- 
cgit v1.2.3-1-g7c22


From 366557b101f318b69ad854349c2414783ce1c82a Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Mon, 29 Jun 2015 08:10:59 -0400
Subject: rebase touch-ups

---
 web/react/components/sidebar_right_menu.jsx  | 1 +
 web/react/components/team_settings.jsx       | 2 +-
 web/react/components/user_settings_modal.jsx | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'web')

diff --git a/web/react/components/sidebar_right_menu.jsx b/web/react/components/sidebar_right_menu.jsx
index c523ce554..22d1d9ad2 100644
--- a/web/react/components/sidebar_right_menu.jsx
+++ b/web/react/components/sidebar_right_menu.jsx
@@ -60,6 +60,7 @@ module.exports = React.createClass({
                 <div className="nav-pills__container">
                     <ul className="nav nav-pills nav-stacked">
                         <li><a href="#" data-toggle="modal" data-target="#user_settings1"><i className="glyphicon glyphicon-cog"></i>Account Settings</a></li>
+                        { isAdmin ? <li><a href="#" data-toggle="modal" data-target="#team_settings"><i className="glyphicon glyphicon-globe"></i>Team Settings</a></li> : "" }
                         { invite_link }
                         { team_link }
                         { manage_link }
diff --git a/web/react/components/team_settings.jsx b/web/react/components/team_settings.jsx
index 0cec30f3e..a43e5d2f0 100644
--- a/web/react/components/team_settings.jsx
+++ b/web/react/components/team_settings.jsx
@@ -113,7 +113,7 @@ var FeatureTab = React.createClass({
             <div>
                 <div className="modal-header">
                     <button type="button" className="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    <h4 className="modal-title" ref="title"><i className="modal-back"></i>General Settings</h4>
+                    <h4 className="modal-title" ref="title"><i className="modal-back"></i>Feature Settings</h4>
                 </div>
                 <div ref="wrapper" className="user-settings">
                     <h3 className="tab-header">Feature Settings</h3>
diff --git a/web/react/components/user_settings_modal.jsx b/web/react/components/user_settings_modal.jsx
index ff001611d..1761e575a 100644
--- a/web/react/components/user_settings_modal.jsx
+++ b/web/react/components/user_settings_modal.jsx
@@ -50,7 +50,7 @@ module.exports = React.createClass({
                                 updateTab={this.updateTab}
                             />
                         </div>
-                        <div className="settings-content">
+                        <div className="settings-content minimize-settings">
                             <UserSettings
                                 activeTab={this.state.active_tab}
                                 activeSection={this.state.active_section}
-- 
cgit v1.2.3-1-g7c22


From cebb4bef843e848531bdf3465f49bd0d995efa8e Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Mon, 29 Jun 2015 09:07:13 -0400
Subject: move default channel creation to seperate func and add off-topic

---
 web/web.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web')

diff --git a/web/web.go b/web/web.go
index 7357124b5..443a75916 100644
--- a/web/web.go
+++ b/web/web.go
@@ -285,7 +285,7 @@ func getChannel(c *api.Context, w http.ResponseWriter, r *http.Request) {
 				otherUserId = ids[0]
 			}
 
-			if sc, err := api.CreateDirectChannel(c, otherUserId, r.URL.Path); err != nil {
+			if sc, err := api.CreateDirectChannel(c, otherUserId); err != nil {
 				api.Handle404(w, r)
 				return
 			} else {
-- 
cgit v1.2.3-1-g7c22


From 72d54e427c035162260f47b0b79864e6193861e9 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Mon, 29 Jun 2015 10:31:56 -0400
Subject: add intro text specific to off-topic channel

---
 web/react/components/post_list.jsx | 13 ++++++++++++-
 web/react/utils/constants.jsx      |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'web')

diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index 37e3faef2..e37de8d88 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -356,6 +356,7 @@ module.exports = React.createClass({
                 var ui_name = channel.display_name
                 var members = ChannelStore.getCurrentExtraInfo().members;
                 var creator_name = "";
+                var userStyle = { color: UserStore.getCurrentUser().props.theme }
 
                 for (var i = 0; i < members.length; i++) {
                     if (members[i].roles.indexOf('admin') > -1) {
@@ -382,8 +383,18 @@ module.exports = React.createClass({
                             </p>
                         </div>
                     );
+                } else if (channel.name === Constants.OFFTOPIC_CHANNEL) {
+                    more_messages = (
+                        <div className="channel-intro">
+                            <h4 className="channel-intro-title">Welcome</h4>
+                            <p>
+                                {"This is the start of " + ui_name + ", a channel for conversations you’d prefer out of more focused channels."}
+                                <br/>
+                                <a className="intro-links" href="#" style={userStyle} data-toggle="modal" data-target="#edit_channel" data-desc={channel.description} data-title={ui_name} data-channelid={channel.id}><i className="fa fa-pencil"></i>Set a description</a>
+                            </p>
+                        </div>
+                    );
                 } else {
-                    var userStyle = { color: UserStore.getCurrentUser().props.theme }
                     var ui_type = channel.type === 'P' ? "private group" : "channel";
                     more_messages = (
                         <div className="channel-intro">
diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx
index e5f42c8a0..a5124afe2 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -51,6 +51,7 @@ module.exports = {
   MAX_UPLOAD_FILES: 5,
   MAX_FILE_SIZE: 50000000, // 50 MB
   DEFAULT_CHANNEL: 'town-square',
+  OFFTOPIC_CHANNEL: 'off-topic',
   POST_CHUNK_SIZE: 60,
   RESERVED_DOMAINS: [
     "www",
-- 
cgit v1.2.3-1-g7c22


From 7b7e73fb9290a8084989a4219681c636670e7555 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Mon, 29 Jun 2015 14:37:59 -0400
Subject: added team-wide and channel-wide mentions

---
 web/react/components/user_settings.jsx | 47 ++++++++++++++++++++++++++++++----
 1 file changed, 42 insertions(+), 5 deletions(-)

(limited to 'web')

diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx
index 147973fb7..f97a06db3 100644
--- a/web/react/components/user_settings.jsx
+++ b/web/react/components/user_settings.jsx
@@ -20,11 +20,10 @@ function getNotificationsStateFromStores() {
     var mention_key = false;
     var custom_keys = "";
     var first_name_key = false;
+    var all_key = false;
+    var channel_key = false;
 
-    if (!user.notify_props) {
-        mention_keys = user.username;
-        if (user.full_name.length > 0) mention_keys += ","+ user.full_name.split(" ")[0];
-    } else {
+    if (user.notify_props) {
         if (user.notify_props.mention_keys !== undefined) {
             var keys = user.notify_props.mention_keys.split(',');
 
@@ -48,9 +47,17 @@ function getNotificationsStateFromStores() {
         if (user.notify_props.first_name !== undefined) {
             first_name_key = user.notify_props.first_name === "true";
         }
+
+        if (user.notify_props.all !== undefined) {
+            all_key = user.notify_props.all === "true";
+        }
+
+        if (user.notify_props.channel !== undefined) {
+            channel_key = user.notify_props.channel === "true";
+        }
     }
 
-    return { notify_level: desktop, enable_email: email, enable_sound: sound, username_key: username_key, mention_key: mention_key, custom_keys: custom_keys, custom_keys_checked: custom_keys.length > 0, first_name_key: first_name_key };
+    return { notify_level: desktop, enable_email: email, enable_sound: sound, username_key: username_key, mention_key: mention_key, custom_keys: custom_keys, custom_keys_checked: custom_keys.length > 0, first_name_key: first_name_key, all_key: all_key, channel_key: channel_key };
 }
 
 
@@ -73,6 +80,8 @@ var NotificationsTab = React.createClass({
 
         data["mention_keys"] = string_keys;
         data["first_name"] = this.state.first_name_key ? "true" : "false";
+        data["all"] = this.state.all_key ? "true" : "false";
+        data["channel"] = this.state.channel_key ? "true" : "false";
 
         client.updateUserNotifyProps(data,
             function(data) {
@@ -120,6 +129,12 @@ var NotificationsTab = React.createClass({
     updateFirstNameKey: function(val) {
         this.setState({ first_name_key: val });
     },
+    updateAllKey: function(val) {
+        this.setState({ all_key: val });
+    },
+    updateChannelKey: function(val) {
+        this.setState({ channel_key: val });
+    },
     updateCustomMentionKeys: function() {
         var checked = this.refs.customcheck.getDOMNode().checked;
 
@@ -339,6 +354,26 @@ var NotificationsTab = React.createClass({
                 </div>
             );
 
+            inputs.push(
+                <div>
+                    <div className="checkbox">
+                        <label>
+                            <input type="checkbox" checked={this.state.all_key} onChange={function(e){self.updateAllKey(e.target.checked);}}>{'Team-wide mentions "@all"'}</input>
+                        </label>
+                    </div>
+                </div>
+            );
+
+            inputs.push(
+                <div>
+                    <div className="checkbox">
+                        <label>
+                            <input type="checkbox" checked={this.state.channel_key} onChange={function(e){self.updateChannelKey(e.target.checked);}}>{'Channel-wide mentions "@channel"'}</input>
+                        </label>
+                    </div>
+                </div>
+            );
+
             inputs.push(
                 <div>
                     <div className="checkbox">
@@ -369,6 +404,8 @@ var NotificationsTab = React.createClass({
             }
             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.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(','));
 
             var describe = "";
-- 
cgit v1.2.3-1-g7c22


From 2d3ef0b0510e4c0be49cb6025e312fcb932789fd Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Mon, 29 Jun 2015 15:20:49 -0400
Subject: @all and @channel now auto-complete

---
 web/react/components/mention.jsx      |  2 +-
 web/react/components/mention_list.jsx | 15 ++++++++++++++-
 web/react/components/textbox.jsx      |  2 +-
 web/react/utils/constants.jsx         |  1 +
 4 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'web')

diff --git a/web/react/components/mention.jsx b/web/react/components/mention.jsx
index 86a423138..f1292c743 100644
--- a/web/react/components/mention.jsx
+++ b/web/react/components/mention.jsx
@@ -9,7 +9,7 @@ module.exports = React.createClass({
         return (
             <div className="mentions-name" onClick={this.handleClick}>
                 <img className="mention-img" src={"/api/v1/users/" + this.props.id + "/image"}/>
-                <span>@{this.props.username}</span><span className="mention-fullname">{this.props.name}</span>
+                <span>@{this.props.username}</span><span className="mention-fullname">{this.props.secondary_text}</span>
             </div>
         );
     }
diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index 8b7e25b04..eb21e0efe 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -74,6 +74,18 @@ module.exports = React.createClass({
             users.push(profiles[id]);
         }
 
+        var all = {};
+        all.username = "all";
+        all.full_name = "";
+        all.secondary_text = "Notifies everyone in the team";
+        users.push(all);
+
+        var channel = {};
+        channel.username = "channel";
+        channel.full_name = "";
+        channel.secondary_text = "Notifies everyone in the channel";
+        users.push(channel);
+
         users.sort(function(a,b) {
             if (a.username < b.username) return -1;
             if (a.username > b.username) return 1;
@@ -91,6 +103,7 @@ module.exports = React.createClass({
                 var splitName = users[i].full_name.split(' ');
                 firstName = splitName[0].toLowerCase();
                 lastName = splitName.length > 1 ? splitName[splitName.length-1].toLowerCase() : "";
+                users[i].secondary_text = users[i].full_name;
             }
 
             if (firstName.lastIndexOf(mentionText,0) === 0
@@ -99,7 +112,7 @@ module.exports = React.createClass({
                     <Mention
                         ref={'mention' + index}
                         username={users[i].username}
-                        name={users[i].full_name}
+                        secondary_text={users[i].secondary_text}
                         id={users[i].id}
                         handleClick={this.handleClick} />
                 );
diff --git a/web/react/components/textbox.jsx b/web/react/components/textbox.jsx
index 7a4762e07..934e863a2 100644
--- a/web/react/components/textbox.jsx
+++ b/web/react/components/textbox.jsx
@@ -153,7 +153,7 @@ module.exports = React.createClass({
         var mentions = [];
         for (var i = 0; i < matches.length; i++) {
             var m = matches[i].substring(1,matches[i].length).trim();
-            if (m in profileMap && mentions.indexOf(m) === -1) {
+            if ((m in profileMap && mentions.indexOf(m) === -1) || Constants.SPECIAL_MENTIONS.indexOf(m) !== -1) {
                 mentions.push(m);
             }
         }
diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx
index e5f42c8a0..f3f3399d9 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -36,6 +36,7 @@ module.exports = {
     SERVER_ACTION: null,
     VIEW_ACTION: null
   }),
+  SPECIAL_MENTIONS: ['all', 'channel'],
   CHARACTER_LIMIT: 4000,
   IMAGE_TYPES: ['jpg', 'gif', 'bmp', 'png'],
   AUDIO_TYPES: ['mp3', 'wav', 'wma', 'm4a', 'flac', 'aac'],
-- 
cgit v1.2.3-1-g7c22


From 0dd73fb9b3faa8afb390792bf83ddddeb8c00d29 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Mon, 29 Jun 2015 15:04:08 -0700
Subject: Changed file preview removal from using dataset which is unsupported
 in ie10 to using the getAttribute method which is backwards and forwards
 compatible

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

(limited to 'web')

diff --git a/web/react/components/file_preview.jsx b/web/react/components/file_preview.jsx
index 99327c22f..17a1e2bc2 100644
--- a/web/react/components/file_preview.jsx
+++ b/web/react/components/file_preview.jsx
@@ -10,7 +10,7 @@ var Constants = require('../utils/constants.jsx');
 module.exports = React.createClass({
     handleRemove: function(e) {
         var previewDiv = e.target.parentNode.parentNode;
-        this.props.onRemove(previewDiv.dataset.filename);
+        this.props.onRemove(previewDiv.getAttribute('data-filename'));
     },
     render: function() {
         var previews = [];
-- 
cgit v1.2.3-1-g7c22


From 9afbc9c206d12b2d38cf853f37f4ba678bbd1d90 Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Sun, 28 Jun 2015 16:36:19 -0700
Subject: Sorted the channel members popover lexigraphically

---
 web/react/components/channel_header.jsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'web')

diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index 428d3ed81..f4e4078a5 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -44,8 +44,13 @@ var ExtraMembers = React.createClass({
         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.state.extra_info.members
 
-        this.props.members.forEach(function(m) {
+        sortedMembers.sort(function(a,b) {
+            return a.username.localeCompare(b.username)
+        })
+
+        sortedMembers.forEach(function(m) {
             data_content += "<div style='white-space: nowrap'>" + m.username + "</div>";
         });
 
-- 
cgit v1.2.3-1-g7c22


From e41e7a27cfe14d6c17a10d4037a11c430cc86e39 Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Mon, 29 Jun 2015 15:27:53 -0700
Subject: Added semicolons

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

(limited to 'web')

diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index f4e4078a5..39e3e767a 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -44,10 +44,10 @@ var ExtraMembers = React.createClass({
         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.state.extra_info.members
+        var sortedMembers = this.state.extra_info.members;
 
         sortedMembers.sort(function(a,b) {
-            return a.username.localeCompare(b.username)
+            return a.username.localeCompare(b.username);
         })
 
         sortedMembers.forEach(function(m) {
-- 
cgit v1.2.3-1-g7c22


From 6df00cadb5fc6f3d1780cdac9f11c11ed0841a01 Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Mon, 29 Jun 2015 17:06:04 -0700
Subject: Updated file display key to avoid child flattening

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

(limited to 'web')

diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx
index 3079917ec..0fffec021 100644
--- a/web/react/components/post_body.jsx
+++ b/web/react/components/post_body.jsx
@@ -89,6 +89,7 @@ module.exports = React.createClass({
                 var fileInfo = utils.splitFileLocation(filenames[i]);
                 if (Object.keys(fileInfo).length === 0) continue;
 
+
                 var type = utils.getFileType(fileInfo.ext);
 
                 if (type === "image") {
@@ -102,7 +103,7 @@ module.exports = React.createClass({
                     images.push(filenames[i]);
                 } else if (i < Constants.MAX_DISPLAY_FILES) {
                     postFiles.push(
-                        <div className="post-image__column custom-file" key={fileInfo.name}>
+                        <div className="post-image__column custom-file" key={fileInfo.name+fileInfo.ext}>
                             <a href={fileInfo.path+"."+fileInfo.ext} download={fileInfo.name+"."+fileInfo.ext}>
                                 <div className={"file-icon "+utils.getIconClassName(type)}/>
                             </a>
-- 
cgit v1.2.3-1-g7c22


From 351068491e506eb228335fa100d1aa0416ae132f Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Mon, 29 Jun 2015 17:19:00 -0700
Subject: Changed the style of key-assignment to allow for more assured
 variance

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

(limited to 'web')

diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx
index 0fffec021..7d5ef4d33 100644
--- a/web/react/components/post_body.jsx
+++ b/web/react/components/post_body.jsx
@@ -89,7 +89,6 @@ module.exports = React.createClass({
                 var fileInfo = utils.splitFileLocation(filenames[i]);
                 if (Object.keys(fileInfo).length === 0) continue;
 
-
                 var type = utils.getFileType(fileInfo.ext);
 
                 if (type === "image") {
@@ -103,7 +102,7 @@ module.exports = React.createClass({
                     images.push(filenames[i]);
                 } else if (i < Constants.MAX_DISPLAY_FILES) {
                     postFiles.push(
-                        <div className="post-image__column custom-file" key={fileInfo.name+fileInfo.ext}>
+                        <div className="post-image__column custom-file" key={fileInfo.name+i}>
                             <a href={fileInfo.path+"."+fileInfo.ext} download={fileInfo.name+"."+fileInfo.ext}>
                                 <div className={"file-icon "+utils.getIconClassName(type)}/>
                             </a>
-- 
cgit v1.2.3-1-g7c22


From 495b0e45235b646e7bb6aedf53004ee359b6887f Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Tue, 30 Jun 2015 08:42:08 -0400
Subject: add default icon for non-user autocompletes

---
 web/react/components/mention.jsx            | 10 ++++++++--
 web/sass-files/sass/partials/_mentions.scss |  5 +++++
 2 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'web')

diff --git a/web/react/components/mention.jsx b/web/react/components/mention.jsx
index f1292c743..3c33ddf49 100644
--- a/web/react/components/mention.jsx
+++ b/web/react/components/mention.jsx
@@ -6,10 +6,16 @@ module.exports = React.createClass({
         this.props.handleClick(this.props.username);
     },
     render: function() {
+        var icon;
+        if (this.props.id != null) {
+            icon = <span><img className="mention-img" src={"/api/v1/users/" + this.props.id + "/image"}/></span>;
+        } else {
+            icon = <span><i className="mention-img fa fa-users fa-2x"></i></span>;
+        }
         return (
             <div className="mentions-name" onClick={this.handleClick}>
-                <img className="mention-img" src={"/api/v1/users/" + this.props.id + "/image"}/>
-                <span>@{this.props.username}</span><span className="mention-fullname">{this.props.secondary_text}</span>
+                <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/sass-files/sass/partials/_mentions.scss b/web/sass-files/sass/partials/_mentions.scss
index cb6ff16c5..ee254b546 100644
--- a/web/sass-files/sass/partials/_mentions.scss
+++ b/web/sass-files/sass/partials/_mentions.scss
@@ -56,3 +56,8 @@
 .mention-link {
 	color:$primary-color;
 }
+
+.mention-align {
+	position:relative;
+	top:5px;
+}
-- 
cgit v1.2.3-1-g7c22


From f030476ff5f438b96d7282c37ad7a42ffc61ae85 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Tue, 30 Jun 2015 09:06:10 -0400
Subject: @all and @channel now highlight like other mentions

---
 web/react/stores/user_store.jsx | 3 +++
 web/react/utils/utils.jsx       | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'web')

diff --git a/web/react/stores/user_store.jsx b/web/react/stores/user_store.jsx
index bbca92c84..e1df4879f 100644
--- a/web/react/stores/user_store.jsx
+++ b/web/react/stores/user_store.jsx
@@ -240,6 +240,9 @@ var UserStore = assign({}, EventEmitter.prototype, {
         if (first.length > 0) keys.push(first);
       }
 
+      if (user.notify_props.all === "true") keys.push('@all');
+      if (user.notify_props.channel === "true") keys.push('@channel');
+
       return keys;
     } else {
       return [];
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 75c583c8f..d50a044bc 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -421,10 +421,13 @@ module.exports.textToJsx = function(text, options) {
                 highlightSearchClass = " search-highlight";
             }
 
-            if (explicitMention && UserStore.getProfileByUsername(explicitMention[1])) {
+            if (explicitMention &&
+                (UserStore.getProfileByUsername(explicitMention[1]) ||
+                Constants.SPECIAL_MENTIONS.indexOf(explicitMention[1]) !== -1))
+            {
                 var name = explicitMention[1];
                 // do both a non-case sensitive and case senstive check
-                var mClass = (name.toLowerCase() in implicitKeywords || name in implicitKeywords) ? mentionClass : "";
+                var mClass = (('@'+name.toLowerCase()) in implicitKeywords || ('@'+name) in implicitKeywords) ? mentionClass : "";
 
                 var suffix = word.match(puncEndRegex);
                 var prefix = word.match(puncStartRegex);
-- 
cgit v1.2.3-1-g7c22


From 3943d6a209f9119f5732b5e6ec8bdd36cf0566af Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Tue, 30 Jun 2015 10:23:46 -0400
Subject: Revert "MM-1289 Sorted the channel members popover lexigraphically"

---
 web/react/components/channel_header.jsx | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'web')

diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index 39e3e767a..428d3ed81 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -44,13 +44,8 @@ var ExtraMembers = React.createClass({
         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.state.extra_info.members;
 
-        sortedMembers.sort(function(a,b) {
-            return a.username.localeCompare(b.username);
-        })
-
-        sortedMembers.forEach(function(m) {
+        this.props.members.forEach(function(m) {
             data_content += "<div style='white-space: nowrap'>" + m.username + "</div>";
         });
 
-- 
cgit v1.2.3-1-g7c22


From c1d138612273d43024d8364d4910530e0a92ae16 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Tue, 30 Jun 2015 07:46:43 -0700
Subject: Fixed grammmatical issue in error message

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

(limited to 'web')

diff --git a/web/react/components/signup_team_complete.jsx b/web/react/components/signup_team_complete.jsx
index 30fe92af5..709bd6c99 100644
--- a/web/react/components/signup_team_complete.jsx
+++ b/web/react/components/signup_team_complete.jsx
@@ -337,7 +337,7 @@ EmailItem = React.createClass({
             return false;
         }
         else if (email === teamEmail) {
-            this.state.email_error = "Please use an a different email than the one used at signup";
+            this.state.email_error = "Please use a different email than the one used at signup";
             this.setState(this.state);
             return false;
         }
-- 
cgit v1.2.3-1-g7c22


From ab154d50ea67acf7b1afa347ad5f2186369d169d Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Tue, 30 Jun 2015 07:47:46 -0700
Subject: MM-1289 Now sorts users in lexigraphical order in extra members
 popover

---
 web/react/components/channel_header.jsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'web')

diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index 428d3ed81..cd1fb225a 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -44,8 +44,13 @@ var ExtraMembers = React.createClass({
         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;
 
-        this.props.members.forEach(function(m) {
+        sortedMembers.sort(function(a,b) {
+            return a.username.localeCompare(b.username);
+        })
+
+        sortedMembers.forEach(function(m) {
             data_content += "<div style='white-space: nowrap'>" + m.username + "</div>";
         });
 
-- 
cgit v1.2.3-1-g7c22


From 4022ab5ce0b8f8480ea2a6fb32d68422aa17e90e Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Tue, 30 Jun 2015 07:59:31 -0700
Subject: Added extra precaution to avoid null error

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

(limited to 'web')

diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index cd1fb225a..48cb4d13b 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -46,13 +46,15 @@ var ExtraMembers = React.createClass({
         var data_content = "";
         var sortedMembers = this.props.members;
 
-        sortedMembers.sort(function(a,b) {
-            return a.username.localeCompare(b.username);
-        })
-
-        sortedMembers.forEach(function(m) {
-            data_content += "<div style='white-space: nowrap'>" + m.username + "</div>";
-        });
+        if(sortedMembers) {
+            sortedMembers.sort(function(a,b) {
+                return a.username.localeCompare(b.username);
+            })
+
+            sortedMembers.forEach(function(m) {
+                data_content += "<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" >
-- 
cgit v1.2.3-1-g7c22


From bcc31b714b19ff3817c96c801028e23ace8cc55b Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Tue, 30 Jun 2015 11:56:55 -0700
Subject: Added the ability to have hashtags with dashes in them

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

(limited to 'web')

diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index d50a044bc..175fc2922 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -395,8 +395,8 @@ module.exports.textToJsx = function(text, options) {
 
     var inner = [];
 
-    // Function specific regexes
-    var hashRegex = /^href="#[^"]+"|(#[A-Za-z]+[A-Za-z0-9_]*[A-Za-z0-9])$/g;
+    // Function specific regex
+    var hashRegex = /^href="#[^"]+"|(#[A-Za-z]+[A-Za-z0-9_\-]*[A-Za-z0-9])$/g;
 
     var implicitKeywords = {};
     var keywordArray = UserStore.getCurrentMentionKeys();
-- 
cgit v1.2.3-1-g7c22


From 018f6d96baf5f99efa643527fae78ec623ff1b69 Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Tue, 30 Jun 2015 12:08:53 -0700
Subject: Aligned front end and back end domain requirements

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

(limited to 'web')

diff --git a/web/react/components/signup_team_complete.jsx b/web/react/components/signup_team_complete.jsx
index 709bd6c99..587d8cb82 100644
--- a/web/react/components/signup_team_complete.jsx
+++ b/web/react/components/signup_team_complete.jsx
@@ -164,7 +164,9 @@ TeamUrlPage = React.createClass({
         }
 
         var cleaned_name = utils.cleanUpUrlable(name);
-        if (cleaned_name != name) {
+
+        var urlRegex = /^[a-z0-9]+([a-z\-0-9]+|(__)?)[a-z0-9]+$/g;
+        if (cleaned_name != name || !urlRegex.test(name)) {
             this.setState({name_error: "Must be lowercase alphanumeric characters"});
             return;
         }
-- 
cgit v1.2.3-1-g7c22


From ae77db2145684e6d6db2b120c248279b55c5e407 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Tue, 30 Jun 2015 12:30:11 -0700
Subject: Changed keyword logic to use arrays rather than maps to remove
 highlighting of js object properties like constructor and __proto__

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

(limited to 'web')

diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index d50a044bc..84bcc284d 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -398,10 +398,10 @@ module.exports.textToJsx = function(text, options) {
     // Function specific regexes
     var hashRegex = /^href="#[^"]+"|(#[A-Za-z]+[A-Za-z0-9_]*[A-Za-z0-9])$/g;
 
-    var implicitKeywords = {};
+    var implicitKeywords = [];
     var keywordArray = UserStore.getCurrentMentionKeys();
     for (var i = 0; i < keywordArray.length; i++) {
-        implicitKeywords[keywordArray[i]] = true;
+        implicitKeywords[i] = keywordArray[i];
     }
 
     var lines = text.split("\n");
@@ -427,7 +427,7 @@ module.exports.textToJsx = function(text, options) {
             {
                 var name = explicitMention[1];
                 // do both a non-case sensitive and case senstive check
-                var mClass = (('@'+name.toLowerCase()) in implicitKeywords || ('@'+name) in implicitKeywords) ? mentionClass : "";
+                var mClass = implicitKeywords.indexOf('@'+name.toLowerCase()) !== -1 || implicitKeywords.indexOf('@'+name) !== -1 ? mentionClass : "";
 
                 var suffix = word.match(puncEndRegex);
                 var prefix = word.match(puncStartRegex);
@@ -449,7 +449,7 @@ module.exports.textToJsx = function(text, options) {
             } else if (trimWord.match(hashRegex)) {
                 var suffix = word.match(puncEndRegex);
                 var prefix = word.match(puncStartRegex);
-                var mClass = trimWord in implicitKeywords || trimWord.toLowerCase() in implicitKeywords ? mentionClass : "";
+                var mClass = implicitKeywords.indexOf(trimWord) !== -1 || implicitKeywords.indexOf(trimWord.toLowerCase()) !== -1 ? mentionClass : "";
 
                 if (searchTerm === trimWord.substring(1).toLowerCase() || searchTerm === trimWord.toLowerCase()) {
                     highlightSearchClass = " search-highlight";
@@ -457,7 +457,7 @@ module.exports.textToJsx = function(text, options) {
 
                 inner.push(<span key={word+i+z+"_span"}>{prefix}<a key={word+i+z+"_hash"} className={"theme " + mClass + highlightSearchClass} href="#" onClick={function(value) { return function() { module.exports.searchForTerm(value); } }(trimWord)}>{trimWord}</a>{suffix} </span>);
 
-            } else if (trimWord in implicitKeywords || trimWord.toLowerCase() in implicitKeywords) {
+            } else if (implicitKeywords.indexOf(trimWord) !== -1 || implicitKeywords.indexOf(trimWord.toLowerCase()) !== -1) {
                 var suffix = word.match(puncEndRegex);
                 var prefix = word.match(puncStartRegex);
 
-- 
cgit v1.2.3-1-g7c22


From 71d0a9472f22e34c24bcdd61ce14748f5ca7ae43 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Tue, 30 Jun 2015 15:00:57 -0700
Subject: Removed unnecessary loop copying

---
 web/react/utils/utils.jsx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'web')

diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 84bcc284d..08b83d084 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -398,11 +398,7 @@ module.exports.textToJsx = function(text, options) {
     // Function specific regexes
     var hashRegex = /^href="#[^"]+"|(#[A-Za-z]+[A-Za-z0-9_]*[A-Za-z0-9])$/g;
 
-    var implicitKeywords = [];
-    var keywordArray = UserStore.getCurrentMentionKeys();
-    for (var i = 0; i < keywordArray.length; i++) {
-        implicitKeywords[i] = keywordArray[i];
-    }
+    var implicitKeywords = UserStore.getCurrentMentionKeys();
 
     var lines = text.split("\n");
     var urlMatcher = new LinkifyIt();
-- 
cgit v1.2.3-1-g7c22


From 42c7fbaa92e2b1f76a99a2704f777f18c9095c33 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Wed, 1 Jul 2015 20:37:27 +0500
Subject: Fixing css issues in IE, adding doctype to html files

---
 web/templates/channel.html              | 1 +
 web/templates/find_team.html            | 1 +
 web/templates/home.html                 | 1 +
 web/templates/login.html                | 1 +
 web/templates/password_reset.html       | 1 +
 web/templates/signup_team.html          | 1 +
 web/templates/signup_team_complete.html | 1 +
 web/templates/signup_team_confirm.html  | 1 +
 web/templates/signup_user_complete.html | 1 +
 web/templates/verify.html               | 1 +
 web/templates/welcome.html              | 1 +
 11 files changed, 11 insertions(+)

(limited to 'web')

diff --git a/web/templates/channel.html b/web/templates/channel.html
index d10ae2304..f8a4008f5 100644
--- a/web/templates/channel.html
+++ b/web/templates/channel.html
@@ -1,4 +1,5 @@
 {{define "channel"}}
+<!DOCTYPE html>
 <html>
 {{template "head" . }}
 <body>
diff --git a/web/templates/find_team.html b/web/templates/find_team.html
index c731f7a8f..9acf3ac64 100644
--- a/web/templates/find_team.html
+++ b/web/templates/find_team.html
@@ -1,4 +1,5 @@
 {{define "find_team"}}
+<!DOCTYPE html>
 <html>
 {{template "head" . }}
 <body class="white">
diff --git a/web/templates/home.html b/web/templates/home.html
index 74f7a015b..abf8062f2 100644
--- a/web/templates/home.html
+++ b/web/templates/home.html
@@ -1,4 +1,5 @@
 {{define "home"}}
+<!DOCTYPE html>
 <html>
 {{template "head" . }}
 <body>
diff --git a/web/templates/login.html b/web/templates/login.html
index 1bc5394ab..c107e1ad5 100644
--- a/web/templates/login.html
+++ b/web/templates/login.html
@@ -1,4 +1,5 @@
 {{define "login"}}
+<!DOCTYPE html>
 <html>
 {{template "head" . }}
 <body class="white">
diff --git a/web/templates/password_reset.html b/web/templates/password_reset.html
index 1c5485e33..8b63556b1 100644
--- a/web/templates/password_reset.html
+++ b/web/templates/password_reset.html
@@ -1,4 +1,5 @@
 {{define "password_reset"}}
+<!DOCTYPE html>
 <html>
 {{template "head" . }}
 <body class="white">
diff --git a/web/templates/signup_team.html b/web/templates/signup_team.html
index f7e277340..fad332bee 100644
--- a/web/templates/signup_team.html
+++ b/web/templates/signup_team.html
@@ -1,4 +1,5 @@
 {{define "signup_team"}}
+<!DOCTYPE html>
 <html>
 {{template "head" . }}
 <body class="white">
diff --git a/web/templates/signup_team_complete.html b/web/templates/signup_team_complete.html
index aad521cb3..59f49cdbd 100644
--- a/web/templates/signup_team_complete.html
+++ b/web/templates/signup_team_complete.html
@@ -1,4 +1,5 @@
 {{define "signup_team_complete"}}
+<!DOCTYPE html>
 <html>
 {{template "head" . }}
 <body class="white">
diff --git a/web/templates/signup_team_confirm.html b/web/templates/signup_team_confirm.html
index a34c39ab6..9e21126da 100644
--- a/web/templates/signup_team_confirm.html
+++ b/web/templates/signup_team_confirm.html
@@ -1,4 +1,5 @@
 {{define "signup_team_confirm"}}
+<!DOCTYPE html>
 <html>
 {{template "head" . }}
 <body class="white">
diff --git a/web/templates/signup_user_complete.html b/web/templates/signup_user_complete.html
index a6827bc3a..5fe907ba7 100644
--- a/web/templates/signup_user_complete.html
+++ b/web/templates/signup_user_complete.html
@@ -1,4 +1,5 @@
 {{define "signup_user_complete"}}
+<!DOCTYPE html>
 <html>
 {{template "head" . }}
 <body class="white">
diff --git a/web/templates/verify.html b/web/templates/verify.html
index 60a7990f0..a61964bb3 100644
--- a/web/templates/verify.html
+++ b/web/templates/verify.html
@@ -1,4 +1,5 @@
 {{define "verify"}}
+<!DOCTYPE html>
 <html>
 {{template "head" . }}
 <body>
diff --git a/web/templates/welcome.html b/web/templates/welcome.html
index 27bf4bcaf..bab7a135d 100644
--- a/web/templates/welcome.html
+++ b/web/templates/welcome.html
@@ -1,4 +1,5 @@
 {{define "welcome"}}
+<!DOCTYPE html>
 <html>
 {{template "head" . }}
 <body>
-- 
cgit v1.2.3-1-g7c22


From 27eeabafe096013f1d0d368a65fe71ef230eab50 Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Wed, 1 Jul 2015 09:48:39 -0700
Subject: Facelifted "direct message" to "private message"

---
 web/react/components/more_direct_channels.jsx | 2 +-
 web/react/components/post_list.jsx            | 4 ++--
 web/react/components/search_results.jsx       | 2 +-
 web/react/components/sidebar.jsx              | 2 +-
 web/react/components/user_settings.jsx        | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'web')

diff --git a/web/react/components/more_direct_channels.jsx b/web/react/components/more_direct_channels.jsx
index 2785dc8e0..182d8884d 100644
--- a/web/react/components/more_direct_channels.jsx
+++ b/web/react/components/more_direct_channels.jsx
@@ -49,7 +49,7 @@ module.exports = React.createClass({
                                 <span aria-hidden="true">&times;</span>
                                 <span className="sr-only">Close</span>
                             </button>
-                            <h4 className="modal-title">More Direct Messages</h4>
+                            <h4 className="modal-title">More Private Messages</h4>
                         </div>
                         <div className="modal-body">
                             <ul className="nav nav-pills nav-stacked">
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index e37de8d88..40c30539e 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -342,13 +342,13 @@ 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 direct message history with " + teammate_name + "." }<br/>{"Direct 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 {
                     more_messages = (
                         <div className="channel-intro">
-                            <p className="channel-intro-text">{"This is the start of your direct message history with this " + strings.Team + "mate. Direct 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 this " + strings.Team + "mate. Private messages and files shared here are not shown to people outside this area."}</p>
                         </div>
                     );
                 }
diff --git a/web/react/components/search_results.jsx b/web/react/components/search_results.jsx
index 51aefd3b8..f0ed788b4 100644
--- a/web/react/components/search_results.jsx
+++ b/web/react/components/search_results.jsx
@@ -73,7 +73,7 @@ SearchItem = React.createClass({
 
         if (channel) {
             if (channel.type === 'D') {
-                channelName = "Direct Message";
+                channelName = "Private Message";
             } else {
                 channelName = channel.display_name;
             }
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index 10017c7ee..b5598e23a 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -414,7 +414,7 @@ var SidebarLoggedIn = React.createClass({
                         {privateChannelItems}
                     </ul>
                     <ul className="nav nav-pills nav-stacked">
-                        <li><h4>Direct Messages</h4></li>
+                        <li><h4>Private Messages</h4></li>
                         {directMessageItems}
                         { this.state.hideDirectChannels.length > 0 ?
                             <li><a href="#" data-toggle="modal" className="nav-more" data-target="#more_direct_channels" data-channels={JSON.stringify(this.state.hideDirectChannels)}>{"More ("+this.state.hideDirectChannels.length+")"}</a></li>
diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx
index f97a06db3..0a2a8125c 100644
--- a/web/react/components/user_settings.jsx
+++ b/web/react/components/user_settings.jsx
@@ -179,7 +179,7 @@ var NotificationsTab = React.createClass({
                     </div>
                     <div className="radio">
                         <label>
-                            <input type="radio" checked={notifyActive[1]} onClick={function(){self.handleNotifyRadio("mention")}}>Only for mentions and direct messages</input>
+                            <input type="radio" checked={notifyActive[1]} onClick={function(){self.handleNotifyRadio("mention")}}>Only for mentions and private messages</input>
                         </label>
                         <br/>
                     </div>
@@ -203,7 +203,7 @@ var NotificationsTab = React.createClass({
         } else {
             var describe = "";
             if (this.state.notify_level === "mention") {
-                describe = "Only for mentions and direct messages";
+                describe = "Only for mentions and private messages";
             } else if (this.state.notify_level === "none") {
                 describe = "Never";
             } else {
@@ -282,7 +282,7 @@ var NotificationsTab = React.createClass({
                         <button className={"btn btn-default "+emailActive[0]} onClick={function(){self.handleEmailRadio("true")}}>On</button>
                         <button className={"btn btn-default "+emailActive[1]} onClick={function(){self.handleEmailRadio("false")}}>Off</button>
                     </div>
-                    <div><br/>{"Email notifications are sent for mentions and direct messages after you have been away from " + config.SiteName + " for 5 minutes."}</div>
+                    <div><br/>{"Email notifications are sent for mentions and private messages after you have been away from " + config.SiteName + " for 5 minutes."}</div>
                 </div>
             );
 
-- 
cgit v1.2.3-1-g7c22


From 26560b5fc61dd8272f689d692638cb5e50b9e366 Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Wed, 1 Jul 2015 09:53:32 -0700
Subject: Inital attempt at active element checking

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

(limited to 'web')

diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index eb21e0efe..37fd3e2dc 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -23,6 +23,12 @@ module.exports = React.createClass({
                 }
             }
         );
+        $(document).click(function() {
+            if ($(document.activeElement).get(0) != $('#'+this.props.id).get(0)) {
+            this.setState({ mentionText: '-1'})
+            console.log(this.state)
+            }
+        });
     },
     componentWillUnmount: function() {
         PostStore.removeMentionDataChangeListener(this._onChange);
@@ -131,7 +137,7 @@ module.exports = React.createClass({
 
         return (
             <div className="mentions--top" style={{height: height, width: width, bottom: bottom, left: left}}>
-                <div ref="mentionlist" className="mentions-box" style={{maxHeight: max_height, height: height, width: width}}>
+                <div ref="mentionlist" id="mentionlist" className="mentions-box" style={{maxHeight: max_height, height: height, width: width}}>
                     { mentions }
                 </div>
             </div>
-- 
cgit v1.2.3-1-g7c22


From 0967e1fd013e97d36e6d46d89b2b7bcfa3b24624 Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Wed, 1 Jul 2015 11:08:55 -0700
Subject: Fixed click response

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

(limited to 'web')

diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index 37fd3e2dc..a4408acb2 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -24,9 +24,8 @@ module.exports = React.createClass({
             }
         );
         $(document).click(function() {
-            if ($(document.activeElement).get(0) != $('#'+this.props.id).get(0)) {
-            this.setState({ mentionText: '-1'})
-            console.log(this.state)
+            if($('#'+self.props.id).length && $('#'+self.props.id).get(0) !== $(':focus').get(0)) {
+                self.setState({mentionText: "-1"})
             }
         });
     },
-- 
cgit v1.2.3-1-g7c22


From d47c86b9217d24add8612767b73dab9455bb134b Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Wed, 1 Jul 2015 11:14:18 -0700
Subject: Removed a change originally made for a prior fix tactic

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

(limited to 'web')

diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index a4408acb2..2fecc129a 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -136,7 +136,7 @@ module.exports = React.createClass({
 
         return (
             <div className="mentions--top" style={{height: height, width: width, bottom: bottom, left: left}}>
-                <div ref="mentionlist" id="mentionlist" className="mentions-box" style={{maxHeight: max_height, height: height, width: width}}>
+                <div ref="mentionlist" className="mentions-box" style={{maxHeight: max_height, height: height, width: width}}>
                     { mentions }
                 </div>
             </div>
-- 
cgit v1.2.3-1-g7c22


From 494781d3cc67a0784ee36c4448194df66392b1e0 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Wed, 1 Jul 2015 23:30:41 +0500
Subject: Fixing height for content

---
 web/sass-files/sass/partials/_base.scss | 7 ++++---
 web/templates/channel.html              | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'web')

diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss
index 5808aeb44..444f8db29 100644
--- a/web/sass-files/sass/partials/_base.scss
+++ b/web/sass-files/sass/partials/_base.scss
@@ -10,9 +10,6 @@ body {
   height: 100%;
   &.white {
     background: #fff;
-    .inner__wrap {
-      height: 100%;
-    }
     .row.content {
       min-height: 100%;
       height: auto !important;
@@ -20,8 +17,12 @@ body {
       margin-bottom: -89px;
     }
   }
+  .inner__wrap, .row.main {
+    height: 100%;
+  }
   > .container-fluid {
     @include clearfix;
+    height: 100%;
     position: relative;
   }
 }
diff --git a/web/templates/channel.html b/web/templates/channel.html
index f8a4008f5..d96aee3d4 100644
--- a/web/templates/channel.html
+++ b/web/templates/channel.html
@@ -1,3 +1,4 @@
+
 {{define "channel"}}
 <!DOCTYPE html>
 <html>
-- 
cgit v1.2.3-1-g7c22


From 64c88565654b9cfcd973961245a796d104c4e266 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Wed, 1 Jul 2015 23:36:51 +0500
Subject: Just arranging the css more properly

---
 web/sass-files/sass/partials/_base.scss | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'web')

diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss
index 444f8db29..4f069b23b 100644
--- a/web/sass-files/sass/partials/_base.scss
+++ b/web/sass-files/sass/partials/_base.scss
@@ -17,8 +17,11 @@ body {
       margin-bottom: -89px;
     }
   }
-  .inner__wrap, .row.main {
+  .inner__wrap {
     height: 100%;
+    > .row.main {
+      height: 100%;
+    }
   }
   > .container-fluid {
     @include clearfix;
-- 
cgit v1.2.3-1-g7c22


From c15bc9ad94b80f3342c5daf3702231ce86561073 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Wed, 1 Jul 2015 23:37:50 +0500
Subject: Improving targeting for row content

---
 web/sass-files/sass/partials/_base.scss | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'web')

diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss
index 4f069b23b..4fb918bd1 100644
--- a/web/sass-files/sass/partials/_base.scss
+++ b/web/sass-files/sass/partials/_base.scss
@@ -10,11 +10,11 @@ body {
   height: 100%;
   &.white {
     background: #fff;
-    .row.content {
-      min-height: 100%;
-      height: auto !important;
-      height: 100%;
-      margin-bottom: -89px;
+    .inner__wrap {
+      > .row.content {
+        min-height: 100%;
+        margin-bottom: -89px;
+      }
     }
   }
   .inner__wrap {
-- 
cgit v1.2.3-1-g7c22


From fd310e382a2cc1a9779ef28dee7fea9476bb425f Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Wed, 1 Jul 2015 12:41:36 -0700
Subject: Finally fixed the git weirdness

---
 web/react/components/post_list.jsx      |  8 +-------
 web/react/components/search_results.jsx |  6 ++++++
 web/react/components/sidebar.jsx        |  9 ++-------
 web/react/utils/utils.jsx               | 18 ++++++++++++++++++
 4 files changed, 27 insertions(+), 14 deletions(-)

(limited to 'web')

diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index e37de8d88..142d7ab1c 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -324,13 +324,7 @@ module.exports = React.createClass({
             if (order.length > 0 && order.length % Constants.POST_CHUNK_SIZE === 0) {
                 more_messages = <a ref="loadmore" className="more-messages-text theme" href="#" onClick={this.getMorePosts}>Load more messages</a>;
             } else if (channel.type === 'D') {
-                var userIds = channel.name.split('__');
-                var teammate;
-                if (userIds.length === 2 && userIds[0] === user_id) {
-                    teammate = UserStore.getProfile(userIds[1]);
-                } else if (userIds.length === 2 && userIds[1] === user_id) {
-                    teammate = UserStore.getProfile(userIds[0]);
-                }
+                var teammate = utils.getDirectTeammate(channel.id)
 
                 if (teammate) {
                     var teammate_name = teammate.full_name.length > 0 ? teammate.full_name : teammate.username;
diff --git a/web/react/components/search_results.jsx b/web/react/components/search_results.jsx
index 51aefd3b8..15c2b37a2 100644
--- a/web/react/components/search_results.jsx
+++ b/web/react/components/search_results.jsx
@@ -43,6 +43,7 @@ SearchItem = React.createClass({
         e.preventDefault();
 
         var self = this;
+
         client.getPost(
             this.props.post.channel_id,
             this.props.post.id,
@@ -64,6 +65,11 @@ SearchItem = React.createClass({
                 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 : "";
+
+    utils.switchChannel(postChannel,teammate);
     },
     render: function() {
 
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index 10017c7ee..dc8496156 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -269,13 +269,8 @@ var SidebarLoggedIn = React.createClass({
         var channel = ChannelStore.getCurrent();
         if (channel) {
             if (channel.type === 'D') {
-                userIds = channel.name.split('__');
-                if (userIds.length < 2) return;
-                if (userIds[0] == UserStore.getCurrentId() && UserStore.getProfile(userIds[1])) {
-                    document.title = UserStore.getProfile(userIds[1]).username + " " + document.title.substring(document.title.lastIndexOf("-"));
-                } else if (userIds[1] == UserStore.getCurrentId() && UserStore.getProfile(userIds[0])) {
-                    document.title = UserStore.getProfile(userIds[0]).username + " " + document.title.substring(document.title.lastIndexOf("-"));
-                }
+                var teammate_username = utils.getDirectTeammate(channel.id).username
+                document.title = teammate_username + " " + document.title.substring(document.title.lastIndexOf("-"));
             } else {
                 document.title = channel.display_name + " " + document.title.substring(document.title.lastIndexOf("-"))
             }
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 70a47742f..530166f04 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -2,6 +2,7 @@
 // See License.txt for license information.
 
 var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
+var ChannelStore = require('../stores/channel_store.jsx')
 var UserStore = require('../stores/user_store.jsx');
 var Constants = require('../utils/constants.jsx');
 var ActionTypes = Constants.ActionTypes;
@@ -726,6 +727,23 @@ module.exports.isComment = function(post) {
     return false;
 }
 
+module.exports.getDirectTeammate = function(channel_id) {
+  var userIds = ChannelStore.get(channel_id).name.split('__');
+
+  if(userIds.length != 2) {
+    return;
+  }
+
+  var curUser = UserStore.getCurrentId();
+
+  for(var idx in userIds) {
+    if(userIds[idx] === curUser)
+      delete userIds[idx];
+  }
+
+  return UserStore.getProfile(userIds[0])
+}
+
 Image.prototype.load = function(url, progressCallback) {
     var thisImg = this;
     var xmlHTTP = new XMLHttpRequest();
-- 
cgit v1.2.3-1-g7c22


From 6f83b0fd2c64f36f59bf0c0ac7fa87f6da1e65c9 Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Wed, 1 Jul 2015 16:04:18 -0700
Subject: Restricted profile picture uploads to just JPEGs

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

(limited to 'web')

diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx
index f97a06db3..2e563ff45 100644
--- a/web/react/components/user_settings.jsx
+++ b/web/react/components/user_settings.jsx
@@ -809,6 +809,11 @@ var GeneralTab = React.createClass({
 
         if(!this.submitActive) return;
 
+        if(this.state.picture.type !== "image/jpeg") {
+            this.setState({client_error: "Only JPG images may be used for profile pictures"});
+            return;
+        }
+
         formData = new FormData();
         formData.append('image', this.state.picture, this.state.picture.name);
 
@@ -984,7 +989,7 @@ var GeneralTab = React.createClass({
                     submit={this.submitPicture}
                     src={"/api/v1/users/" + user.id + "/image"}
                     server_error={server_error}
-                    client_error={email_error}
+                    client_error={client_error}
                     updateSection={function(e){self.updateSection("");e.preventDefault();}}
                     picture={this.state.picture}
                     pictureChange={this.updatePicture}
-- 
cgit v1.2.3-1-g7c22


From 855f3d3630576e0fe65751ef71a82eb0a1200f5e Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Wed, 1 Jul 2015 17:04:10 -0700
Subject: Changed ordering of steps for upload to imporve asthetic

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

(limited to 'web')

diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx
index 2e563ff45..add57f147 100644
--- a/web/react/components/user_settings.jsx
+++ b/web/react/components/user_settings.jsx
@@ -844,11 +844,13 @@ var GeneralTab = React.createClass({
     updatePicture: function(e) {
         if (e.target.files && e.target.files[0]) {
             this.setState({ picture: e.target.files[0] });
+
+            this.submitActive = true;
+            this.setState({client_error:null})
+
         } else {
             this.setState({ picture: null });
         }
-
-        this.submitActive = true
     },
     updateSection: function(section) {
         this.setState({client_error:""})
-- 
cgit v1.2.3-1-g7c22


From 7b6fe252f18b12107af105f9348da28f2f0d4a0c Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Thu, 2 Jul 2015 09:32:31 -0400
Subject: fix getDirectTeammate so that if teammate is the second id it doesn't
 return null

---
 web/react/utils/utils.jsx | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'web')

diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 530166f04..13cb0ff53 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -728,20 +728,22 @@ module.exports.isComment = function(post) {
 }
 
 module.exports.getDirectTeammate = function(channel_id) {
-  var userIds = ChannelStore.get(channel_id).name.split('__');
+    var userIds = ChannelStore.get(channel_id).name.split('__');
+    var curUserId = UserStore.getCurrentId();
+    var teammate = {};
 
-  if(userIds.length != 2) {
-    return;
-  }
-
-  var curUser = UserStore.getCurrentId();
+    if(userIds.length != 2 || userIds.indexOf(curUserId) === -1) {
+        return teammate;
+    }
 
-  for(var idx in userIds) {
-    if(userIds[idx] === curUser)
-      delete userIds[idx];
-  }
+    for (var idx = 0; idx < userIds.length; idx++) {
+        if(userIds[idx] !== curUserId) {
+            teammate = UserStore.getProfile(userIds[idx]);
+            break;
+        }
+    }
 
-  return UserStore.getProfile(userIds[0])
+    return teammate;
 }
 
 Image.prototype.load = function(url, progressCallback) {
-- 
cgit v1.2.3-1-g7c22


From 18629d8184a985d9fe9f9bf892952044b1e5d57f Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Thu, 2 Jul 2015 09:34:57 -0400
Subject: make loop simpler

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

(limited to 'web')

diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 13cb0ff53..f8a7d6450 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -736,7 +736,7 @@ module.exports.getDirectTeammate = function(channel_id) {
         return teammate;
     }
 
-    for (var idx = 0; idx < userIds.length; idx++) {
+    for (var idx in userIds) {
         if(userIds[idx] !== curUserId) {
             teammate = UserStore.getProfile(userIds[idx]);
             break;
-- 
cgit v1.2.3-1-g7c22


From 801cac46a90a119bb05e909be915eb9891b77574 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Thu, 2 Jul 2015 09:02:47 -0700
Subject: Changed valet title and description for clarity

---
 web/react/components/team_settings.jsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'web')

diff --git a/web/react/components/team_settings.jsx b/web/react/components/team_settings.jsx
index a43e5d2f0..166b1f38b 100644
--- a/web/react/components/team_settings.jsx
+++ b/web/react/components/team_settings.jsx
@@ -78,13 +78,14 @@ var FeatureTab = React.createClass({
                         <button className={"btn btn-default "+valetActive[0]} onClick={function(){self.handleValetRadio("true")}}>On</button>
                         <button className={"btn btn-default "+valetActive[1]} onClick={function(){self.handleValetRadio("false")}}>Off</button>
                     </div>
-                    <div><br/>Warning: Turning on the Valet feature and using it with any third party software increases the risk of a security breach.</div>
+                    <div><br/>Valet is a preview feature for enabling a non-user account limited to basic member permissions that can be manipulated by 3rd parties.<br/><br/>IMPORTANT: The preview version of Valet should not be used without a secure connection and a trusted 3rd party, since user credentials are used to connect. OAuth2 will be used in the final release.</div>
+                    <br></br>
                 </div>
             );
 
             valetSection = (
                 <SettingItemMax
-                    title="Valet"
+                    title="Valet (Preview - EXPERTS ONLY)"
                     inputs={inputs}
                     submit={this.submitValetFeature}
                     server_error={server_error}
@@ -102,7 +103,7 @@ var FeatureTab = React.createClass({
 
             valetSection = (
                 <SettingItemMin
-                    title="Valet"
+                    title="Valet (Preview - EXPERTS ONLY)"
                     describe={describe}
                     updateSection={function(){self.props.updateSection("valet");}}
                 />
-- 
cgit v1.2.3-1-g7c22


From 9fca35cad531fe040155ba460577b0c3eba6b24e Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Thu, 2 Jul 2015 11:13:38 -0700
Subject: Added additional class to the markup indicating if the post came from
 the current user

---
 web/react/components/post.jsx       | 12 +++++++++---
 web/react/components/post_right.jsx | 20 +++++++++++++++-----
 2 files changed, 24 insertions(+), 8 deletions(-)

(limited to 'web')

diff --git a/web/react/components/post.jsx b/web/react/components/post.jsx
index afe978495..e877a2213 100644
--- a/web/react/components/post.jsx
+++ b/web/react/components/post.jsx
@@ -6,6 +6,7 @@ var PostBody = require('./post_body.jsx');
 var PostInfo = require('./post_info.jsx');
 var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
 var Constants = require('../utils/constants.jsx');
+var UserStore = require('../stores/user_store.jsx');
 var ActionTypes = Constants.ActionTypes;
 
 module.exports = React.createClass({
@@ -56,7 +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){
+        if (this.props.sameRoot){
             rootUser = "same--root";
         }
         else {
@@ -64,13 +65,18 @@ module.exports = React.createClass({
         }
 
         var postType = "";
-        if(type != "Post"){
+        if (type != "Post"){
             postType = "post--comment";
         }
 
+        var currentUser = "";
+        if (UserStore.getCurrentId() === post.user_id) {
+            currentUser = "current--user";
+        }
+
         return (
             <div>
-                <div id={post.id} className={"post " + this.props.sameUser + " " + rootUser + " " + postType}>
+                <div id={post.id} className={"post " + this.props.sameUser + " " + rootUser + " " + postType + " " + currentUser}>
                     { !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" />
diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx
index 43be60afa..15a058c5f 100644
--- a/web/react/components/post_right.jsx
+++ b/web/react/components/post_right.jsx
@@ -68,9 +68,14 @@ RootPost = React.createClass({
         var filenames = this.props.post.filenames;
         var isOwner = UserStore.getCurrentId() == this.props.post.user_id;
 
-        var type = "Post"
+        var type = "Post";
         if (this.props.post.root_id.length > 0) {
-            type = "Comment"
+            type = "Comment";
+        }
+
+        var currentUser = "";
+        if (UserStore.getCurrentId() === this.props.post.user_id) {
+            currentUser = "current--user";
         }
 
         if (filenames) {
@@ -84,7 +89,7 @@ RootPost = React.createClass({
                 if (fileSplit.length < 2) continue;
 
                 var ext = fileSplit[fileSplit.length-1];
-                fileSplit.splice(fileSplit.length-1,1)
+                fileSplit.splice(fileSplit.length-1,1);
                 var filePath = fileSplit.join('.');
                 var filename = filePath.split('/')[filePath.split('/').length-1];
 
@@ -111,7 +116,7 @@ RootPost = React.createClass({
         }
 
         return (
-            <div className="post post--root">
+            <div className={"post post--root " + currentUser}>
                 <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" />
                 </div>
@@ -170,6 +175,11 @@ CommentPost = React.createClass({
 
         var commentClass = "post";
 
+        var currentUser = "";
+        if (UserStore.getCurrentId() === this.props.post.user_id) {
+            currentUser = "current--user";
+        }
+
         var postImageModalId = "rhs_comment_view_image_modal_" + this.props.post.id;
         var filenames = this.props.post.filenames;
         var isOwner = UserStore.getCurrentId() == this.props.post.user_id;
@@ -219,7 +229,7 @@ CommentPost = React.createClass({
         var message = utils.textToJsx(this.props.post.message);
 
         return (
-            <div className={commentClass}>
+            <div className={commentClass + " " + currentUser}>
                 <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" />
                 </div>
-- 
cgit v1.2.3-1-g7c22


From e46561339f59ff19f68d69596567d1498ed5a857 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Fri, 17 Jul 2015 21:04:33 +0500
Subject: MM-1426 - Updating UI

---
 web/sass-files/sass/partials/_base.scss          |  8 ++++++--
 web/sass-files/sass/partials/_modal.scss         |  4 ++--
 web/sass-files/sass/partials/_post.scss          | 14 +++++++++++---
 web/sass-files/sass/partials/_responsive.scss    | 17 +++++++++++------
 web/sass-files/sass/partials/_search.scss        |  2 +-
 web/sass-files/sass/partials/_settings.scss      |  4 ++--
 web/sass-files/sass/partials/_sidebar--left.scss |  3 ++-
 web/templates/head.html                          |  2 +-
 8 files changed, 36 insertions(+), 18 deletions(-)

(limited to 'web')

diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss
index 4fb918bd1..cf28e44e8 100644
--- a/web/sass-files/sass/partials/_base.scss
+++ b/web/sass-files/sass/partials/_base.scss
@@ -3,7 +3,7 @@ html, body {
 }
 
 body {
-  font-family: 'Lato', sans-serif;
+  font-family: 'Open Sans', sans-serif;
   -webkit-font-smoothing: antialiased;
   background: #e9e9e9;
   position: relative;
@@ -30,6 +30,10 @@ body {
   }
 }
 
+b, strong {
+  font-weight: 600;
+}
+
 a {
   word-break: break-word;
 }
@@ -146,7 +150,7 @@ div.theme {
     top: 0;
     color: #FFF;
     font-size: 20px;
-    font-weight: bold;
+    font-weight: 600;
     text-decoration: none;
     padding: 0 10px;
   }
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index 4427cb7dd..7367b5d1a 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -8,7 +8,7 @@
 		}
 	}
 	.info__label {
-		font-weight: bold;
+		font-weight: 600;
 		text-align: right;
 		padding-right: 0;
 	}
@@ -120,7 +120,7 @@
 		}
 		.more-channel-name {
 			color: #444;
-			font-weight: bold;
+			font-weight: 600;
 			font-size: 0.95em;
 		}
 		tbody {
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index 745d50173..7551d8d58 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -86,10 +86,11 @@ body.ios {
 			background: #FFF;
 			display: inline-block;
 			padding: 0 1em;
-			font-weight: 900;
+			font-weight: 700;
 			@include border-radius(50px);
 			position: relative;
 			z-index: 5;
+			font-size: 13px;
 		}
 	}
 	.new-separator {
@@ -212,6 +213,11 @@ body.ios {
 			}
 		}
 	}
+	&.current--user {
+		.post-body {
+			background: #f5f5f5;
+		}
+	}
 	&.same--root {
 		.comment-icon__container {
 			@include opacity(0);
@@ -269,7 +275,7 @@ body.ios {
 			float: left;
 			.post-profile-img {
 				margin-right: 10px;
-				@include border-radius(3px);
+				@include border-radius(50px);
 			}
 		}
 		&.post__content {
@@ -290,6 +296,8 @@ body.ios {
 		width: 600px;
 		float: left;
 		word-wrap: break-word;
+		padding: 0.3em 0 0.1em;
+		margin: -0.3em 0 0;
 		.post-link {
 			@include clearfix;
 			text-overflow: ellipsis;
@@ -359,7 +367,7 @@ body.ios {
 		.embed-title {
 			margin: 3px 0 1px;
 			color: #555;
-			font-weight: bold;
+			font-weight: 600;
 			white-space: nowrap;
 			text-overflow: ellipsis;
 			overflow: hidden;
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index 25533c770..403e84521 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -22,11 +22,17 @@
                         width: 825px;
                     }
                     .post-body {
-                        padding-left: 0;
                         border: none;
                         margin: 0;
                     }
                 }
+                .post-body {
+                    float: none;
+                    width: 750px;
+                    padding-left: 0.5em;
+                    padding-right: 0.5em;
+                    margin: 0;
+                }
                 .post__content {
                     width: 920px;
                 }
@@ -63,10 +69,6 @@
                         }
                     }
                 }
-                .post-body {
-                    float: none;
-                    width: 750px;
-                }
             }
         }
     }
@@ -89,6 +91,7 @@
             margin-left: 60px;
             padding-left: 10px;
             border-left: 4px solid #EEE;
+            margin-bottom: 10px;
             div.post-profile-img__container {
                 .post-profile-img {
                     display: none;
@@ -98,7 +101,6 @@
                 width: 825px;
             }
             .post-body {
-                padding-left: 0;
                 border: none;
                 margin: 0;
             }
@@ -135,6 +137,9 @@
             }
         }
         .post-body {
+            margin: 0;
+            padding-left: 0.5em;
+            padding-right: 0.5em;
             float: none;
             width: 750px;
         }
diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss
index ca5d25720..8d51d00c0 100644
--- a/web/sass-files/sass/partials/_search.scss
+++ b/web/sass-files/sass/partials/_search.scss
@@ -77,7 +77,7 @@
 		border: none;
 	}
 	.search-channel__name {
-		font-weight: bold;
+		font-weight: 600;
 		margin: 0 0 10px 0;
 	}
 }
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss
index dbaab8b58..af759c650 100644
--- a/web/sass-files/sass/partials/_settings.scss
+++ b/web/sass-files/sass/partials/_settings.scss
@@ -56,7 +56,7 @@
 
             .section-title {
                 margin-bottom: 5px;
-                font-weight: bold;
+                font-weight: 600;
             }
 
             .section-edit {
@@ -172,7 +172,7 @@
         border-top:1px solid lightgrey;
     }
     .post-profile-img {
-        @include border-radius(3px);
+        @include border-radius(50px);
         margin-right: 8px;
     }
     .member-name {
diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss
index b1dd470d2..46b328d43 100644
--- a/web/sass-files/sass/partials/_sidebar--left.scss
+++ b/web/sass-files/sass/partials/_sidebar--left.scss
@@ -59,7 +59,7 @@
                 color: #999;
                 &.unread-title {
                     color: #333;
-                    font-weight: bold;
+                    font-weight: 600;
                 }
                 &:hover, &:focus {
                     background: #e6f2fa;
@@ -70,6 +70,7 @@
                     color: #111;
                     background-color: #e1e1e1;
                     border-radius: 0;
+                    font-weight: 600;
                 }
             }
         }
diff --git a/web/templates/head.html b/web/templates/head.html
index 5eb7a7333..9c025d1f9 100644
--- a/web/templates/head.html
+++ b/web/templates/head.html
@@ -14,7 +14,7 @@
 
     <link id="favicon" rel="icon" href="/static/images/favicon.ico" type="image/x-icon">
     <link rel="shortcut icon" href="/static/images/favicon.ico" type="image/x-icon">
-    <link href='https://fonts.googleapis.com/css?family=Lato:400,700,900' rel='stylesheet' type='text/css'>
+    <link href='http://fonts.googleapis.com/css?family=Open+Sans:400,600,700' rel='stylesheet' type='text/css'>
     <link rel="stylesheet" href="/static/css/styles.css">
 
     <script src="/static/js/min/perfect-scrollbar.min.js"></script>
-- 
cgit v1.2.3-1-g7c22


From 138d0ea12b6e0f2cd26f658224018c6a76e4d2a8 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Fri, 17 Jul 2015 21:07:53 +0500
Subject: Adding border radius

---
 web/sass-files/sass/partials/_post.scss | 1 +
 1 file changed, 1 insertion(+)

(limited to 'web')

diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index 7551d8d58..8ce1bf984 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -215,6 +215,7 @@ body.ios {
 	}
 	&.current--user {
 		.post-body {
+			@include border-radius(4px);
 			background: #f5f5f5;
 		}
 	}
-- 
cgit v1.2.3-1-g7c22


From 30239d255ae8ecbed70bb7b5b10db23039ca649b Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Fri, 17 Jul 2015 22:06:53 +0500
Subject: Improving image modals

---
 web/sass-files/sass/partials/_headers.scss | 2 +-
 web/sass-files/sass/partials/_modal.scss   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'web')

diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss
index 89bbaef2b..e240d5151 100644
--- a/web/sass-files/sass/partials/_headers.scss
+++ b/web/sass-files/sass/partials/_headers.scss
@@ -65,7 +65,7 @@
 		float:left;
 	}
 	.channel-intro-title {
-		font-weight:bold;
+		font-weight:600;
 	}
 	.channel-intro-text {
 		margin-top:35px;
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index 7367b5d1a..b26af1d32 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -145,6 +145,7 @@
 	.modal-image {
 		position:relative;
 		width:100%;
+		height: 100%;
 		margin: 0 auto;
 		.image-wrapper {
 			background: #FFF;
-- 
cgit v1.2.3-1-g7c22


From 665dff3f6d96b5f9736fbae0e87fbb66dc6acb32 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Fri, 17 Jul 2015 22:09:25 +0500
Subject: Improving channel notifications

---
 web/react/components/channel_notifications.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'web')

diff --git a/web/react/components/channel_notifications.jsx b/web/react/components/channel_notifications.jsx
index fa9ab42ae..638d16576 100644
--- a/web/react/components/channel_notifications.jsx
+++ b/web/react/components/channel_notifications.jsx
@@ -97,7 +97,7 @@ module.exports = React.createClass({
             var inputs = [];
 
             inputs.push(
-                <div className="col-sm-12">
+                <div>
                     <div className="radio">
                         <label>
                             <input type="radio" checked={notifyActive[0]} onClick={function(){self.handleRadioClick("all")}}>For all activity</input>
@@ -158,7 +158,7 @@ module.exports = React.createClass({
             var inputs = [];
 
             inputs.push(
-                <div className="col-sm-12">
+                <div>
                     <div className="btn-group" data-toggle="buttons-radio">
                         <button className={"btn btn-default "+quietActive[0]} onClick={function(){self.handleQuietToggle(true)}}>On</button>
                         <button className={"btn btn-default "+quietActive[1]} onClick={function(){self.handleQuietToggle(false)}}>Off</button>
@@ -167,7 +167,7 @@ module.exports = React.createClass({
             );
 
             inputs.push(
-                <div className="col-sm-12">
+                <div>
                     <br/>
                     Enabling quiet mode will turn off desktop notifications and only mark the channel as unread if you have been mentioned.
                 </div>
-- 
cgit v1.2.3-1-g7c22


From 764bd97bc72ac335ce42b5c4e19931b6a72b803b Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Fri, 17 Jul 2015 23:10:10 +0500
Subject: Improving modal UI

---
 web/react/components/post.jsx            | 6 +++---
 web/sass-files/sass/partials/_modal.scss | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'web')

diff --git a/web/react/components/post.jsx b/web/react/components/post.jsx
index afe978495..09437f8dc 100644
--- a/web/react/components/post.jsx
+++ b/web/react/components/post.jsx
@@ -10,9 +10,9 @@ var ActionTypes = Constants.ActionTypes;
 
 module.exports = React.createClass({
     componentDidMount: function() {
-        $('.edit-modal').on('show.bs.modal', function () {
-            $('.edit-modal .edit-modal-body').css('overflow-y', 'auto');
-            $('.edit-modal .edit-modal-body').css('max-height', $(window).height() * 0.7);
+        $('.modal').on('show.bs.modal', function () {
+            $('.modal-body').css('overflow-y', 'auto');
+            $('.modal-body').css('max-height', $(window).height() * 0.7);
         });
     },
     handleCommentClick: function(e) {
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index b26af1d32..5438f58fb 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -66,7 +66,6 @@
 			}
 		}
 		.btn {
-			margin-right: 10px;
 			&.btn-primary {
 				float: right;
 				margin-top: -4px;
-- 
cgit v1.2.3-1-g7c22


From f5c4cf10c484111e817c1111d9138d891c6d84cf Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Fri, 17 Jul 2015 23:39:09 +0500
Subject: Adding highlights and improving css for posts on responsive screens

---
 web/sass-files/sass/partials/_modal.scss      | 1 -
 web/sass-files/sass/partials/_post.scss       | 4 ++--
 web/sass-files/sass/partials/_responsive.scss | 6 ++----
 3 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'web')

diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index 5438f58fb..971ed0935 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -21,7 +21,6 @@
 		margin-right: auto;
 	}
 	.modal-body {
-		max-height: 75%;
 		overflow: auto;
 	}
 	.modal-push-down {
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index 8ce1bf984..72b527311 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -215,7 +215,7 @@ body.ios {
 	}
 	&.current--user {
 		.post-body {
-			@include border-radius(4px);
+			@include border-radius(0 4px 4px 0);
 			background: #f5f5f5;
 		}
 	}
@@ -297,7 +297,7 @@ body.ios {
 		width: 600px;
 		float: left;
 		word-wrap: break-word;
-		padding: 0.3em 0 0.1em;
+		padding: 0.3em 0.5em 0.1em;
 		margin: -0.3em 0 0;
 		.post-link {
 			@include clearfix;
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index 403e84521..5497e2c6c 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -22,6 +22,7 @@
                         width: 825px;
                     }
                     .post-body {
+                        width: 736px;
                         border: none;
                         margin: 0;
                     }
@@ -29,8 +30,6 @@
                 .post-body {
                     float: none;
                     width: 750px;
-                    padding-left: 0.5em;
-                    padding-right: 0.5em;
                     margin: 0;
                 }
                 .post__content {
@@ -101,6 +100,7 @@
                 width: 825px;
             }
             .post-body {
+                width: 736px;
                 border: none;
                 margin: 0;
             }
@@ -138,8 +138,6 @@
         }
         .post-body {
             margin: 0;
-            padding-left: 0.5em;
-            padding-right: 0.5em;
             float: none;
             width: 750px;
         }
-- 
cgit v1.2.3-1-g7c22


From 07601d6561cf6e7fe3c8cb9c15a12f26f8183246 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Fri, 17 Jul 2015 23:43:36 +0500
Subject: Changing var name from currentUser to currentUserCss

---
 web/react/components/post.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'web')

diff --git a/web/react/components/post.jsx b/web/react/components/post.jsx
index ab5d70f12..04b5ba082 100644
--- a/web/react/components/post.jsx
+++ b/web/react/components/post.jsx
@@ -69,14 +69,14 @@ module.exports = React.createClass({
             postType = "post--comment";
         }
 
-        var currentUser = "";
+        var currentUserCss = "";
         if (UserStore.getCurrentId() === post.user_id) {
-            currentUser = "current--user";
+            currentUserCss = "current--user";
         }
 
         return (
             <div>
-                <div id={post.id} className={"post " + this.props.sameUser + " " + rootUser + " " + postType + " " + currentUser}>
+                <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" />
-- 
cgit v1.2.3-1-g7c22


From 97c112c42707f92279b8a85f1f0ad8517fa59f18 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Fri, 17 Jul 2015 23:56:27 +0500
Subject: Changing var currentUser in post_right

---
 web/react/components/post_right.jsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'web')

diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx
index 15a058c5f..2c28c5d9f 100644
--- a/web/react/components/post_right.jsx
+++ b/web/react/components/post_right.jsx
@@ -73,9 +73,9 @@ RootPost = React.createClass({
             type = "Comment";
         }
 
-        var currentUser = "";
+        var currentUserCss = "";
         if (UserStore.getCurrentId() === this.props.post.user_id) {
-            currentUser = "current--user";
+            currentUserCss = "current--user";
         }
 
         if (filenames) {
@@ -116,7 +116,7 @@ RootPost = React.createClass({
         }
 
         return (
-            <div className={"post post--root " + currentUser}>
+            <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" />
                 </div>
@@ -175,9 +175,9 @@ CommentPost = React.createClass({
 
         var commentClass = "post";
 
-        var currentUser = "";
+        var currentUserCss = "";
         if (UserStore.getCurrentId() === this.props.post.user_id) {
-            currentUser = "current--user";
+            currentUserCss = "current--user";
         }
 
         var postImageModalId = "rhs_comment_view_image_modal_" + this.props.post.id;
@@ -229,7 +229,7 @@ CommentPost = React.createClass({
         var message = utils.textToJsx(this.props.post.message);
 
         return (
-            <div className={commentClass + " " + currentUser}>
+            <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" />
                 </div>
-- 
cgit v1.2.3-1-g7c22


From dafc49dcaead4ba7a0210aebc578ba258c991261 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Sat, 18 Jul 2015 01:09:02 +0500
Subject: Minor fixes to mattermost UI

---
 web/sass-files/sass/partials/_post.scss          | 1 +
 web/sass-files/sass/partials/_sidebar--left.scss | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'web')

diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index 72b527311..769cb1091 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -256,6 +256,7 @@ body.ios {
 	}
 	p {
 		margin: 0 0 5px;
+		font-size: 0.97em;
 		white-space: pre-wrap;
 	}
 	.comment-icon__container {
diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss
index 46b328d43..89d1ff416 100644
--- a/web/sass-files/sass/partials/_sidebar--left.scss
+++ b/web/sass-files/sass/partials/_sidebar--left.scss
@@ -70,7 +70,7 @@
                     color: #111;
                     background-color: #e1e1e1;
                     border-radius: 0;
-                    font-weight: 600;
+                    font-weight: 400;
                 }
             }
         }
-- 
cgit v1.2.3-1-g7c22


From 1005dfb8e4a276fc394c655f891388795cc60b09 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Sat, 18 Jul 2015 01:19:53 +0500
Subject: Updating margins

---
 web/sass-files/sass/partials/_responsive.scss | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'web')

diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index 5497e2c6c..a34bbe8d8 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -5,7 +5,8 @@
                 &.post--comment {
                     &.other--root {
                         .post-comment {
-                            margin-left: 0;
+                            margin-left: -7px;
+                            background: #e8e8e8;
                         }
                     }
                 }
@@ -82,7 +83,8 @@
         &.post--comment {
             &.other--root {
                 .post-comment {
-                    margin-left: 0;
+                    margin-left: -7px;
+                    background: #e8e8e8;
                 }
             }
         }
@@ -578,7 +580,7 @@
         &.post--comment {
             &.other--root {
                 .post-comment {
-                    margin-left: 11px;
+                    margin-left: 4px;
                 }
             }
         }
-- 
cgit v1.2.3-1-g7c22


From ea1ef222b717394e8019b203ad37e63d102d0ab9 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Sat, 18 Jul 2015 01:52:37 +0500
Subject: MM-1319 - Copy link and background change

---
 web/react/components/get_link_modal.jsx       | 2 +-
 web/sass-files/sass/partials/_responsive.scss | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'web')

diff --git a/web/react/components/get_link_modal.jsx b/web/react/components/get_link_modal.jsx
index 334591ee3..69e565185 100644
--- a/web/react/components/get_link_modal.jsx
+++ b/web/react/components/get_link_modal.jsx
@@ -42,7 +42,7 @@ module.exports = React.createClass({
                         </div>
                         <div className="modal-footer">
                           <button type="button" className="btn btn-default" data-dismiss="modal">Close</button>
-                          <button data-copy-btn type="button" className="btn btn-primary" data-clipboard-text={this.state.value}>Copy Link</button>
+                          <button data-copy-btn type="button" className="btn btn-primary pull-left" data-clipboard-text={this.state.value}>Copy Link</button>
                         </div>
                       </div>
                    </div>
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index a34bbe8d8..0037879cf 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -6,7 +6,6 @@
                     &.other--root {
                         .post-comment {
                             margin-left: -7px;
-                            background: #e8e8e8;
                         }
                     }
                 }
@@ -84,7 +83,6 @@
             &.other--root {
                 .post-comment {
                     margin-left: -7px;
-                    background: #e8e8e8;
                 }
             }
         }
-- 
cgit v1.2.3-1-g7c22


From a3d521298a3b65dd3870deffecc8b95efa6cfabe Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Sat, 18 Jul 2015 01:54:56 +0500
Subject: Fixing padding in sidebar dropdown

---
 web/sass-files/sass/partials/_headers.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web')

diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss
index e240d5151..1ec1109a5 100644
--- a/web/sass-files/sass/partials/_headers.scss
+++ b/web/sass-files/sass/partials/_headers.scss
@@ -88,7 +88,7 @@
 			}
 			.dropdown-menu {
 				li a {
-					padding: 3 20px;
+					padding: 3px 20px;
 					color: #555;
 				}
 			}
-- 
cgit v1.2.3-1-g7c22


From d5d9481c0f4c1ddd86f2e30f798da50c37f56a3a Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Tue, 30 Jun 2015 20:01:35 -0700
Subject: Added new files for adding new loading animation

---
 web/react/components/loading_posts.jsx     |  3 ++
 web/sass-files/sass/partials/_loading.scss | 68 ++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 web/react/components/loading_posts.jsx
 create mode 100644 web/sass-files/sass/partials/_loading.scss

(limited to 'web')

diff --git a/web/react/components/loading_posts.jsx b/web/react/components/loading_posts.jsx
new file mode 100644
index 000000000..f6d859954
--- /dev/null
+++ b/web/react/components/loading_posts.jsx
@@ -0,0 +1,3 @@
+// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// See License.txt for license information.
+
diff --git a/web/sass-files/sass/partials/_loading.scss b/web/sass-files/sass/partials/_loading.scss
new file mode 100644
index 000000000..185a42180
--- /dev/null
+++ b/web/sass-files/sass/partials/_loading.scss
@@ -0,0 +1,68 @@
+.loading-screen {
+	display: table;
+	width: 100%;
+	height: 100%;
+	position: absolute;
+	@include box-sizing(border-box);
+	text-align: center;
+	.loading__content {
+		display: table-cell;
+		vertical-align: middle;
+		h3 {
+			font-weight: 400;
+			margin: 0 0.2em 0;
+			display: inline-block;
+		}
+	}
+}
+
+.loading-screen {
+	.loading__content {
+		.round {
+			background-color: #444;
+			width: 4px;
+			height: 4px;
+			display: inline-block;
+			margin: 0 1px;
+			opacity: 0.1;
+			@include border-radius(10px);
+			-moz-animation: move 0.75s infinite linear;
+			-webkit-animation: move 0.75s infinite linear;
+		}
+
+		#round_1 {
+			-moz-animation-delay: .2s;
+			-webkit-animation-delay: .2s;
+		}
+
+		#round_2 {
+			-moz-animation-delay: .4s;
+			-webkit-animation-delay: .4s;
+		}
+
+		#round_3 {
+			-moz-animation-delay: .6s;
+			-webkit-animation-delay: .6s;
+		}
+
+		@-moz-keyframes move {
+			0% {
+				opacity: 1;
+			}
+
+			100% {
+				opacity: 0.1;
+			};
+		}
+
+		@-webkit-keyframes move {
+			0% {
+				opacity: 1;
+			}
+
+			100% {
+				opacity: 0.1;
+			};
+		}
+	}
+}
-- 
cgit v1.2.3-1-g7c22


From 483b37a64f978db84cd0d128665d2c79775c6e60 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Wed, 1 Jul 2015 16:51:26 -0700
Subject: Added logic for loading animation to appear when posts have yet to be
 loaded.  Added markup necessary for loading animation css.  Removed a file
 that was no longer needed for the design.

---
 web/react/components/loading_posts.jsx |  3 ---
 web/react/components/post_list.jsx     | 17 +++++++++++++++--
 2 files changed, 15 insertions(+), 5 deletions(-)
 delete mode 100644 web/react/components/loading_posts.jsx

(limited to 'web')

diff --git a/web/react/components/loading_posts.jsx b/web/react/components/loading_posts.jsx
deleted file mode 100644
index f6d859954..000000000
--- a/web/react/components/loading_posts.jsx
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
-// See License.txt for license information.
-
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index ad8cfa20f..a860804cc 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -295,7 +295,7 @@ module.exports = React.createClass({
     },
     render: function() {
         var order = [];
-        var posts = {};
+        var posts;
 
         var last_viewed = Number.MAX_VALUE;
 
@@ -408,7 +408,7 @@ module.exports = React.createClass({
         }
 
         var postCtls = [];
-        var previousPostDay = posts[order[order.length-1]] ? utils.getDateForUnixTicks(posts[order[order.length-1]].create_at): new Date();
+        var previousPostDay = posts && posts[order[order.length-1]] ? utils.getDateForUnixTicks(posts[order[order.length-1]].create_at): new Date();
         var currentPostDay = new Date();
 
         for (var i = order.length-1; i >= 0; i--) {
@@ -459,6 +459,19 @@ module.exports = React.createClass({
             previousPostDay = utils.getDateForUnixTicks(post.create_at);
         }
 
+        if (posts == undefined) {
+            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>
+            );
+        }
+
         return (
             <div ref="postlist" className="post-list-holder-by-time">
                 <div className="post-list__table">
-- 
cgit v1.2.3-1-g7c22


From cbfc85fde2cea70e944f22cc2620d343af839395 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Thu, 2 Jul 2015 12:20:39 -0700
Subject: Added import statement to styles.scss

---
 web/sass-files/sass/styles.scss | 1 +
 1 file changed, 1 insertion(+)

(limited to 'web')

diff --git a/web/sass-files/sass/styles.scss b/web/sass-files/sass/styles.scss
index 8446f1c01..9cc26320c 100644
--- a/web/sass-files/sass/styles.scss
+++ b/web/sass-files/sass/styles.scss
@@ -29,6 +29,7 @@
 @import "partials/modal";
 @import "partials/mentions";
 @import "partials/error";
+@import "partials/loading"; 
 
 // Responsive Css
 @import "partials/responsive";
-- 
cgit v1.2.3-1-g7c22


From 1a1b29ee6c1aa20a5f608f57616b078f0dbbbe51 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Thu, 2 Jul 2015 16:38:34 -0700
Subject: Restructured logic to flow more naturally and be cleaner

---
 web/react/components/post_list.jsx | 86 +++++++++++++++++++-------------------
 1 file changed, 44 insertions(+), 42 deletions(-)

(limited to 'web')

diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index a860804cc..169efc766 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -408,58 +408,60 @@ module.exports = React.createClass({
         }
 
         var postCtls = [];
-        var previousPostDay = posts && posts[order[order.length-1]] ? utils.getDateForUnixTicks(posts[order[order.length-1]].create_at): new Date();
-        var currentPostDay = new Date();
 
-        for (var i = order.length-1; i >= 0; i--) {
-            var post = posts[order[i]];
-            var parentPost;
+        if (posts != undefined) {
+            var previousPostDay = posts[order[order.length-1]] ? utils.getDateForUnixTicks(posts[order[order.length-1]].create_at): new Date();
+            var currentPostDay = new Date();
 
-            if (post.parent_id) {
-                parentPost = posts[post.parent_id];
-            } else {
-                parentPost = null;
-            }
+            for (var i = order.length-1; i >= 0; i--) {
+                var post = posts[order[i]];
+                var parentPost;
 
-            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 (post.parent_id) {
+                    parentPost = posts[post.parent_id];
+                } else {
+                    parentPost = null;
+                }
 
-            // 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 === '';
+                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;
 
-            // 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);
-            }
+                // 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 === '';
 
-            var postCtl = <Post sameUser={sameUser} sameRoot={sameRoot} post={post} parentPost={parentPost} key={post.id} posts={posts} hideProfilePic={hideProfilePic} isLastComment={isLastComment} />;
+                // 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);
+                }
 
-            currentPostDay = utils.getDateForUnixTicks(post.create_at);
-            if(currentPostDay.getDate() !== previousPostDay.getDate() || currentPostDay.getMonth() !== previousPostDay.getMonth() || currentPostDay.getFullYear() !== previousPostDay.getFullYear()) {
-                postCtls.push(
-                    <div className="date-separator">
-                        <hr className="separator__hr" />
-                        <div className="separator__text">{currentPostDay.toDateString()}</div>
-                    </div>
-                );
-            }
+                var postCtl = <Post sameUser={sameUser} sameRoot={sameRoot} post={post} parentPost={parentPost} key={post.id} posts={posts} hideProfilePic={hideProfilePic} isLastComment={isLastComment} />;
 
-            if (post.create_at > last_viewed && !rendered_last_viewed) {
-                rendered_last_viewed = true;
-                postCtls.push(
-                    <div className="new-separator">
-                        <hr id="new_message" className="separator__hr" />
-                        <div className="separator__text">New Messages</div>
-                    </div>
-                );
+                currentPostDay = utils.getDateForUnixTicks(post.create_at);
+                if(currentPostDay.getDate() !== previousPostDay.getDate() || currentPostDay.getMonth() !== previousPostDay.getMonth() || currentPostDay.getFullYear() !== previousPostDay.getFullYear()) {
+                    postCtls.push(
+                        <div className="date-separator">
+                            <hr className="separator__hr" />
+                            <div className="separator__text">{currentPostDay.toDateString()}</div>
+                        </div>
+                    );
+                }
+
+                if (post.create_at > last_viewed && !rendered_last_viewed) {
+                    rendered_last_viewed = true;
+                    postCtls.push(
+                        <div className="new-separator">
+                            <hr id="new_message" className="separator__hr" />
+                            <div className="separator__text">New Messages</div>
+                        </div>
+                    );
+                }
+                postCtls.push(postCtl);
+                previousPostDay = utils.getDateForUnixTicks(post.create_at);
             }
-            postCtls.push(postCtl);
-            previousPostDay = utils.getDateForUnixTicks(post.create_at);
         }
-
-        if (posts == undefined) {
+        else {
             postCtls.push(
                 <div ref="loadingscreen" className="loading-screen">
                     <div className="loading__content">
-- 
cgit v1.2.3-1-g7c22