1
0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 17:56:25 +00:00

Merged Master into feature branch and fixed conflicts

This commit is contained in:
nathan-castlehow
2019-08-01 20:12:58 +08:00
75 changed files with 477 additions and 224 deletions

View File

@@ -181,7 +181,26 @@ class HotkeyTab extends React.Component {
onChange={(e) => this.handleHotkeyChange(e)}
ref='prettifyMarkdown'
value={config.hotkey.prettifyMarkdown}
type='text'/>
</div>
</div>
<div styleName='group-section'>
<div styleName='group-section-label'>{i18n.__('Insert Current Date')}</div>
<div styleName='group-section-control'>
<input styleName='group-section-control-input'
value={config.hotkey.insertDate}
type='text'
disabled='true'
/>
</div>
</div>
<div styleName='group-section'>
<div styleName='group-section-label'>{i18n.__('Insert Current Date and Time')}</div>
<div styleName='group-section-control'>
<input styleName='group-section-control-input'
value={config.hotkey.insertDateTime}
type='text'
disabled='true'
/>
</div>
</div>