tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add regex filters on the community timeline and the public timeline. (#3564)

Browse Source 
* Add regex filter on the community timeline and the public timeline

* correcting

* Adjust the height of header buttons

* Remove trailing spaces

* Remove trailing spaces

* Solve some code duplication

* reset the state of the locale files in app/javascript/mastodon/locales

* adjust to upstream

* adjust to upstream

* change keys of locale settings
This commit is contained in:
ふぁぼ原
2017-06-06 23:56:10 +09:00
committed by Eugen Rochko
parent e34c5a3503
commit 7623766241
11 changed files with 105 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/features/home_timeline/components/column_settings.js
View File

@@ -4,7 +4,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import ColumnCollapsable from '../../../components/column_collapsable';
import SettingToggle from '../../notifications/components/setting_toggle';
import SettingText from './setting_text';
import SettingText from '../../../components/setting_text';
const messages = defineMessages({
filter_regex: { id: 'home.column_settings.filter_regex', defaultMessage: 'Filter out by regular expressions' },