Merge branch 'release-1.3'

web/react/components/admin_console/email_settings.jsx

@@ -586,7 +586,7 @@ export default class EmailSettings extends React.Component {
                                 onChange={this.handleChange}
                                 disabled={!this.state.sendPushNotifications}
                             />
-                            <p className='help-text'>{'Location of the push notification server.'}</p>
+                            <p className='help-text'>{'Location of Mattermost push notification service you can set up behind your firewall using https://github.com/mattermost/push-proxy. For testing you can use https://push.mattermost.com, which connects to the sample Mattermost iOS app in the public Apple AppStore. Please do not use test service for production deployments.'}</p>
                         </div>
                     </div>
 

web/react/components/posts_view.jsx

@@ -233,7 +233,8 @@ export default class PostsView extends React.Component {
             window.requestAnimationFrame(() => {
                 // If separator exists scroll to it. Otherwise scroll to bottom.
                 if (this.refs.newMessageSeparator) {
-                    this.refs.newMessageSeparator.scrollIntoView();
+                    var objDiv = this.refs.postlist;
+                    objDiv.scrollTop = this.refs.newMessageSeparator.offsetTop; //scrolls node to top of Div
                 } else {
                     this.refs.postlist.scrollTop = this.refs.postlist.scrollHeight;
                 }

web/react/components/search_results_item.jsx

@@ -31,8 +31,7 @@ export default class SearchResultsItem extends React.Component {
 
     handleFocusRHSClick(e) {
         e.preventDefault();
-
-        EventHelpers.emitPostFocusRightHandSideEvent(this.props.post);
+        EventHelpers.emitPostFocusRightHandSideFromSearch(this.props.post, this.props.isMentionSearch);
     }
 
     render() {

web/react/dispatcher/event_helpers.jsx

@@ -4,11 +4,11 @@
 import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
 import ChannelStore from '../stores/channel_store.jsx';
 import PostStore from '../stores/post_store.jsx';
+import SearchStore from '../stores/search_store.jsx';
 import Constants from '../utils/constants.jsx';
 const ActionTypes = Constants.ActionTypes;
 import * as AsyncClient from '../utils/async_client.jsx';
 import * as Client from '../utils/client.jsx';
-import * as Utils from '../utils/utils.jsx';
 
 export function emitChannelClickEvent(channel) {
     AsyncClient.getChannels(true);
@@ -39,28 +39,27 @@ export function emitPostFocusEvent(postId) {
     );
 }
 
-export function emitPostFocusRightHandSideEvent(post) {
+export function emitPostFocusRightHandSideFromSearch(post, isMentionSearch) {
     Client.getPost(
         post.channel_id,
         post.id,
         (data) => {
             AppDispatcher.handleServerAction({
                 type: ActionTypes.RECIEVED_POST_SELECTED,
-                post_list: data
+                post_list: data,
+                from_search: SearchStore.getSearchTerm()
             });
 
             AppDispatcher.handleServerAction({
                 type: ActionTypes.RECIEVED_SEARCH,
-                results: null
+                results: null,
+                is_mention_search: isMentionSearch
             });
         },
         (err) => {
             AsyncClient.dispatchError(err, 'getPost');
         }
     );
-
-    var postChannel = ChannelStore.get(post.channel_id);
-    Utils.switchChannel(postChannel);
 }
 
 export function emitLoadMorePostsEvent() {