Merge branch 'release-3.0'

webapp/components/admin_console/compliance_reports.jsx

@@ -7,7 +7,7 @@ import * as Utils from '../../utils/utils.jsx';
 import AdminStore from '../../stores/admin_store.jsx';
 import UserStore from '../../stores/user_store.jsx';
 
-import * as Client from '../../utils/web_client.jsx';
+import Client from 'utils/web_client.jsx';
 import * as AsyncClient from '../../utils/async_client.jsx';
 
 import {FormattedMessage, FormattedDate, FormattedTime} from 'react-intl';

webapp/components/admin_console/compliance_settings.jsx

@@ -2,7 +2,7 @@
 // See License.txt for license information.
 
 import $ from 'jquery';
-import * as Client from '../../utils/web_client.jsx';
+import Client from 'utils/web_client.jsx';
 import * as AsyncClient from '../../utils/async_client.jsx';
 import * as Utils from '../../utils/utils.jsx';
 
@@ -40,6 +40,7 @@ export default class ComplianceSettings extends React.Component {
         $('#save-button').button('loading');
 
         const config = this.props.config;
+        const oldEnable = config.ComplianceSettings.Enable;
         config.ComplianceSettings.Enable = this.refs.Enable.checked;
         config.ComplianceSettings.Directory = ReactDOM.findDOMNode(this.refs.Directory).value;
         config.ComplianceSettings.EnableDaily = this.refs.EnableDaily.checked;
@@ -47,12 +48,15 @@ export default class ComplianceSettings extends React.Component {
         Client.saveConfig(
             config,
             () => {
+                $('#save-button').button('reset');
                 AsyncClient.getConfig();
                 this.setState({
                     serverError: null,
                     saveNeeded: false
                 });
-                $('#save-button').button('reset');
+                if (oldEnable !== config.ComplianceSettings.Enable) {
+                    window.location.reload();
+                }
             },
             (err) => {
                 this.setState({

webapp/components/admin_console/setting.jsx

@@ -5,7 +5,7 @@ import React from 'react';
 
 export default class Setting extends React.Component {
     render() {
-        let marginClass;
+        let marginClass = '';
         if (this.props.margin === 'small') {
             marginClass = ' form-group--small';
         }

webapp/components/user_settings/user_settings_general.jsx

@@ -23,7 +23,7 @@ const holders = defineMessages({
     },
     usernameRestrictions: {
         id: 'user.settings.general.usernameRestrictions',
-        defaultMessage: "Pick something easy for teammates to recognize and recall. Username must begin with a letter, and contain between {min} to {max} lowercase characters made up of numbers, letters, and the symbols '.', '-', and '_'"
+        defaultMessage: "Username must begin with a letter, and contain between {min} to {max} lowercase characters made up of numbers, letters, and the symbols '.', '-', and '_'."
     },
     validEmail: {
         id: 'user.settings.general.validEmail',
@@ -108,7 +108,7 @@ class UserSettingsGeneralTab extends React.Component {
             this.setState({clientError: formatMessage(holders.usernameReserved)});
             return;
         } else if (usernameError) {
-            this.setState({clientError: formatMessage(holders.usernameRestrictions, {min: Constants.MIN_USERNAME_LENGTH}, {max: Constants.MAX_USERNAME_LENGTH})});
+            this.setState({clientError: formatMessage(holders.usernameRestrictions, {min: Constants.MIN_USERNAME_LENGTH, max: Constants.MAX_USERNAME_LENGTH})});
             return;
         }
 
@@ -773,7 +773,7 @@ class UserSettingsGeneralTab extends React.Component {
                     <span>
                         <FormattedMessage
                             id='user.settings.general.usernameInfo'
-                            defaultMessage="Pick something easy for teammates to recognize and recall. Username must begin with a letter, and contain between {Constants.MIN_USERNAME_LENGTH to {Constants.MAX_USERNAME_LENGTH} lowercase characters made up of numbers, letters, and the symbols '.', '-', and '_'"
+                            defaultMessage='Pick something easy for teammates to recognize and recall.'
                         />
                     </span>
                 );