Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements

17 files changed, 641 insertions, 153 deletions

diff --git a/web/react/.eslintrc b/web/react/.eslintrc
index 6a35d3123..d78068882 100644
--- a/web/react/.eslintrc
+++ b/web/react/.eslintrc
@@ -20,7 +20,8 @@
         "globals": {
             "React": false,
             "ReactDOM": false,
-            "ReactBootstrap": false
+            "ReactBootstrap": false,
+            "Chart": false
         },
         "rules": {
             "comma-dangle": [2, "never"],
diff --git a/web/react/components/admin_console/admin_controller.jsx b/web/react/components/admin_console/admin_controller.jsx
index f770d166c..d309ced2e 100644
--- a/web/react/components/admin_console/admin_controller.jsx
+++ b/web/react/components/admin_console/admin_controller.jsx
@@ -18,6 +18,7 @@ var SqlSettingsTab = require('./sql_settings.jsx');
 var TeamSettingsTab = require('./team_settings.jsx');
 var ServiceSettingsTab = require('./service_settings.jsx');
 var TeamUsersTab = require('./team_users.jsx');
+var TeamAnalyticsTab = require('./team_analytics.jsx');
 
 export default class AdminController extends React.Component {
     constructor(props) {
@@ -149,6 +150,10 @@ export default class AdminController extends React.Component {
                 if (this.state.teams) {
                     tab = <TeamUsersTab team={this.state.teams[this.state.selectedTeam]} />;
                 }
+            } else if (this.state.selected === 'team_analytics') {
+                if (this.state.teams) {
+                    tab = <TeamAnalyticsTab team={this.state.teams[this.state.selectedTeam]} />;
+                }
             }
         }
 
diff --git a/web/react/components/admin_console/admin_sidebar.jsx b/web/react/components/admin_console/admin_sidebar.jsx
index b0e01ff17..f2fb1c96d 100644
--- a/web/react/components/admin_console/admin_sidebar.jsx
+++ b/web/react/components/admin_console/admin_sidebar.jsx
@@ -24,7 +24,7 @@ export default class AdminSidebar extends React.Component {
     handleClick(name, teamId, e) {
         e.preventDefault();
         this.props.selectTab(name, teamId);
-        history.pushState({name: name, teamId: teamId}, null, `/admin_console/${name}/${teamId || ''}`);
+        history.pushState({name, teamId}, null, `/admin_console/${name}/${teamId || ''}`);
     }
 
     isSelected(name, teamId) {
@@ -121,6 +121,15 @@ export default class AdminSidebar extends React.Component {
                                                 {'- Users'}
                                             </a>
                                         </li>
+                                        <li>
+                                            <a
+                                                href='#'
+                                                className={this.isSelected('team_analytics', team.id)}
+                                                onClick={this.handleClick.bind(this, 'team_analytics', team.id)}
+                                            >
+                                                {'- Statistics'}
+                                            </a>
+                                        </li>
                                     </ul>
                                 </li>
                             </ul>
diff --git a/web/react/components/admin_console/line_chart.jsx b/web/react/components/admin_console/line_chart.jsx
new file mode 100644
index 000000000..7e2f95c84
--- /dev/null
+++ b/web/react/components/admin_console/line_chart.jsx
@@ -0,0 +1,50 @@
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+export default class LineChart extends React.Component {
+    constructor(props) {
+        super(props);
+
+        this.initChart = this.initChart.bind(this);
+        this.chart = null;
+    }
+
+    componentDidMount() {
+        this.initChart(this.props);
+    }
+
+    componentWillReceiveProps(nextProps) {
+        if (this.chart) {
+            this.chart.destroy();
+            this.initChart(nextProps);
+        }
+    }
+
+    componentWillUnmount() {
+        if (this.chart) {
+            this.chart.destroy();
+        }
+    }
+
+    initChart(props) {
+        var el = ReactDOM.findDOMNode(this);
+        var ctx = el.getContext('2d');
+        this.chart = new Chart(ctx).Line(props.data, props.options || {}); //eslint-disable-line new-cap
+    }
+
+    render() {
+        return (
+            <canvas
+                width={this.props.width}
+                height={this.props.height}
+            />
+        );
+    }
+}
+
+LineChart.propTypes = {
+    width: React.PropTypes.string,
+    height: React.PropTypes.string,
+    data: React.PropTypes.object,
+    options: React.PropTypes.object
+};
diff --git a/web/react/components/admin_console/team_analytics.jsx b/web/react/components/admin_console/team_analytics.jsx
new file mode 100644
index 000000000..a945a551c
--- /dev/null
+++ b/web/react/components/admin_console/team_analytics.jsx
@@ -0,0 +1,357 @@
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+var Client = require('../../utils/client.jsx');
+var Utils = require('../../utils/utils.jsx');
+var LineChart = require('./line_chart.jsx');
+
+export default class TeamAnalytics extends React.Component {
+    constructor(props) {
+        super(props);
+
+        this.getData = this.getData.bind(this);
+
+        this.state = {
+            users: null,
+            serverError: null,
+            channel_open_count: null,
+            channel_private_count: null,
+            post_count: null,
+            post_counts_day: null,
+            user_counts_with_posts_day: null,
+            recent_active_users: null,
+            newly_created_users: null
+        };
+    }
+
+    componentDidMount() {
+        this.getData(this.props.team.id);
+    }
+
+    getData(teamId) {
+        Client.getAnalytics(
+            teamId,
+            'standard',
+            (data) => {
+                for (var index in data) {
+                    if (data[index].name === 'channel_open_count') {
+                        this.setState({channel_open_count: data[index].value});
+                    }
+
+                    if (data[index].name === 'channel_private_count') {
+                        this.setState({channel_private_count: data[index].value});
+                    }
+
+                    if (data[index].name === 'post_count') {
+                        this.setState({post_count: data[index].value});
+                    }
+                }
+            },
+            (err) => {
+                this.setState({serverError: err.message});
+            }
+        );
+
+        Client.getAnalytics(
+            teamId,
+            'post_counts_day',
+            (data) => {
+                data.reverse();
+
+                var chartData = {
+                    labels: [],
+                    datasets: [{
+                        label: 'Total Posts',
+                        fillColor: 'rgba(151,187,205,0.2)',
+                        strokeColor: 'rgba(151,187,205,1)',
+                        pointColor: 'rgba(151,187,205,1)',
+                        pointStrokeColor: '#fff',
+                        pointHighlightFill: '#fff',
+                        pointHighlightStroke: 'rgba(151,187,205,1)',
+                        data: []
+                    }]
+                };
+
+                for (var index in data) {
+                    if (data[index]) {
+                        var row = data[index];
+                        chartData.labels.push(row.name);
+                        chartData.datasets[0].data.push(row.value);
+                    }
+                }
+
+                this.setState({post_counts_day: chartData});
+            },
+            (err) => {
+                this.setState({serverError: err.message});
+            }
+        );
+
+        Client.getAnalytics(
+            teamId,
+            'user_counts_with_posts_day',
+            (data) => {
+                data.reverse();
+
+                var chartData = {
+                    labels: [],
+                    datasets: [{
+                        label: 'Active Users With Posts',
+                        fillColor: 'rgba(151,187,205,0.2)',
+                        strokeColor: 'rgba(151,187,205,1)',
+                        pointColor: 'rgba(151,187,205,1)',
+                        pointStrokeColor: '#fff',
+                        pointHighlightFill: '#fff',
+                        pointHighlightStroke: 'rgba(151,187,205,1)',
+                        data: []
+                    }]
+                };
+
+                for (var index in data) {
+                    if (data[index]) {
+                        var row = data[index];
+                        chartData.labels.push(row.name);
+                        chartData.datasets[0].data.push(row.value);
+                    }
+                }
+
+                this.setState({user_counts_with_posts_day: chartData});
+            },
+            (err) => {
+                this.setState({serverError: err.message});
+            }
+        );
+
+        Client.getProfilesForTeam(
+            teamId,
+            (users) => {
+                this.setState({users});
+
+                var usersList = [];
+                for (var id in users) {
+                    if (users.hasOwnProperty(id)) {
+                        usersList.push(users[id]);
+                    }
+                }
+
+                usersList.sort((a, b) => {
+                    if (a.last_activity_at < b.last_activity_at) {
+                        return 1;
+                    }
+
+                    if (a.last_activity_at > b.last_activity_at) {
+                        return -1;
+                    }
+
+                    return 0;
+                });
+
+                var recentActive = [];
+                for (let i = 0; i < usersList.length; i++) {
+                    recentActive.push(usersList[i]);
+                    if (i > 19) {
+                        break;
+                    }
+                }
+
+                this.setState({recent_active_users: recentActive});
+
+                usersList.sort((a, b) => {
+                    if (a.create_at < b.create_at) {
+                        return 1;
+                    }
+
+                    if (a.create_at > b.create_at) {
+                        return -1;
+                    }
+
+                    return 0;
+                });
+
+                var newlyCreated = [];
+                for (let i = 0; i < usersList.length; i++) {
+                    newlyCreated.push(usersList[i]);
+                    if (i > 19) {
+                        break;
+                    }
+                }
+
+                this.setState({newly_created_users: newlyCreated});
+            },
+            (err) => {
+                this.setState({serverError: err.message});
+            }
+        );
+    }
+
+    componentWillReceiveProps(newProps) {
+        this.setState({
+            users: null,
+            serverError: null,
+            channel_open_count: null,
+            channel_private_count: null,
+            post_count: null,
+            post_counts_day: null,
+            user_counts_with_posts_day: null,
+            recent_active_users: null,
+            newly_created_users: null
+        });
+
+        this.getData(newProps.team.id);
+    }
+
+    componentWillUnmount() {
+    }
+
+    render() {
+        var serverError = '';
+        if (this.state.serverError) {
+            serverError = <div className='form-group has-error'><label className='control-label'>{this.state.serverError}</label></div>;
+        }
+
+        var totalCount = (
+            <div className='total-count text-center'>
+                <div>{'Total Users'}</div>
+                <div>{this.state.users == null ? 'Loading...' : Object.keys(this.state.users).length}</div>
+            </div>
+        );
+
+        var openChannelCount = (
+            <div className='total-count text-center'>
+                <div>{'Public Groups'}</div>
+                <div>{this.state.channel_open_count == null ? 'Loading...' : this.state.channel_open_count}</div>
+            </div>
+        );
+
+        var openPrivateCount = (
+            <div className='total-count text-center'>
+                <div>{'Private Groups'}</div>
+                <div>{this.state.channel_private_count == null ? 'Loading...' : this.state.channel_private_count}</div>
+            </div>
+        );
+
+        var postCount = (
+            <div className='total-count text-center'>
+                <div>{'Total Posts'}</div>
+                <div>{this.state.post_count == null ? 'Loading...' : this.state.post_count}</div>
+            </div>
+        );
+
+        var postCountsByDay = (
+            <div className='total-count-by-day'>
+                <div>{'Total Posts'}</div>
+                <div>{'Loading...'}</div>
+            </div>
+        );
+
+        if (this.state.post_counts_day != null) {
+            postCountsByDay = (
+                <div className='total-count-by-day'>
+                    <div>{'Total Posts'}</div>
+                    <LineChart
+                        data={this.state.post_counts_day}
+                        width='740'
+                        height='225'
+                    />
+                </div>
+            );
+        }
+
+        var usersWithPostsByDay = (
+            <div className='total-count-by-day'>
+                <div>{'Total Posts'}</div>
+                <div>{'Loading...'}</div>
+            </div>
+        );
+
+        if (this.state.user_counts_with_posts_day != null) {
+            usersWithPostsByDay = (
+                <div className='total-count-by-day'>
+                    <div>{'Active Users With Posts'}</div>
+                    <LineChart
+                        data={this.state.user_counts_with_posts_day}
+                        width='740'
+                        height='225'
+                    />
+                </div>
+            );
+        }
+
+        var recentActiveUser = (
+            <div className='recent-active-users'>
+                <div>{'Recent Active Users'}</div>
+                <div>{'Loading...'}</div>
+            </div>
+        );
+
+        if (this.state.recent_active_users != null) {
+            recentActiveUser = (
+                <div className='recent-active-users'>
+                    <div>{'Recent Active Users'}</div>
+                    <table width='90%'>
+                        <tbody>
+                            {
+                                this.state.recent_active_users.map((user) => {
+                                    return (
+                                        <tr key={user.id}>
+                                            <td className='recent-active-users-td'>{user.email}</td>
+                                            <td className='recent-active-users-td'>{Utils.displayDateTime(user.last_activity_at)}</td>
+                                        </tr>
+                                    );
+                                })
+                            }
+                        </tbody>
+                    </table>
+                </div>
+            );
+        }
+
+        var newUsers = (
+            <div className='recent-active-users'>
+                <div>{'Newly Created Users'}</div>
+                <div>{'Loading...'}</div>
+            </div>
+        );
+
+        if (this.state.newly_created_users != null) {
+            newUsers = (
+                <div className='recent-active-users'>
+                    <div>{'Newly Created Users'}</div>
+                    <table width='90%'>
+                        <tbody>
+                            {
+                                this.state.newly_created_users.map((user) => {
+                                    return (
+                                        <tr key={user.id}>
+                                            <td className='recent-active-users-td'>{user.email}</td>
+                                            <td className='recent-active-users-td'>{Utils.displayDateTime(user.create_at)}</td>
+                                        </tr>
+                                    );
+                                })
+                            }
+                        </tbody>
+                    </table>
+                </div>
+            );
+        }
+
+        return (
+            <div className='wrapper--fixed'>
+                <h2>{'Statistics for ' + this.props.team.name}</h2>
+                {serverError}
+                {totalCount}
+                {postCount}
+                {openChannelCount}
+                {openPrivateCount}
+                {postCountsByDay}
+                {usersWithPostsByDay}
+                {recentActiveUser}
+                {newUsers}
+            </div>
+        );
+    }
+}
+
+TeamAnalytics.propTypes = {
+    team: React.PropTypes.object
+};
diff --git a/web/react/components/admin_console/team_users.jsx b/web/react/components/admin_console/team_users.jsx
index ffb412159..b44aba56e 100644
--- a/web/react/components/admin_console/team_users.jsx
+++ b/web/react/components/admin_console/team_users.jsx
@@ -33,14 +33,6 @@ export default class UserList extends React.Component {
         this.getTeamProfiles(this.props.team.id);
     }
 
-    // this.setState({
-    //     teamId: this.state.teamId,
-    //     users: this.state.users,
-    //     serverError: this.state.serverError,
-    //     showPasswordModal: this.state.showPasswordModal,
-    //     user: this.state.user
-    // });
-
     getTeamProfiles(teamId) {
         Client.getProfilesForTeam(
             teamId,
@@ -95,8 +87,6 @@ export default class UserList extends React.Component {
     }
 
     doPasswordResetDismiss() {
-        this.state.showPasswordModal = false;
-        this.state.user = null;
         this.setState({
             teamId: this.state.teamId,
             users: this.state.users,
diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index 1b709336f..d66777cc6 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -3,7 +3,7 @@
 
 const ChannelStore = require('../stores/channel_store.jsx');
 const UserStore = require('../stores/user_store.jsx');
-const PostStore = require('../stores/post_store.jsx');
+const SearchStore = require('../stores/search_store.jsx');
 const NavbarSearchBox = require('./search_bar.jsx');
 const AsyncClient = require('../utils/async_client.jsx');
 const Client = require('../utils/client.jsx');
@@ -35,19 +35,19 @@ export default class ChannelHeader extends React.Component {
             memberChannel: ChannelStore.getCurrentMember(),
             memberTeam: UserStore.getCurrentUser(),
             users: ChannelStore.getCurrentExtraInfo().members,
-            searchVisible: PostStore.getSearchResults() !== null
+            searchVisible: SearchStore.getSearchResults() !== null
         };
     }
     componentDidMount() {
         ChannelStore.addChangeListener(this.onListenerChange);
         ChannelStore.addExtraInfoChangeListener(this.onListenerChange);
-        PostStore.addSearchChangeListener(this.onListenerChange);
+        SearchStore.addSearchChangeListener(this.onListenerChange);
         UserStore.addChangeListener(this.onListenerChange);
     }
     componentWillUnmount() {
         ChannelStore.removeChangeListener(this.onListenerChange);
         ChannelStore.removeExtraInfoChangeListener(this.onListenerChange);
-        PostStore.removeSearchChangeListener(this.onListenerChange);
+        SearchStore.removeSearchChangeListener(this.onListenerChange);
         UserStore.addChangeListener(this.onListenerChange);
     }
     onListenerChange() {
diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index 60cae55d6..61a24c09c 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -2,7 +2,7 @@
 // See License.txt for license information.
 
 var UserStore = require('../stores/user_store.jsx');
-var PostStore = require('../stores/post_store.jsx');
+var SearchStore = require('../stores/search_store.jsx');
 var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
 var Mention = require('./mention.jsx');
 
@@ -66,7 +66,7 @@ export default class MentionList extends React.Component {
         }
     }
     componentDidMount() {
-        PostStore.addMentionDataChangeListener(this.onListenerChange);
+        SearchStore.addMentionDataChangeListener(this.onListenerChange);
 
         $('.post-right__scroll').scroll(this.onScroll);
 
@@ -74,7 +74,7 @@ export default class MentionList extends React.Component {
         $(document).click(this.onClick);
     }
     componentWillUnmount() {
-        PostStore.removeMentionDataChangeListener(this.onListenerChange);
+        SearchStore.removeMentionDataChangeListener(this.onListenerChange);
         $('body').off('keydown.mentionlist', '#' + this.props.id);
     }
 
diff --git a/web/react/components/search_bar.jsx b/web/react/components/search_bar.jsx
index 0da43e8cd..83c10494a 100644
--- a/web/react/components/search_bar.jsx
+++ b/web/react/components/search_bar.jsx
@@ -3,7 +3,7 @@
 
 var client = require('../utils/client.jsx');
 var AsyncClient = require('../utils/async_client.jsx');
-var PostStore = require('../stores/post_store.jsx');
+var SearchStore = require('../stores/search_store.jsx');
 var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
 var utils = require('../utils/utils.jsx');
 var Constants = require('../utils/constants.jsx');
@@ -30,17 +30,17 @@ export default class SearchBar extends React.Component {
         this.state = state;
     }
     getSearchTermStateFromStores() {
-        var term = PostStore.getSearchTerm() || '';
+        var term = SearchStore.getSearchTerm() || '';
         return {
             searchTerm: term
         };
     }
     componentDidMount() {
-        PostStore.addSearchTermChangeListener(this.onListenerChange);
+        SearchStore.addSearchTermChangeListener(this.onListenerChange);
         this.mounted = true;
     }
     componentWillUnmount() {
-        PostStore.removeSearchTermChangeListener(this.onListenerChange);
+        SearchStore.removeSearchTermChangeListener(this.onListenerChange);
         this.mounted = false;
     }
     onListenerChange(doSearch, isMentionSearch) {
@@ -84,8 +84,8 @@ export default class SearchBar extends React.Component {
     }
     handleUserInput(e) {
         var term = e.target.value;
-        PostStore.storeSearchTerm(term);
-        PostStore.emitSearchTermChange(false);
+        SearchStore.storeSearchTerm(term);
+        SearchStore.emitSearchTermChange(false);
         this.setState({searchTerm: term});
 
         this.refs.autocomplete.handleInputChange(e.target, term);
@@ -150,8 +150,8 @@ export default class SearchBar extends React.Component {
         textbox.value = text;
         utils.setCaretPosition(textbox, preText.length + word.length);
 
-        PostStore.storeSearchTerm(text);
-        PostStore.emitSearchTermChange(false);
+        SearchStore.storeSearchTerm(text);
+        SearchStore.emitSearchTermChange(false);
         this.setState({searchTerm: text});
     }
 
diff --git a/web/react/components/search_results.jsx b/web/react/components/search_results.jsx
index 30e15d0ad..ce19c48f0 100644
--- a/web/react/components/search_results.jsx
+++ b/web/react/components/search_results.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var PostStore = require('../stores/post_store.jsx');
+var SearchStore = require('../stores/search_store.jsx');
 var UserStore = require('../stores/user_store.jsx');
 var SearchBox = require('./search_bar.jsx');
 var Utils = require('../utils/utils.jsx');
@@ -9,7 +9,7 @@ var SearchResultsHeader = require('./search_results_header.jsx');
 var SearchResultsItem = require('./search_results_item.jsx');
 
 function getStateFromStores() {
-    return {results: PostStore.getSearchResults()};
+    return {results: SearchStore.getSearchResults()};
 }
 
 export default class SearchResults extends React.Component {
@@ -30,7 +30,7 @@ export default class SearchResults extends React.Component {
 
     componentDidMount() {
         this.mounted = true;
-        PostStore.addSearchChangeListener(this.onChange);
+        SearchStore.addSearchChangeListener(this.onChange);
         this.resize();
         window.addEventListener('resize', this.handleResize);
     }
@@ -40,7 +40,7 @@ export default class SearchResults extends React.Component {
     }
 
     componentWillUnmount() {
-        PostStore.removeSearchChangeListener(this.onChange);
+        SearchStore.removeSearchChangeListener(this.onChange);
         this.mounted = false;
         window.removeEventListener('resize', this.handleResize);
     }
@@ -78,7 +78,7 @@ export default class SearchResults extends React.Component {
             searchForm = <SearchBox />;
         }
         var noResults = (!results || !results.order || !results.order.length);
-        var searchTerm = PostStore.getSearchTerm();
+        var searchTerm = SearchStore.getSearchTerm();
 
         var ctls = null;
 
diff --git a/web/react/components/search_results_item.jsx b/web/react/components/search_results_item.jsx
index d212e47a3..a8bd4db2c 100644
--- a/web/react/components/search_results_item.jsx
+++ b/web/react/components/search_results_item.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var PostStore = require('../stores/post_store.jsx');
+var SearchStore = require('../stores/search_store.jsx');
 var ChannelStore = require('../stores/channel_store.jsx');
 var UserStore = require('../stores/user_store.jsx');
 var UserProfile = require('./user_profile.jsx');
@@ -32,7 +32,7 @@ export default class SearchResultsItem extends React.Component {
                 AppDispatcher.handleServerAction({
                     type: ActionTypes.RECIEVED_POST_SELECTED,
                     post_list: data,
-                    from_search: PostStore.getSearchTerm()
+                    from_search: SearchStore.getSearchTerm()
                 });
 
                 AppDispatcher.handleServerAction({
diff --git a/web/react/components/sidebar_right.jsx b/web/react/components/sidebar_right.jsx
index 4e6985a86..51225cbbe 100644
--- a/web/react/components/sidebar_right.jsx
+++ b/web/react/components/sidebar_right.jsx
@@ -3,11 +3,12 @@
 
 var SearchResults = require('./search_results.jsx');
 var RhsThread = require('./rhs_thread.jsx');
+var SearchStore = require('../stores/search_store.jsx');
 var PostStore = require('../stores/post_store.jsx');
 var Utils = require('../utils/utils.jsx');
 
 function getStateFromStores() {
-    return {search_visible: PostStore.getSearchResults() != null, post_right_visible: PostStore.getSelectedPost() != null, is_mention_search: PostStore.getIsMentionSearch()};
+    return {search_visible: SearchStore.getSearchResults() != null, post_right_visible: PostStore.getSelectedPost() != null, is_mention_search: SearchStore.getIsMentionSearch()};
 }
 
 export default class SidebarRight extends React.Component {
@@ -22,11 +23,11 @@ export default class SidebarRight extends React.Component {
         this.state = getStateFromStores();
     }
     componentDidMount() {
-        PostStore.addSearchChangeListener(this.onSearchChange);
+        SearchStore.addSearchChangeListener(this.onSearchChange);
         PostStore.addSelectedPostChangeListener(this.onSelectedChange);
     }
     componentWillUnmount() {
-        PostStore.removeSearchChangeListener(this.onSearchChange);
+        SearchStore.removeSearchChangeListener(this.onSearchChange);
         PostStore.removeSelectedPostChangeListener(this.onSelectedChange);
     }
     componentDidUpdate() {
diff --git a/web/react/components/textbox.jsx b/web/react/components/textbox.jsx
index 86bb42f62..707033d8f 100644
--- a/web/react/components/textbox.jsx
+++ b/web/react/components/textbox.jsx
@@ -2,7 +2,7 @@
 // See License.txt for license information.
 
 const AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-const PostStore = require('../stores/post_store.jsx');
+const SearchStore = require('../stores/search_store.jsx');
 const CommandList = require('./command_list.jsx');
 const ErrorStore = require('../stores/error_store.jsx');
 
@@ -54,7 +54,7 @@ export default class Textbox extends React.Component {
     }
 
     componentDidMount() {
-        PostStore.addAddMentionListener(this.onListenerChange);
+        SearchStore.addAddMentionListener(this.onListenerChange);
         ErrorStore.addChangeListener(this.onRecievedError);
 
         this.resize();
@@ -62,7 +62,7 @@ export default class Textbox extends React.Component {
     }
 
     componentWillUnmount() {
-        PostStore.removeAddMentionListener(this.onListenerChange);
+        SearchStore.removeAddMentionListener(this.onListenerChange);
         ErrorStore.removeChangeListener(this.onRecievedError);
     }
 
diff --git a/web/react/stores/post_store.jsx b/web/react/stores/post_store.jsx
index 4a9314b31..a58fdde3a 100644
--- a/web/react/stores/post_store.jsx
+++ b/web/react/stores/post_store.jsx
@@ -12,11 +12,7 @@ var Constants = require('../utils/constants.jsx');
 var ActionTypes = Constants.ActionTypes;
 
 var CHANGE_EVENT = 'change';
-var SEARCH_CHANGE_EVENT = 'search_change';
-var SEARCH_TERM_CHANGE_EVENT = 'search_term_change';
 var SELECTED_POST_CHANGE_EVENT = 'selected_post_change';
-var MENTION_DATA_CHANGE_EVENT = 'mention_data_change';
-var ADD_MENTION_EVENT = 'add_mention';
 var EDIT_POST_EVENT = 'edit_post';
 
 class PostStoreClass extends EventEmitter {
@@ -26,21 +22,15 @@ class PostStoreClass extends EventEmitter {
         this.emitChange = this.emitChange.bind(this);
         this.addChangeListener = this.addChangeListener.bind(this);
         this.removeChangeListener = this.removeChangeListener.bind(this);
-        this.emitSearchChange = this.emitSearchChange.bind(this);
-        this.addSearchChangeListener = this.addSearchChangeListener.bind(this);
-        this.removeSearchChangeListener = this.removeSearchChangeListener.bind(this);
-        this.emitSearchTermChange = this.emitSearchTermChange.bind(this);
-        this.addSearchTermChangeListener = this.addSearchTermChangeListener.bind(this);
-        this.removeSearchTermChangeListener = this.removeSearchTermChangeListener.bind(this);
+
         this.emitSelectedPostChange = this.emitSelectedPostChange.bind(this);
         this.addSelectedPostChangeListener = this.addSelectedPostChangeListener.bind(this);
         this.removeSelectedPostChangeListener = this.removeSelectedPostChangeListener.bind(this);
-        this.emitMentionDataChange = this.emitMentionDataChange.bind(this);
-        this.addMentionDataChangeListener = this.addMentionDataChangeListener.bind(this);
-        this.removeMentionDataChangeListener = this.removeMentionDataChangeListener.bind(this);
-        this.emitAddMention = this.emitAddMention.bind(this);
-        this.addAddMentionListener = this.addAddMentionListener.bind(this);
-        this.removeAddMentionListener = this.removeAddMentionListener.bind(this);
+
+        this.emitEditPost = this.emitEditPost.bind(this);
+        this.addEditPostListener = this.addEditPostListener.bind(this);
+        this.removeEditPostListener = this.removeEditPostListener.bind(this);
+
         this.getCurrentPosts = this.getCurrentPosts.bind(this);
         this.storePosts = this.storePosts.bind(this);
         this.pStorePosts = this.pStorePosts.bind(this);
@@ -59,13 +49,8 @@ class PostStoreClass extends EventEmitter {
         this.pRemovePendingPost = this.pRemovePendingPost.bind(this);
         this.clearPendingPosts = this.clearPendingPosts.bind(this);
         this.updatePendingPost = this.updatePendingPost.bind(this);
-        this.storeSearchResults = this.storeSearchResults.bind(this);
-        this.getSearchResults = this.getSearchResults.bind(this);
-        this.getIsMentionSearch = this.getIsMentionSearch.bind(this);
         this.storeSelectedPost = this.storeSelectedPost.bind(this);
         this.getSelectedPost = this.getSelectedPost.bind(this);
-        this.storeSearchTerm = this.storeSearchTerm.bind(this);
-        this.getSearchTerm = this.getSearchTerm.bind(this);
         this.getEmptyDraft = this.getEmptyDraft.bind(this);
         this.storeCurrentDraft = this.storeCurrentDraft.bind(this);
         this.getCurrentDraft = this.getCurrentDraft.bind(this);
@@ -77,9 +62,6 @@ class PostStoreClass extends EventEmitter {
         this.clearCommentDraftUploads = this.clearCommentDraftUploads.bind(this);
         this.storeLatestUpdate = this.storeLatestUpdate.bind(this);
         this.getLatestUpdate = this.getLatestUpdate.bind(this);
-        this.emitEditPost = this.emitEditPost.bind(this);
-        this.addEditPostListener = this.addEditPostListener.bind(this);
-        this.removeEditPostListener = this.removeEditPostListener.bind(this);
         this.getCurrentUsersLatestPost = this.getCurrentUsersLatestPost.bind(this);
     }
     emitChange() {
@@ -94,30 +76,6 @@ class PostStoreClass extends EventEmitter {
         this.removeListener(CHANGE_EVENT, callback);
     }
 
-    emitSearchChange() {
-        this.emit(SEARCH_CHANGE_EVENT);
-    }
-
-    addSearchChangeListener(callback) {
-        this.on(SEARCH_CHANGE_EVENT, callback);
-    }
-
-    removeSearchChangeListener(callback) {
-        this.removeListener(SEARCH_CHANGE_EVENT, callback);
-    }
-
-    emitSearchTermChange(doSearch, isMentionSearch) {
-        this.emit(SEARCH_TERM_CHANGE_EVENT, doSearch, isMentionSearch);
-    }
-
-    addSearchTermChangeListener(callback) {
-        this.on(SEARCH_TERM_CHANGE_EVENT, callback);
-    }
-
-    removeSearchTermChangeListener(callback) {
-        this.removeListener(SEARCH_TERM_CHANGE_EVENT, callback);
-    }
-
     emitSelectedPostChange(fromSearch) {
         this.emit(SELECTED_POST_CHANGE_EVENT, fromSearch);
     }
@@ -130,30 +88,6 @@ class PostStoreClass extends EventEmitter {
         this.removeListener(SELECTED_POST_CHANGE_EVENT, callback);
     }
 
-    emitMentionDataChange(id, mentionText) {
-        this.emit(MENTION_DATA_CHANGE_EVENT, id, mentionText);
-    }
-
-    addMentionDataChangeListener(callback) {
-        this.on(MENTION_DATA_CHANGE_EVENT, callback);
-    }
-
-    removeMentionDataChangeListener(callback) {
-        this.removeListener(MENTION_DATA_CHANGE_EVENT, callback);
-    }
-
-    emitAddMention(id, username) {
-        this.emit(ADD_MENTION_EVENT, id, username);
-    }
-
-    addAddMentionListener(callback) {
-        this.on(ADD_MENTION_EVENT, callback);
-    }
-
-    removeAddMentionListener(callback) {
-        this.removeListener(ADD_MENTION_EVENT, callback);
-    }
-
     emitEditPost(post) {
         this.emit(EDIT_POST_EVENT, post);
     }
@@ -181,9 +115,9 @@ class PostStoreClass extends EventEmitter {
 
         var postList = makePostListNonNull(this.getPosts(channelId));
 
-        for (let pid in newPostList.posts) {
+        for (const pid in newPostList.posts) {
             if (newPostList.posts.hasOwnProperty(pid)) {
-                var np = newPostList.posts[pid];
+                const np = newPostList.posts[pid];
                 if (np.delete_at === 0) {
                     postList.posts[pid] = np;
                     if (postList.order.indexOf(pid) === -1) {
@@ -194,7 +128,7 @@ class PostStoreClass extends EventEmitter {
                         delete postList.posts[pid];
                     }
 
-                    var index = postList.order.indexOf(pid);
+                    const index = postList.order.indexOf(pid);
                     if (index !== -1) {
                         postList.order.splice(index, 1);
                     }
@@ -202,7 +136,7 @@ class PostStoreClass extends EventEmitter {
             }
         }
 
-        postList.order.sort(function postSort(a, b) {
+        postList.order.sort((a, b) => {
             if (postList.posts[a].create_at > postList.posts[b].create_at) {
                 return -1;
             }
@@ -306,7 +240,7 @@ class PostStoreClass extends EventEmitter {
         var posts = postList.posts;
 
         // sort failed posts to the bottom
-        postList.order.sort(function postSort(a, b) {
+        postList.order.sort((a, b) => {
             if (posts[a].state === Constants.POST_LOADING && posts[b].state === Constants.POST_FAILED) {
                 return 1;
             }
@@ -371,7 +305,7 @@ class PostStoreClass extends EventEmitter {
         this.pStorePendingPosts(channelId, postList);
     }
     clearPendingPosts() {
-        BrowserStore.actionOnGlobalItemsWithPrefix('pending_posts_', function clearPending(key) {
+        BrowserStore.actionOnGlobalItemsWithPrefix('pending_posts_', (key) => {
             BrowserStore.removeItem(key);
         });
     }
@@ -387,28 +321,12 @@ class PostStoreClass extends EventEmitter {
         this.pStorePendingPosts(post.channel_id, postList);
         this.emitChange();
     }
-    storeSearchResults(results, isMentionSearch) {
-        BrowserStore.setItem('search_results', results);
-        BrowserStore.setItem('is_mention_search', Boolean(isMentionSearch));
-    }
-    getSearchResults() {
-        return BrowserStore.getItem('search_results');
-    }
-    getIsMentionSearch() {
-        return BrowserStore.getItem('is_mention_search');
-    }
     storeSelectedPost(postList) {
         BrowserStore.setItem('select_post', postList);
     }
     getSelectedPost() {
         return BrowserStore.getItem('select_post');
     }
-    storeSearchTerm(term) {
-        BrowserStore.setItem('search_term', term);
-    }
-    getSearchTerm() {
-        return BrowserStore.getItem('search_term');
-    }
     getEmptyDraft() {
         return {message: '', uploadsInProgress: [], previews: []};
     }
@@ -433,7 +351,7 @@ class PostStoreClass extends EventEmitter {
         return BrowserStore.getGlobalItem('comment_draft_' + parentPostId, this.getEmptyDraft());
     }
     clearDraftUploads() {
-        BrowserStore.actionOnGlobalItemsWithPrefix('draft_', function clearUploads(key, value) {
+        BrowserStore.actionOnGlobalItemsWithPrefix('draft_', (key, value) => {
             if (value) {
                 value.uploadsInProgress = [];
                 BrowserStore.setItem(key, value);
@@ -441,7 +359,7 @@ class PostStoreClass extends EventEmitter {
         });
     }
     clearCommentDraftUploads() {
-        BrowserStore.actionOnGlobalItemsWithPrefix('comment_draft_', function clearUploads(key, value) {
+        BrowserStore.actionOnGlobalItemsWithPrefix('comment_draft_', (key, value) => {
             if (value) {
                 value.uploadsInProgress = [];
                 BrowserStore.setItem(key, value);
@@ -458,7 +376,7 @@ class PostStoreClass extends EventEmitter {
 
 var PostStore = new PostStoreClass();
 
-PostStore.dispatchToken = AppDispatcher.register(function registry(payload) {
+PostStore.dispatchToken = AppDispatcher.register((payload) => {
     var action = payload.action;
 
     switch (action.type) {
@@ -469,24 +387,10 @@ PostStore.dispatchToken = AppDispatcher.register(function registry(payload) {
         PostStore.pStorePost(action.post);
         PostStore.emitChange();
         break;
-    case ActionTypes.RECIEVED_SEARCH:
-        PostStore.storeSearchResults(action.results, action.is_mention_search);
-        PostStore.emitSearchChange();
-        break;
-    case ActionTypes.RECIEVED_SEARCH_TERM:
-        PostStore.storeSearchTerm(action.term);
-        PostStore.emitSearchTermChange(action.do_search, action.is_mention_search);
-        break;
     case ActionTypes.RECIEVED_POST_SELECTED:
         PostStore.storeSelectedPost(action.post_list);
         PostStore.emitSelectedPostChange(action.from_search);
         break;
-    case ActionTypes.RECIEVED_MENTION_DATA:
-        PostStore.emitMentionDataChange(action.id, action.mention_text);
-        break;
-    case ActionTypes.RECIEVED_ADD_MENTION:
-        PostStore.emitAddMention(action.id, action.username);
-        break;
     case ActionTypes.RECIEVED_EDIT_POST:
         PostStore.emitEditPost(action);
         break;
diff --git a/web/react/stores/search_store.jsx b/web/react/stores/search_store.jsx
new file mode 100644
index 000000000..95f0ea845
--- /dev/null
+++ b/web/react/stores/search_store.jsx
@@ -0,0 +1,153 @@
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
+var EventEmitter = require('events').EventEmitter;
+
+var BrowserStore = require('../stores/browser_store.jsx');
+
+var Constants = require('../utils/constants.jsx');
+var ActionTypes = Constants.ActionTypes;
+
+var CHANGE_EVENT = 'change';
+var SEARCH_CHANGE_EVENT = 'search_change';
+var SEARCH_TERM_CHANGE_EVENT = 'search_term_change';
+var MENTION_DATA_CHANGE_EVENT = 'mention_data_change';
+var ADD_MENTION_EVENT = 'add_mention';
+
+class SearchStoreClass extends EventEmitter {
+    constructor() {
+        super();
+
+        this.emitChange = this.emitChange.bind(this);
+        this.addChangeListener = this.addChangeListener.bind(this);
+        this.removeChangeListener = this.removeChangeListener.bind(this);
+
+        this.emitSearchChange = this.emitSearchChange.bind(this);
+        this.addSearchChangeListener = this.addSearchChangeListener.bind(this);
+        this.removeSearchChangeListener = this.removeSearchChangeListener.bind(this);
+
+        this.emitSearchTermChange = this.emitSearchTermChange.bind(this);
+        this.addSearchTermChangeListener = this.addSearchTermChangeListener.bind(this);
+        this.removeSearchTermChangeListener = this.removeSearchTermChangeListener.bind(this);
+
+        this.emitMentionDataChange = this.emitMentionDataChange.bind(this);
+        this.addMentionDataChangeListener = this.addMentionDataChangeListener.bind(this);
+        this.removeMentionDataChangeListener = this.removeMentionDataChangeListener.bind(this);
+
+        this.getSearchResults = this.getSearchResults.bind(this);
+        this.getIsMentionSearch = this.getIsMentionSearch.bind(this);
+
+        this.storeSearchTerm = this.storeSearchTerm.bind(this);
+        this.getSearchTerm = this.getSearchTerm.bind(this);
+
+        this.storeSearchResults = this.storeSearchResults.bind(this);
+    }
+
+    emitChange() {
+        this.emit(CHANGE_EVENT);
+    }
+
+    addChangeListener(callback) {
+        this.on(CHANGE_EVENT, callback);
+    }
+
+    removeChangeListener(callback) {
+        this.removeListener(CHANGE_EVENT, callback);
+    }
+
+    emitSearchChange() {
+        this.emit(SEARCH_CHANGE_EVENT);
+    }
+
+    addSearchChangeListener(callback) {
+        this.on(SEARCH_CHANGE_EVENT, callback);
+    }
+
+    removeSearchChangeListener(callback) {
+        this.removeListener(SEARCH_CHANGE_EVENT, callback);
+    }
+
+    emitSearchTermChange(doSearch, isMentionSearch) {
+        this.emit(SEARCH_TERM_CHANGE_EVENT, doSearch, isMentionSearch);
+    }
+
+    addSearchTermChangeListener(callback) {
+        this.on(SEARCH_TERM_CHANGE_EVENT, callback);
+    }
+
+    removeSearchTermChangeListener(callback) {
+        this.removeListener(SEARCH_TERM_CHANGE_EVENT, callback);
+    }
+
+    getSearchResults() {
+        return BrowserStore.getItem('search_results');
+    }
+
+    getIsMentionSearch() {
+        return BrowserStore.getItem('is_mention_search');
+    }
+
+    storeSearchTerm(term) {
+        BrowserStore.setItem('search_term', term);
+    }
+
+    getSearchTerm() {
+        return BrowserStore.getItem('search_term');
+    }
+
+    emitMentionDataChange(id, mentionText) {
+        this.emit(MENTION_DATA_CHANGE_EVENT, id, mentionText);
+    }
+
+    addMentionDataChangeListener(callback) {
+        this.on(MENTION_DATA_CHANGE_EVENT, callback);
+    }
+
+    removeMentionDataChangeListener(callback) {
+        this.removeListener(MENTION_DATA_CHANGE_EVENT, callback);
+    }
+
+    emitAddMention(id, username) {
+        this.emit(ADD_MENTION_EVENT, id, username);
+    }
+
+    addAddMentionListener(callback) {
+        this.on(ADD_MENTION_EVENT, callback);
+    }
+
+    removeAddMentionListener(callback) {
+        this.removeListener(ADD_MENTION_EVENT, callback);
+    }
+
+    storeSearchResults(results, isMentionSearch) {
+        BrowserStore.setItem('search_results', results);
+        BrowserStore.setItem('is_mention_search', Boolean(isMentionSearch));
+    }
+}
+
+var SearchStore = new SearchStoreClass();
+
+SearchStore.dispatchToken = AppDispatcher.register((payload) => {
+    var action = payload.action;
+
+    switch (action.type) {
+    case ActionTypes.RECIEVED_SEARCH:
+        SearchStore.storeSearchResults(action.results, action.is_mention_search);
+        SearchStore.emitSearchChange();
+        break;
+    case ActionTypes.RECIEVED_SEARCH_TERM:
+        SearchStore.storeSearchTerm(action.term);
+        SearchStore.emitSearchTermChange(action.do_search, action.is_mention_search);
+        break;
+    case ActionTypes.RECIEVED_MENTION_DATA:
+        SearchStore.emitMentionDataChange(action.id, action.mention_text);
+        break;
+    case ActionTypes.RECIEVED_ADD_MENTION:
+        SearchStore.emitAddMention(action.id, action.username);
+        break;
+    default:
+    }
+});
+
+export default SearchStore;
diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx
index a93257dd2..bf117b3b3 100644
--- a/web/react/utils/client.jsx
+++ b/web/react/utils/client.jsx
@@ -328,6 +328,20 @@ export function getConfig(success, error) {
     });
 }
 
+export function getAnalytics(teamId, name, success, error) {
+    $.ajax({
+        url: '/api/v1/admin/analytics/' + teamId + '/' + name,
+        dataType: 'json',
+        contentType: 'application/json',
+        type: 'GET',
+        success,
+        error: (xhr, status, err) => {
+            var e = handleError('getAnalytics', xhr, status, err);
+            error(e);
+        }
+    });
+}
+
 export function saveConfig(config, success, error) {
     $.ajax({
         url: '/api/v1/admin/save_config',
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index fadab27a7..3140a5d77 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -211,11 +211,15 @@ export function displayDateTime(ticks) {
     }
 
     interval = Math.floor(seconds / 60);
-    if (interval > 1) {
+    if (interval >= 2) {
         return interval + ' minutes ago';
     }
 
-    return '1 minute ago';
+    if (interval >= 1) {
+        return '1 minute ago';
+    }
+
+    return 'just now';
 }
 
 export function displayCommentDateTime(ticks) {