Merging from master
Этот коммит содержится в:
=Corey Hulen
@@ -152,9 +152,8 @@ export default class UserSettingsAppearance extends React.Component {
|
||||
<input type='radio'
|
||||
checked={!displayCustom}
|
||||
onChange={this.updateType.bind(this, 'premade')}
|
||||
>
|
||||
{'Theme Colors'}
|
||||
</input>
|
||||
/>
|
||||
{'Theme Colors'}
|
||||
</label>
|
||||
<br/>
|
||||
</div>
|
||||
@@ -164,9 +163,8 @@ export default class UserSettingsAppearance extends React.Component {
|
||||
<input type='radio'
|
||||
checked={displayCustom}
|
||||
onChange={this.updateType.bind(this, 'custom')}
|
||||
>
|
||||
{'Custom Theme'}
|
||||
</input>
|
||||
/>
|
||||
{'Custom Theme'}
|
||||
</label>
|
||||
<br/>
|
||||
</div>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
|
||||
// See License.txt for license information.
|
||||
|
||||
import { savePreferences } from '../../utils/client.jsx';
|
||||
import {savePreferences} from '../../utils/client.jsx';
|
||||
import SettingItemMin from '../setting_item_min.jsx';
|
||||
import SettingItemMax from '../setting_item_max.jsx';
|
||||
import Constants from '../../utils/constants.jsx';
|
||||
@@ -38,7 +38,7 @@ export default class UserSettingsDisplay extends React.Component {
|
||||
);
|
||||
}
|
||||
handleClockRadio(militaryTime) {
|
||||
this.setState({militaryTime: militaryTime});
|
||||
this.setState({militaryTime});
|
||||
}
|
||||
updateSection(section) {
|
||||
this.setState(getDisplayStateFromStores());
|
||||
@@ -57,7 +57,7 @@ export default class UserSettingsDisplay extends React.Component {
|
||||
const serverError = this.state.serverError || null;
|
||||
let clockSection;
|
||||
if (this.props.activeSection === 'clock') {
|
||||
let clockFormat = [false, false];
|
||||
const clockFormat = [false, false];
|
||||
if (this.state.militaryTime === 'true') {
|
||||
clockFormat[1] = true;
|
||||
} else {
|
||||
@@ -77,9 +77,8 @@ export default class UserSettingsDisplay extends React.Component {
|
||||
type='radio'
|
||||
checked={clockFormat[0]}
|
||||
onChange={this.handleClockRadio.bind(this, 'false')}
|
||||
>
|
||||
12-hour clock (example: 4:00 PM)
|
||||
</input>
|
||||
/>
|
||||
{'12-hour clock (example: 4:00 PM)'}
|
||||
</label>
|
||||
<br/>
|
||||
</div>
|
||||
@@ -89,9 +88,8 @@ export default class UserSettingsDisplay extends React.Component {
|
||||
type='radio'
|
||||
checked={clockFormat[1]}
|
||||
onChange={this.handleClockRadio.bind(this, 'true')}
|
||||
>
|
||||
24-hour clock (example: 16:00)
|
||||
</input>
|
||||
/>
|
||||
{'24-hour clock (example: 16:00)'}
|
||||
</label>
|
||||
<br/>
|
||||
</div>
|
||||
@@ -99,7 +97,6 @@ export default class UserSettingsDisplay extends React.Component {
|
||||
</div>
|
||||
];
|
||||
|
||||
|
||||
clockSection = (
|
||||
<SettingItemMax
|
||||
title='Clock Display'
|
||||
@@ -138,13 +135,13 @@ export default class UserSettingsDisplay extends React.Component {
|
||||
className='close'
|
||||
data-dismiss='modal'
|
||||
aria-label='Close'
|
||||
>
|
||||
>
|
||||
<span aria-hidden='true'>{'×'}</span>
|
||||
</button>
|
||||
<h4
|
||||
className='modal-title'
|
||||
ref='title'
|
||||
>
|
||||
>
|
||||
<i className='modal-back'></i>
|
||||
{'Display Settings'}
|
||||
</h4>
|
||||
|
||||
@@ -228,9 +228,8 @@ export default class NotificationsTab extends React.Component {
|
||||
<input type='radio'
|
||||
checked={notifyActive[0]}
|
||||
onChange={this.handleNotifyRadio.bind(this, 'all')}
|
||||
>
|
||||
For all activity
|
||||
</input>
|
||||
/>
|
||||
{'For all activity'}
|
||||
</label>
|
||||
<br/>
|
||||
</div>
|
||||
@@ -240,9 +239,8 @@ export default class NotificationsTab extends React.Component {
|
||||
type='radio'
|
||||
checked={notifyActive[1]}
|
||||
onChange={this.handleNotifyRadio.bind(this, 'mention')}
|
||||
>
|
||||
Only for mentions and direct messages
|
||||
</input>
|
||||
/>
|
||||
{'Only for mentions and direct messages'}
|
||||
</label>
|
||||
<br/>
|
||||
</div>
|
||||
@@ -252,9 +250,8 @@ export default class NotificationsTab extends React.Component {
|
||||
type='radio'
|
||||
checked={notifyActive[2]}
|
||||
onChange={this.handleNotifyRadio.bind(this, 'none')}
|
||||
>
|
||||
Never
|
||||
</input>
|
||||
/>
|
||||
{'Never'}
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
@@ -320,9 +317,8 @@ export default class NotificationsTab extends React.Component {
|
||||
type='radio'
|
||||
checked={soundActive[0]}
|
||||
onChange={this.handleSoundRadio.bind(this, 'true')}
|
||||
>
|
||||
On
|
||||
</input>
|
||||
/>
|
||||
{'On'}
|
||||
</label>
|
||||
<br/>
|
||||
</div>
|
||||
@@ -332,9 +328,8 @@ export default class NotificationsTab extends React.Component {
|
||||
type='radio'
|
||||
checked={soundActive[1]}
|
||||
onChange={this.handleSoundRadio.bind(this, 'false')}
|
||||
>
|
||||
Off
|
||||
</input>
|
||||
/>
|
||||
{'Off'}
|
||||
</label>
|
||||
<br/>
|
||||
</div>
|
||||
@@ -402,9 +397,8 @@ export default class NotificationsTab extends React.Component {
|
||||
type='radio'
|
||||
checked={emailActive[0]}
|
||||
onChange={this.handleEmailRadio.bind(this, 'true')}
|
||||
>
|
||||
On
|
||||
</input>
|
||||
/>
|
||||
{'On'}
|
||||
</label>
|
||||
<br/>
|
||||
</div>
|
||||
@@ -414,9 +408,8 @@ export default class NotificationsTab extends React.Component {
|
||||
type='radio'
|
||||
checked={emailActive[1]}
|
||||
onChange={this.handleEmailRadio.bind(this, 'false')}
|
||||
>
|
||||
Off
|
||||
</input>
|
||||
/>
|
||||
{'Off'}
|
||||
</label>
|
||||
<br/>
|
||||
</div>
|
||||
@@ -482,9 +475,8 @@ export default class NotificationsTab extends React.Component {
|
||||
type='checkbox'
|
||||
checked={this.state.firstNameKey}
|
||||
onChange={handleUpdateFirstNameKey}
|
||||
>
|
||||
{'Your case sensitive first name "' + user.first_name + '"'}
|
||||
</input>
|
||||
/>
|
||||
{'Your case sensitive first name "' + user.first_name + '"'}
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
@@ -502,9 +494,8 @@ export default class NotificationsTab extends React.Component {
|
||||
type='checkbox'
|
||||
checked={this.state.usernameKey}
|
||||
onChange={handleUpdateUsernameKey}
|
||||
>
|
||||
{'Your non-case sensitive username "' + user.username + '"'}
|
||||
</input>
|
||||
/>
|
||||
{'Your non-case sensitive username "' + user.username + '"'}
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
@@ -521,9 +512,8 @@ export default class NotificationsTab extends React.Component {
|
||||
type='checkbox'
|
||||
checked={this.state.mentionKey}
|
||||
onChange={handleUpdateMentionKey}
|
||||
>
|
||||
{'Your username mentioned "@' + user.username + '"'}
|
||||
</input>
|
||||
/>
|
||||
{'Your username mentioned "@' + user.username + '"'}
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
@@ -540,9 +530,8 @@ export default class NotificationsTab extends React.Component {
|
||||
type='checkbox'
|
||||
checked={this.state.allKey}
|
||||
onChange={handleUpdateAllKey}
|
||||
>
|
||||
{'Team-wide mentions "@all"'}
|
||||
</input>
|
||||
/>
|
||||
{'Team-wide mentions "@all"'}
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
@@ -559,9 +548,8 @@ export default class NotificationsTab extends React.Component {
|
||||
type='checkbox'
|
||||
checked={this.state.channelKey}
|
||||
onChange={handleUpdateChannelKey}
|
||||
>
|
||||
{'Channel-wide mentions "@channel"'}
|
||||
</input>
|
||||
/>
|
||||
{'Channel-wide mentions "@channel"'}
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
@@ -576,9 +564,8 @@ export default class NotificationsTab extends React.Component {
|
||||
type='checkbox'
|
||||
checked={this.state.customKeysChecked}
|
||||
onChange={this.updateCustomMentionKeys}
|
||||
>
|
||||
{'Other non-case sensitive words, separated by commas:'}
|
||||
</input>
|
||||
/>
|
||||
{'Other non-case sensitive words, separated by commas:'}
|
||||
</label>
|
||||
</div>
|
||||
<input
|
||||
|
||||
Ссылка в новой задаче
Block a user