Merge branch 'master' into admin-improvements

This commit is contained in:
Kiwi
2018-10-25 21:58:16 +02:00
committed by GitHub
3 changed files with 1865 additions and 1 deletions
@@ -238,12 +238,14 @@ class StreamSettings extends React.Component {
onChange={this.updateClosedTimeout}
value={getTimeoutAmount(settings.closedTimeout)}
label={t('configure.closed_comments_label')}
disabled={!settings.autoCloseStream}
/>
<div className={styles.configTimeoutSelect}>
<SelectField
label="comments closed time window"
value={getTimeoutMeasure(settings.closedTimeout)}
onChange={this.updateClosedTimeoutMeasure}
readOnly={!settings.autoCloseStream}
>
<Option value={'hours'}>{t('configure.hours')}</Option>
<Option value={'days'}>{t('configure.days')}</Option>
@@ -44,6 +44,5 @@
.disabledBody {
color: #ccc;
pointer-events: none;
}
+1863
View File
File diff suppressed because it is too large Load Diff