Merge branch 'master' into bug-comment-number

client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js

@@ -77,7 +77,11 @@ class ModerationContainer extends React.Component {
     const {comments} = this.props;
     const premodIds = comments.ids.filter(id => comments.byId[id].status === 'premod');
     const rejectedIds = comments.ids.filter(id => comments.byId[id].status === 'rejected');
-    const flaggedIds = comments.ids.filter(id => comments.byId[id].flagged === true);
+    const flaggedIds = comments.ids.filter(id =>
+        comments.byId[id].flagged === true &&
+        comments.byId[id].status !== 'rejected' &&
+        comments.byId[id].status !== 'accepted'
+      );
 
     return (
       <ModerationQueue

client/coral-framework/helpers/validate.js

@@ -1,6 +1,6 @@
 export default {
   email: email => (/^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/.test(email)),
-  password: pass => (/^(?=.{8,}).*$/.test(pass)),
+  password: pass => !(/^(?=.{8,}).*$/.test(pass)),
   confirmPassword: () => true,
   displayName: displayName => (/^[a-z0-9_]+$/.test(displayName))
 };

client/coral-sign-in/components/SignDialog.js

@@ -3,7 +3,7 @@ import {Dialog} from 'coral-ui';
 import styles from './styles.css';
 
 import SignInContent from './SignInContent';
-import SingUpContent from './SignUpContent';
+import SignUpContent from './SignUpContent';
 import ForgotContent from './ForgotContent';
 
 const SignDialog = ({open, view, handleClose, offset, ...props}) => (
@@ -17,7 +17,7 @@ const SignDialog = ({open, view, handleClose, offset, ...props}) => (
     }}>
     <span className={styles.close} onClick={handleClose}>×</span>
     {view === 'SIGNIN' && <SignInContent {...props} />}
-    {view === 'SIGNUP' && <SingUpContent {...props} />}
+    {view === 'SIGNUP' && <SignUpContent {...props} />}
     {view === 'FORGOT' && <ForgotContent {...props} />}
   </Dialog>
 );