Merge branch 'master' into mod-queue-load-more

This commit is contained in:
David Jay
2017-03-20 07:27:15 -07:00
committed by gaba
3 changed files with 27 additions and 6 deletions
@@ -27,7 +27,7 @@ class ModerationContainer extends Component {
componentWillMount() {
const {toggleModal, singleView} = this.props;
this.props.fetchSettings();
key('s', () => singleView());
key('shift+/', () => toggleModal(true));
@@ -163,8 +163,10 @@ class ModerationContainer extends Component {
<BanUserDialog
open={moderation.banDialog}
user={moderation.user}
commentId={moderation.commentId}
handleClose={props.hideBanUserDialog}
handleBanUser={props.banUser}
rejectComment={props.rejectComment}
/>
<ModerationKeysModal
open={moderation.modalOpen}