Merge branch 'master' into email-confirm

client/coral-admin/src/translations.json

@@ -146,6 +146,7 @@
       "moderate": "Moderar",
       "configure": "Configurar",
       "community": "Comunidad",
+      "streams": "Streams",
       "closed-comments-desc": "Escribe un mensaje para cuando los comentarios se encuentran cerrados",
       "closed-comments-label": "Escribe un mensaje...",
       "never": "Nunca",

client/coral-framework/constants/user.js

@@ -4,3 +4,4 @@ export const SAVE_BIO_FAILURE = 'SAVE_BIO_FAILURE';
 export const COMMENTS_BY_USER_REQUEST = 'COMMENTS_BY_USER_REQUEST';
 export const COMMENTS_BY_USER_SUCCESS = 'COMMENTS_BY_USER_SUCCESS';
 export const COMMENTS_BY_USER_FAILURE = 'COMMENTS_BY_USER_FAILURE';
+export const LOGOUT_SUCCESS = 'LOGOUT_SUCCESS';

client/coral-framework/reducers/user.js

@@ -36,6 +36,8 @@ export default function user (state = initialState, action) {
     return state.set('myComments', action.comments);
   case assetActions.MULTIPLE_ASSETS_SUCCESS:
     return state.set('myAssets', action.assets);
+  case actions.LOGOUT_SUCCESS:
+    return initialState;
   default :
     return state;
   }

client/coral-plugin-flags/FlagButton.js

@@ -102,7 +102,7 @@ class FlagButton extends Component {
     const popupMenu = getPopupMenu[this.state.step](this.state.itemType);
 
     return <div className={`${name}-container`}>
-      <button onClick={this.onReportClick} className={`${name}-button`}>
+      <button onClick={!this.props.banned ? this.onReportClick : null} className={`${name}-button`}>
         {
           flagged
           ? <span className={`${name}-button-text`}>{lang.t('reported')}</span>