diff options
author | ThibG <thib@sitedethib.com> | 2019-03-13 23:44:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-13 23:44:37 +0100 |
commit | fa75324059c7a146354470691888dc0e1de0342f (patch) | |
tree | 2f4a582a05b6ef7b001140871bf2e2bea7771d95 /app/javascript/flavours/glitch/features/notifications/components/filter_bar.js | |
parent | 3005e473a0df4d2ea942dcc33e01c5e4c15b81fa (diff) | |
parent | 931ecc8824e81c4dcaeb900290c09145b4ed7351 (diff) |
Merge pull request #958 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/notifications/components/filter_bar.js')
-rw-r--r-- | app/javascript/flavours/glitch/features/notifications/components/filter_bar.js | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/features/notifications/components/filter_bar.js b/app/javascript/flavours/glitch/features/notifications/components/filter_bar.js index f95a2c9de..3457b7598 100644 --- a/app/javascript/flavours/glitch/features/notifications/components/filter_bar.js +++ b/app/javascript/flavours/glitch/features/notifications/components/filter_bar.js @@ -6,6 +6,7 @@ const tooltips = defineMessages({ mentions: { id: 'notifications.filter.mentions', defaultMessage: 'Mentions' }, favourites: { id: 'notifications.filter.favourites', defaultMessage: 'Favourites' }, boosts: { id: 'notifications.filter.boosts', defaultMessage: 'Boosts' }, + polls: { id: 'notifications.filter.polls', defaultMessage: 'Poll results' }, follows: { id: 'notifications.filter.follows', defaultMessage: 'Follows' }, }); @@ -79,6 +80,13 @@ class FilterBar extends React.PureComponent { <i className='fa fa-fw fa-retweet' /> </button> <button + className={selectedFilter === 'poll' ? 'active' : ''} + onClick={this.onClick('poll')} + title={intl.formatMessage(tooltips.polls)} + > + <i className='fa fa-fw fa-tasks' /> + </button> + <button className={selectedFilter === 'follow' ? 'active' : ''} onClick={this.onClick('follow')} title={intl.formatMessage(tooltips.follows)} |