From 52b5db3a0b5d2ed3b96a72d8e8865d61d865320e Mon Sep 17 00:00:00 2001
From: Corey Hulen <corey@hulen.com>
Date: Tue, 7 Jun 2016 14:42:58 -0700
Subject: PLT-3215 Moving custom branding in admin console (#3286)

---
 webapp/components/admin_console/admin_sidebar.jsx | 27 ++++++++++++++---------
 1 file changed, 17 insertions(+), 10 deletions(-)

(limited to 'webapp/components/admin_console')

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={
-- 
cgit v1.2.3-1-g7c22


From eefde7d7b6231d2ba143aa496f698d0c9f758bdd Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Thu, 9 Jun 2016 12:08:27 -0300
Subject: PLT-3236 Click in little x for admin console localization settings
 causes error (#3292)

---
 webapp/components/admin_console/multiselect_settings.jsx | 1 +
 1 file changed, 1 insertion(+)

(limited to 'webapp/components/admin_console')

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}
-- 
cgit v1.2.3-1-g7c22


From de907280a7932a387909fc9310e6bd50269bbd98 Mon Sep 17 00:00:00 2001
From: jasonblais <jason@spinpunch.com>
Date: Thu, 9 Jun 2016 11:44:13 -0400
Subject: Add server restart note to LDAP sync setting (#3303)

* Add server restart note to LDAP sync setting

* Add server restart note to LDAP sync setting
---
 webapp/components/admin_console/ldap_settings.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'webapp/components/admin_console')

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}
-- 
cgit v1.2.3-1-g7c22


From 974238231b9cdbd39a825ec8e9299fbb0b51f6b8 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Mon, 13 Jun 2016 14:36:40 -0400
Subject: PLT-3270 Comment out max file size setting in system console (#3324)

* Comment out max file size settting in system console

* Remove pending post after successful create post request
---
 .../components/admin_console/storage_settings.jsx  | 41 +++++++++++-----------
 1 file changed, 21 insertions(+), 20 deletions(-)

(limited to 'webapp/components/admin_console')

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={[
-- 
cgit v1.2.3-1-g7c22