diff options
author | ThibG <thib@sitedethib.com> | 2020-04-20 18:25:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-20 18:25:18 +0200 |
commit | 60f8a63a76f7c866b5338c33a8b897ba022368ca (patch) | |
tree | b816c0e92ade09712e9bcce29716e762f38769c1 /app/javascript/flavours/glitch/features/hashtag_timeline/components | |
parent | d5530827c984238f93100ee737ed209d61e316c0 (diff) | |
parent | 221ea4787fe0caf0f8a3238ab95e97aaac8fe360 (diff) |
Merge pull request #1320 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/hashtag_timeline/components')
-rw-r--r-- | app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.js b/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.js index 9c39b158a..956f16734 100644 --- a/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.js +++ b/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.js @@ -4,6 +4,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import Toggle from 'react-toggle'; import AsyncSelect from 'react-select/async'; +import SettingToggle from '../../notifications/components/setting_toggle'; const messages = defineMessages({ placeholder: { id: 'hashtag.column_settings.select.placeholder', defaultMessage: 'Enter hashtags…' }, @@ -87,6 +88,8 @@ class ColumnSettings extends React.PureComponent { }; render () { + const { settings, onChange } = this.props; + return ( <div> <div className='column-settings__row'> @@ -106,6 +109,10 @@ class ColumnSettings extends React.PureComponent { {this.modeSelect('none')} </div> )} + + <div className='column-settings__row'> + <SettingToggle settings={settings} settingPath={['local']} onChange={onChange} label={<FormattedMessage id='community.column_settings.local_only' defaultMessage='Local only' />} /> + </div> </div> ); } |