summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorReed Garmsen <rgarmsen2295@gmail.com>2016-02-08 13:45:19 -0800
committerReed Garmsen <rgarmsen2295@gmail.com>2016-02-08 13:49:11 -0800
commite56454ca11c4b14ecc1cb097f2941e7d0980a7b8 (patch)
tree0bd518f7f21c8ff3963e1bafa824bec89d262b81 /web
parent137920b479b9cb6688a4ad683c67280549680c70 (diff)
downloadchat-e56454ca11c4b14ecc1cb097f2941e7d0980a7b8.tar.gz
chat-e56454ca11c4b14ecc1cb097f2941e7d0980a7b8.tar.bz2
chat-e56454ca11c4b14ecc1cb097f2941e7d0980a7b8.zip
Removed the ability to disable file storage from the admin console
Diffstat (limited to 'web')
-rw-r--r--web/react/components/admin_console/image_settings.jsx5
-rw-r--r--web/static/i18n/en.json1
-rw-r--r--web/static/i18n/es.json1
3 files changed, 0 insertions, 7 deletions
diff --git a/web/react/components/admin_console/image_settings.jsx b/web/react/components/admin_console/image_settings.jsx
index 12bf554ea..86f78e093 100644
--- a/web/react/components/admin_console/image_settings.jsx
+++ b/web/react/components/admin_console/image_settings.jsx
@@ -8,10 +8,6 @@ import crypto from 'crypto';
import {injectIntl, intlShape, defineMessages, FormattedMessage} from 'mm-intl';
const holders = defineMessages({
- storeDisabled: {
- id: 'admin.image.storeDisabled',
- defaultMessage: 'Disable File Storage'
- },
storeLocal: {
id: 'admin.image.storeLocal',
defaultMessage: 'Local File System'
@@ -242,7 +238,6 @@ class FileSettings extends React.Component {
defaultValue={this.props.config.FileSettings.DriverName}
onChange={this.handleChange.bind(this, 'DriverName')}
>
- <option value=''>{formatMessage(holders.storeDisabled)}</option>
<option value='local'>{formatMessage(holders.storeLocal)}</option>
<option value='amazons3'>{formatMessage(holders.storeAmazonS3)}</option>
</select>
diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json
index ff25d98c2..1f6d80b08 100644
--- a/web/static/i18n/en.json
+++ b/web/static/i18n/en.json
@@ -148,7 +148,6 @@
"admin.gitlab.userTitle": "User API Endpoint:",
"admin.gitlab.userDescription": "Enter https://<your-gitlab-url>/api/v3/user. Make sure you use HTTP or HTTPS in your URL depending on your server configuration.",
"admin.gitlab.save": "Save",
- "admin.image.storeDisabled": "Disable File Storage",
"admin.image.storeLocal": "Local File System",
"admin.image.storeAmazonS3": "Amazon S3",
"admin.image.localExample": "Ex \"./data/\"",
diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json
index 19582b836..09bdefcf5 100644
--- a/web/static/i18n/es.json
+++ b/web/static/i18n/es.json
@@ -157,7 +157,6 @@
"admin.image.shareDescription": "Permitir a los usuarios compartir enlaces públicos para archivos e imágenes.",
"admin.image.shareTitle": "Compartir publicamente enlaces de archivos: ",
"admin.image.storeAmazonS3": "Amazon S3",
- "admin.image.storeDisabled": "Deshabilitar almacenamiento de archivos",
"admin.image.storeLocal": "Sistema local de archivos",
"admin.image.storeTitle": "Almacenar archivos en:",
"admin.image.thumbHeightDescription": "Alto de imágen miniatura subida. Actualizando este valor la imagen miniatura cambia en el futuro, pero no cambia para imagenes creadas en el pasado.",