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

5
app/javascript/mastodon/features/community_timeline/index.js
View file

@ -14,6 +14,7 @@ import {
import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import ColumnBackButtonSlim from '../../components/column_back_button_slim';
import ColumnSettingsContainer from './containers/column_settings_container';
import createStream from '../../stream';
const messages = defineMessages({
@ -120,7 +121,9 @@ class CommunityTimeline extends React.PureComponent {
onClick={this.handleHeaderClick}
pinned={pinned}
multiColumn={multiColumn}
/>
>
<ColumnSettingsContainer />
</ColumnHeader>
<StatusListContainer
{...this.props}