diff options
| author | pluralcafe-docker <docker@plural.cafe> | 2018-08-30 05:23:58 +0000 |
|---|---|---|
| committer | pluralcafe-docker <docker@plural.cafe> | 2018-08-30 05:23:58 +0000 |
| commit | cc7437e25597e24b9a5f06f7991861506d9abe5c (patch) | |
| tree | e627d32df29ef7ae30a67607caf3ecdc1ae333a9 /app/javascript/flavours/glitch/features/local_settings | |
| parent | 395164add468b1079669699dfe8eeaab73f69c15 (diff) | |
| parent | 5ce67276691c37baad149f2f89f765543f70e6f9 (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/javascript/flavours/glitch/features/local_settings')
| -rw-r--r-- | app/javascript/flavours/glitch/features/local_settings/page/index.js | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/features/local_settings/page/index.js b/app/javascript/flavours/glitch/features/local_settings/page/index.js index f88e23c47..ad5c11979 100644 --- a/app/javascript/flavours/glitch/features/local_settings/page/index.js +++ b/app/javascript/flavours/glitch/features/local_settings/page/index.js @@ -77,6 +77,14 @@ export default class LocalSettingsPage extends React.PureComponent { <h2><FormattedMessage id='settings.compose_box_opts' defaultMessage='Compose box options' /></h2> <LocalSettingsPageItem settings={settings} + item={['always_show_spoilers_field']} + id='mastodon-settings--always_show_spoilers_field' + onChange={onChange} + > + <FormattedMessage id='settings.always_show_spoilers_field' defaultMessage='Always enable the Content Warning field' /> + </LocalSettingsPageItem> + <LocalSettingsPageItem + settings={settings} item={['side_arm']} id='mastodon-settings--side_arm' options={[ |