From 8ec509b9f6c88ccd72bc2c37d85f326b979cd647 Mon Sep 17 00:00:00 2001 From: it33 Date: Fri, 25 Sep 2015 07:57:51 -0700 Subject: Fix capitalization type --- web/react/components/admin_console/service_settings.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/react/components/admin_console') diff --git a/web/react/components/admin_console/service_settings.jsx b/web/react/components/admin_console/service_settings.jsx index 4b09fefc2..5056e843a 100644 --- a/web/react/components/admin_console/service_settings.jsx +++ b/web/react/components/admin_console/service_settings.jsx @@ -287,7 +287,7 @@ export default class ServiceSettings extends React.Component { // /> // {'false'} // -//

{'When enabled Mattermost will act as an Oauth2 Provider. Changing this will require a server restart before taking effect.'}

+//

{'When enabled Mattermost will act as an OAuth2 Provider. Changing this will require a server restart before taking effect.'}

// // -- cgit v1.2.3-1-g7c22 From d60c18d8d640a3086919ac235448a990b198ba39 Mon Sep 17 00:00:00 2001 From: it33 Date: Fri, 25 Sep 2015 07:59:36 -0700 Subject: Typo fix --- web/react/components/admin_console/service_settings.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/react/components/admin_console') diff --git a/web/react/components/admin_console/service_settings.jsx b/web/react/components/admin_console/service_settings.jsx index 5056e843a..db1e213ae 100644 --- a/web/react/components/admin_console/service_settings.jsx +++ b/web/react/components/admin_console/service_settings.jsx @@ -199,7 +199,7 @@ export default class ServiceSettings extends React.Component { /> {'false'} -

{'When true incomming web hooks will be allowed.'}

+

{'When true incoming webhooks will be allowed.'}

-- cgit v1.2.3-1-g7c22 From 4192b9efce7f85f7a0d648f4b0e131b0dfc1ebda Mon Sep 17 00:00:00 2001 From: it33 Date: Fri, 25 Sep 2015 08:09:50 -0700 Subject: Minor wording change --- web/react/components/admin_console/service_settings.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/react/components/admin_console') diff --git a/web/react/components/admin_console/service_settings.jsx b/web/react/components/admin_console/service_settings.jsx index db1e213ae..dee168a41 100644 --- a/web/react/components/admin_console/service_settings.jsx +++ b/web/react/components/admin_console/service_settings.jsx @@ -103,7 +103,7 @@ export default class ServiceSettings extends React.Component { defaultValue={this.props.config.ServiceSettings.ListenAddress} onChange={this.handleChange} /> -

{'The address to bind to and listen. ":8065" will bind to all interfaces or you can choose one like "127.0.0.1:8065". Changing this will require a server restart before taking effect.'}

+

{'The address to which to bind and listen. Entering ":8065" will bind to all interfaces or you can choose one like "127.0.0.1:8065". Changing this will require a server restart before taking effect.'}

-- cgit v1.2.3-1-g7c22 From 0c27f8e58489a675ea33845104c63b619f446382 Mon Sep 17 00:00:00 2001 From: it33 Date: Fri, 25 Sep 2015 20:56:32 -0700 Subject: Update service_settings.jsx --- web/react/components/admin_console/service_settings.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'web/react/components/admin_console') diff --git a/web/react/components/admin_console/service_settings.jsx b/web/react/components/admin_console/service_settings.jsx index dee168a41..245ffa871 100644 --- a/web/react/components/admin_console/service_settings.jsx +++ b/web/react/components/admin_console/service_settings.jsx @@ -199,7 +199,7 @@ export default class ServiceSettings extends React.Component { /> {'false'} -

{'When true incoming webhooks will be allowed.'}

+

{'When true, incoming webhooks will be allowed.'}

@@ -232,7 +232,7 @@ export default class ServiceSettings extends React.Component { /> {'false'} -

{'When true slash commands like /loadtest are enabled in the add comment box. Changing this will require a server restart before taking effect. Typically used for development.'}

+

{'(Developer Option) When true, /loadtest slash command is enabled to load test accounts and test data. Changing this will require a server restart before taking effect.'}

-- cgit v1.2.3-1-g7c22 From 84e3c816d624b938dcfb378a33c87f3407d541db Mon Sep 17 00:00:00 2001 From: it33 Date: Fri, 25 Sep 2015 21:01:42 -0700 Subject: Update team_settings.jsx --- web/react/components/admin_console/team_settings.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'web/react/components/admin_console') diff --git a/web/react/components/admin_console/team_settings.jsx b/web/react/components/admin_console/team_settings.jsx index 3e0890f98..0f6f819d3 100644 --- a/web/react/components/admin_console/team_settings.jsx +++ b/web/react/components/admin_console/team_settings.jsx @@ -117,7 +117,7 @@ export default class TeamSettings extends React.Component { defaultValue={this.props.config.TeamSettings.MaxUsersPerTeam} onChange={this.handleChange} /> -

{'Maximum number of users per team.'}

+

{'Maximum total number of users per team, including both active and inactive users.'}

@@ -150,7 +150,7 @@ export default class TeamSettings extends React.Component { /> {'false'} -

{'When false the ability to create teams is disabled. The create team button displays error when pressed.'}

+

{'When false, the ability to create teams is disabled. The create team button displays error when pressed.'}

@@ -183,7 +183,7 @@ export default class TeamSettings extends React.Component { /> {'false'} -

{'When false the ability to create accounts is disabled. The create account button displays error when pressed.'}

+

{'When false, the ability to create accounts is disabled. The create account button displays error when pressed.'}

-- cgit v1.2.3-1-g7c22 From de1c87f66069cbb14a404de84e04a4fddf1341c2 Mon Sep 17 00:00:00 2001 From: it33 Date: Fri, 25 Sep 2015 21:03:57 -0700 Subject: Update sql_settings.jsx --- web/react/components/admin_console/sql_settings.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/react/components/admin_console') diff --git a/web/react/components/admin_console/sql_settings.jsx b/web/react/components/admin_console/sql_settings.jsx index ad01b5963..430a7453b 100644 --- a/web/react/components/admin_console/sql_settings.jsx +++ b/web/react/components/admin_console/sql_settings.jsx @@ -252,7 +252,7 @@ export default class SqlSettings extends React.Component { /> {'false'} -

{'Output executing SQL statements to the log. Typically used for development.'}

+

{'(Development Mode) When true, executing SQL statements are written to the log.'}

-- cgit v1.2.3-1-g7c22 From 56b3df2e87b23bea9bd21e283ffcba3f431a514e Mon Sep 17 00:00:00 2001 From: it33 Date: Fri, 25 Sep 2015 21:23:46 -0700 Subject: Update email_settings.jsx --- web/react/components/admin_console/email_settings.jsx | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'web/react/components/admin_console') diff --git a/web/react/components/admin_console/email_settings.jsx b/web/react/components/admin_console/email_settings.jsx index 854988947..32c832c6a 100644 --- a/web/react/components/admin_console/email_settings.jsx +++ b/web/react/components/admin_console/email_settings.jsx @@ -211,7 +211,7 @@ export default class EmailSettings extends React.Component { /> {'false'} -

{'Typically set to true in production. When true Mattermost will allow team creation and account signup utilizing email and password. You would set this to false if you only wanted to allow signup from a service like OAuth or LDAP.'}

+

{'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.'}

@@ -244,7 +244,7 @@ export default class EmailSettings extends React.Component { /> {'false'} -

{'Typically set to true in production. When true Mattermost will attempt to send email notifications. Developers may set this field to false skipping sending emails for faster development.'}

+

{'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.'}

@@ -268,7 +268,6 @@ export default class EmailSettings extends React.Component { /> {'true'} - -

{'Typically set to true in production. When true Mattermost will not allow a user to login without first having recieved an email with a verification link. Developers may set this field to false so skip sending verification emails for faster development.'}

+

{'Typically set to true in production. When true, Mattermost requires email verification after account creation prior to allowing login. Developers may set this field to false so skip sending verification emails for faster development.'}

@@ -296,12 +295,12 @@ export default class EmailSettings extends React.Component { className='form-control' id='feedbackName' ref='feedbackName' - placeholder='Ex: "Mattermost", "System", "John Smith"' + placeholder='Ex: "Mattermost Notification", "System", "No-Reply"' defaultValue={this.props.config.EmailSettings.FeedbackName} onChange={this.handleChange} disabled={!this.state.sendEmailNotifications} /> -

{'Name displayed on email account used when sending notification emails from Mattermost.'}

+

{'Display name on email account used when sending notification emails from Mattermost.'}

@@ -323,7 +322,7 @@ export default class EmailSettings extends React.Component { onChange={this.handleChange} disabled={!this.state.sendEmailNotifications} /> -

{'Email displayed on email account used when sending notification emails from Mattermost.'}

+

{'Email address displayed on email account used when sending notification emails from Mattermost.'}

@@ -479,7 +478,7 @@ export default class EmailSettings extends React.Component { onChange={this.handleChange} disabled={!this.state.sendEmailNotifications} /> -

{'32-character salt added to signing of email invites.'}

+

{'32-character salt added to signing of email invites. Randomly generated on install. Click "Re-Generate" to create new salt.'}

@@ -149,7 +149,7 @@ export default class LogSettings extends React.Component { -

{'This setting determines the level of detail at which log events are written to the console. ERROR: Outputs only error messages. INFO: Outputs error messages and information around startup and initialization. DEBUG: Prints high detail for developers debugging issues working on debugging issues.'}

+

{'This setting determines the level of detail at which log events are written to the console. ERROR: Outputs only error messages. INFO: Outputs error messages and information around startup and initialization. DEBUG: Prints high detail for developers working on debugging issues.'}

@@ -157,7 +157,7 @@ export default class LogSettings extends React.Component {
-

{'Typically set to true in production. When true log files are written to the file specified in file location field below.'}

+

{'Typically set to true in production. When true, log files are written to the log file specified in file location field below.'}

@@ -205,7 +205,7 @@ export default class LogSettings extends React.Component { -

{'This setting determines the level of detail at which log events are written to the file. ERROR: Outputs only error messages. INFO: Outputs error messages and information around startup and initialization. DEBUG: Prints high detail for developers debugging issues working on debugging issues.'}

+

{'This setting determines the level of detail at which log events are written to the log file. ERROR: Outputs only error messages. INFO: Outputs error messages and information around startup and initialization. DEBUG: Prints high detail for developers working on debugging issues.'}

@@ -227,7 +227,7 @@ export default class LogSettings extends React.Component { onChange={this.handleChange} disabled={!this.state.fileEnable} /> -

{'File to which log files are written. If blank, will be set to ./logs/mattermost.log. Log rotation is enabled and new files may be created in the same directory.'}

+

{'File to which log files are written. If blank, will be set to ./logs/mattermost.log. Log rotation is enabled and every 10,000 lines of log information is written to a new file, for example mattermost.1.log, mattermost.2.log, and so forth.'}

-- cgit v1.2.3-1-g7c22 From 5548bdfd36a9aedc55657a9838c8da1229beb60b Mon Sep 17 00:00:00 2001 From: it33 Date: Fri, 25 Sep 2015 21:53:37 -0700 Subject: Update rate_settings.jsx --- web/react/components/admin_console/rate_settings.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'web/react/components/admin_console') diff --git a/web/react/components/admin_console/rate_settings.jsx b/web/react/components/admin_console/rate_settings.jsx index c05bf4a82..87a93a6a1 100644 --- a/web/react/components/admin_console/rate_settings.jsx +++ b/web/react/components/admin_console/rate_settings.jsx @@ -140,7 +140,7 @@ export default class RateSettings extends React.Component { /> {'false'} -

{'When enabled throttles rate at which APIs respond.'}

+

{'When true, APIs are throttled at rates specified below.'}

@@ -228,7 +228,7 @@ export default class RateSettings extends React.Component { className='control-label col-sm-4' htmlFor='VaryByHeader' > - {'Limit By Http Header:'} + {'Limit By HTTP Header:'}
-

{'When filled in, vary rate limiting by http header field specified (e.g. when configuring ngnix set to "X-Real-IP", when configuring AmazonELB set to "X-Forwarded-For").'}

+

{'When filled in, vary rate limiting by HTTP header field specified (e.g. when configuring ngnix set to "X-Real-IP", when configuring AmazonELB set to "X-Forwarded-For").'}

-- cgit v1.2.3-1-g7c22 From 7e94080752c135d7f8fec7b4356f23f79c98c720 Mon Sep 17 00:00:00 2001 From: it33 Date: Fri, 25 Sep 2015 22:20:16 -0700 Subject: Update rate_settings.jsx --- web/react/components/admin_console/rate_settings.jsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'web/react/components/admin_console') diff --git a/web/react/components/admin_console/rate_settings.jsx b/web/react/components/admin_console/rate_settings.jsx index 87a93a6a1..0081daca3 100644 --- a/web/react/components/admin_console/rate_settings.jsx +++ b/web/react/components/admin_console/rate_settings.jsx @@ -184,7 +184,7 @@ export default class RateSettings extends React.Component { onChange={this.handleChange} disabled={!this.state.EnableRateLimiter} /> -

{'Maximum number of users sessions connected to the system as determined by VaryByRemoteAddr and VaryByHeader variables.'}

+

{'Maximum number of users sessions connected to the system as determined by "Vary By Remote Address" and "Vary By Header" settings below.'}

@@ -193,7 +193,7 @@ export default class RateSettings extends React.Component { className='control-label col-sm-4' htmlFor='VaryByRemoteAddr' > - {'Limit By Remote Address: '} + {'Vary By Remote Address: '}
-

{'Rate limit API access by IP address.'}

+

{'When true, rate limit API access by IP address.'}

@@ -228,7 +228,7 @@ export default class RateSettings extends React.Component { className='control-label col-sm-4' htmlFor='VaryByHeader' > - {'Limit By HTTP Header:'} + {'Vary By HTTP Header:'}
-

{'When filled in, vary rate limiting by HTTP header field specified (e.g. when configuring ngnix set to "X-Real-IP", when configuring AmazonELB set to "X-Forwarded-For").'}

+

{'When filled in, vary rate limiting by HTTP header field specified (e.g. when configuring Ngnix set to "X-Real-IP", when configuring AmazonELB set to "X-Forwarded-For").'}

-- cgit v1.2.3-1-g7c22 From 1b5c32f8ab8fcbf84870fef5a717b85e1a3c90e8 Mon Sep 17 00:00:00 2001 From: it33 Date: Fri, 25 Sep 2015 22:23:06 -0700 Subject: Update privacy_settings.jsx --- web/react/components/admin_console/privacy_settings.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'web/react/components/admin_console') diff --git a/web/react/components/admin_console/privacy_settings.jsx b/web/react/components/admin_console/privacy_settings.jsx index 8ce693925..affd8ae11 100644 --- a/web/react/components/admin_console/privacy_settings.jsx +++ b/web/react/components/admin_console/privacy_settings.jsx @@ -99,7 +99,7 @@ export default class PrivacySettings extends React.Component { /> {'false'} -

{'Hides email address of users from other users including team administrator.'}

+

{'When false, hides email address of users from other users in the user interface, including team owners and team administrators. Used when system is set up for managing teams where some users choose to keep their contact information private.'}

@@ -132,7 +132,7 @@ export default class PrivacySettings extends React.Component { /> {'false'} -

{'Hides full name of users from other users including team administrator.'}

+

{'When false, hides full name of users from other users including team owner and team administrators.'}

-- cgit v1.2.3-1-g7c22 From 5ca63153dc1fbadebae0a727c63ec18fbacff603 Mon Sep 17 00:00:00 2001 From: it33 Date: Fri, 25 Sep 2015 22:32:26 -0700 Subject: Update gitlab_settings.jsx --- web/react/components/admin_console/gitlab_settings.jsx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'web/react/components/admin_console') diff --git a/web/react/components/admin_console/gitlab_settings.jsx b/web/react/components/admin_console/gitlab_settings.jsx index f76655b89..1e10c5592 100644 --- a/web/react/components/admin_console/gitlab_settings.jsx +++ b/web/react/components/admin_console/gitlab_settings.jsx @@ -114,7 +114,7 @@ export default class GitLabSettings extends React.Component { /> {'false'} -

{'When true Mattermost will allow team creation and account signup utilizing GitLab OAuth.'}

+

{'When true, Mattermost allows team creation and account signup using GitLab OAuth. To configure, log in to your GitLab account and go to Applications -> Profile Settings. Enter Redirect URIs "/login/gitlab/complete" (example: http://localhost:8065/login/gitlab/complete) and "/signup/gitlab/complete". Then use "Secret" and "Id" fields to complete the options below.'}

@@ -136,7 +136,7 @@ export default class GitLabSettings extends React.Component { onChange={this.handleChange} disabled={!this.state.Allow} /> -

{'Need help text.'}

+

{'Obtain this value via the instructions above for logging into GitLab.'}

@@ -158,7 +158,7 @@ export default class GitLabSettings extends React.Component { onChange={this.handleChange} disabled={!this.state.Allow} /> -

{'Need help text.'}

+

{'Obtain this value via the instructions above for logging into GitLab'}

@@ -175,12 +175,12 @@ export default class GitLabSettings extends React.Component { className='form-control' id='Scope' ref='Scope' - placeholder='Ex ""' + placeholder='Not currently used by GitLab. Please leave blank' defaultValue={this.props.config.GitLabSettings.Scope} onChange={this.handleChange} disabled={!this.state.Allow} /> -

{'Need help text.'}

+

{'This field is not yet used by GitLab OAuth. Other OAuth providers may use this field to specify the scope of account data from OAuth provider that is sent to Mattermost.'}

@@ -202,7 +202,7 @@ export default class GitLabSettings extends React.Component { onChange={this.handleChange} disabled={!this.state.Allow} /> -

{'Need help text.'}

+

{'Enter /oauth/authorize (example http://localhost:3000/oauth/authorize).'}

@@ -224,7 +224,7 @@ export default class GitLabSettings extends React.Component { onChange={this.handleChange} disabled={!this.state.Allow} /> -

{'Need help text.'}

+

{'Enter /oauth/token.'}

@@ -246,7 +246,7 @@ export default class GitLabSettings extends React.Component { onChange={this.handleChange} disabled={!this.state.Allow} /> -

{'Need help text.'}

+

{'Enter /api/v3/user.'}

-- cgit v1.2.3-1-g7c22 From 8af7386898737770b2b845c76c2810c7ea6697ae Mon Sep 17 00:00:00 2001 From: it33 Date: Fri, 25 Sep 2015 22:38:23 -0700 Subject: Update log_settings.jsx --- web/react/components/admin_console/log_settings.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'web/react/components/admin_console') diff --git a/web/react/components/admin_console/log_settings.jsx b/web/react/components/admin_console/log_settings.jsx index 781a937bf..1c39c60e8 100644 --- a/web/react/components/admin_console/log_settings.jsx +++ b/web/react/components/admin_console/log_settings.jsx @@ -101,7 +101,7 @@ export default class LogSettings extends React.Component { className='control-label col-sm-4' htmlFor='consoleEnable' > - {'Log to the Console: '} + {'Log To The Console: '}
-- cgit v1.2.3-1-g7c22