diff options
| author | Corey Hulen <corey@hulen.com> | 2017-06-05 13:36:59 -0700 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-06-05 16:36:59 -0400 |
| commit | 86fe96a6e2f06b09d1cb5243e3e76834594ddb9c (patch) | |
| tree | 649dcb7528d1457bc73e06dfe0ca877980901055 /webapp | |
| parent | a3171048e089fba22360e90fe5312be344ab1739 (diff) | |
| download | chat-86fe96a6e2f06b09d1cb5243e3e76834594ddb9c.tar.gz chat-86fe96a6e2f06b09d1cb5243e3e76834594ddb9c.tar.bz2 chat-86fe96a6e2f06b09d1cb5243e3e76834594ddb9c.zip | |
Tweaking strings and adding them to the loc files for the signature v2 fix (#6527)
* Tweaking strings and adding them to the loc files
* Fixing spacing
* Removing V2 from config
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/admin_console/storage_settings.jsx | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/webapp/components/admin_console/storage_settings.jsx b/webapp/components/admin_console/storage_settings.jsx index 74c53770a..1400b673c 100644 --- a/webapp/components/admin_console/storage_settings.jsx +++ b/webapp/components/admin_console/storage_settings.jsx @@ -34,7 +34,6 @@ export default class StorageSettings extends AdminSettings { config.FileSettings.AmazonS3Bucket = this.state.amazonS3Bucket; config.FileSettings.AmazonS3Endpoint = this.state.amazonS3Endpoint; config.FileSettings.AmazonS3SSL = this.state.amazonS3SSL; - config.FileSettings.AmazonS3SignV2 = this.state.amazonS3SignV2; return config; } @@ -49,8 +48,7 @@ export default class StorageSettings extends AdminSettings { amazonS3SecretAccessKey: config.FileSettings.AmazonS3SecretAccessKey, amazonS3Bucket: config.FileSettings.AmazonS3Bucket, amazonS3Endpoint: config.FileSettings.AmazonS3Endpoint, - amazonS3SSL: config.FileSettings.AmazonS3SSL, - amazonS3SignV2: config.FileSettings.AmazonS3SignV2 + amazonS3SSL: config.FileSettings.AmazonS3SSL }; } @@ -204,25 +202,6 @@ export default class StorageSettings extends AdminSettings { disabled={this.state.driverName !== DRIVER_S3} /> <BooleanSetting - id='amazonS3SignV2' - label={ - <FormattedMessage - id='admin.image.amazonS3SignV2Title' - defaultMessage='Enable Signature V2 for S3 Connections:' - /> - } - placeholder={Utils.localizeMessage('admin.image.amazonS3SignV2Example', 'Ex "false"')} - helpText={ - <FormattedMessage - id='admin.image.amazonS3SignV2Desc' - defaultMessage='When true, allow signature v2 to Amazon S3. Defaults to Signature V4 requests.' - /> - } - value={this.state.amazonS3SignV2} - onChange={this.handleChange} - disabled={this.state.driverName !== DRIVER_S3} - /> - <BooleanSetting id='enableFileAttachments' label={ <FormattedMessage |