Merge branch 'release-3.1'

Conflicts:
	webapp/components/create_comment.jsx

4 files changed, 40 insertions, 31 deletions

diff --git a/webapp/components/admin_console/admin_sidebar.jsx b/webapp/components/admin_console/admin_sidebar.jsx
index d760e3db9..c947be5cb 100644
--- a/webapp/components/admin_console/admin_sidebar.jsx
+++ b/webapp/components/admin_console/admin_sidebar.jsx
@@ -239,6 +239,22 @@ export default class AdminSidebar extends React.Component {
             );
         }
 
+        let customBranding = null;
+
+        if (window.mm_license.IsLicensed === 'true') {
+            customBranding = (
+                <AdminSidebarSection
+                    name='custom_brand'
+                    title={
+                        <FormattedMessage
+                            id='admin.sidebar.customBrand'
+                            defaultMessage='Custom Branding'
+                        />
+                    }
+                />
+            );
+        }
+
         return (
             <div className='admin-sidebar'>
                 <AdminSidebarHeader/>
@@ -515,16 +531,7 @@ export default class AdminSidebar extends React.Component {
                                     />
                                 }
                             >
-                                <AdminSidebarSection
-                                    name='custom_brand'
-                                    title={
-                                        <FormattedMessage
-                                            id='admin.sidebar.customBrand'
-                                            defaultMessage='Custom Branding'
-                                        />
-
-                                    }
-                                />
+                                {customBranding}
                                 <AdminSidebarSection
                                     name='legal_and_support'
                                     title={
diff --git a/webapp/components/admin_console/ldap_settings.jsx b/webapp/components/admin_console/ldap_settings.jsx
index acda672d8..01d4b0a67 100644
--- a/webapp/components/admin_console/ldap_settings.jsx
+++ b/webapp/components/admin_console/ldap_settings.jsx
@@ -343,7 +343,7 @@ export default class LdapSettings extends AdminSettings {
                     helpText={
                         <FormattedMessage
                             id='admin.ldap.syncIntervalHelpText'
-                            defaultMessage='LDAP Synchronization is the process by which Mattermost updates its users to reflect any updated data on the LDAP server. For example if a name for a user is updated on the LDAP server, the change will be reflected in Mattermost when the synchronization is performed. Accounts that have been removed from the LDAP server will have their active sessions cleared and no longer be able to login to Mattermost. Mattermost will perform this synchronization regularly according to the interval supplied here. For example, if 60 is supplied, Mattermost will update the users every hour.'
+                            defaultMessage='LDAP Synchronization is the process by which Mattermost updates its users to reflect any updated data on the LDAP server. For example if a name for a user is updated on the LDAP server, the change will be reflected in Mattermost when the synchronization is performed. Accounts that have been removed from the LDAP server will have their active sessions cleared and no longer be able to login to Mattermost. Mattermost will perform this synchronization regularly according to the interval supplied here. For example, if 60 is supplied, Mattermost will update the users every hour. Changing this will require a server restart before taking effect.'
                         />
                     }
                     value={this.state.syncIntervalMinutes}
diff --git a/webapp/components/admin_console/multiselect_settings.jsx b/webapp/components/admin_console/multiselect_settings.jsx
index deba983de..ca0bdc9aa 100644
--- a/webapp/components/admin_console/multiselect_settings.jsx
+++ b/webapp/components/admin_console/multiselect_settings.jsx
@@ -50,6 +50,7 @@ export default class MultiSelectSetting extends React.Component {
                     labelKey='text'
                     options={this.props.values}
                     joinValues={true}
+                    clearable={false}
                     disabled={this.props.disabled}
                     noResultsText={this.props.noResultText}
                     onChange={this.handleChange}
diff --git a/webapp/components/admin_console/storage_settings.jsx b/webapp/components/admin_console/storage_settings.jsx
index 60eedc2d2..077d75c73 100644
--- a/webapp/components/admin_console/storage_settings.jsx
+++ b/webapp/components/admin_console/storage_settings.jsx
@@ -22,8 +22,8 @@ export default class StorageSettings extends AdminSettings {
 
         this.renderSettings = this.renderSettings.bind(this);
 
+        //maxFileSize: props.config.FileSettings.MaxFileSize,
         this.state = Object.assign(this.state, {
-            maxFileSize: props.config.FileSettings.MaxFileSize,
             driverName: props.config.FileSettings.DriverName,
             directory: props.config.FileSettings.Directory,
             amazonS3AccessKeyId: props.config.FileSettings.AmazonS3AccessKeyId,
@@ -34,7 +34,7 @@ export default class StorageSettings extends AdminSettings {
     }
 
     getConfigFromState(config) {
-        config.FileSettings.MaxFileSize = this.parseInt(this.state.maxFileSize);
+        //config.FileSettings.MaxFileSize = this.parseInt(this.state.maxFileSize);
         config.FileSettings.DriverName = this.state.driverName;
         config.FileSettings.Directory = this.state.directory;
         config.FileSettings.AmazonS3AccessKeyId = this.state.amazonS3AccessKeyId;
@@ -57,26 +57,27 @@ export default class StorageSettings extends AdminSettings {
     }
 
     renderSettings() {
+        /*<TextSetting
+            id='maxFileSize'
+            label={
+                <FormattedMessage
+                    id='admin.image.maxFileSizeTitle'
+                    defaultMessage='Max File Size:'
+                />
+            }
+            placeholder={Utils.localizeMessage('admin.image.maxFileSizeExample', 'Ex "52428800"')}
+            helpText={
+                <FormattedMessage
+                    id='admin.image.maxFileSizeDescription'
+                    defaultMessage='Max File Size in bytes. If blank, will be set to 52428800 (50MB).'
+                />
+            }
+            value={this.state.maxFileSize}
+            onChange={this.handleChange}
+        />*/
+
         return (
             <SettingsGroup>
-                <TextSetting
-                    id='maxFileSize'
-                    label={
-                        <FormattedMessage
-                            id='admin.image.maxFileSizeTitle'
-                            defaultMessage='Max File Size:'
-                        />
-                    }
-                    placeholder={Utils.localizeMessage('admin.image.maxFileSizeExample', 'Ex "52428800"')}
-                    helpText={
-                        <FormattedMessage
-                            id='admin.image.maxFileSizeDescription'
-                            defaultMessage='Max File Size in bytes. If blank, will be set to 52428800 (50MB).'
-                        />
-                    }
-                    value={this.state.maxFileSize}
-                    onChange={this.handleChange}
-                />
                 <DropdownSetting
                     id='driverName'
                     values={[