Fixing merge

web/react/components/admin_console/service_settings.jsx

@@ -35,7 +35,7 @@ export default class ServiceSettings extends React.Component {
 
         config.ServiceSettings.SegmentDeveloperKey = React.findDOMNode(this.refs.SegmentDeveloperKey).value.trim();
         config.ServiceSettings.GoogleDeveloperKey = React.findDOMNode(this.refs.GoogleDeveloperKey).value.trim();
-        config.ServiceSettings.EnableOAuthServiceProvider = React.findDOMNode(this.refs.EnableOAuthServiceProvider).checked;
+        //config.ServiceSettings.EnableOAuthServiceProvider = React.findDOMNode(this.refs.EnableOAuthServiceProvider).checked;
         config.ServiceSettings.EnableIncomingWebhooks = React.findDOMNode(this.refs.EnableIncomingWebhooks).checked;
         config.ServiceSettings.EnableTesting = React.findDOMNode(this.refs.EnableTesting).checked;
 
@@ -170,45 +170,12 @@ export default class ServiceSettings extends React.Component {
                         </div>
                     </div>
 
-                    <div className='form-group'>
-                        <label
-                            className='control-label col-sm-4'
-                            htmlFor='EnableOAuthServiceProvider'
-                        >
-                            {'Enable OAuth Service Provider: '}
-                        </label>
-                        <div className='col-sm-8'>
-                            <label className='radio-inline'>
-                                <input
-                                    type='radio'
-                                    name='EnableOAuthServiceProvider'
-                                    value='true'
-                                    ref='EnableOAuthServiceProvider'
-                                    defaultChecked={this.props.config.ServiceSettings.EnableOAuthServiceProvider}
-                                    onChange={this.handleChange}
-                                />
-                                    {'true'}
-                            </label>
-                            <label className='radio-inline'>
-                                <input
-                                    type='radio'
-                                    name='EnableOAuthServiceProvider'
-                                    value='false'
-                                    defaultChecked={!this.props.config.ServiceSettings.EnableOAuthServiceProvider}
-                                    onChange={this.handleChange}
-                                />
-                                    {'false'}
-                            </label>
-                            <p className='help-text'>{'When enabled Mattermost will act as an Oauth2 Provider.  Changing this will require a server restart before taking effect.'}</p>
-                        </div>
-                    </div>
-
                     <div className='form-group'>
                         <label
                             className='control-label col-sm-4'
                             htmlFor='EnableIncomingWebhooks'
                         >
-                            {'EnableIncomingWebhooks: '}
+                            {'Enable Incoming Webhooks: '}
                         </label>
                         <div className='col-sm-8'>
                             <label className='radio-inline'>
@@ -291,6 +258,39 @@ export default class ServiceSettings extends React.Component {
     }
 }
 
+// <div className='form-group'>
+//     <label
+//         className='control-label col-sm-4'
+//         htmlFor='EnableOAuthServiceProvider'
+//     >
+//         {'Enable OAuth Service Provider: '}
+//     </label>
+//     <div className='col-sm-8'>
+//         <label className='radio-inline'>
+//             <input
+//                 type='radio'
+//                 name='EnableOAuthServiceProvider'
+//                 value='true'
+//                 ref='EnableOAuthServiceProvider'
+//                 defaultChecked={this.props.config.ServiceSettings.EnableOAuthServiceProvider}
+//                 onChange={this.handleChange}
+//             />
+//                 {'true'}
+//         </label>
+//         <label className='radio-inline'>
+//             <input
+//                 type='radio'
+//                 name='EnableOAuthServiceProvider'
+//                 value='false'
+//                 defaultChecked={!this.props.config.ServiceSettings.EnableOAuthServiceProvider}
+//                 onChange={this.handleChange}
+//             />
+//                 {'false'}
+//         </label>
+//         <p className='help-text'>{'When enabled Mattermost will act as an Oauth2 Provider.  Changing this will require a server restart before taking effect.'}</p>
+//     </div>
+// </div>
+
 ServiceSettings.propTypes = {
     config: React.PropTypes.object
 };

web/react/components/admin_console/team_settings.jsx

@@ -28,7 +28,6 @@ export default class TeamSettings extends React.Component {
 
         var config = this.props.config;
         config.TeamSettings.SiteName = React.findDOMNode(this.refs.SiteName).value.trim();
-        config.TeamSettings.DefaultThemeColor = React.findDOMNode(this.refs.DefaultThemeColor).value.trim();
         config.TeamSettings.RestrictCreationToDomains = React.findDOMNode(this.refs.RestrictCreationToDomains).value.trim();
         config.TeamSettings.EnableTeamCreation = React.findDOMNode(this.refs.EnableTeamCreation).checked;
         config.TeamSettings.EnableUserCreation = React.findDOMNode(this.refs.EnableUserCreation).checked;
@@ -122,27 +121,6 @@ export default class TeamSettings extends React.Component {
                         </div>
                     </div>
 
-                    <div className='form-group'>
-                        <label
-                            className='control-label col-sm-4'
-                            htmlFor='DefaultThemeColor'
-                        >
-                            {'Default Theme Color:'}
-                        </label>
-                        <div className='col-sm-8'>
-                            <input
-                                type='text'
-                                className='form-control'
-                                id='DefaultThemeColor'
-                                ref='DefaultThemeColor'
-                                placeholder='Ex "#2389D7"'
-                                defaultValue={this.props.config.TeamSettings.DefaultThemeColor}
-                                onChange={this.handleChange}
-                            />
-                            <p className='help-text'>{'Default theme color for team sites.'}</p>
-                        </div>
-                    </div>
-
                     <div className='form-group'>
                         <label
                             className='control-label col-sm-4'

web/react/components/team_settings_modal.jsx

@@ -36,7 +36,9 @@ export default class TeamSettingsModal extends React.Component {
         const tabs = [];
         tabs.push({name: 'general', uiName: 'General', icon: 'glyphicon glyphicon-cog'});
         tabs.push({name: 'import', uiName: 'Import', icon: 'glyphicon glyphicon-upload'});
-        tabs.push({name: 'export', uiName: 'Export', icon: 'glyphicon glyphicon-download'});
+
+        // To enable export uncomment this line
+        //tabs.push({name: 'export', uiName: 'Export', icon: 'glyphicon glyphicon-download'});
 
         return (
             <div

web/react/components/user_settings/manage_incoming_hooks.jsx

@@ -107,23 +107,23 @@ export default class ManageIncomingHooks extends React.Component {
         this.state.hooks.forEach((hook) => {
             const c = ChannelStore.get(hook.channel_id);
             hooks.push(
-                <div>
-                    <div className='divider-light'></div>
-                    <span>
-                        <strong>{'URL: '}</strong>{Utils.getWindowLocationOrigin() + '/hooks/' + hook.id}
-                    </span>
-                    <br/>
-                    <span>
+                <div className='font--small'>
+                    <div className='padding-top x2 divider-light'></div>
+                    <div className='padding-top x2'>
+                        <strong>{'URL: '}</strong><span className='word-break--all'>{Utils.getWindowLocationOrigin() + '/hooks/' + hook.id}</span>
+                    </div>
+                    <div className='padding-top'>
                         <strong>{'Channel: '}</strong>{c.name}
-                    </span>
-                    <br/>
-                    <a
-                        className={'btn btn-sm btn-primary'}
-                        href='#'
-                        onClick={this.removeHook.bind(this, hook.id)}
-                    >
-                        {'Remove'}
-                    </a>
+                    </div>
+                    <div className='padding-top'>
+                        <a
+                            className={'text-danger'}
+                            href='#'
+                            onClick={this.removeHook.bind(this, hook.id)}
+                        >
+                            {'Remove'}
+                        </a>
+                    </div>
                 </div>
             );
         });
@@ -134,41 +134,38 @@ export default class ManageIncomingHooks extends React.Component {
         } else if (hooks.length > 0) {
             displayHooks = hooks;
         } else {
-            displayHooks = <label>{'None'}</label>;
+            displayHooks = <label>{' None'}</label>;
         }
 
         const existingHooks = (
-            <div>
-                <label className='control-label'>{'Existing incoming webhooks'}</label>
-                <br/>
+            <div className='padding-top x2'>
+                <label className='control-label padding-top x2'>{'Existing incoming webhooks'}</label>
                 {displayHooks}
             </div>
         );
 
         return (
-            <div
-                key='addIncomingHook'
-                className='form-group'
-            >
+            <div key='addIncomingHook'>
                 <label className='control-label'>{'Add a new incoming webhook'}</label>
-                <br/>
-                <div>
+                <div className='padding-top'>
                     <select
                         ref='channelName'
+                        className='form-control'
                         value={this.state.channelId}
                         onChange={this.updateChannelId}
                     >
                         {options}
                     </select>
-                    <br/>
                     {serverError}
-                    <a
-                        className={'btn btn-sm btn-primary' + disableButton}
-                        href='#'
-                        onClick={this.addNewHook}
-                    >
-                        {'Add'}
-                    </a>
+                    <div className='padding-top'>
+                        <a
+                            className={'btn btn-sm btn-primary' + disableButton}
+                            href='#'
+                            onClick={this.addNewHook}
+                        >
+                            {'Add'}
+                        </a>
+                    </div>
                 </div>
                 {existingHooks}
             </div>

web/react/components/view_image.jsx

@@ -40,7 +40,9 @@ export default class ViewImageModal extends React.Component {
         };
     }
     handleNext(e) {
-        e.stopPropagation();
+        if (e) {
+            e.stopPropagation();
+        }
         var id = this.state.imgId + 1;
         if (id > this.props.filenames.length - 1) {
             id = 0;
@@ -49,7 +51,9 @@ export default class ViewImageModal extends React.Component {
         this.loadImage(id);
     }
     handlePrev(e) {
-        e.stopPropagation();
+        if (e) {
+            e.stopPropagation();
+        }
         var id = this.state.imgId - 1;
         if (id < 0) {
             id = this.props.filenames.length - 1;