Merge branch 'master' of github.com:coralproject/talk into instream-ban

client/coral-admin/src/components/ActionButton.js

@@ -28,7 +28,11 @@ const ActionButton = ({type = '', active, ...props}) => {
 };
 
 ActionButton.propTypes = {
-  active: PropTypes.bool
+  active: PropTypes.bool,
+  type: PropTypes.oneOf(['APPROVE', 'REJECT']),
+  minimal: PropTypes.bool,
+  acceptComment: PropTypes.func,
+  rejectComment: PropTypes.func,
 };
 
 export default ActionButton;

client/coral-admin/src/components/ActionsMenu.js

@@ -58,6 +58,7 @@ class ActionsMenu extends React.Component {
 
 ActionsMenu.propTypes = {
   icon: PropTypes.string,
+  children: PropTypes.node,
 };
 
 export default ActionsMenu;

client/coral-admin/src/components/ActionsMenuItem.js

@@ -1,9 +1,14 @@
 import React from 'react';
 import cn from 'classnames';
 import {MenuItem} from 'react-mdl';
+import PropTypes from 'prop-types';
 import styles from './ActionsMenu.css';
 
 const ActionsMenuItem = (props) =>
   <MenuItem className={cn(styles.menuItem, props.className)} {...props} />;
 
+ActionsMenuItem.propTypes = {
+  className: PropTypes.string,
+};
+
 export default ActionsMenuItem;

client/coral-admin/src/components/AdminLogin.js

@@ -105,7 +105,9 @@ AdminLogin.propTypes = {
   handleLogin: PropTypes.func.isRequired,
   passwordRequestSuccess: PropTypes.string,
   loginError: PropTypes.string,
-  recaptchaPublic: PropTypes.string
+  recaptchaPublic: PropTypes.string,
+  requestPasswordReset: PropTypes.func,
+  errorMessage: PropTypes.string,
 };
 
 export default AdminLogin;

client/coral-admin/src/components/CommentAnimatedEdit.js

@@ -2,8 +2,9 @@ import React from 'react';
 import {murmur3} from 'murmurhash-js';
 import {CSSTransitionGroup} from 'react-transition-group';
 import styles from './CommentAnimatedEdit.css';
+import PropTypes from 'prop-types';
 
-export default ({children, body}) => {
+const CommentBodyHighlighter = ({children, body}) => {
   return (
     <CSSTransitionGroup
       component={'div'}
@@ -23,3 +24,10 @@ export default ({children, body}) => {
     </CSSTransitionGroup>
   );
 };
+
+CommentBodyHighlighter.propTypes = {
+  children: PropTypes.node,
+  body: PropTypes.string,
+};
+
+export default CommentBodyHighlighter;

client/coral-admin/src/components/CommentBox.css

@@ -1,4 +0,0 @@
-
-.textareaContainer {
-  width: 100%;
-}

client/coral-admin/src/components/UserDetail.js

@@ -183,7 +183,6 @@ export default class UserDetail extends React.Component {
                   key={comment.id}
                   user={user}
                   comment={comment}
-                  selected={false}
                   suspectWords={suspectWords}
                   bannedWords={bannedWords}
                   actions={actionsMap[status]}

client/coral-admin/src/components/ui/Header.js

@@ -73,12 +73,12 @@ const CoralHeader = ({
               <Menu target="menu-settings" align="right">
                 <MenuItem onClick={() => showShortcuts(true)}>{t('configure.shortcuts')}</MenuItem>
                 <MenuItem>
-                  <a href="https://github.com/coralproject/talk/releases" target="_blank">
+                  <a href="https://github.com/coralproject/talk/releases" target="_blank" rel="noopener noreferrer">
                       View latest version
                   </a>
                 </MenuItem>
                 <MenuItem>
-                  <a href="https://coralproject.net/contribute.html#other-ideas-and-bug-reports" target="_blank">
+                  <a href="https://coralproject.net/contribute.html#other-ideas-and-bug-reports" target="_blank" rel="noopener noreferrer">
                       Report a bug or give feedback
                   </a>
                 </MenuItem>

client/coral-admin/src/routes/Community/components/Table.js

@@ -28,7 +28,8 @@ export default ({headers, commenters, onHeaderClickHandler, onRoleChange, onComm
             {row.created_at}
           </td>
           <td className="mdl-data-table__cell--non-numeric">
-            <SelectField label={'Select me'} value={row.status || ''}
+            <SelectField
+              value={row.status || ''}
               className={styles.selectField}
               label={t('community.status')}
               onChange={(status) => onCommenterStatusChange(row.id, status)}>
@@ -37,7 +38,8 @@ export default ({headers, commenters, onHeaderClickHandler, onRoleChange, onComm
             </SelectField>
           </td>
           <td className="mdl-data-table__cell--non-numeric">
-            <SelectField label={'Select me'} value={row.roles[0] || ''}
+            <SelectField
+              value={row.roles[0] || ''}
               className={styles.selectField}
               label={t('community.role')}
               onChange={(role) => onRoleChange(row.id, role)}>

client/talk-plugin-commentbox/CommentBox.js

@@ -150,7 +150,6 @@ class CommentBox extends React.Component {
     return <div>
       <CommentForm
         defaultValue={this.props.defaultValue}
-        bodyInputId={isReply ? 'replyText' : 'commentText'}
         bodyLabel={isReply ? t('comment_box.reply') : t('comment.comment')}
         maxCharCount={maxCharCount}
         charCountEnable={this.props.charCountEnable}