From 3d03bdf2f1af5385c2150544977fbba89650b1ee Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Tue, 2 Feb 2016 08:41:02 -0500 Subject: Added extra system-wide statistics for EE --- web/static/i18n/en.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'web/static/i18n/en.json') diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json index d6401ab6e..ae3a38c71 100644 --- a/web/static/i18n/en.json +++ b/web/static/i18n/en.json @@ -101,6 +101,13 @@ "admin.analytics.publicChannels": "Public Channels", "admin.analytics.privateGroups": "Private Groups", "admin.analytics.totalPosts": "Total Posts", + "admin.analytics.totalFilePosts": "Posts with Files", + "admin.analytics.totalHashtagPosts": "Posts with Hashtags", + "admin.analytics.totalIncomingWebhooks": "Incoming Webhooks", + "admin.analytics.totalOutgoingWebhooks": "Outgoing Webhooks", + "admin.analytics.channelTypes": "Channel Types", + "admin.analytics.textPosts": "Posts with Text-only", + "admin.analytics.postTypes": "Posts, Files and Hashtags", "admin.analytics.meaningful": "Not enough data for a meaningful representation.", "admin.analytics.activeUsers": "Active Users With Posts", "admin.analytics.recentActive": "Recent Active Users", @@ -1044,4 +1051,4 @@ "user.settings.security.title": "Security Settings", "user.settings.security.viewHistory": "View Access History", "user.settings.security.logoutActiveSessions": "View and Logout of Active Sessions" -} \ No newline at end of file +} -- cgit v1.2.3-1-g7c22 From b013f02209c7c128a35d1c54f2d4a7d6a9701f72 Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Wed, 13 Jan 2016 14:58:49 -0800 Subject: Added ability to sign in via username; separated email sign in and sign up config settings --- web/static/i18n/en.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'web/static/i18n/en.json') diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json index d6401ab6e..7c32d856a 100644 --- a/web/static/i18n/en.json +++ b/web/static/i18n/en.json @@ -127,6 +127,10 @@ "admin.email.true": "true", "admin.email.false": "false", "admin.email.allowSignupDescription": "When true, Mattermost allows team creation and account signup using email and password. This value should be false only when you want to limit signup to a single-sign-on service like OAuth or LDAP.", + "admin.email.allowEmailSignInTitle": "Allow Sign In With Email: ", + "admin.email.allowEmailSignInDescription": "When true, Mattermost allows users to sign in using their email and password.", + "admin.email.allowUsernameSignInTitle": "Allow Sign In With Username: ", + "admin.email.allowUsernameSignInDescription": "When true, Mattermost allows users to sign in using their username and password. This setting is typically only used when email verification is disabled.", "admin.email.notificationsTitle": "Send Email Notifications: ", "admin.email.notificationsDescription": "Typically set to true in production. When true, Mattermost attempts to send email notifications. Developers may set this field to false to skip email setup for faster development.
Setting this to true removes the Preview Mode banner (requires logging out and logging back in after setting is changed).", "admin.email.requireVerificationTitle": "Require Email Verification: ", @@ -550,6 +554,14 @@ "login_email.email": "Email", "login_email.pwd": "Password", "login_email.signin": "Sign in", + "login_username.badTeam": "Bad team name", + "login_username.usernameReq": "A username is required", + "login_username.pwdReq": "A password is required", + "login_username.verifyEmailError": "Please verify your email address. Check your inbox for an email.", + "login_username.userNotFoundError": "We couldn't find an existing account matching your username for this team.", + "login_username.username": "Username", + "login_username.pwd": "Password", + "login_username.signin": "Sign in", "login_ldap.badTeam": "Bad team name", "login_ldap.idlReq": "An LDAP ID is required", "login_ldap.pwdReq": "An LDAP password is required", -- cgit v1.2.3-1-g7c22 From eeb1c1b5b827cc20ae32449bfc8c227152ba1a9d Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Fri, 29 Jan 2016 13:29:43 -0800 Subject: Properly disable the get team link functionality when user creation is disabled --- web/static/i18n/en.json | 1 + 1 file changed, 1 insertion(+) (limited to 'web/static/i18n/en.json') diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json index d6401ab6e..2412a1bae 100644 --- a/web/static/i18n/en.json +++ b/web/static/i18n/en.json @@ -526,6 +526,7 @@ "get_link.close": "Close", "get_team_invite_link_modal.title": "Team Invite Link", "get_team_invite_link_modal.help": "Send teammates the link below for them to sign-up to this team site.", + "get_team_invite_link_modal.helpDisabled": "User creation has been disabled for your team. Please ask your team administrator for details.", "invite_member.emailError": "Please enter a valid email address", "invite_member.firstname": "First name", "invite_member.lastname": "Last name", -- cgit v1.2.3-1-g7c22 From d153d661db7d4349d69824d318aa9ad571970606 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Tue, 2 Feb 2016 16:49:27 -0500 Subject: Add basic server audit tab to system console for EE --- web/static/i18n/en.json | 100 +++++++++++++++++++++++++----------------------- 1 file changed, 52 insertions(+), 48 deletions(-) (limited to 'web/static/i18n/en.json') diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json index d6401ab6e..d4c319145 100644 --- a/web/static/i18n/en.json +++ b/web/static/i18n/en.json @@ -8,53 +8,54 @@ "about.date": "Build Date:", "about.hash": "Build Hash:", "about.close": "Close", - "access_history.sessionRevoked": "The session with id {sessionId} was revoked", - "access_history.channelCreated": "Created the {channelName} channel/group", - "access_history.establishedDM": "Established a direct message channel with {username}", - "access_history.nameUpdated": "Updated the {channelName} channel/group name", - "access_history.headerUpdated": "Updated the {channelName} channel/group header", - "access_history.channelDeleted": "Deleted the channel/group with the URL {url}", - "access_history.userAdded": "Added {username} to the {channelName} channel/group", - "access_history.userRemoved": "Removed {username} to the {channelName} channel/group", - "access_history.attemptedRegisterApp": "Attempted to register a new OAuth Application with ID {id}", - "access_history.attemptedAllowOAuthAccess": "Attempted to allow a new OAuth service access", - "access_history.successfullOAuthAccess": "Successfully gave a new OAuth service access", - "access_history.failedOAuthAccess": "Failed to allow a new OAuth service access - the redirect URI did not match the previously registered callback", - "access_history.attemptedOAuthToken": "Attempted to get an OAuth access token", - "access_history.successfullOAuthToken": "Successfully added a new OAuth service", - "access_history.oauthTokenFailed": "Failed to get an OAuth access token - {token}", - "access_history.attemptedLogin": "Attempted to login", - "access_history.successfullLogin": "Successfully logged in", - "access_history.failedLogin": "FAILED login attempt", - "access_history.updatePicture": "Updated your profile picture", - "access_history.updateGeneral": "Updated the general settings of your account", - "access_history.attemptedPassword": "Attempted to change password", - "access_history.successfullPassword": "Successfully changed password", - "access_history.failedPassword": "Failed to change password - tried to update user password who was logged in through oauth", - "access_history.updatedRol": "Updated user role(s) to ", - "access_history.member": "member", - "access_history.accountActive": "Account made active", - "access_history.accountInactive": "Account made inactive", - "access_history.by": " by {username}", - "access_history.byAdmin": " by an admin", - "access_history.sentEmail": "Sent an email to {email} to reset your password", - "access_history.attemptedReset": "Attempted to reset password", - "access_history.successfullReset": "Successfully reset password", - "access_history.updateGlobalNotifications": "Updated your global notification settings", - "access_history.attemptedWebhookCreate": "Attempted to create a webhook", - "access_history.successfullWebhookCreate": "Successfully created a webhook", - "access_history.failedWebhookCreate": "Failed to create a webhook - bad channel permissions", - "access_history.attemptedWebhookDelete": "Attempted to delete a webhook", - "access_history.successfullWebhookDelete": "Successfully deleted a webhook", - "access_history.failedWebhookDelete": "Failed to delete a webhook - inappropriate conditions", - "access_history.logout": "Logged out of your account", - "access_history.verified": "Sucessfully verified your email address", - "access_history.revokedAll": "Revoked all current sessions for the team", - "access_history.loginAttempt": " (Login attempt)", - "access_history.loginFailure": " (Login failure)", - "access_history.moreInfo": "More info", - "access_history.ip": "IP: {ip}", - "access_history.session": "Session ID: {id}", + "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: {ip}", + "audit_table.session": "Session ID: {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", @@ -96,6 +97,7 @@ "admin.sidebar.teams": "TEAMS ({count})", "admin.sidebar.other": "OTHER", "admin.sidebar.logs": "Logs", + "admin.sidebar.audits": "Audits", "admin.analytics.loading": "Loading...", "admin.analytics.totalUsers": "Total Users", "admin.analytics.publicChannels": "Public Channels", @@ -326,6 +328,8 @@ "admin.log.save": "Save", "admin.logs.title": "Server Logs", "admin.logs.reload": "Reload", + "admin.audits.title": "Server Audits", + "admin.audits.reload": "Reload", "admin.privacy.saving": "Saving Config...", "admin.privacy.title": "Privacy Settings", "admin.privacy.showEmailTitle": "Show Email Address: ", @@ -1044,4 +1048,4 @@ "user.settings.security.title": "Security Settings", "user.settings.security.viewHistory": "View Access History", "user.settings.security.logoutActiveSessions": "View and Logout of Active Sessions" -} \ No newline at end of file +} -- cgit v1.2.3-1-g7c22 From d424c9eaf12653332f15afa2cb9dfc6684fa95d8 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Tue, 2 Feb 2016 19:39:56 -0300 Subject: PLT-7: Refactoring frontend (chunk 10) - Modals - Fix bug on msg_typing - Add missing translations in es.json for EE --- web/static/i18n/en.json | 90 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) (limited to 'web/static/i18n/en.json') diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json index d6401ab6e..52b8fc5e4 100644 --- a/web/static/i18n/en.json +++ b/web/static/i18n/en.json @@ -480,6 +480,40 @@ "change_url.noUnderscore": "Can not contain two underscores in a row.", "change_url.invalidUrl": "Invalid URL", "change_url.close": "Close", + "channel_header.recentMentions": "Recent Mentions", + "channel_header.channel": "Channel", + "channel_header.group": "Group", + "channel_header.channelHeader": "Set Channel Header...", + "channel_header.viewInfo": "View Info", + "chanel_header.addMembers": "Add Members", + "channel_header.manageMembers": "Manage Members", + "channel_header.setHeader": "Set {term} Header...", + "channel_header.setPurpose": "Set {term} Purpose...", + "channel_header.notificationPreferences": "Notification Preferences", + "channel_header.rename": "Rename {term}...", + "channel_header.delete": "Delete {term}...", + "channel_header.leave": "Leave {term}", + "channel_info.notFound": "No Channel Found", + "channel_info.name": "Channel Name:", + "channel_info.url": "Channel URL:", + "channel_info.id": "Channel ID:", + "channel_info.purpose": "Channel Purpose:", + "channel_info.close": "Close", + "channel_invite.addNewMembers": "Add New Members to ", + "channel_invite.close": "Close", + "channel_memebers_modal.members": " Members", + "channel_members_modal.addNew": " Add New Members", + "channel_members_modal.close": "Close", + "channel_notifications.allActivity": "For all activity", + "channel_notifications.onlyMentions": "Only for mentions", + "channel_notifications.never": "Never", + "channel_notifications.sendDesktop": "Send desktop notifications", + "channel_notifications.globalDefault": "Global default ({notifyLevel}", + "channel_notifications.override": "Selecting an option other than \"Default\" will override the global notification settings. Desktop notifications are available on Firefox, Safari, and Chrome.", + "channel_notifications.markUnread": "Mark Channel Unread", + "channel_notifications.allUnread": "For all unread messages", + "channel_notifications.unreadInfo": "The channel name is bolded in the sidebar when there are unread messages. Selecting \"Only for mentions\" will bold the channel only when you are mentioned.", + "channel_notifications.preferences": "Notification Preferences for ", "claim.account.noEmail": "No email specified", "claim.email_to_sso.pwdError": "Please enter your password.", "claim.email_to_sso.pwd": "Password", @@ -502,6 +536,36 @@ "create_comment.commentTitle": "Comment", "create_comment.file": "File uploading", "create_comment.files": "Files uploading", + "delete_channel.channel": "channel", + "delete_channel.group": "group", + "delete_channel.confirm": "Confirm DELETE Channel", + "delete_channel.question": "Are you sure you wish to delete the {display_name} {term}?", + "delete_channel.cancel": "Cancel", + "delete_channel.del": "Delete", + "delete_post.warning": "This post has {count} comment(s) on it.", + "delete_post.comment": "Comment", + "delete_post.post": "Post", + "delete_post.confirm": "Confirm {term} Delete", + "delete_post.question": "Are you sure you want to delete this ${term}?", + "delete_post.cancel": "Cancel", + "delete_post.del": "Delete", + "edit_channel_header_modal.error": "This channel header is too long, please enter a shorter one", + "edit_channel_header_modal.title": "Edit Header for {channel}", + "edit_channel_header_modal.description": "Edit the text appearing next to the channel name in the channel header.", + "edit_channel_header_modal.cancel": "Cancel", + "edit_channel_header_modal.save": "Save", + "edit_channel_purpose_modal.error": "This channel purpose is too long, please enter a shorter one", + "edit_channel_purpose_modal.title1": "Edit Purpose", + "edit_channel_purpose_modal.title2": "Edit Purpose for ", + "edit_channel_purpose_modal.channel": "Channel", + "edit_channel_purpose_modal.group": "Group", + "edit_channel_purpose_modal.body": "Describe how this {type} should be used. This text appears in the channel list in the \"More...\" menu and helps others decide whether to join.", + "edit_channel_purpose_modal.cancel": "Cancel", + "edit_channel_purpose_modal.save": "Save", + "edit_post.editPost": "Edit the post...", + "edit_post.edit": "Edit {title}", + "edit_post.cancel": "Cancel", + "edit_post.save": "Save", "email_verify.verified": "{siteName} Email Verified", "email_verify.verifiedBody": "

Your email has been verified! Click here to log in.

", "email_verify.almost": "{siteName}: You are almost done", @@ -568,6 +632,10 @@ "login.find": "Find your other teams", "login.signTo": "Sign in to:", "login.on": "on {siteName}", + "member_item.add": " Add", + "member_item.makeAdmin": "Make Admin", + "member_item.removeMember": "Remove Member", + "member_item.member": "Member", "member_team_item.member": "Member", "member_team_item.systemAdmin": "System Admin", "member_team_item.teamAdmin": "Team Admin", @@ -643,6 +711,11 @@ "password_send.title": "Password Reset", "password_send.description": "To reset your password, enter the email address you used to sign up for {teamName}.", "password_send.reset": "Reset my password", + "members_popover.msg": "Message", + "members_popover.title": "Members", + "post_delete.notPosted": "Comment could not be posted", + "post_delete.someone": "Someone deleted the message on which you tried to post a comment.", + "post_delete.okay": "Okay", "register_app.required": "Required", "register_app.optional": "Optional", "register_app.nameError": "Application name must be filled in.", @@ -662,6 +735,23 @@ "register_app.credentialsSave": "I have saved both my Client Id and Client Secret somewhere safe", "register_app.close": "Close", "register_app.dev": "Developer Applications", + "removed_channel.channelName": "the channel", + "removed_channel.someone": "Someone", + "removed_channel.from": "Removed from ", + "removed_channel.remover": "{remover} removed you from {channel}", + "removed_channel.okay": "Okay", + "rename_channel.required": "This field is required", + "rename_channel.maxLength": "This field must be less than 22 characters", + "rename_channel.lowercase": "Must be lowercase alphanumeric characters", + "rename_channel.handle": "Handle", + "rename_channel.defaultError": " - Cannot be changed for the default channel", + "rename_channel.displayNameHolder": "Enter display name", + "rename_channel.handleHolder": "lowercase alphanumeric's only", + "rename_channel.close": "Close", + "rename_channel.title": "Rename Channel", + "rename_channel.displayName": "Display Name", + "rename_channel.cancel": "Cancel", + "rename_channel.save": "Save", "rhs_comment.comment": "Comment", "rhs_comment.edit": "Edit", "rhs_comment.del": "Delete", -- cgit v1.2.3-1-g7c22