From f60588700d662faba97fee3ccf5a5331f6160f7b Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Mon, 15 Jun 2015 09:40:46 -0400
Subject: fixes mm-1237 remove sessions and activity log from account settings

---
 web/react/components/settings_sidebar.jsx | 6 ++++--
 web/react/components/user_settings.jsx    | 5 +++++
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/settings_sidebar.jsx b/web/react/components/settings_sidebar.jsx
index 34e3c9203..a1546890f 100644
--- a/web/react/components/settings_sidebar.jsx
+++ b/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>
+        */
     }
 });
diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx
index b165a59ad..9af2cbf04 100644
--- a/web/react/components/user_settings.jsx
+++ b/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 sessoions 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>
-- 
cgit v1.2.3-1-g7c22


From 4ba80e3b30c3d3e7fc6e214fbdfdd85553f470c9 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Mon, 15 Jun 2015 09:41:23 -0400
Subject: fix typo

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

(limited to 'web/react/components')

diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx
index 9af2cbf04..a9c2433f2 100644
--- a/web/react/components/user_settings.jsx
+++ b/web/react/components/user_settings.jsx
@@ -1127,7 +1127,7 @@ module.exports = React.createClass({
                 </div>
             );
 
-        /* Temporarily removing sessoions and activity_log tabs
+        /* Temporarily removing sessions and activity_log tabs
 
         } else if (this.props.activeTab === 'sessions') {
             return (
-- 
cgit v1.2.3-1-g7c22