diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-05-03 12:05:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-03 12:05:24 +0200 |
commit | 58ac5ae643dc57ffd20017c54e7be523deaef156 (patch) | |
tree | 491e4afab8ab269096f6f68a3dfab08433954cda /app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.js | |
parent | cb9a919ff28294a2f1cf3642a165ad433cbf856b (diff) | |
parent | fa22b8ed229f93de1236a74d4df4a0b5fa57dddd (diff) |
Merge pull request #1761 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.js')
-rw-r--r-- | app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.js b/app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.js index ce14e2a9d..18c3c7e21 100644 --- a/app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.js +++ b/app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.js @@ -2,6 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import ImmutablePropTypes from 'react-immutable-proptypes'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; +import SettingToggle from 'flavours/glitch/features/notifications/components/setting_toggle'; import SettingText from '../../../components/setting_text'; const messages = defineMessages({ @@ -23,6 +24,12 @@ class ColumnSettings extends React.PureComponent { return ( <div> + <span className='column-settings__section'><FormattedMessage id='home.column_settings.basic' defaultMessage='Basic' /></span> + + <div className='column-settings__row'> + <SettingToggle settings={settings} settingPath={['conversations']} onChange={onChange} label={<FormattedMessage id='direct.group_by_conversations' defaultMessage='Group by conversation' />} /> + </div> + <span className='column-settings__section'><FormattedMessage id='home.column_settings.advanced' defaultMessage='Advanced' /></span> <div className='column-settings__row'> |