Merge pull request #3 from mattermost/mm-1237

fixes mm-1237 remove sessions and activity log from account settings

web/react/components/settings_sidebar.jsx

@@ -14,11 +14,13 @@ module.exports = React.createClass({
                     <li className={this.props.activeTab == 'general' ? 'active' : ''}><a href="#" onClick={function(){self.updateTab("general");}}><i className="glyphicon glyphicon-cog"></i>General</a></li>
                     <li className={this.props.activeTab == 'security' ? 'active' : ''}><a href="#" onClick={function(){self.updateTab("security");}}><i className="glyphicon glyphicon-lock"></i>Security</a></li>
                     <li className={this.props.activeTab == 'notifications' ? 'active' : ''}><a href="#" onClick={function(){self.updateTab("notifications");}}><i className="glyphicon glyphicon-exclamation-sign"></i>Notifications</a></li>
-                    <li className={this.props.activeTab == 'sessions' ? 'active' : ''}><a href="#" onClick={function(){self.updateTab("sessions");}}><i className="glyphicon glyphicon-globe"></i>Sessions</a></li>
-                    <li className={this.props.activeTab == 'activity_log' ? 'active' : ''}><a href="#" onClick={function(){self.updateTab("activity_log");}}><i className="glyphicon glyphicon-time"></i>Activity Log</a></li>
                     <li className={this.props.activeTab == 'appearance' ? 'active' : ''}><a href="#" onClick={function(){self.updateTab("appearance");}}><i className="glyphicon glyphicon-wrench"></i>Appearance</a></li>
                 </ul>
             </div>
         );
+        /* Temporarily removing sessions and activity logs
+                    <li className={this.props.activeTab == 'sessions' ? 'active' : ''}><a href="#" onClick={function(){self.updateTab("sessions");}}><i className="glyphicon glyphicon-globe"></i>Sessions</a></li>
+                    <li className={this.props.activeTab == 'activity_log' ? 'active' : ''}><a href="#" onClick={function(){self.updateTab("activity_log");}}><i className="glyphicon glyphicon-time"></i>Activity Log</a></li>
+        */
     }
 });

web/react/components/user_settings.jsx

@@ -1126,6 +1126,9 @@ module.exports = React.createClass({
                     <NotificationsTab user={this.state.user} activeSection={this.props.activeSection} updateSection={this.props.updateSection} />
                 </div>
             );
+
+        /* Temporarily removing sessions and activity_log tabs
+
         } else if (this.props.activeTab === 'sessions') {
             return (
                 <div>
@@ -1138,6 +1141,8 @@ module.exports = React.createClass({
                     <AuditTab activeSection={this.props.activeSection} updateSection={this.props.updateSection} />
                 </div>
             );
+        */
+
         } else if (this.props.activeTab === 'appearance') {
             return (
                 <div>