diff options
| author | Corey Hulen <corey@hulen.com> | 2016-01-13 09:02:43 -0600 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-01-13 09:02:43 -0600 |
| commit | 75ae098dfe57c3350861e633b680e6489900d884 (patch) | |
| tree | d11bceb93f9e2b30a3e52a67d0c6f22e8455de76 | |
| parent | b15b2bc2ae3c2c23218e0acf8cfe8a8534d5e616 (diff) | |
| parent | bf1f0d03191165b5735e1a4f5850971b507ec513 (diff) | |
| download | chat-75ae098dfe57c3350861e633b680e6489900d884.tar.gz chat-75ae098dfe57c3350861e633b680e6489900d884.tar.bz2 chat-75ae098dfe57c3350861e633b680e6489900d884.zip | |
Merge pull request #1850 from mattermost/preview-mode
Documenting how Preview Mode is disabled
| -rw-r--r-- | doc/install/Configuration-Settings.md | 4 | ||||
| -rw-r--r-- | web/react/components/admin_console/email_settings.jsx | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/install/Configuration-Settings.md b/doc/install/Configuration-Settings.md index 962be0eb7..31d4551f6 100644 --- a/doc/install/Configuration-Settings.md +++ b/doc/install/Configuration-Settings.md @@ -123,11 +123,13 @@ Settings to configure email signup, notifications, security, and SMTP options. #### Notifications ```"SendEmailNotifications": false``` -"true": Enables sending of email notifications. “false”: Disables email notifications for developers who may want to skip email setup for faster development. +"true": Enables sending of email notifications. “false”: Disables email notifications for developers who may want to skip email setup for faster development. Setting this to true removes the **Preview Mode: Email notifications have not been configured** banner (requires logging out and logging back in after setting is changed) + ```"RequireEmailVerification": false``` "true": Require email verification after account creation prior to allowing login; “false”: Users do not need to verify their email address prior to login. Developers may set this field to false so skip sending verification emails for faster development. + ```"FeedbackName": ""``` Name displayed on email account used when sending notification emails from Mattermost system. diff --git a/web/react/components/admin_console/email_settings.jsx b/web/react/components/admin_console/email_settings.jsx index 193fd4147..c568c5a77 100644 --- a/web/react/components/admin_console/email_settings.jsx +++ b/web/react/components/admin_console/email_settings.jsx @@ -254,7 +254,7 @@ export default class EmailSettings extends React.Component { /> {'false'} </label> - <p className='help-text'>{'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.'}</p> + <p className='help-text'>{'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.\nSetting this to true removes the Preview Mode banner (requires logging out and logging back in after setting is changed).'}</p> </div> </div> |