Merge branch 'master' of github.com:coralproject/talk into moderate-bio

This commit is contained in:
David Jay
2017-01-13 16:37:31 -05:00
19 changed files with 373 additions and 223 deletions
@@ -109,7 +109,7 @@ export default (props) => (
<div className={`mdl-tabs__panel ${styles.listContainer}`} id='flagged'>
<ModerationList
suspectWords={props.settings.settings.wordlist.suspect}
isActive={props.activeTab === 'rejected'}
isActive={props.activeTab === 'flagged'}
singleView={props.singleView}
commentIds={props.flaggedIds}
userStatusUpdate={props.userStatusUpdate}