]> cat aescling's git repositories - mastodon.git/commit
Add regex filters on the community timeline and the public timeline. (#3564)
authorふぁぼ原 <ko_kurihara@yahoo.co.jp>
Tue, 6 Jun 2017 14:56:10 +0000 (23:56 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Tue, 6 Jun 2017 14:56:10 +0000 (16:56 +0200)
commit7623766241862d2ede47558639c357d57b769e3b
tree3211cfa0d57173b8ced269871a32bf07c4ce36f0
parente34c5a350321c6c1997bdcc15fbd85cfb521f51b
Add regex filters on the community timeline and the public timeline. (#3564)

* 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
app/javascript/mastodon/components/setting_text.js [moved from app/javascript/mastodon/features/home_timeline/components/setting_text.js with 100% similarity]
app/javascript/mastodon/features/community_timeline/components/column_settings.js [new file with mode: 0644]
app/javascript/mastodon/features/community_timeline/containers/column_settings_container.js [new file with mode: 0644]
app/javascript/mastodon/features/community_timeline/index.js
app/javascript/mastodon/features/home_timeline/components/column_settings.js
app/javascript/mastodon/features/public_timeline/containers/column_settings_container.js [new file with mode: 0644]
app/javascript/mastodon/features/public_timeline/index.js
app/javascript/mastodon/locales/pt-BR.json
app/javascript/mastodon/locales/pt.json
app/javascript/mastodon/reducers/settings.js
app/javascript/styles/components.scss