Merge branch 'master' into off-topic-features

Conflicts:
	client/coral-embed-stream/src/components/Comment.css
	client/coral-embed-stream/src/components/Comment.js
	client/coral-embed-stream/src/components/Stream.js
	client/coral-embed-stream/src/reducers/index.js
	client/coral-framework/helpers/plugins.js

plugins/coral-plugin-auth/client/components/SignInContainer.js

@@ -18,7 +18,6 @@ import {
   facebookCallback,
   invalidForm,
   validForm,
-  checkLogin
 } from 'coral-framework/actions/auth';
 
 class SignInContainer extends React.Component {
@@ -38,10 +37,6 @@ class SignInContainer extends React.Component {
     };
   }
 
-  componentWillMount() {
-    this.props.checkLogin();
-  }
-
   componentDidMount() {
     window.addEventListener('storage', this.handleAuth);
 
@@ -187,7 +182,6 @@ const mapStateToProps = (state) => ({
 const mapDispatchToProps = (dispatch) =>
   bindActionCreators(
     {
-      checkLogin,
       facebookCallback,
       fetchSignUp,
       fetchSignIn,

plugins/coral-plugin-auth/client/components/UserBox.js

@@ -9,10 +9,10 @@ const UserBox = ({loggedIn, user, logout, onShowProfile}) => (
   <div>
     {
       loggedIn ? (
-        <div className={styles.userBox}>
+        <div className={`${styles.userBox} talk-stream-auth-userbox`}>
           <span className={styles.userBoxLoggedIn}>{t('sign_in.logged_in_as')}</span>
           <a onClick={onShowProfile}>{user.username}</a>. {t('sign_in.not_you')}
-          <a className={styles.logout} onClick={() => logout()}>
+          <a className={`${styles.logout} talk-stream-userbox-logout`} onClick={() => logout()}>
             {t('sign_in.logout')}
           </a>
         </div>

plugins/coral-plugin-respect/client/components/RespectButton.js

@@ -7,6 +7,8 @@ import cn from 'classnames';
 
 import {getMyActionSummary, getTotalActionCount} from 'coral-framework/utils';
 
+const name = 'coral-plugin-respect';
+
 class RespectButton extends Component {
 
   handleClick = () => {
@@ -47,13 +49,13 @@ class RespectButton extends Component {
     let count = getTotalActionCount('RespectActionSummary', comment);
 
     return (
-      <div className={styles.respect}>
+      <div className={cn(styles.respect, `${name}-container`)}>
         <button
-          className={cn(styles.button, {[styles.respected]: myRespect})}
+          className={cn(styles.button, {[styles.respected]: myRespect}, `${name}-button`)}
           onClick={this.handleClick} >
-          <span>{t(myRespect ? 'respected' : 'respect')}</span>
-          <Icon className={cn(styles.icon, {[styles.respected]: myRespect})} />
-          {count > 0 && count}
+          <span className={`${name}-button-text`}>{t(myRespect ? 'respected' : 'respect')}</span>
+          <Icon className={cn(styles.icon, {[styles.respected]: myRespect}, `${name}-icon`)} />
+          <span className={`${name}-count`}>{count > 0 && count}</span>
         </button>
       </div>
     );

plugins/coral-plugin-viewing-options/client/containers/ViewingOptions.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 import ViewingOptions from '../components/ViewingOptions';