Merge branch 'master' of github.com:coralproject/talk into design-pass-adm

This commit is contained in:
Belen Curcio
2017-01-13 17:14:51 -03:00
17 changed files with 302 additions and 205 deletions
@@ -77,7 +77,7 @@ export default ({onTabClick, ...props}) => (
<div className={`mdl-tabs__panel ${styles.listContainer}`} id='flagged'>
<CommentList
suspectWords={props.settings.settings.wordlist.suspect}
isActive={props.activeTab === 'rejected'}
isActive={props.activeTab === 'flagged'}
singleView={props.singleView}
commentIds={props.flaggedIds}
comments={props.comments.byId}