Merge branch 'master' into user-sort

Conflicts:
	client/coral-admin/src/reducers/moderation.js
	client/coral-embed-stream/src/actions/stream.js
	client/coral-embed-stream/src/components/Stream.js
	client/coral-framework/components/Slot.js
	plugin-api/beta/client/utils/index.js
	test/server/routes/api/account/index.js

plugin-api/beta/client/hocs/withReaction.js

@@ -7,7 +7,6 @@ import {getDisplayName} from 'coral-framework/helpers/hoc';
 import {compose, gql} from 'react-apollo';
 import withFragments from 'coral-framework/hocs/withFragments';
 import withMutation from 'coral-framework/hocs/withMutation';
-import {showSignInDialog} from 'coral-framework/actions/auth';
 import {addNotification} from 'coral-framework/actions/notification';
 import {capitalize} from 'coral-framework/helpers/strings';
 import {getMyActionSummary, getTotalActionCount} from 'coral-framework/utils';
@@ -15,6 +14,9 @@ import hoistStatics from 'recompose/hoistStatics';
 import * as PropTypes from 'prop-types';
 import {getDefinitionName} from '../utils';
 
+// TODO: Auth logic needs refactoring.
+import {showSignInDialog} from 'coral-embed-stream/src/actions/auth';
+
 /*
  * Disable false-positive warning below, as it doesn't work well with how we currently
  * assemble the queries.

plugin-api/beta/client/services/index.js

@@ -1,9 +1,3 @@
 export {t, timeago} from 'coral-framework/services/i18n';
 export {can} from 'coral-framework/services/perms';
-import {isSlotEmpty as ise} from 'coral-framework/helpers/plugins';
 
-// @TODO: Deprecated.
-export function isSlotEmpty(...args) {
-  console.warn('A plugin is using `isSlotEmpty` which has been deprecated, please port to the new API using the `IfSlotIsEmpty` and `IfSlotIsNotEmpty` components.');
-  return ise(...args);
-}

plugin-api/beta/client/utils/index.js

@@ -4,5 +4,6 @@ export {
   getSlotFragmentSpreads,
   forEachError,
   capitalize,
+  getErrorMessages,
   getDefinitionName,
 } from 'coral-framework/utils';