Unfloyded/Legamunt
0
0
Fork 0
Code 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

21
app/javascript/mastodon/features/public_timeline/containers/column_settings_container.js Normal file
View file

@ -0,0 +1,21 @@
import { connect } from 'react-redux';
import ColumnSettings from '../../community_timeline/components/column_settings';
import { changeSetting, saveSettings } from '../../../actions/settings';
const mapStateToProps = state => ({
settings: state.getIn(['settings', 'public']),
});
const mapDispatchToProps = dispatch => ({
onChange (key, checked) {
dispatch(changeSetting(['public', ...key], checked));
},
onSave () {
dispatch(saveSettings());
},
});
export default connect(mapStateToProps, mapDispatchToProps)(ColumnSettings);