diff options
author | Corey Hulen <corey@hulen.com> | 2015-10-12 14:22:05 -0700 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-10-12 14:22:05 -0700 |
commit | 191e248b0fbe833c0c52e1e6145f4d19b4c3a7b6 (patch) | |
tree | 63378d3100f0a70806767c87886b3e0b9037f8c5 /web/react/components/admin_console/service_settings.jsx | |
parent | 246c7414bd2f22a3440af5df7d72f33e7207dc50 (diff) | |
parent | a6a3c351a828441313e90c1ac8e6afbfadad1f7c (diff) | |
download | chat-191e248b0fbe833c0c52e1e6145f4d19b4c3a7b6.tar.gz chat-191e248b0fbe833c0c52e1e6145f4d19b4c3a7b6.tar.bz2 chat-191e248b0fbe833c0c52e1e6145f4d19b4c3a7b6.zip |
Merge pull request #1022 from mattermost/release-1.1.0
Release 1.1.0rc merging to master
Diffstat (limited to 'web/react/components/admin_console/service_settings.jsx')
-rw-r--r-- | web/react/components/admin_console/service_settings.jsx | 37 |
1 files changed, 36 insertions, 1 deletions
diff --git a/web/react/components/admin_console/service_settings.jsx b/web/react/components/admin_console/service_settings.jsx index 3968d9820..f29d62646 100644 --- a/web/react/components/admin_console/service_settings.jsx +++ b/web/react/components/admin_console/service_settings.jsx @@ -35,11 +35,13 @@ export default class ServiceSettings extends React.Component { config.ServiceSettings.SegmentDeveloperKey = React.findDOMNode(this.refs.SegmentDeveloperKey).value.trim(); config.ServiceSettings.GoogleDeveloperKey = React.findDOMNode(this.refs.GoogleDeveloperKey).value.trim(); - //config.ServiceSettings.EnableOAuthServiceProvider = React.findDOMNode(this.refs.EnableOAuthServiceProvider).checked; config.ServiceSettings.EnableIncomingWebhooks = React.findDOMNode(this.refs.EnableIncomingWebhooks).checked; config.ServiceSettings.EnablePostUsernameOverride = React.findDOMNode(this.refs.EnablePostUsernameOverride).checked; config.ServiceSettings.EnablePostIconOverride = React.findDOMNode(this.refs.EnablePostIconOverride).checked; config.ServiceSettings.EnableTesting = React.findDOMNode(this.refs.EnableTesting).checked; + config.ServiceSettings.EnableSecurityFixAlert = React.findDOMNode(this.refs.EnableSecurityFixAlert).checked; + + //config.ServiceSettings.EnableOAuthServiceProvider = React.findDOMNode(this.refs.EnableOAuthServiceProvider).checked; var MaximumLoginAttempts = 10; if (!isNaN(parseInt(React.findDOMNode(this.refs.MaximumLoginAttempts).value, 10))) { @@ -305,6 +307,39 @@ export default class ServiceSettings extends React.Component { </div> <div className='form-group'> + <label + className='control-label col-sm-4' + htmlFor='EnableSecurityFixAlert' + > + {'Enable Security Alerts: '} + </label> + <div className='col-sm-8'> + <label className='radio-inline'> + <input + type='radio' + name='EnableSecurityFixAlert' + value='true' + ref='EnableSecurityFixAlert' + defaultChecked={this.props.config.ServiceSettings.EnableSecurityFixAlert} + onChange={this.handleChange} + /> + {'true'} + </label> + <label className='radio-inline'> + <input + type='radio' + name='EnableSecurityFixAlert' + value='false' + defaultChecked={!this.props.config.ServiceSettings.EnableSecurityFixAlert} + onChange={this.handleChange} + /> + {'false'} + </label> + <p className='help-text'>{'When true, System Administrators are notified by email if a relevant security fix alert has been announced in the last 12 hours. Requires email to be enabled.'}</p> + </div> + </div> + + <div className='form-group'> <div className='col-sm-12'> {serverError} <button |