Convert audit_table to a proper table

1 files changed, 48 insertions, 54 deletions

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?",