From b3b71c292db2dcbdcfe03db1c24fa3f57f45794e Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Thu, 4 Feb 2016 08:29:15 -0500
Subject: Fix license info localization

---
 web/react/components/admin_console/license_settings.jsx | 14 ++++++++++++--
 web/static/i18n/en.json                                 |  2 +-
 web/static/i18n/es.json                                 |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'web')

diff --git a/web/react/components/admin_console/license_settings.jsx b/web/react/components/admin_console/license_settings.jsx
index 539acd869..1ea176ed0 100644
--- a/web/react/components/admin_console/license_settings.jsx
+++ b/web/react/components/admin_console/license_settings.jsx
@@ -109,7 +109,17 @@ class LicenseSettings extends React.Component {
             );
             licenseType = (
                 <FormattedHTMLMessage
-                    id='admin.license.entrepriseType'
+                    id='admin.license.enterpriseType'
+                    values={{
+                        terms: global.window.mm_config.TermsOfServiceLink,
+                        name: global.window.mm_license.Name,
+                        company: global.window.mm_license.Company,
+                        users: global.window.mm_license.Users,
+                        issued: Utils.displayDate(parseInt(global.window.mm_license.IssuedAt, 10)) + ' ' + Utils.displayTime(parseInt(global.window.mm_license.IssuedAt, 10), true),
+                        start: Utils.displayDate(parseInt(global.window.mm_license.StartsAt, 10)),
+                        expires: Utils.displayDate(parseInt(global.window.mm_license.ExpiresAt, 10)),
+                        ldap: global.window.mm_license.LDAP
+                    }}
                     defaultMessage='<div><p>This compiled release of Mattermost platform is provided under a <a href="http://mattermost.com" target="_blank">commercial license</a>
                     from Mattermost, Inc. based on your subscription level and is subject to the <a href="{terms}" target="_blank">Terms of Service.</a></p>
                     <p>Your subscription details are as follows:</p>
@@ -259,4 +269,4 @@ LicenseSettings.propTypes = {
     intl: intlShape.isRequired
 };
 
-export default injectIntl(LicenseSettings);
\ No newline at end of file
+export default injectIntl(LicenseSettings);
diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json
index a160aa58f..dffda84f3 100644
--- a/web/static/i18n/en.json
+++ b/web/static/i18n/en.json
@@ -255,7 +255,7 @@
   "admin.license.removing": "Removing License...",
   "admin.license.uploading": "Uploading License...",
   "admin.license.enterpriseEdition": "Mattermost Enterprise Edition. Designed for enterprise-scale communication.",
-  "admin.license.entrepriseType": "<div><p>This compiled release of Mattermost platform is provided under a <a href=\"http://mattermost.com\" target=\"_blank\">commercial license</a>\n                    from Mattermost, Inc. based on your subscription level and is subject to the <a href=\"{terms}\" target=\"_blank\">Terms of Service.</a></p>\n                    <p>Your subscription details are as follows:</p>\n                    Name: {name}<br />\n                    Company or organization name: {company}<br/>\n                    Number of users: {users}<br/>\n                    License issued: {issued}<br/>\n                    Start date of license: {start}<br/>\n                    Expiry date of license: {expires}<br/>\n                    LDAP: {ldap}<br/></div>",
+  "admin.license.enterpriseType": "<div><p>This compiled release of Mattermost platform is provided under a <a href=\"http://mattermost.com\" target=\"_blank\">commercial license</a> from Mattermost, Inc. based on your subscription level and is subject to the <a href=\"{terms}\" target=\"_blank\">Terms of Service.</a></p><p>Your subscription details are as follows:</p>Name: {name}<br />Company or organization name: {company}<br/>Number of users: {users}<br/>License issued: {issued}<br/>Start date of license: {start}<br/>Expiry date of license: {expires}<br/>LDAP: {ldap}<br/></div>",
   "admin.license.keyRemove": "Remove Enterprise License and Downgrade Server",
   "admin.licence.keyMigration": "If you’re migrating servers you may need to remove your license key from this server in order to install it on a new server. To start,\n                            <a href=\"http://mattermost.com\" target=\"_blank\">disable all Enterprise Edition features on this server</a>.\n                            This will enable the ability to remove the license key and downgrade this server from Enterprise Edition to Team Edition.",
   "admin.license.teamEdition": "Mattermost Team Edition. Designed for teams from 5 to 50 users.",
diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json
index 0a780c442..b6152474c 100644
--- a/web/static/i18n/es.json
+++ b/web/static/i18n/es.json
@@ -211,7 +211,7 @@
   "admin.licence.keyMigration": "Si estás migrando servidores es posible que necesites remover tu licencia de este servidor para poder instalarlo en un servidor nuevo. Para empezar,\n                            <a href=\"http://mattermost.com\" target=\"_blank\">deshabilita todas las características de la Edición Enterprise de este servidor</a>.\n                            Esta operación habilitará la opción para remover la licencia y degradar este servidor de la Edición Enterprise a la Edición Team.",
   "admin.license.edition": "Edición: ",
   "admin.license.enterpriseEdition": "Mattermost Edición Enterprise. Diseñada para comunicación de escala empresarial.",
-  "admin.license.entrepriseType": "<div><p>Esta versión compilada de la plataforma de Mattermost es proporcionada bajo una <a href=\"http://mattermost.com\" target=\"_blank\">licencia comercial</a>\n                    de Mattermost, Inc. basado en tu nivel de subscripción y sujeto a los <a href=\"{terms}\" target=\"_blank\">Términos del Servicio.</a></p>\n                    <p>Los detalles de tu subscripción son los siguientes:</p>\n                    Nombre: {name}<br />\n                    Nombre de compañia u organización: {company}<br/>\n                    Cantidad de usuarios: {users}<br/>\n                    Licencia emitida por: {issued}<br/>\n                    Inicio de la licencia: {start}<br/>\n                    Fecha de expiración: {expires}<br/>\n                    LDAP: {ldap}<br/></div>",
+  "admin.license.enterpriseType": "<div><p>Esta versión compilada de la plataforma de Mattermost es proporcionada bajo una <a href=\"http://mattermost.com\" target=\"_blank\">licencia comercial</a> de Mattermost, Inc. basado en tu nivel de subscripción y sujeto a los <a href=\"{terms}\" target=\"_blank\">Términos del Servicio.</a></p><p>Los detalles de tu subscripción son los siguientes:</p>Nombre: {name}<br />Nombre de compañia u organización: {company}<br/>Cantidad de usuarios: {users}<br/>Licencia emitida por: {issued}<br/>Inicio de la licencia: {start}<br/>Fecha de expiración: {expires}<br/>LDAP: {ldap}<br/></div>",
   "admin.license.key": "Llave de la Licencia: ",
   "admin.license.keyRemove": "Remover la Licencia Enterprise y Degradar el Servidor",
   "admin.license.removing": "Removiendo Licencia...",
-- 
cgit v1.2.3-1-g7c22


From da7832ed8a26ec180787614d84f227bf45e305af Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Thu, 4 Feb 2016 09:20:04 -0500
Subject: Disable remove license button until LDAP is disabled

---
 web/react/components/admin_console/admin_controller.jsx | 2 +-
 web/react/components/admin_console/license_settings.jsx | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'web')

diff --git a/web/react/components/admin_console/admin_controller.jsx b/web/react/components/admin_console/admin_controller.jsx
index 360ae3ef3..695e2083a 100644
--- a/web/react/components/admin_console/admin_controller.jsx
+++ b/web/react/components/admin_console/admin_controller.jsx
@@ -160,7 +160,7 @@ export default class AdminController extends React.Component {
             } else if (this.state.selected === 'ldap_settings') {
                 tab = <LdapSettingsTab config={this.state.config} />;
             } else if (this.state.selected === 'license') {
-                tab = <LicenseSettingsTab />;
+                tab = <LicenseSettingsTab config={this.state.config} />;
             } else if (this.state.selected === 'team_users') {
                 if (this.state.teams) {
                     tab = <TeamUsersTab team={this.state.teams[this.state.selectedTeam]} />;
diff --git a/web/react/components/admin_console/license_settings.jsx b/web/react/components/admin_console/license_settings.jsx
index 1ea176ed0..3332f37ef 100644
--- a/web/react/components/admin_console/license_settings.jsx
+++ b/web/react/components/admin_console/license_settings.jsx
@@ -136,6 +136,7 @@ class LicenseSettings extends React.Component {
             licenseKey = (
                 <div className='col-sm-8'>
                     <button
+                        disabled={this.props.config.LdapSettings.Enable}
                         className='btn btn-danger'
                         onClick={this.handleRemove}
                         id='remove-button'
@@ -266,7 +267,8 @@ class LicenseSettings extends React.Component {
 }
 
 LicenseSettings.propTypes = {
-    intl: intlShape.isRequired
+    intl: intlShape.isRequired,
+    config: React.PropTypes.object
 };
 
 export default injectIntl(LicenseSettings);
-- 
cgit v1.2.3-1-g7c22


From a3df1eaa5520b5aab871464d767f1f56b84b6158 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Thu, 4 Feb 2016 09:29:00 -0500
Subject: Rename audits tab

---
 web/react/components/admin_console/admin_sidebar.jsx | 2 +-
 web/react/components/admin_console/audits.jsx        | 2 +-
 web/static/i18n/en.json                              | 9 ++++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'web')

diff --git a/web/react/components/admin_console/admin_sidebar.jsx b/web/react/components/admin_console/admin_sidebar.jsx
index 642bfe9d7..7d74013f2 100644
--- a/web/react/components/admin_console/admin_sidebar.jsx
+++ b/web/react/components/admin_console/admin_sidebar.jsx
@@ -225,7 +225,7 @@ export default class AdminSidebar extends React.Component {
                     >
                         <FormattedMessage
                             id='admin.sidebar.audits'
-                            defaultMessage='Audits'
+                            defaultMessage='Compliance and Auditing'
                         />
                     </a>
                 </li>
diff --git a/web/react/components/admin_console/audits.jsx b/web/react/components/admin_console/audits.jsx
index 866539b3d..01db939ef 100644
--- a/web/react/components/admin_console/audits.jsx
+++ b/web/react/components/admin_console/audits.jsx
@@ -72,7 +72,7 @@ export default class Audits extends React.Component {
                 <h3>
                     <FormattedMessage
                         id='admin.audits.title'
-                        defaultMessage='Server Audits'
+                        defaultMessage='User Activity'
                     />
                 </h3>
                 <button
diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json
index dffda84f3..bd3a44392 100644
--- a/web/static/i18n/en.json
+++ b/web/static/i18n/en.json
@@ -50,6 +50,8 @@
   "admin.sidebar.teams": "TEAMS ({count})",
   "admin.sidebar.other": "OTHER",
   "admin.sidebar.logs": "Logs",
+  "admin.sidebar.audits": "Compliance and Auditing",
+  "admin.analytics.loading": "Loading...",
   "admin.analytics.totalUsers": "Total Users",
   "admin.analytics.publicChannels": "Public Channels",
   "admin.analytics.privateGroups": "Private Groups",
@@ -293,6 +295,11 @@
   "admin.log.save": "Save",
   "admin.logs.title": "Server Logs",
   "admin.logs.reload": "Reload",
+<<<<<<< HEAD
+=======
+  "admin.audits.title": "User Activity",
+  "admin.audits.reload": "Reload",
+>>>>>>> Rename audits tab
   "admin.privacy.saving": "Saving Config...",
   "admin.privacy.title": "Privacy Settings",
   "admin.privacy.showEmailTitle": "Show Email Address: ",
@@ -1257,4 +1264,4 @@
   "intro_messages.beginning": "Beginning of {name}",
   "intro_messages.invite": "Invite others to this {type}",
   "intro_messages.setHeader": "Set a Header"
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-1-g7c22


From 66a5bdba2e622dc542d1add3acd50a5f2549335a Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Thu, 4 Feb 2016 10:35:31 -0500
Subject: Convert audit_table to a proper table

---
 web/react/components/access_history_modal.jsx |   3 +-
 web/react/components/admin_console/audits.jsx |   3 +-
 web/react/components/audit_table.jsx          | 652 +++++++++++++-------------
 web/static/i18n/en.json                       | 102 ++--
 4 files changed, 375 insertions(+), 385 deletions(-)

(limited to 'web')

diff --git a/web/react/components/access_history_modal.jsx b/web/react/components/access_history_modal.jsx
index 98b1d7cc1..af4d3fb0f 100644
--- a/web/react/components/access_history_modal.jsx
+++ b/web/react/components/access_history_modal.jsx
@@ -73,7 +73,8 @@ class AccessHistoryModal extends React.Component {
             content = (
                 <AuditTable
                     audits={this.state.audits}
-                    moreInfo={this.state.moreInfo}
+                    showIp={true}
+                    showSession={true}
                 />
             );
         }
diff --git a/web/react/components/admin_console/audits.jsx b/web/react/components/admin_console/audits.jsx
index 01db939ef..173e63b45 100644
--- a/web/react/components/admin_console/audits.jsx
+++ b/web/react/components/admin_console/audits.jsx
@@ -60,8 +60,9 @@ export default class Audits extends React.Component {
                 <div style={{margin: '10px'}}>
                 <AuditTable
                     audits={this.state.audits}
-                    oneLine={true}
                     showUserId={true}
+                    showIp={true}
+                    showSession={true}
                 />
                 </div>
             );
diff --git a/web/react/components/audit_table.jsx b/web/react/components/audit_table.jsx
index cdca7e8d6..ce547eb45 100644
--- a/web/react/components/audit_table.jsx
+++ b/web/react/components/audit_table.jsx
@@ -183,389 +183,383 @@ const holders = defineMessages({
     loginFailure: {
         id: 'audit_table.loginFailure',
         defaultMessage: ' (Login failure)'
-    },
-    userId: {
-        id: 'audit_table.userId',
-        defaultMessage: 'User ID'
     }
 });
 
 class AuditTable extends React.Component {
     constructor(props) {
         super(props);
-
-        this.handleMoreInfo = this.handleMoreInfo.bind(this);
-        this.formatAuditInfo = this.formatAuditInfo.bind(this);
-        this.handleRevokedSession = this.handleRevokedSession.bind(this);
-
-        this.state = {moreInfo: []};
-    }
-    handleMoreInfo(index) {
-        var newMoreInfo = this.state.moreInfo;
-        newMoreInfo[index] = true;
-        this.setState({moreInfo: newMoreInfo});
     }
-    handleRevokedSession(sessionId) {
-        return this.props.intl.formatMessage(holders.sessionRevoked, {sessionId: sessionId});
-    }
-    formatAuditInfo(currentAudit) {
-        const currentActionURL = currentAudit.action.replace(/\/api\/v[1-9]/, '');
+    render() {
+        var accessList = [];
 
         const {formatMessage} = this.props.intl;
-        let currentAuditDesc = '';
-
-        if (currentActionURL.indexOf('/channels') === 0) {
-            const channelInfo = currentAudit.extra_info.split(' ');
-            const channelNameField = channelInfo[0].split('=');
-
-            let channelURL = '';
-            let channelObj;
-            let channelName = '';
-            if (channelNameField.indexOf('name') >= 0) {
-                channelURL = channelNameField[channelNameField.indexOf('name') + 1];
-                channelObj = ChannelStore.getByName(channelURL);
-                if (channelObj) {
-                    channelName = channelObj.display_name;
-                } else {
-                    channelName = channelURL;
-                }
-            }
-
-            switch (currentActionURL) {
-            case '/channels/create':
-                currentAuditDesc = formatMessage(holders.channelCreated, {channelName: channelName});
-                break;
-            case '/channels/create_direct':
-                currentAuditDesc = formatMessage(holders.establishedDM, {username: Utils.getDirectTeammate(channelObj.id).username});
-                break;
-            case '/channels/update':
-                currentAuditDesc = formatMessage(holders.nameUpdated, {channelName: channelName});
-                break;
-            case '/channels/update_desc': // support the old path
-            case '/channels/update_header':
-                currentAuditDesc = formatMessage(holders.headerUpdated, {channelName: channelName});
-                break;
-            default: {
-                let userIdField = [];
-                let userId = '';
-                let username = '';
-
-                if (channelInfo[1]) {
-                    userIdField = channelInfo[1].split('=');
-
-                    if (userIdField.indexOf('user_id') >= 0) {
-                        userId = userIdField[userIdField.indexOf('user_id') + 1];
-                        username = UserStore.getProfile(userId).username;
-                    }
-                }
+        for (var i = 0; i < this.props.audits.length; i++) {
+            const audit = this.props.audits[i];
+            const auditInfo = formatAuditInfo(audit, formatMessage);
 
-                if (/\/channels\/[A-Za-z0-9]+\/delete/.test(currentActionURL)) {
-                    currentAuditDesc = formatMessage(holders.channelDeleted, {url: channelURL});
-                } else if (/\/channels\/[A-Za-z0-9]+\/add/.test(currentActionURL)) {
-                    currentAuditDesc = formatMessage(holders.userAdded, {username: username, channelName: channelName});
-                } else if (/\/channels\/[A-Za-z0-9]+\/remove/.test(currentActionURL)) {
-                    currentAuditDesc = formatMessage(holders.userRemoved, {username: username, channelName: channelName});
-                }
+            let uContent;
+            if (this.props.showUserId) {
+                uContent = <td>{auditInfo.userId}</td>;
+            }
 
-                break;
+            let iContent;
+            if (this.props.showIp) {
+                iContent = <td>{auditInfo.ip}</td>;
             }
+
+            let sContent;
+            if (this.props.showSession) {
+                sContent = <td>{auditInfo.sessionId}</td>;
             }
-        } else if (currentActionURL.indexOf('/oauth') === 0) {
-            const oauthInfo = currentAudit.extra_info.split(' ');
 
-            switch (currentActionURL) {
-            case '/oauth/register': {
-                const clientIdField = oauthInfo[0].split('=');
+            accessList[i] = (
+                <tr key={audit.id}>
+                    <td>{auditInfo.timestamp}</td>
+                    {uContent}
+                    <td>{auditInfo.desc}</td>
+                    {iContent}
+                    {sContent}
+                </tr>
+            );
+        }
 
-                if (clientIdField[0] === 'client_id') {
-                    currentAuditDesc = formatMessage(holders.attemptedRegisterApp, {id: clientIdField[1]});
-                }
+        let userIdContent;
+        if (this.props.showUserId) {
+            userIdContent = (
+                <th>
+                    <FormattedMessage
+                        id='audit_table.userId'
+                        defaultMessage='User ID'
+                    />
+                </th>
+            );
+        }
 
-                break;
-            }
-            case '/oauth/allow':
-                if (oauthInfo[0] === 'attempt') {
-                    currentAuditDesc = formatMessage(holders.attemptedAllowOAuthAccess);
-                } else if (oauthInfo[0] === 'success') {
-                    currentAuditDesc = formatMessage(holders.successfullOAuthAccess);
-                } else if (oauthInfo[0] === 'fail - redirect_uri did not match registered callback') {
-                    currentAuditDesc = formatMessage(holders.failedOAuthAccess);
-                }
+        let ipContent;
+        if (this.props.showIp) {
+            ipContent = (
+                <th>
+                    <FormattedMessage
+                        id='audit_table.ip'
+                        defaultMessage='IP Address'
+                    />
+                </th>
+            );
+        }
 
-                break;
-            case '/oauth/access_token':
-                if (oauthInfo[0] === 'attempt') {
-                    currentAuditDesc = formatMessage(holders.attemptedOAuthToken);
-                } else if (oauthInfo[0] === 'success') {
-                    currentAuditDesc = formatMessage(holders.successfullOAuthToken);
-                } else {
-                    const oauthTokenFailure = oauthInfo[0].split('-');
-
-                    if (oauthTokenFailure[0].trim() === 'fail' && oauthTokenFailure[1]) {
-                        currentAuditDesc = formatMessage(oauthTokenFailure, {token: oauthTokenFailure[1].trim()});
-                    }
-                }
+        let sessionContent;
+        if (this.props.showSession) {
+            sessionContent = (
+                <th>
+                    <FormattedMessage
+                        id='audit_table.session'
+                        defaultMessage='Session ID'
+                    />
+                </th>
+            );
+        }
 
-                break;
-            default:
-                break;
-            }
-        } else if (currentActionURL.indexOf('/users') === 0) {
-            const userInfo = currentAudit.extra_info.split(' ');
-
-            switch (currentActionURL) {
-            case '/users/login':
-                if (userInfo[0] === 'attempt') {
-                    currentAuditDesc = formatMessage(holders.attemptedLogin);
-                } else if (userInfo[0] === 'success') {
-                    currentAuditDesc = formatMessage(holders.successfullLogin);
-                } else if (userInfo[0]) {
-                    currentAuditDesc = formatMessage(holders.failedLogin);
-                }
+        return (
+            <table className='table'>
+                <thead>
+                    <tr>
+                        <th>
+                            <FormattedMessage
+                                id='audit_table.timestamp'
+                                defaultMessage='Timestamp'
+                            />
+                        </th>
+                        {userIdContent}
+                        <th>
+                            <FormattedMessage
+                                id='audit_table.action'
+                                defaultMessage='Action'
+                            />
+                        </th>
+                        {ipContent}
+                        {sessionContent}
+                    </tr>
+                </thead>
+                <tbody>
+                    {accessList}
+                </tbody>
+            </table>
+        );
+    }
+}
 
-                break;
-            case '/users/revoke_session':
-                currentAuditDesc = this.handleRevokedSession(userInfo[0].split('=')[1]);
-                break;
-            case '/users/newimage':
-                currentAuditDesc = formatMessage(holders.updatePicture);
-                break;
-            case '/users/update':
-                currentAuditDesc = formatMessage(holders.updateGeneral);
-                break;
-            case '/users/newpassword':
-                if (userInfo[0] === 'attempted') {
-                    currentAuditDesc = formatMessage(holders.attemptedPassword);
-                } else if (userInfo[0] === 'completed') {
-                    currentAuditDesc = formatMessage(holders.successfullPassword);
-                } else if (userInfo[0] === 'failed - tried to update user password who was logged in through oauth') {
-                    currentAuditDesc = formatMessage(holders.failedPassword);
-                }
+AuditTable.propTypes = {
+    intl: intlShape.isRequired,
+    audits: React.PropTypes.array.isRequired,
+    showUserId: React.PropTypes.bool,
+    showIp: React.PropTypes.bool,
+    showSession: React.PropTypes.bool
+};
 
-                break;
-            case '/users/update_roles': {
-                const userRoles = userInfo[0].split('=')[1];
+export default injectIntl(AuditTable);
 
-                currentAuditDesc = formatMessage(holders.updatedRol);
-                if (userRoles.trim()) {
-                    currentAuditDesc += userRoles;
-                } else {
-                    currentAuditDesc += formatMessage(holders.member);
+export function formatAuditInfo(audit, formatMessage) {
+    const actionURL = audit.action.replace(/\/api\/v[1-9]/, '');
+    let auditDesc = '';
+
+    if (actionURL.indexOf('/channels') === 0) {
+        const channelInfo = audit.extra_info.split(' ');
+        const channelNameField = channelInfo[0].split('=');
+
+        let channelURL = '';
+        let channelObj;
+        let channelName = '';
+        if (channelNameField.indexOf('name') >= 0) {
+            channelURL = channelNameField[channelNameField.indexOf('name') + 1];
+            channelObj = ChannelStore.getByName(channelURL);
+            if (channelObj) {
+                channelName = channelObj.display_name;
+            } else {
+                channelName = channelURL;
+            }
+        }
+
+        switch (actionURL) {
+        case '/channels/create':
+            auditDesc = formatMessage(holders.channelCreated, {channelName: channelName});
+            break;
+        case '/channels/create_direct':
+            auditDesc = formatMessage(holders.establishedDM, {username: Utils.getDirectTeammate(channelObj.id).username});
+            break;
+        case '/channels/update':
+            auditDesc = formatMessage(holders.nameUpdated, {channelName: channelName});
+            break;
+        case '/channels/update_desc': // support the old path
+        case '/channels/update_header':
+            auditDesc = formatMessage(holders.headerUpdated, {channelName: channelName});
+            break;
+        default: {
+            let userIdField = [];
+            let userId = '';
+            let username = '';
+
+            if (channelInfo[1]) {
+                userIdField = channelInfo[1].split('=');
+
+                if (userIdField.indexOf('user_id') >= 0) {
+                    userId = userIdField[userIdField.indexOf('user_id') + 1];
+                    username = UserStore.getProfile(userId).username;
                 }
+            }
 
-                break;
+            if (/\/channels\/[A-Za-z0-9]+\/delete/.test(actionURL)) {
+                auditDesc = formatMessage(holders.channelDeleted, {url: channelURL});
+            } else if (/\/channels\/[A-Za-z0-9]+\/add/.test(actionURL)) {
+                auditDesc = formatMessage(holders.userAdded, {username: username, channelName: channelName});
+            } else if (/\/channels\/[A-Za-z0-9]+\/remove/.test(actionURL)) {
+                auditDesc = formatMessage(holders.userRemoved, {username: username, channelName: channelName});
             }
-            case '/users/update_active': {
-                const updateType = userInfo[0].split('=')[0];
-                const updateField = userInfo[0].split('=')[1];
-
-                /* Either describes account activation/deactivation or a revoked session as part of an account deactivation */
-                if (updateType === 'active') {
-                    if (updateField === 'true') {
-                        currentAuditDesc = formatMessage(holders.accountActive);
-                    } else if (updateField === 'false') {
-                        currentAuditDesc = formatMessage(holders.accountInactive);
-                    }
 
-                    const actingUserInfo = userInfo[1].split('=');
-                    if (actingUserInfo[0] === 'session_user') {
-                        const actingUser = UserStore.getProfile(actingUserInfo[1]);
-                        const currentUser = UserStore.getCurrentUser();
-                        if (currentUser && actingUser && (Utils.isAdmin(currentUser.roles) || Utils.isSystemAdmin(currentUser.roles))) {
-                            currentAuditDesc += formatMessage(holders.by, {username: actingUser.username});
-                        } else if (currentUser && actingUser) {
-                            currentAuditDesc += formatMessage(holders.byAdmin);
-                        }
-                    }
-                } else if (updateType === 'session_id') {
-                    currentAuditDesc = this.handleRevokedSession(updateField);
-                }
+            break;
+        }
+        }
+    } else if (actionURL.indexOf('/oauth') === 0) {
+        const oauthInfo = audit.extra_info.split(' ');
+
+        switch (actionURL) {
+        case '/oauth/register': {
+            const clientIdField = oauthInfo[0].split('=');
 
-                break;
+            if (clientIdField[0] === 'client_id') {
+                auditDesc = formatMessage(holders.attemptedRegisterApp, {id: clientIdField[1]});
             }
-            case '/users/send_password_reset':
-                currentAuditDesc = formatMessage(holders.sentEmail, {email: userInfo[0].split('=')[1]});
-                break;
-            case '/users/reset_password':
-                if (userInfo[0] === 'attempt') {
-                    currentAuditDesc = formatMessage(holders.attemptedReset);
-                } else if (userInfo[0] === 'success') {
-                    currentAuditDesc = formatMessage(holders.successfullReset);
-                }
 
-                break;
-            case '/users/update_notify':
-                currentAuditDesc = formatMessage(holders.updateGlobalNotifications);
-                break;
-            default:
-                break;
+            break;
+        }
+        case '/oauth/allow':
+            if (oauthInfo[0] === 'attempt') {
+                auditDesc = formatMessage(holders.attemptedAllowOAuthAccess);
+            } else if (oauthInfo[0] === 'success') {
+                auditDesc = formatMessage(holders.successfullOAuthAccess);
+            } else if (oauthInfo[0] === 'fail - redirect_uri did not match registered callback') {
+                auditDesc = formatMessage(holders.failedOAuthAccess);
             }
-        } else if (currentActionURL.indexOf('/hooks') === 0) {
-            const webhookInfo = currentAudit.extra_info.split(' ');
-
-            switch (currentActionURL) {
-            case '/hooks/incoming/create':
-                if (webhookInfo[0] === 'attempt') {
-                    currentAuditDesc = formatMessage(holders.attemptedWebhookCreate);
-                } else if (webhookInfo[0] === 'success') {
-                    currentAuditDesc = formatMessage(holders.succcessfullWebhookCreate);
-                } else if (webhookInfo[0] === 'fail - bad channel permissions') {
-                    currentAuditDesc = formatMessage(holders.failedWebhookCreate);
-                }
 
-                break;
-            case '/hooks/incoming/delete':
-                if (webhookInfo[0] === 'attempt') {
-                    currentAuditDesc = formatMessage(holders.attemptedWebhookDelete);
-                } else if (webhookInfo[0] === 'success') {
-                    currentAuditDesc = formatMessage(holders.successfullWebhookDelete);
-                } else if (webhookInfo[0] === 'fail - inappropriate conditions') {
-                    currentAuditDesc = formatMessage(holders.failedWebhookDelete);
+            break;
+        case '/oauth/access_token':
+            if (oauthInfo[0] === 'attempt') {
+                auditDesc = formatMessage(holders.attemptedOAuthToken);
+            } else if (oauthInfo[0] === 'success') {
+                auditDesc = formatMessage(holders.successfullOAuthToken);
+            } else {
+                const oauthTokenFailure = oauthInfo[0].split('-');
+
+                if (oauthTokenFailure[0].trim() === 'fail' && oauthTokenFailure[1]) {
+                    auditDesc = formatMessage(oauthTokenFailure, {token: oauthTokenFailure[1].trim()});
                 }
+            }
 
-                break;
-            default:
-                break;
+            break;
+        default:
+            break;
+        }
+    } else if (actionURL.indexOf('/users') === 0) {
+        const userInfo = audit.extra_info.split(' ');
+
+        switch (actionURL) {
+        case '/users/login':
+            if (userInfo[0] === 'attempt') {
+                auditDesc = formatMessage(holders.attemptedLogin);
+            } else if (userInfo[0] === 'success') {
+                auditDesc = formatMessage(holders.successfullLogin);
+            } else if (userInfo[0]) {
+                auditDesc = formatMessage(holders.failedLogin);
             }
-        } else {
-            switch (currentActionURL) {
-            case '/logout':
-                currentAuditDesc = formatMessage(holders.logout);
-                break;
-            case '/verify_email':
-                currentAuditDesc = formatMessage(holders.verified);
-                break;
-            default:
-                break;
+
+            break;
+        case '/users/revoke_session':
+            auditDesc = formatMessage(holders.sessionRevoked, {sessionId: userInfo[0].split('=')[1]});
+            break;
+        case '/users/newimage':
+            auditDesc = formatMessage(holders.updatePicture);
+            break;
+        case '/users/update':
+            auditDesc = formatMessage(holders.updateGeneral);
+            break;
+        case '/users/newpassword':
+            if (userInfo[0] === 'attempted') {
+                auditDesc = formatMessage(holders.attemptedPassword);
+            } else if (userInfo[0] === 'completed') {
+                auditDesc = formatMessage(holders.successfullPassword);
+            } else if (userInfo[0] === 'failed - tried to update user password who was logged in through oauth') {
+                auditDesc = formatMessage(holders.failedPassword);
             }
-        }
 
-        /* If all else fails... */
-        if (!currentAuditDesc) {
-            /* Currently not called anywhere */
-            if (currentAudit.extra_info.indexOf('revoked_all=') >= 0) {
-                currentAuditDesc = formatMessage(holders.revokedAll);
+            break;
+        case '/users/update_roles': {
+            const userRoles = userInfo[0].split('=')[1];
+
+            auditDesc = formatMessage(holders.updatedRol);
+            if (userRoles.trim()) {
+                auditDesc += userRoles;
             } else {
-                let currentActionDesc = '';
-                if (currentActionURL && currentActionURL.lastIndexOf('/') !== -1) {
-                    currentActionDesc = currentActionURL.substring(currentActionURL.lastIndexOf('/') + 1).replace('_', ' ');
-                    currentActionDesc = Utils.toTitleCase(currentActionDesc);
-                }
+                auditDesc += formatMessage(holders.member);
+            }
 
-                let currentExtraInfoDesc = '';
-                if (currentAudit.extra_info) {
-                    currentExtraInfoDesc = currentAudit.extra_info;
+            break;
+        }
+        case '/users/update_active': {
+            const updateType = userInfo[0].split('=')[0];
+            const updateField = userInfo[0].split('=')[1];
+
+            /* Either describes account activation/deactivation or a revoked session as part of an account deactivation */
+            if (updateType === 'active') {
+                if (updateField === 'true') {
+                    auditDesc = formatMessage(holders.accountActive);
+                } else if (updateField === 'false') {
+                    auditDesc = formatMessage(holders.accountInactive);
+                }
 
-                    if (currentExtraInfoDesc.indexOf('=') !== -1) {
-                        currentExtraInfoDesc = currentExtraInfoDesc.substring(currentExtraInfoDesc.indexOf('=') + 1);
+                const actingUserInfo = userInfo[1].split('=');
+                if (actingUserInfo[0] === 'session_user') {
+                    const actingUser = UserStore.getProfile(actingUserInfo[1]);
+                    const user = UserStore.getCurrentUser();
+                    if (user && actingUser && (Utils.isAdmin(user.roles) || Utils.isSystemAdmin(user.roles))) {
+                        auditDesc += formatMessage(holders.by, {username: actingUser.username});
+                    } else if (user && actingUser) {
+                        auditDesc += formatMessage(holders.byAdmin);
                     }
                 }
-                currentAuditDesc = currentActionDesc + ' ' + currentExtraInfoDesc;
+            } else if (updateType === 'session_id') {
+                auditDesc = formatMessage(holders.sessionRevoked, {sessionId: updateField});
             }
-        }
 
-        const currentDate = new Date(currentAudit.create_at);
-        let currentAuditInfo = currentDate.toLocaleDateString(global.window.mm_locale, {month: 'short', day: '2-digit', year: 'numeric'}) + ' - ' + currentDate.toLocaleTimeString(global.window.mm_locale, {hour: '2-digit', minute: '2-digit'});
+            break;
+        }
+        case '/users/send_password_reset':
+            auditDesc = formatMessage(holders.sentEmail, {email: userInfo[0].split('=')[1]});
+            break;
+        case '/users/reset_password':
+            if (userInfo[0] === 'attempt') {
+                auditDesc = formatMessage(holders.attemptedReset);
+            } else if (userInfo[0] === 'success') {
+                auditDesc = formatMessage(holders.successfullReset);
+            }
 
-        if (this.props.showUserId) {
-            currentAuditInfo += ' | ' + formatMessage(holders.userId) + ': ' + currentAudit.user_id;
+            break;
+        case '/users/update_notify':
+            auditDesc = formatMessage(holders.updateGlobalNotifications);
+            break;
+        default:
+            break;
         }
+    } else if (actionURL.indexOf('/hooks') === 0) {
+        const webhookInfo = audit.extra_info.split(' ');
+
+        switch (actionURL) {
+        case '/hooks/incoming/create':
+            if (webhookInfo[0] === 'attempt') {
+                auditDesc = formatMessage(holders.attemptedWebhookCreate);
+            } else if (webhookInfo[0] === 'success') {
+                auditDesc = formatMessage(holders.succcessfullWebhookCreate);
+            } else if (webhookInfo[0] === 'fail - bad channel permissions') {
+                auditDesc = formatMessage(holders.failedWebhookCreate);
+            }
 
-        currentAuditInfo += ' | ' + currentAuditDesc;
+            break;
+        case '/hooks/incoming/delete':
+            if (webhookInfo[0] === 'attempt') {
+                auditDesc = formatMessage(holders.attemptedWebhookDelete);
+            } else if (webhookInfo[0] === 'success') {
+                auditDesc = formatMessage(holders.successfullWebhookDelete);
+            } else if (webhookInfo[0] === 'fail - inappropriate conditions') {
+                auditDesc = formatMessage(holders.failedWebhookDelete);
+            }
 
-        return currentAuditInfo;
+            break;
+        default:
+            break;
+        }
+    } else {
+        switch (actionURL) {
+        case '/logout':
+            auditDesc = formatMessage(holders.logout);
+            break;
+        case '/verify_email':
+            auditDesc = formatMessage(holders.verified);
+            break;
+        default:
+            break;
+        }
     }
-    render() {
-        var accessList = [];
 
-        const {formatMessage} = this.props.intl;
-        for (var i = 0; i < this.props.audits.length; i++) {
-            const currentAudit = this.props.audits[i];
-            const currentAuditInfo = this.formatAuditInfo(currentAudit);
-
-            let moreInfo;
-            if (!this.props.oneLine) {
-                moreInfo = (
-                    <a
-                        href='#'
-                        className='theme'
-                        onClick={this.handleMoreInfo.bind(this, i)}
-                    >
-                        <FormattedMessage
-                            id='audit_table.moreInfo'
-                            defaultMessage='More info'
-                        />
-                    </a>
-                );
+    /* If all else fails... */
+    if (!auditDesc) {
+        /* Currently not called anywhere */
+        if (audit.extra_info.indexOf('revoked_all=') >= 0) {
+            auditDesc = formatMessage(holders.revokedAll);
+        } else {
+            let actionDesc = '';
+            if (actionURL && actionURL.lastIndexOf('/') !== -1) {
+                actionDesc = actionURL.substring(actionURL.lastIndexOf('/') + 1).replace('_', ' ');
+                actionDesc = Utils.toTitleCase(actionDesc);
             }
 
-            if (this.state.moreInfo[i]) {
-                if (!currentAudit.session_id) {
-                    currentAudit.session_id = 'N/A';
+            let extraInfoDesc = '';
+            if (audit.extra_info) {
+                extraInfoDesc = audit.extra_info;
 
-                    if (currentAudit.action.search('/users/login') >= 0) {
-                        if (currentAudit.extra_info === 'attempt') {
-                            currentAudit.session_id += formatMessage(holders.loginAttempt);
-                        } else {
-                            currentAudit.session_id += formatMessage(holders.loginFailure);
-                        }
-                    }
+                if (extraInfoDesc.indexOf('=') !== -1) {
+                    extraInfoDesc = extraInfoDesc.substring(extraInfoDesc.indexOf('=') + 1);
                 }
-
-                moreInfo = (
-                    <div>
-                        <div>
-                            <FormattedMessage
-                                id='audit_table.ip'
-                                defaultMessage='IP: {ip}'
-                                values={{
-                                    ip: currentAudit.ip_address
-                                }}
-                            />
-                        </div>
-                        <div>
-                            <FormattedMessage
-                                id='audit_table.session'
-                                defaultMessage='Session ID: {id}'
-                                values={{
-                                    id: currentAudit.session_id
-                                }}
-                            />
-                        </div>
-                    </div>
-                );
             }
-
-            var divider = null;
-            if (i < this.props.audits.length - 1) {
-                divider = (<div className='divider-light'></div>);
-            }
-
-            accessList[i] = (
-                <div
-                    key={'accessHistoryEntryKey' + i}
-                    className='access-history__table'
-                >
-                    <div className='access__report'>
-                        <div className='report__time'>{currentAuditInfo}</div>
-                        <div className='report__info'>
-                            {moreInfo}
-                        </div>
-                        {divider}
-                    </div>
-                </div>
-            );
+            auditDesc = actionDesc + ' ' + extraInfoDesc;
         }
-
-        return <form role='form'>{accessList}</form>;
     }
-}
 
-AuditTable.propTypes = {
-    intl: intlShape.isRequired,
-    audits: React.PropTypes.array.isRequired,
-    oneLine: React.PropTypes.bool,
-    showUserId: React.PropTypes.bool
-};
+    const date = new Date(audit.create_at);
+    let auditInfo = {};
+    auditInfo.timestamp = date.toLocaleDateString(global.window.mm_locale, {month: 'short', day: '2-digit', year: 'numeric'}) + ' - ' + date.toLocaleTimeString(global.window.mm_locale, {hour: '2-digit', minute: '2-digit'});
+    auditInfo.userId = audit.user_id;
+    auditInfo.desc = auditDesc;
+    auditInfo.ip = audit.ip_address;
+    auditInfo.sessionId = audit.session_id;
 
-export default injectIntl(AuditTable);
+    return auditInfo;
+}
diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json
index bd3a44392..1ebb91c93 100644
--- a/web/static/i18n/en.json
+++ b/web/static/i18n/en.json
@@ -8,6 +8,54 @@
   "about.date": "Build Date:",
   "about.hash": "Build Hash:",
   "about.close": "Close",
+  "audit_table.sessionRevoked": "The session with id {sessionId} was revoked",
+  "audit_table.channelCreated": "Created the {channelName} channel/group",
+  "audit_table.establishedDM": "Established a direct message channel with {username}",
+  "audit_table.nameUpdated": "Updated the {channelName} channel/group name",
+  "audit_table.headerUpdated": "Updated the {channelName} channel/group header",
+  "audit_table.channelDeleted": "Deleted the channel/group with the URL {url}",
+  "audit_table.userAdded": "Added {username} to the {channelName} channel/group",
+  "audit_table.userRemoved": "Removed {username} to the {channelName} channel/group",
+  "audit_table.attemptedRegisterApp": "Attempted to register a new OAuth Application with ID {id}",
+  "audit_table.attemptedAllowOAuthAccess": "Attempted to allow a new OAuth service access",
+  "audit_table.successfullOAuthAccess": "Successfully gave a new OAuth service access",
+  "audit_table.failedOAuthAccess": "Failed to allow a new OAuth service access - the redirect URI did not match the previously registered callback",
+  "audit_table.attemptedOAuthToken": "Attempted to get an OAuth access token",
+  "audit_table.successfullOAuthToken": "Successfully added a new OAuth service",
+  "audit_table.oauthTokenFailed": "Failed to get an OAuth access token - {token}",
+  "audit_table.attemptedLogin": "Attempted to login",
+  "audit_table.successfullLogin": "Successfully logged in",
+  "audit_table.failedLogin": "FAILED login attempt",
+  "audit_table.updatePicture": "Updated your profile picture",
+  "audit_table.updateGeneral": "Updated the general settings of your account",
+  "audit_table.attemptedPassword": "Attempted to change password",
+  "audit_table.successfullPassword": "Successfully changed password",
+  "audit_table.failedPassword": "Failed to change password - tried to update user password who was logged in through oauth",
+  "audit_table.updatedRol": "Updated user role(s) to ",
+  "audit_table.member": "member",
+  "audit_table.accountActive": "Account made active",
+  "audit_table.accountInactive": "Account made inactive",
+  "audit_table.by": " by {username}",
+  "audit_table.byAdmin": " by an admin",
+  "audit_table.sentEmail": "Sent an email to {email} to reset your password",
+  "audit_table.attemptedReset": "Attempted to reset password",
+  "audit_table.successfullReset": "Successfully reset password",
+  "audit_table.updateGlobalNotifications": "Updated your global notification settings",
+  "audit_table.attemptedWebhookCreate": "Attempted to create a webhook",
+  "audit_table.successfullWebhookCreate": "Successfully created a webhook",
+  "audit_table.failedWebhookCreate": "Failed to create a webhook - bad channel permissions",
+  "audit_table.attemptedWebhookDelete": "Attempted to delete a webhook",
+  "audit_table.successfullWebhookDelete": "Successfully deleted a webhook",
+  "audit_table.failedWebhookDelete": "Failed to delete a webhook - inappropriate conditions",
+  "audit_table.logout": "Logged out of your account",
+  "audit_table.verified": "Sucessfully verified your email address",
+  "audit_table.revokedAll": "Revoked all current sessions for the team",
+  "audit_table.loginAttempt": " (Login attempt)",
+  "audit_table.loginFailure": " (Login failure)",
+  "audit_table.moreInfo": "More info",
+  "audit_table.ip": "IP Address",
+  "audit_table.session": "Session ID",
+  "audit_table.userId": "User ID",
   "access_history.title": "Access History",
   "activity_log_modal.iphoneNativeApp": "iPhone Native App",
   "activity_log_modal.androidNativeApp": "Android Native App",
@@ -33,7 +81,6 @@
   "admin.sidebar.statistics": "- Statistics",
   "admin.sidebar.ldap": "LDAP Settings",
   "admin.sidebar.license": "Edition and License",
-  "admin.sidebar.audits": "Audits",
   "admin.sidebar.reports": "SITE REPORTS",
   "admin.sidebar.view_statistics": "View Statistics",
   "admin.sidebar.settings": "SETTINGS",
@@ -69,8 +116,6 @@
   "admin.analytics.recentActive": "Recent Active Users",
   "admin.analytics.newlyCreated": "Newly Created Users",
   "admin.analytics.title": "Statistics for {title}",
-  "admin.audits.title": "Server Audits",
-  "admin.audits.reload": "Reload",
   "admin.email.notificationDisplayExample": "Ex: \"Mattermost Notification\", \"System\", \"No-Reply\"",
   "admin.email.notificationEmailExample": "Ex: \"mattermost@yourcompany.com\", \"admin@yourcompany.com\"",
   "admin.email.smtpUsernameExample": "Ex: \"admin@yourcompany.com\", \"AKIADTOVBGERKLCBV\"",
@@ -295,11 +340,8 @@
   "admin.log.save": "Save",
   "admin.logs.title": "Server Logs",
   "admin.logs.reload": "Reload",
-<<<<<<< HEAD
-=======
   "admin.audits.title": "User Activity",
   "admin.audits.reload": "Reload",
->>>>>>> Rename audits tab
   "admin.privacy.saving": "Saving Config...",
   "admin.privacy.title": "Privacy Settings",
   "admin.privacy.showEmailTitle": "Show Email Address: ",
@@ -447,54 +489,6 @@
   "admin.user_item.makeActive": "Make Active",
   "admin.user_item.makeInactive": "Make Inactive",
   "admin.user_item.resetPwd": "Reset Password",
-  "audit_table.sessionRevoked": "The session with id {sessionId} was revoked",
-  "audit_table.channelCreated": "Created the {channelName} channel/group",
-  "audit_table.establishedDM": "Established a direct message channel with {username}",
-  "audit_table.nameUpdated": "Updated the {channelName} channel/group name",
-  "audit_table.headerUpdated": "Updated the {channelName} channel/group header",
-  "audit_table.channelDeleted": "Deleted the channel/group with the URL {url}",
-  "audit_table.userAdded": "Added {username} to the {channelName} channel/group",
-  "audit_table.userRemoved": "Removed {username} to the {channelName} channel/group",
-  "audit_table.attemptedRegisterApp": "Attempted to register a new OAuth Application with ID {id}",
-  "audit_table.attemptedAllowOAuthAccess": "Attempted to allow a new OAuth service access",
-  "audit_table.successfullOAuthAccess": "Successfully gave a new OAuth service access",
-  "audit_table.failedOAuthAccess": "Failed to allow a new OAuth service access - the redirect URI did not match the previously registered callback",
-  "audit_table.attemptedOAuthToken": "Attempted to get an OAuth access token",
-  "audit_table.successfullOAuthToken": "Successfully added a new OAuth service",
-  "audit_table.oauthTokenFailed": "Failed to get an OAuth access token - {token}",
-  "audit_table.attemptedLogin": "Attempted to login",
-  "audit_table.successfullLogin": "Successfully logged in",
-  "audit_table.failedLogin": "FAILED login attempt",
-  "audit_table.updatePicture": "Updated your profile picture",
-  "audit_table.updateGeneral": "Updated the general settings of your account",
-  "audit_table.attemptedPassword": "Attempted to change password",
-  "audit_table.successfullPassword": "Successfully changed password",
-  "audit_table.failedPassword": "Failed to change password - tried to update user password who was logged in through oauth",
-  "audit_table.updatedRol": "Updated user role(s) to ",
-  "audit_table.member": "member",
-  "audit_table.accountActive": "Account made active",
-  "audit_table.accountInactive": "Account made inactive",
-  "audit_table.by": " by {username}",
-  "audit_table.byAdmin": " by an admin",
-  "audit_table.sentEmail": "Sent an email to {email} to reset your password",
-  "audit_table.attemptedReset": "Attempted to reset password",
-  "audit_table.successfullReset": "Successfully reset password",
-  "audit_table.updateGlobalNotifications": "Updated your global notification settings",
-  "audit_table.attemptedWebhookCreate": "Attempted to create a webhook",
-  "audit_table.successfullWebhookCreate": "Successfully created a webhook",
-  "audit_table.failedWebhookCreate": "Failed to create a webhook - bad channel permissions",
-  "audit_table.attemptedWebhookDelete": "Attempted to delete a webhook",
-  "audit_table.successfullWebhookDelete": "Successfully deleted a webhook",
-  "audit_table.failedWebhookDelete": "Failed to delete a webhook - inappropriate conditions",
-  "audit_table.logout": "Logged out of your account",
-  "audit_table.verified": "Sucessfully verified your email address",
-  "audit_table.revokedAll": "Revoked all current sessions for the team",
-  "audit_table.loginAttempt": " (Login attempt)",
-  "audit_table.loginFailure": " (Login failure)",
-  "audit_table.userId": "User ID",
-  "audit_table.moreInfo": "More info",
-  "audit_table.ip": "IP: {ip}",
-  "audit_table.session": "Session ID: {id}",
   "authorize.title": "An application would like to connect to your {teamName} account",
   "authorize.app": "The app <strong>{appName}</strong> would like the ability to access and modify your basic information.",
   "authorize.access": "Allow <strong>{appName}</strong> access?",
-- 
cgit v1.2.3-1-g7c22


From 7e8389cd0538fb6aff3931fb23714158d3f24449 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Thu, 4 Feb 2016 10:44:35 -0500
Subject: Turn failed audit descriptions red

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

(limited to 'web')

diff --git a/web/react/components/audit_table.jsx b/web/react/components/audit_table.jsx
index ce547eb45..49892ff98 100644
--- a/web/react/components/audit_table.jsx
+++ b/web/react/components/audit_table.jsx
@@ -213,11 +213,16 @@ class AuditTable extends React.Component {
                 sContent = <td>{auditInfo.sessionId}</td>;
             }
 
+            let descStyle = {};
+            if (auditInfo.desc.toLowerCase().indexOf('fail') !== -1) {
+                descStyle.color = 'red';
+            }
+
             accessList[i] = (
                 <tr key={audit.id}>
                     <td>{auditInfo.timestamp}</td>
                     {uContent}
-                    <td>{auditInfo.desc}</td>
+                    <td style={descStyle}>{auditInfo.desc}</td>
                     {iContent}
                     {sContent}
                 </tr>
-- 
cgit v1.2.3-1-g7c22


From e45282deaa1d78d7ff3a125e9fd11e3fdc120b07 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Thu, 4 Feb 2016 13:00:03 -0500
Subject: Move license storage to database

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

(limited to 'web')

diff --git a/web/react/components/admin_console/admin_sidebar.jsx b/web/react/components/admin_console/admin_sidebar.jsx
index 7d74013f2..eadd8d412 100644
--- a/web/react/components/admin_console/admin_sidebar.jsx
+++ b/web/react/components/admin_console/admin_sidebar.jsx
@@ -454,6 +454,7 @@ export default class AdminSidebar extends React.Component {
                                 </ul>
                                 <ul className='nav nav__sub-menu padded'>
                                     {licenseSettings}
+                                    {audits}
                                     <li>
                                         <a
                                             href='#'
@@ -466,7 +467,6 @@ export default class AdminSidebar extends React.Component {
                                             />
                                         </a>
                                     </li>
-                                    {audits}
                                 </ul>
                             </li>
                         </ul>
-- 
cgit v1.2.3-1-g7c22