From 8866366d3cf5f95e2a4d3c244fb13fea76dc8634 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Fri, 17 Feb 2017 16:07:34 -0700
Subject: [PATCH 001/132] storing my place in case we want to come back to this

---
 .../coral-admin/src/components/FlagWidget.js  |  2 +-
 .../coral-admin/src/components/LikeWidget.js  | 34 +++++++++++++++++++
 client/coral-admin/src/components/Widget.css  | 34 +++++++++++++++++++
 .../src/containers/Dashboard/Dashboard.js     | 11 ++++--
 .../coral-admin/src/graphql/queries/index.js  | 20 +++++++++--
 .../src/graphql/queries/metrics.graphql       | 24 +++++++++++++
 6 files changed, 119 insertions(+), 6 deletions(-)
 create mode 100644 client/coral-admin/src/components/LikeWidget.js
 create mode 100644 client/coral-admin/src/components/Widget.css
 create mode 100644 client/coral-admin/src/graphql/queries/metrics.graphql

diff --git a/client/coral-admin/src/components/FlagWidget.js b/client/coral-admin/src/components/FlagWidget.js
index 187306c8c..96e21ac0b 100644
--- a/client/coral-admin/src/components/FlagWidget.js
+++ b/client/coral-admin/src/components/FlagWidget.js
@@ -1,6 +1,6 @@
 import React, {PropTypes} from 'react';
 import {Link} from 'react-router';
-import styles from './FlagWidget.css';
+import styles from './Widget.css';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from 'coral-admin/src/translations';
 
diff --git a/client/coral-admin/src/components/LikeWidget.js b/client/coral-admin/src/components/LikeWidget.js
new file mode 100644
index 000000000..33df3e2b4
--- /dev/null
+++ b/client/coral-admin/src/components/LikeWidget.js
@@ -0,0 +1,34 @@
+import React, {PropTypes} from 'react';
+import {Link} from 'react-router';
+import styles from './Widget.css';
+import I18n from 'coral-framework/modules/i18n/i18n';
+import translations from 'coral-admin/src/translations';
+
+const lang = new I18n(translations);
+
+const LikeWidget = ({assets}) => {
+  return (
+    <table className={styles.widgetTable}>
+    </table>
+  );
+};
+
+LikeWidget.propTypes = {
+  assets: PropTypes.arrayOf(
+    PropTypes.shape({
+      id: PropTypes.string,
+      title: PropTypes.string,
+      url: PropTypes.string,
+      commentCount: PropTypes.number,
+      action_summaries: PropTypes.arrayOf(
+        PropTypes.shape({
+          __typename: PropTypes.string.isRequired,
+          actionCount: PropTypes.number.isRequired,
+          actionableItemCount: PropTypes.number.isRequired
+        })
+      )
+    })
+  ).isRequired
+};
+
+export default LikeWidget;
diff --git a/client/coral-admin/src/components/Widget.css b/client/coral-admin/src/components/Widget.css
new file mode 100644
index 000000000..f40da403d
--- /dev/null
+++ b/client/coral-admin/src/components/Widget.css
@@ -0,0 +1,34 @@
+.heading {
+  margin: 0;
+  font-size: 1.5rem;
+  font-weight: bold;
+}
+
+.widgetTable {
+  width: 100%;
+  border-collapse: collapse;
+  box-shadow: 0px 0px 5px 0px rgba(0,0,0,0.2);
+}
+
+.widgetTable thead th {
+  border-bottom: 1px solid #f47e6b;
+  padding: 10px;
+  text-align: left;
+}
+
+.widgetTable tbody tr {
+  border-bottom: 1px solid lightgrey;
+}
+
+.widgetTable tbody tr:last-child {
+  border-bottom: none;
+}
+
+.widgetTable tbody td {
+  padding: 10px;
+}
+
+.lede {
+  font-size: 0.9em;
+  color: grey;
+}
diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.js b/client/coral-admin/src/containers/Dashboard/Dashboard.js
index 6baa16af1..253c0980b 100644
--- a/client/coral-admin/src/containers/Dashboard/Dashboard.js
+++ b/client/coral-admin/src/containers/Dashboard/Dashboard.js
@@ -1,14 +1,16 @@
 import React from 'react';
 import {compose} from 'react-apollo';
-import {mostFlags} from 'coral-admin/src/graphql/queries';
+import {mostFlags, mostLikes} from 'coral-admin/src/graphql/queries';
 import {Spinner} from 'coral-ui';
 import styles from './Dashboard.css';
 import FlagWidget from '../../components/FlagWidget';
+import LikeWidget from '../../components/LikeWidget';
 
 class Dashboard extends React.Component {
   render () {
 
     const {data} = this.props;
+    console.log('data', data);
     const {metrics: assets} = data;
 
     if (data.loading) {
@@ -28,11 +30,16 @@ class Dashboard extends React.Component {
         <div className={styles.widget}>
           <h2 className={styles.heading}>Top ten comments with the most likes</h2>
         </div>
+        <div className={styles.widget}>
+          <h2 className={styles.heading}>Top Ten Articles with the most likes</h2>
+          <LikeWidget assets={assets} />
+        </div>
       </div>
     );
   }
 }
 
 export default compose(
-  mostFlags
+  mostFlags,
+  mostLikes
 )(Dashboard);
diff --git a/client/coral-admin/src/graphql/queries/index.js b/client/coral-admin/src/graphql/queries/index.js
index 3325249e1..f98b40091 100644
--- a/client/coral-admin/src/graphql/queries/index.js
+++ b/client/coral-admin/src/graphql/queries/index.js
@@ -1,14 +1,14 @@
 import {graphql} from 'react-apollo';
 
-import MOST_FLAGS from './mostFlags.graphql';
+import METRICS from './metrics.graphql';
 import MOD_QUEUE_QUERY from './modQueueQuery.graphql';
 
-export const mostFlags = graphql(MOST_FLAGS, {
+export const mostFlags = graphql(METRICS, {
   options: () => {
 
     // currently hard-coded per Greg's advice
     const fiveMinutesAgo = new Date();
-    fiveMinutesAgo.setMinutes(fiveMinutesAgo.getMinutes() - 305);
+    fiveMinutesAgo.setMinutes(fiveMinutesAgo.getMinutes() - 5);
     return {
       variables: {
         sort: 'FLAG',
@@ -19,6 +19,20 @@ export const mostFlags = graphql(MOST_FLAGS, {
   }
 });
 
+export const mostLikes = graphql(METRICS, {
+  options: () => {
+    const fiveMinutesAgo = new Date();
+    fiveMinutesAgo.setMinutes(fiveMinutesAgo.getMinutes() - 5);
+    return {
+      variables: {
+        sort: 'LIKE',
+        from: fiveMinutesAgo.toISOString(),
+        to: new Date().toISOString()
+      }
+    };
+  }
+});
+
 export const modQueueQuery = graphql(MOD_QUEUE_QUERY, {
   options: ({params: {id = null}}) => {
     return {
diff --git a/client/coral-admin/src/graphql/queries/metrics.graphql b/client/coral-admin/src/graphql/queries/metrics.graphql
new file mode 100644
index 000000000..2f9afe621
--- /dev/null
+++ b/client/coral-admin/src/graphql/queries/metrics.graphql
@@ -0,0 +1,24 @@
+fragment metrics on Asset {
+  id
+  title
+  action_summaries {
+    type: __typename
+    actionCount
+    actionableItemCount
+  }
+}
+
+query Metrics ($from: Date!, $to: Date!, $sort: ACTION_TYPE!) {
+  metrics(from: $from, to: $to, sort: $sort) {
+    id
+    title
+    url
+    commentCount
+    author
+    created_at
+    action_summaries {
+      actionCount
+      actionableItemCount
+    }
+  }
+}

From 364cf1808e107551218beec3f329d121e4d42dbf Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Tue, 21 Feb 2017 10:28:33 -0700
Subject: [PATCH 002/132] assets by like?

---
 .../src/containers/Dashboard/Dashboard.js     |  6 +++---
 .../{metrics.graphql => assetsByFlag.graphql} | 17 ++++++-----------
 .../src/graphql/queries/assetsByLike.graphql  | 19 +++++++++++++++++++
 .../coral-admin/src/graphql/queries/index.js  |  7 ++++---
 4 files changed, 32 insertions(+), 17 deletions(-)
 rename client/coral-admin/src/graphql/queries/{metrics.graphql => assetsByFlag.graphql} (51%)
 create mode 100644 client/coral-admin/src/graphql/queries/assetsByLike.graphql

diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.js b/client/coral-admin/src/containers/Dashboard/Dashboard.js
index 253c0980b..0cc015e00 100644
--- a/client/coral-admin/src/containers/Dashboard/Dashboard.js
+++ b/client/coral-admin/src/containers/Dashboard/Dashboard.js
@@ -11,7 +11,7 @@ class Dashboard extends React.Component {
 
     const {data} = this.props;
     console.log('data', data);
-    const {metrics: assets} = data;
+    const {assetsByLike, assetsByFlag} = data;
 
     if (data.loading) {
       return <Spinner />;
@@ -25,14 +25,14 @@ class Dashboard extends React.Component {
       <div className={styles.Dashboard}>
         <div className={styles.widget}>
           <h2 className={styles.heading}>Top Ten Articles with the most flagged comments</h2>
-          <FlagWidget assets={assets} />
+          <FlagWidget assets={assetsByFlag} />
         </div>
         <div className={styles.widget}>
           <h2 className={styles.heading}>Top ten comments with the most likes</h2>
         </div>
         <div className={styles.widget}>
           <h2 className={styles.heading}>Top Ten Articles with the most likes</h2>
-          <LikeWidget assets={assets} />
+          <LikeWidget assets={assetsByLike} />
         </div>
       </div>
     );
diff --git a/client/coral-admin/src/graphql/queries/metrics.graphql b/client/coral-admin/src/graphql/queries/assetsByFlag.graphql
similarity index 51%
rename from client/coral-admin/src/graphql/queries/metrics.graphql
rename to client/coral-admin/src/graphql/queries/assetsByFlag.graphql
index 2f9afe621..c6f0900ac 100644
--- a/client/coral-admin/src/graphql/queries/metrics.graphql
+++ b/client/coral-admin/src/graphql/queries/assetsByFlag.graphql
@@ -1,6 +1,10 @@
 fragment metrics on Asset {
   id
   title
+  url
+  commentCount
+  author
+  created_at
   action_summaries {
     type: __typename
     actionCount
@@ -9,16 +13,7 @@ fragment metrics on Asset {
 }
 
 query Metrics ($from: Date!, $to: Date!, $sort: ACTION_TYPE!) {
-  metrics(from: $from, to: $to, sort: $sort) {
-    id
-    title
-    url
-    commentCount
-    author
-    created_at
-    action_summaries {
-      actionCount
-      actionableItemCount
-    }
+  assetsByFlag: metrics(from: $from, to: $to, sort: $sort) {
+    ...metrics
   }
 }
diff --git a/client/coral-admin/src/graphql/queries/assetsByLike.graphql b/client/coral-admin/src/graphql/queries/assetsByLike.graphql
new file mode 100644
index 000000000..853afee41
--- /dev/null
+++ b/client/coral-admin/src/graphql/queries/assetsByLike.graphql
@@ -0,0 +1,19 @@
+fragment metrics on Asset {
+  id
+  title
+  url
+  commentCount
+  author
+  created_at
+  action_summaries {
+    type: __typename
+    actionCount
+    actionableItemCount
+  }
+}
+
+query Metrics ($from: Date!, $to: Date!, $sort: ACTION_TYPE!) {
+  assetsByLike: metrics(from: $from, to: $to, sort: $sort) {
+    ...metrics
+  }
+}
diff --git a/client/coral-admin/src/graphql/queries/index.js b/client/coral-admin/src/graphql/queries/index.js
index f98b40091..96cb319c9 100644
--- a/client/coral-admin/src/graphql/queries/index.js
+++ b/client/coral-admin/src/graphql/queries/index.js
@@ -1,9 +1,10 @@
 import {graphql} from 'react-apollo';
 
-import METRICS from './metrics.graphql';
+import BY_LIKES from './assetsByLike.graphql';
+import BY_FLAGS from './assetsByFlag.graphql';
 import MOD_QUEUE_QUERY from './modQueueQuery.graphql';
 
-export const mostFlags = graphql(METRICS, {
+export const mostFlags = graphql(BY_FLAGS, {
   options: () => {
 
     // currently hard-coded per Greg's advice
@@ -19,7 +20,7 @@ export const mostFlags = graphql(METRICS, {
   }
 });
 
-export const mostLikes = graphql(METRICS, {
+export const mostLikes = graphql(BY_LIKES, {
   options: () => {
     const fiveMinutesAgo = new Date();
     fiveMinutesAgo.setMinutes(fiveMinutesAgo.getMinutes() - 5);

From 5d94a98305bfaa5c07b87746d40565dc41ff6337 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Tue, 21 Feb 2017 14:05:49 -0700
Subject: [PATCH 003/132] Like and Flag summaries work again

---
 .../coral-admin/src/components/FlagWidget.js  | 102 +++++++++---------
 .../coral-admin/src/components/LikeWidget.js  |  73 +++++++++----
 .../src/containers/Dashboard/Dashboard.js     |  53 +++------
 .../src/graphql/queries/assetsByLike.graphql  |  19 ----
 .../coral-admin/src/graphql/queries/index.js  |   9 +-
 .../{assetsByFlag.graphql => metrics.graphql} |   2 +-
 client/coral-admin/src/translations.json      |   2 +
 7 files changed, 121 insertions(+), 139 deletions(-)
 delete mode 100644 client/coral-admin/src/graphql/queries/assetsByLike.graphql
 rename client/coral-admin/src/graphql/queries/{assetsByFlag.graphql => metrics.graphql} (80%)

diff --git a/client/coral-admin/src/components/FlagWidget.js b/client/coral-admin/src/components/FlagWidget.js
index 96e21ac0b..a37ddcd2c 100644
--- a/client/coral-admin/src/components/FlagWidget.js
+++ b/client/coral-admin/src/components/FlagWidget.js
@@ -1,66 +1,60 @@
-import React, {PropTypes} from 'react';
+import React from 'react';
+import {compose} from 'react-apollo';
+import {mostFlags} from 'coral-admin/src/graphql/queries';
 import {Link} from 'react-router';
 import styles from './Widget.css';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from 'coral-admin/src/translations';
+import {Spinner} from 'coral-ui';
 
 const lang = new I18n(translations);
 
-const FlagWidget = ({assets}) => {
+const FlagWidget = (props) => {
+
+  if (props.data.loading) {
+    return <Spinner />;
+  }
+
+  const {data: {metrics: assets}} = props;
 
   return (
-    <table className={styles.widgetTable}>
-      <thead className={styles.widgetHead}>
-        <tr>
-          <th></th>{/* empty on purpose */}
-          <th>{lang.t('streams.article')}</th>
-          <th>{lang.t('modqueue.flagged')}</th>
-          <th>{lang.t('modqueue.likes')}</th>
-          <th>{lang.t('dashboard.comment_count')}</th>
-        </tr>
-      </thead>
-      <tbody>
-        {
-          assets.length
-          ? assets.map((asset, index) => {
-            const flagSummary = asset.action_summaries.find(s => s.__typename === 'FlagAssetActionSummary');
-            const likeSummary = asset.action_summaries.find(s => s.__typename === 'LikeAssetActionSummary');
-            return (
-              <tr key={asset.id}>
-                <td>{index + 1}.</td>
-                <td>
-                  <Link to={`/admin/moderate/flagged/${asset.id}`}>{asset.title}</Link>
-                  <p className={styles.lede}>{asset.author} - Published: {new Date(asset.created_at).toLocaleDateString()}</p>
-                </td>
-                <td>{flagSummary ? flagSummary.actionCount : 0}</td>
-                <td>{likeSummary ? likeSummary.actionCount : 0}</td>
-                <td>{asset.commentCount}</td>
-              </tr>
-            );
-          })
-          : <tr><td colSpan="3">{lang.t('dashboard.no_flags')}</td></tr>
-        }
-      </tbody>
-    </table>
+    <div>
+      <h2 className={styles.heading}>Top Ten Articles with the most flagged comments</h2>
+      <table className={styles.widgetTable}>
+        <thead className={styles.widgetHead}>
+          <tr>
+            <th></th>{/* empty on purpose */}
+            <th>{lang.t('streams.article')}</th>
+            <th>{lang.t('modqueue.flagged')}</th>
+            <th>{lang.t('modqueue.likes')}</th>
+            <th>{lang.t('dashboard.comment_count')}</th>
+          </tr>
+        </thead>
+        <tbody>
+          {
+            assets.length
+            ? assets.map((asset, index) => {
+              const flagSummary = asset.action_summaries.find(s => s.type === 'FlagAssetActionSummary');
+              const likeSummary = asset.action_summaries.find(s => s.type === 'LikeAssetActionSummary');
+              return (
+                <tr key={asset.id}>
+                  <td>{index + 1}.</td>
+                  <td>
+                    <Link to={`/admin/moderate/flagged/${asset.id}`}>{asset.title}</Link>
+                    <p className={styles.lede}>{asset.author} - Published: {new Date(asset.created_at).toLocaleDateString()}</p>
+                  </td>
+                  <td>{flagSummary ? flagSummary.actionCount : 0}</td>
+                  <td>{likeSummary ? likeSummary.actionCount : 0}</td>
+                  <td>{asset.commentCount}</td>
+                </tr>
+              );
+            })
+            : <tr><td colSpan="3">{lang.t('dashboard.no_flags')}</td></tr>
+          }
+        </tbody>
+      </table>
+    </div>
   );
 };
 
-FlagWidget.propTypes = {
-  assets: PropTypes.arrayOf(
-    PropTypes.shape({
-      id: PropTypes.string,
-      title: PropTypes.string,
-      url: PropTypes.string,
-      commentCount: PropTypes.number,
-      action_summaries: PropTypes.arrayOf(
-        PropTypes.shape({
-          __typename: PropTypes.string.isRequired,
-          actionCount: PropTypes.number.isRequired,
-          actionableItemCount: PropTypes.number.isRequired
-        })
-      )
-    })
-  ).isRequired
-};
-
-export default FlagWidget;
+export default compose(mostFlags)(FlagWidget);
diff --git a/client/coral-admin/src/components/LikeWidget.js b/client/coral-admin/src/components/LikeWidget.js
index 33df3e2b4..ac9e111ea 100644
--- a/client/coral-admin/src/components/LikeWidget.js
+++ b/client/coral-admin/src/components/LikeWidget.js
@@ -1,34 +1,61 @@
-import React, {PropTypes} from 'react';
+import React from 'react';
+import {compose} from 'react-apollo';
+import {mostLikes} from 'coral-admin/src/graphql/queries';
 import {Link} from 'react-router';
+import {Spinner} from 'coral-ui';
 import styles from './Widget.css';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from 'coral-admin/src/translations';
 
 const lang = new I18n(translations);
 
-const LikeWidget = ({assets}) => {
+const LikeWidget = (props) => {
+
+  if (props.data.loading) {
+    return <Spinner />;
+  }
+
+  const {data: {metrics: assets}} = props;
+
   return (
-    <table className={styles.widgetTable}>
-    </table>
+    <div>
+      <h2 className={styles.heading}>Top Ten Articles with the most likes</h2>
+      <table className={styles.widgetTable}>
+        <thead className={styles.widgetHead}>
+          <tr>
+            <th></th>{/* empty on purpose */}
+            <th>{lang.t('streams.article')}</th>
+            <th>{lang.t('modqueue.flagged')}</th>
+            <th>{lang.t('modqueue.likes')}</th>
+            <th>{lang.t('dashboard.comment_count')}</th>
+          </tr>
+        </thead>
+        <tbody>
+          {
+            assets.length
+            ? assets.map((asset, index) => {
+              const flagSummary = asset.action_summaries.find(s => s.type === 'FlagAssetActionSummary');
+              const likeSummary = asset.action_summaries.find(s => s.type === 'LikeAssetActionSummary');
+              console.log('LikeWidget', likeSummary);
+              return (
+                <tr key={asset.id}>
+                  <td>{index + 1}.</td>
+                  <td>
+                    <Link to={`/admin/moderate/flagged/${asset.id}`}>{asset.title}</Link>
+                    <p className={styles.lede}>{asset.author} - Published: {new Date(asset.created_at).toLocaleDateString()}</p>
+                  </td>
+                  <td>{flagSummary ? flagSummary.actionCount : 0}</td>
+                  <td>{likeSummary ? likeSummary.actionCount : 0}</td>
+                  <td>{asset.commentCount}</td>
+                </tr>
+              );
+            })
+            : <tr><td colSpan="3">{lang.t('dashboard.no_likes')}</td></tr>
+          }
+        </tbody>
+      </table>
+    </div>
   );
 };
 
-LikeWidget.propTypes = {
-  assets: PropTypes.arrayOf(
-    PropTypes.shape({
-      id: PropTypes.string,
-      title: PropTypes.string,
-      url: PropTypes.string,
-      commentCount: PropTypes.number,
-      action_summaries: PropTypes.arrayOf(
-        PropTypes.shape({
-          __typename: PropTypes.string.isRequired,
-          actionCount: PropTypes.number.isRequired,
-          actionableItemCount: PropTypes.number.isRequired
-        })
-      )
-    })
-  ).isRequired
-};
-
-export default LikeWidget;
+export default compose(mostLikes)(LikeWidget);
diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.js b/client/coral-admin/src/containers/Dashboard/Dashboard.js
index 0cc015e00..fcccb36b3 100644
--- a/client/coral-admin/src/containers/Dashboard/Dashboard.js
+++ b/client/coral-admin/src/containers/Dashboard/Dashboard.js
@@ -1,45 +1,22 @@
 import React from 'react';
-import {compose} from 'react-apollo';
-import {mostFlags, mostLikes} from 'coral-admin/src/graphql/queries';
-import {Spinner} from 'coral-ui';
 import styles from './Dashboard.css';
 import FlagWidget from '../../components/FlagWidget';
 import LikeWidget from '../../components/LikeWidget';
 
-class Dashboard extends React.Component {
-  render () {
-
-    const {data} = this.props;
-    console.log('data', data);
-    const {assetsByLike, assetsByFlag} = data;
-
-    if (data.loading) {
-      return <Spinner />;
-    }
-
-    if (data.error) {
-      return <code><pre>{data.error}</pre></code>;
-    }
-
-    return (
-      <div className={styles.Dashboard}>
-        <div className={styles.widget}>
-          <h2 className={styles.heading}>Top Ten Articles with the most flagged comments</h2>
-          <FlagWidget assets={assetsByFlag} />
-        </div>
-        <div className={styles.widget}>
-          <h2 className={styles.heading}>Top ten comments with the most likes</h2>
-        </div>
-        <div className={styles.widget}>
-          <h2 className={styles.heading}>Top Ten Articles with the most likes</h2>
-          <LikeWidget assets={assetsByLike} />
-        </div>
+const Dashboard = () => {
+  return (
+    <div className={styles.Dashboard}>
+      <div className={styles.widget}>
+        <FlagWidget />
       </div>
-    );
-  }
-}
+      <div className={styles.widget}>
+        <h2 className={styles.heading}>Top ten comments with the most likes</h2>
+      </div>
+      <div className={styles.widget}>
+        <LikeWidget />
+      </div>
+    </div>
+  );
+};
 
-export default compose(
-  mostFlags,
-  mostLikes
-)(Dashboard);
+export default Dashboard;
diff --git a/client/coral-admin/src/graphql/queries/assetsByLike.graphql b/client/coral-admin/src/graphql/queries/assetsByLike.graphql
deleted file mode 100644
index 853afee41..000000000
--- a/client/coral-admin/src/graphql/queries/assetsByLike.graphql
+++ /dev/null
@@ -1,19 +0,0 @@
-fragment metrics on Asset {
-  id
-  title
-  url
-  commentCount
-  author
-  created_at
-  action_summaries {
-    type: __typename
-    actionCount
-    actionableItemCount
-  }
-}
-
-query Metrics ($from: Date!, $to: Date!, $sort: ACTION_TYPE!) {
-  assetsByLike: metrics(from: $from, to: $to, sort: $sort) {
-    ...metrics
-  }
-}
diff --git a/client/coral-admin/src/graphql/queries/index.js b/client/coral-admin/src/graphql/queries/index.js
index 96cb319c9..1628a4ac8 100644
--- a/client/coral-admin/src/graphql/queries/index.js
+++ b/client/coral-admin/src/graphql/queries/index.js
@@ -1,10 +1,9 @@
 import {graphql} from 'react-apollo';
 
-import BY_LIKES from './assetsByLike.graphql';
-import BY_FLAGS from './assetsByFlag.graphql';
+import METRICS from './metrics.graphql';
 import MOD_QUEUE_QUERY from './modQueueQuery.graphql';
 
-export const mostFlags = graphql(BY_FLAGS, {
+export const mostFlags = graphql(METRICS, {
   options: () => {
 
     // currently hard-coded per Greg's advice
@@ -20,8 +19,10 @@ export const mostFlags = graphql(BY_FLAGS, {
   }
 });
 
-export const mostLikes = graphql(BY_LIKES, {
+export const mostLikes = graphql(METRICS, {
   options: () => {
+
+    // currently hard-coded per Greg's advice
     const fiveMinutesAgo = new Date();
     fiveMinutesAgo.setMinutes(fiveMinutesAgo.getMinutes() - 5);
     return {
diff --git a/client/coral-admin/src/graphql/queries/assetsByFlag.graphql b/client/coral-admin/src/graphql/queries/metrics.graphql
similarity index 80%
rename from client/coral-admin/src/graphql/queries/assetsByFlag.graphql
rename to client/coral-admin/src/graphql/queries/metrics.graphql
index c6f0900ac..9a226d8bc 100644
--- a/client/coral-admin/src/graphql/queries/assetsByFlag.graphql
+++ b/client/coral-admin/src/graphql/queries/metrics.graphql
@@ -13,7 +13,7 @@ fragment metrics on Asset {
 }
 
 query Metrics ($from: Date!, $to: Date!, $sort: ACTION_TYPE!) {
-  assetsByFlag: metrics(from: $from, to: $to, sort: $sort) {
+  metrics(from: $from, to: $to, sort: $sort) {
     ...metrics
   }
 }
diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json
index 5b15564d7..13d482d6c 100644
--- a/client/coral-admin/src/translations.json
+++ b/client/coral-admin/src/translations.json
@@ -110,6 +110,7 @@
     },
     "dashboard": {
       "no_flags": "There have been no flags in the last 5 minutes! Hooray!",
+      "no_likes": "There have been no likes in the last 5 minutes. All quiet.",
       "comment_count": "Comments"
     },
     "streams": {
@@ -217,6 +218,7 @@
     },
     "dashbord": {
       "no_flags": "¡Nadie ha marcado nada en los últimos 5 minutos! ¡Bravo!",
+      "no_likes": "A nadie le ha gustado algún comentario en los últimos 5 minutos. Todo tranquilo.",
       "comment_count": "Comentarios"
     },
     "streams": {

From f32fe2629ce74e3214c590fc7014b6109440c4e0 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Tue, 21 Feb 2017 14:16:02 -0700
Subject: [PATCH 004/132] css is the worst

---
 .../src/containers/Dashboard/Dashboard.css          | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.css b/client/coral-admin/src/containers/Dashboard/Dashboard.css
index be2cd9f7a..0e46fb642 100644
--- a/client/coral-admin/src/containers/Dashboard/Dashboard.css
+++ b/client/coral-admin/src/containers/Dashboard/Dashboard.css
@@ -1,19 +1,14 @@
 .Dashboard {
   display: flex;
-  padding: 5px;
+  flex-wrap: wrap;
 }
 
 .widget {
-  margin-top: 10px;
-  flex: 1;
+  box-sizing: border-box;
+  margin: 10px 5px 5px 5px;
   box-shadow: 0px 0px 5px 0px rgba(0,0,0,0.2);
-  margin-right: 10px;
   padding: 15px;
-
-}
-
-.widget:last-child {
-  margin-right: 0;
+  width: calc(50% - 10px);
 }
 
 .heading {

From 2360f280d2015849954e4d911ee0f78f7781f03c Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Tue, 21 Feb 2017 14:17:56 -0700
Subject: [PATCH 005/132] Added commentMetrics edge.

---
 graph/loaders/metrics.js      | 65 +++++++++++++++++++++++++++++++++--
 graph/resolvers/comment.js    |  6 +++-
 graph/resolvers/root_query.js | 12 +++++--
 graph/typeDefs.graphql        | 10 ++++--
 4 files changed, 85 insertions(+), 8 deletions(-)

diff --git a/graph/loaders/metrics.js b/graph/loaders/metrics.js
index a842165c0..7cdecbc8e 100644
--- a/graph/loaders/metrics.js
+++ b/graph/loaders/metrics.js
@@ -5,7 +5,10 @@ const {objectCacheKeyFn} = require('./util');
 const CommentModel = require('../../models/comment');
 const ActionModel = require('../../models/action');
 
-const getMetrics = ({loaders: {Metrics, Assets}}, {from, to, sort, limit}) => {
+/**
+ * Returns a list of assets with action metadata included on the models.
+ */
+const getAssetMetrics = ({loaders: {Metrics, Assets}}, {from, to, sort, limit}) => {
 
   let commentMetrics = {};
   let assetMetrics = [];
@@ -99,6 +102,59 @@ const getMetrics = ({loaders: {Metrics, Assets}}, {from, to, sort, limit}) => {
     });
 };
 
+/**
+ * Returns a list of comments that are retrieved based on most activity within
+ * the indicated time range.
+ */
+const getCommentMetrics = ({loaders: {Metrics, Assets}}, {from, to, sort, limit}) => {
+
+  let commentActionSummaries = {};
+
+  return Metrics.getRecentActions.load({from, to})
+    .then((actionSummaries) => {
+
+      actionSummaries.sort((a, b) => {
+        let aActionSummary = a.action_type === sort ? a : null;
+        let bActionSummary = b.action_type === sort ? b : null;
+
+        // If either a or b don't have this action type, then one of them will
+        // automatically win.
+        if (aActionSummary == null || bActionSummary == null) {
+          if (bActionSummary != null) {
+            return 1;
+          }
+
+          if (aActionSummary != null) {
+            return -1;
+          }
+
+          return 0;
+        }
+
+        // Both of them had an actionCount, hence we can determine that we could
+        // compare the actual values directly.
+        return bActionSummary.count - aActionSummary.count;
+      });
+
+      commentActionSummaries = _.groupBy(actionSummaries, 'item_id');
+
+      let commentIDs = _.uniq(actionSummaries.map(({item_id}) => item_id));
+
+      // Only keep the top `limit`.
+      commentIDs = commentIDs.slice(0, limit);
+
+      // Find those comments.
+      return Metrics.getSpecificComments.loadMany(commentIDs);
+    })
+    .then((comments) => comments.map((comment) => {
+
+      // Add in the action summaries genrerated.
+      comment.action_summaries = commentActionSummaries[comment.id];
+
+      return comment;
+    }));
+};
+
 const getRecentActions = (context, {from, to}) => {
   return ActionModel.aggregate([
 
@@ -150,6 +206,11 @@ module.exports = (context) => ({
       batch: false,
       cacheKeyFn: objectCacheKeyFn('from', 'to')
     }),
-    get: ({from, to, sort, limit}) => getMetrics(context, {from, to, sort, limit})
+    Assets: {
+      get: ({from, to, sort, limit}) => getAssetMetrics(context, {from, to, sort, limit})
+    },
+    Comments: {
+      get: ({from, to, sort, limit}) => getCommentMetrics(context, {from, to, sort, limit})
+    }
   }
 });
diff --git a/graph/resolvers/comment.js b/graph/resolvers/comment.js
index ef77ff6b5..de1909df1 100644
--- a/graph/resolvers/comment.js
+++ b/graph/resolvers/comment.js
@@ -25,7 +25,11 @@ const Comment = {
 
     return null;
   },
-  action_summaries({id}, _, {loaders: {Actions}}) {
+  action_summaries({id, action_summaries}, _, {loaders: {Actions}}) {
+    if (action_summaries) {
+      return action_summaries;
+    }
+
     return Actions.getSummariesByItemID.load(id);
   },
   asset({asset_id}, _, {loaders: {Assets}}) {
diff --git a/graph/resolvers/root_query.js b/graph/resolvers/root_query.js
index ced4e65cf..8800bfebf 100644
--- a/graph/resolvers/root_query.js
+++ b/graph/resolvers/root_query.js
@@ -56,12 +56,20 @@ const RootQuery = {
     return Comments.getCountByQuery({statuses, asset_id, parent_id});
   },
 
-  metrics(_, {from, to, sort, limit = 10}, {user, loaders: {Metrics}}) {
+  assetMetrics(_, {from, to, sort, limit = 10}, {user, loaders: {Metrics: {Assets}}}) {
     if (user == null || !user.hasRoles('ADMIN')) {
       return null;
     }
 
-    return Metrics.get({from, to, sort, limit});
+    return Assets.get({from, to, sort, limit});
+  },
+
+  commentMetrics(_, {from, to, sort, limit = 10}, {user, loaders: {Metrics: {Comments}}}) {
+    if (user == null || !user.hasRoles('ADMIN')) {
+      return null;
+    }
+
+    return Comments.get({from, to, sort, limit});
   },
 
   // This returns the current user, ensure that if we aren't logged in, we
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 72a54a0cd..0eec34b54 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -456,9 +456,13 @@ type RootQuery {
   # role.
   me: User
 
-  # Metrics related to user actions are saturated into the assets returned. The
-  # sort will affect if it will allow
-  metrics(from: Date!, to: Date!, sort: ACTION_TYPE!, limit: Int = 10): [Asset]
+  # Asset metrics related to user actions are saturated into the assets
+  # returned.
+  assetMetrics(from: Date!, to: Date!, sort: ACTION_TYPE!, limit: Int = 10): [Asset]
+
+  # Comment metrics related to user actions are saturated into the comments
+  # returned.
+  commentMetrics(from: Date!, to: Date!, sort: ACTION_TYPE!, limit: Int = 10): [Comment]
 }
 
 ################################################################################

From 6398e2faad14b3e3728a774e8352d2c06ea84a8d Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 22 Feb 2017 09:32:51 -0700
Subject: [PATCH 006/132] Fixed issue with comment hydration

---
 graph/loaders/comments.js | 16 ++++++++++++++++
 graph/loaders/metrics.js  | 13 ++++++++++---
 graph/typeDefs.graphql    |  4 ++--
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/graph/loaders/comments.js b/graph/loaders/comments.js
index ad78a1e92..47a8095dc 100644
--- a/graph/loaders/comments.js
+++ b/graph/loaders/comments.js
@@ -270,6 +270,21 @@ const genRecentComments = (_, ids) => {
   .then(util.arrayJoinBy(ids, 'asset_id'));
 };
 
+/**
+ * Returns the comment's by their id.
+ * @param  {Object}        context graph context
+ * @param  {Array<String>} ids     the comment id's to fetch
+ * @return {Promise}       resolves to the comments
+ */
+const genCommentsByID = (context, ids) => {
+  return CommentModel.find({
+    id: {
+      $in: ids
+    }
+  })
+  .then(util.singleJoinBy(ids, 'id'));
+};
+
 /**
  * Creates a set of loaders based on a GraphQL context.
  * @param  {Object} context the context of the GraphQL request
@@ -277,6 +292,7 @@ const genRecentComments = (_, ids) => {
  */
 module.exports = (context) => ({
   Comments: {
+    get: new DataLoader((ids) => genCommentsByID(context, ids)),
     getByQuery: (query) => getCommentsByQuery(context, query),
     getCountByQuery: (query) => getCommentCountByQuery(context, query),
     countByAssetID: new util.SharedCacheDataLoader('Comments.countByAssetID', 3600, (ids) => getCountsByAssetID(context, ids)),
diff --git a/graph/loaders/metrics.js b/graph/loaders/metrics.js
index 7cdecbc8e..8591ecefe 100644
--- a/graph/loaders/metrics.js
+++ b/graph/loaders/metrics.js
@@ -106,7 +106,7 @@ const getAssetMetrics = ({loaders: {Metrics, Assets}}, {from, to, sort, limit})
  * Returns a list of comments that are retrieved based on most activity within
  * the indicated time range.
  */
-const getCommentMetrics = ({loaders: {Metrics, Assets}}, {from, to, sort, limit}) => {
+const getCommentMetrics = ({loaders: {Metrics, Comments}}, {from, to, sort, limit}) => {
 
   let commentActionSummaries = {};
 
@@ -143,8 +143,15 @@ const getCommentMetrics = ({loaders: {Metrics, Assets}}, {from, to, sort, limit}
       // Only keep the top `limit`.
       commentIDs = commentIDs.slice(0, limit);
 
-      // Find those comments.
-      return Metrics.getSpecificComments.loadMany(commentIDs);
+      // If there are no comment's to get, then just continue with an empty
+      // array.
+      if (commentIDs.length === 0) {
+        return [];
+      }
+
+      // Find those comments, this is the final stage, so let's get all the
+      // fields.
+      return Comments.get.loadMany(commentIDs);
     })
     .then((comments) => comments.map((comment) => {
 
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 0eec34b54..c61312255 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -458,11 +458,11 @@ type RootQuery {
 
   # Asset metrics related to user actions are saturated into the assets
   # returned.
-  assetMetrics(from: Date!, to: Date!, sort: ACTION_TYPE!, limit: Int = 10): [Asset]
+  assetMetrics(from: Date!, to: Date!, sort: ACTION_TYPE!, limit: Int = 10): [Asset!]
 
   # Comment metrics related to user actions are saturated into the comments
   # returned.
-  commentMetrics(from: Date!, to: Date!, sort: ACTION_TYPE!, limit: Int = 10): [Comment]
+  commentMetrics(from: Date!, to: Date!, sort: ACTION_TYPE!, limit: Int = 10): [Comment!]
 }
 
 ################################################################################

From bc4849632794a2a1947d92b3ecd27113bb92902b Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Wed, 22 Feb 2017 10:47:23 -0700
Subject: [PATCH 007/132] add most liked comments widget

---
 .../src/containers/Dashboard/Dashboard.css    |  8 -----
 .../src/containers/Dashboard/Dashboard.js     | 17 ++++-----
 .../Dashboard}/FlagWidget.js                  |  2 +-
 .../Dashboard}/LikeWidget.js                  |  2 +-
 .../Dashboard/MostLikedCommentsWidget.js      | 35 +++++++++++++++++++
 .../Dashboard}/Widget.css                     |  8 +++++
 .../ModerationQueue/ModerationContainer.js    |  5 +--
 .../ModerationQueue/ModerationQueue.js        |  6 ++--
 .../{metrics.graphql => assetMetrics.graphql} |  2 +-
 .../graphql/queries/commentMetrics.graphql    | 19 ++++++++++
 .../coral-admin/src/graphql/queries/index.js  | 23 ++++++++++--
 .../coral-sign-in/components/SignUpContent.js |  9 ++---
 12 files changed, 100 insertions(+), 36 deletions(-)
 rename client/coral-admin/src/{components => containers/Dashboard}/FlagWidget.js (98%)
 rename client/coral-admin/src/{components => containers/Dashboard}/LikeWidget.js (98%)
 create mode 100644 client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
 rename client/coral-admin/src/{components => containers/Dashboard}/Widget.css (75%)
 rename client/coral-admin/src/graphql/queries/{metrics.graphql => assetMetrics.graphql} (80%)
 create mode 100644 client/coral-admin/src/graphql/queries/commentMetrics.graphql

diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.css b/client/coral-admin/src/containers/Dashboard/Dashboard.css
index 0e46fb642..a23927d8a 100644
--- a/client/coral-admin/src/containers/Dashboard/Dashboard.css
+++ b/client/coral-admin/src/containers/Dashboard/Dashboard.css
@@ -3,14 +3,6 @@
   flex-wrap: wrap;
 }
 
-.widget {
-  box-sizing: border-box;
-  margin: 10px 5px 5px 5px;
-  box-shadow: 0px 0px 5px 0px rgba(0,0,0,0.2);
-  padding: 15px;
-  width: calc(50% - 10px);
-}
-
 .heading {
   margin: 0;
   font-size: 1.5rem;
diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.js b/client/coral-admin/src/containers/Dashboard/Dashboard.js
index fcccb36b3..282772403 100644
--- a/client/coral-admin/src/containers/Dashboard/Dashboard.js
+++ b/client/coral-admin/src/containers/Dashboard/Dashboard.js
@@ -1,20 +1,15 @@
 import React from 'react';
 import styles from './Dashboard.css';
-import FlagWidget from '../../components/FlagWidget';
-import LikeWidget from '../../components/LikeWidget';
+import FlagWidget from './FlagWidget';
+import LikeWidget from './LikeWidget';
+import MostLikedCommentsWidget from './MostLikedCommentsWidget';
 
 const Dashboard = () => {
   return (
     <div className={styles.Dashboard}>
-      <div className={styles.widget}>
-        <FlagWidget />
-      </div>
-      <div className={styles.widget}>
-        <h2 className={styles.heading}>Top ten comments with the most likes</h2>
-      </div>
-      <div className={styles.widget}>
-        <LikeWidget />
-      </div>
+      <FlagWidget />
+      <MostLikedCommentsWidget />
+      <LikeWidget />
     </div>
   );
 };
diff --git a/client/coral-admin/src/components/FlagWidget.js b/client/coral-admin/src/containers/Dashboard/FlagWidget.js
similarity index 98%
rename from client/coral-admin/src/components/FlagWidget.js
rename to client/coral-admin/src/containers/Dashboard/FlagWidget.js
index a37ddcd2c..4fb993d35 100644
--- a/client/coral-admin/src/components/FlagWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/FlagWidget.js
@@ -18,7 +18,7 @@ const FlagWidget = (props) => {
   const {data: {metrics: assets}} = props;
 
   return (
-    <div>
+    <div className={styles.widget}>
       <h2 className={styles.heading}>Top Ten Articles with the most flagged comments</h2>
       <table className={styles.widgetTable}>
         <thead className={styles.widgetHead}>
diff --git a/client/coral-admin/src/components/LikeWidget.js b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
similarity index 98%
rename from client/coral-admin/src/components/LikeWidget.js
rename to client/coral-admin/src/containers/Dashboard/LikeWidget.js
index ac9e111ea..0f6ea2ba0 100644
--- a/client/coral-admin/src/components/LikeWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
@@ -18,7 +18,7 @@ const LikeWidget = (props) => {
   const {data: {metrics: assets}} = props;
 
   return (
-    <div>
+    <div className={styles.widget}>
       <h2 className={styles.heading}>Top Ten Articles with the most likes</h2>
       <table className={styles.widgetTable}>
         <thead className={styles.widgetHead}>
diff --git a/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js b/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
new file mode 100644
index 000000000..6e7d03185
--- /dev/null
+++ b/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
@@ -0,0 +1,35 @@
+import React from 'react';
+import {compose} from 'react-apollo';
+import {mostLikedComments} from 'coral-admin/src/graphql/queries';
+import I18n from 'coral-framework/modules/i18n/i18n';
+import translations from 'coral-admin/src/translations';
+import ModerationQueue from 'coral-admin/src/containers/ModerationQueue/ModerationQueue';
+import {Spinner} from 'coral-ui';
+import styles from './Widget.css';
+
+const lang = new I18n(translations);
+
+const MostLikedCommentsWidget = props => {
+
+  if (props.data.loading) {
+    return <Spinner />;
+  }
+
+  const {data: {comments}} = props;
+
+  console.log('MostLikedCommentsWidget', comments);
+
+  return (
+    <div className={styles.widget}>
+      <h2 className={styles.heading}>most liked comments</h2>
+      <ModerationQueue
+        comments={comments}
+        suspectWords={[]}
+        showBanUserDialog={() => {}}
+        acceptComment={() => {}}
+        rejectComment={() => {}} />
+    </div>
+  );
+};
+
+export default compose(mostLikedComments)(MostLikedCommentsWidget);
diff --git a/client/coral-admin/src/components/Widget.css b/client/coral-admin/src/containers/Dashboard/Widget.css
similarity index 75%
rename from client/coral-admin/src/components/Widget.css
rename to client/coral-admin/src/containers/Dashboard/Widget.css
index f40da403d..d9cce2043 100644
--- a/client/coral-admin/src/components/Widget.css
+++ b/client/coral-admin/src/containers/Dashboard/Widget.css
@@ -1,3 +1,11 @@
+.widget {
+  box-sizing: border-box;
+  margin: 10px 5px 5px 5px;
+  box-shadow: 0px 0px 5px 0px rgba(0,0,0,0.2);
+  padding: 15px;
+  width: calc(50% - 10px);
+}
+
 .heading {
   margin: 0;
   font-size: 1.5rem;
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
index f685ac094..9c68d0728 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
@@ -66,6 +66,8 @@ class ModerationContainer extends Component {
       }
     }
 
+    const comments = data[activeTab];
+
     return (
       <div>
         <ModerationHeader asset={asset} />
@@ -76,9 +78,8 @@ class ModerationContainer extends Component {
           flaggedCount={data.flaggedCount}
         />
         <ModerationQueue
-          data={data}
           currentAsset={asset}
-          activeTab={activeTab}
+          comments={comments}
           suspectWords={settings.wordlist.suspect}
           showBanUserDialog={props.showBanUserDialog}
           acceptComment={props.acceptComment}
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
index d30f24c1f..2022fd432 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
@@ -3,12 +3,12 @@ import React, {PropTypes} from 'react';
 import Comment from './components/Comment';
 import {actionsMap} from './helpers/moderationQueueActionsMap';
 
-const ModerationQueue = ({activeTab = 'premod', ...props}) => {
+const ModerationQueue = ({comments, ...props}) => {
   return (
     <div id="moderationList">
       <ul>
       {
-        props.data[activeTab].map((comment, i) => {
+        comments.map((comment, i) => {
           const status = comment.action_summaries ? 'FLAGGED' : comment.status;
           return <Comment
             key={i}
@@ -29,7 +29,7 @@ const ModerationQueue = ({activeTab = 'premod', ...props}) => {
 };
 
 ModerationQueue.propTypes = {
-  data: PropTypes.object.isRequired
+  comments: PropTypes.array.isRequired
 };
 
 export default ModerationQueue;
diff --git a/client/coral-admin/src/graphql/queries/metrics.graphql b/client/coral-admin/src/graphql/queries/assetMetrics.graphql
similarity index 80%
rename from client/coral-admin/src/graphql/queries/metrics.graphql
rename to client/coral-admin/src/graphql/queries/assetMetrics.graphql
index 9a226d8bc..caed174b4 100644
--- a/client/coral-admin/src/graphql/queries/metrics.graphql
+++ b/client/coral-admin/src/graphql/queries/assetMetrics.graphql
@@ -13,7 +13,7 @@ fragment metrics on Asset {
 }
 
 query Metrics ($from: Date!, $to: Date!, $sort: ACTION_TYPE!) {
-  metrics(from: $from, to: $to, sort: $sort) {
+  metrics: assetMetrics(from: $from, to: $to, sort: $sort) {
     ...metrics
   }
 }
diff --git a/client/coral-admin/src/graphql/queries/commentMetrics.graphql b/client/coral-admin/src/graphql/queries/commentMetrics.graphql
new file mode 100644
index 000000000..59a89739c
--- /dev/null
+++ b/client/coral-admin/src/graphql/queries/commentMetrics.graphql
@@ -0,0 +1,19 @@
+query CommentMetrics ($from: Date!, $to: Date!, $sort: ACTION_TYPE!) {
+  comments: commentMetrics(from: $from, to: $to, sort: $sort) {
+    id
+    body
+    user {
+      status
+      username
+    }
+    asset {
+      id
+      title
+    }
+    created_at
+    action_summaries {
+      type: __typename
+      count
+    }
+  }
+}
diff --git a/client/coral-admin/src/graphql/queries/index.js b/client/coral-admin/src/graphql/queries/index.js
index 1628a4ac8..ceedffd9d 100644
--- a/client/coral-admin/src/graphql/queries/index.js
+++ b/client/coral-admin/src/graphql/queries/index.js
@@ -1,9 +1,10 @@
 import {graphql} from 'react-apollo';
 
-import METRICS from './metrics.graphql';
+import ASSET_METRICS from './assetMetrics.graphql';
+import COMMENT_METRICS from './commentMetrics.graphql';
 import MOD_QUEUE_QUERY from './modQueueQuery.graphql';
 
-export const mostFlags = graphql(METRICS, {
+export const mostFlags = graphql(ASSET_METRICS, {
   options: () => {
 
     // currently hard-coded per Greg's advice
@@ -19,7 +20,23 @@ export const mostFlags = graphql(METRICS, {
   }
 });
 
-export const mostLikes = graphql(METRICS, {
+export const mostLikes = graphql(ASSET_METRICS, {
+  options: () => {
+
+    // currently hard-coded per Greg's advice
+    const fiveMinutesAgo = new Date();
+    fiveMinutesAgo.setMinutes(fiveMinutesAgo.getMinutes() - 5);
+    return {
+      variables: {
+        sort: 'LIKE',
+        from: fiveMinutesAgo.toISOString(),
+        to: new Date().toISOString()
+      }
+    };
+  }
+});
+
+export const mostLikedComments = graphql(COMMENT_METRICS, {
   options: () => {
 
     // currently hard-coded per Greg's advice
diff --git a/client/coral-sign-in/components/SignUpContent.js b/client/coral-sign-in/components/SignUpContent.js
index 6a781675b..216349412 100644
--- a/client/coral-sign-in/components/SignUpContent.js
+++ b/client/coral-sign-in/components/SignUpContent.js
@@ -138,12 +138,9 @@ class SignUpContent extends React.Component {
           </div>
         }
         <div className={styles.footer}>
-          <span>
-            {lang.t('signIn.alreadyHaveAnAccount')}
-            <a id="coralSignInViewTrigger" onClick={() => changeView('SIGNIN')}>
-              {lang.t('signIn.signIn')}
-            </a>
-          </span>
+          {lang.t('signIn.alreadyHaveAnAccount')} <a id="coralSignInViewTrigger" onClick={() => changeView('SIGNIN')}>
+            {lang.t('signIn.signIn')}
+          </a>
         </div>
       </div>
     );

From 691d00121366f7f2e14bc2a65cd1e76b61343d2d Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Wed, 22 Feb 2017 10:49:48 -0700
Subject: [PATCH 008/132] simplify a bit

---
 client/coral-admin/src/containers/Dashboard/FlagWidget.js   | 2 +-
 client/coral-admin/src/containers/Dashboard/LikeWidget.js   | 2 +-
 client/coral-admin/src/graphql/queries/assetMetrics.graphql | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/coral-admin/src/containers/Dashboard/FlagWidget.js b/client/coral-admin/src/containers/Dashboard/FlagWidget.js
index 4fb993d35..8c334d2b8 100644
--- a/client/coral-admin/src/containers/Dashboard/FlagWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/FlagWidget.js
@@ -15,7 +15,7 @@ const FlagWidget = (props) => {
     return <Spinner />;
   }
 
-  const {data: {metrics: assets}} = props;
+  const {data: {assets}} = props;
 
   return (
     <div className={styles.widget}>
diff --git a/client/coral-admin/src/containers/Dashboard/LikeWidget.js b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
index 0f6ea2ba0..09dc5606e 100644
--- a/client/coral-admin/src/containers/Dashboard/LikeWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
@@ -15,7 +15,7 @@ const LikeWidget = (props) => {
     return <Spinner />;
   }
 
-  const {data: {metrics: assets}} = props;
+  const {data: {assets}} = props;
 
   return (
     <div className={styles.widget}>
diff --git a/client/coral-admin/src/graphql/queries/assetMetrics.graphql b/client/coral-admin/src/graphql/queries/assetMetrics.graphql
index caed174b4..de0eb1fe8 100644
--- a/client/coral-admin/src/graphql/queries/assetMetrics.graphql
+++ b/client/coral-admin/src/graphql/queries/assetMetrics.graphql
@@ -13,7 +13,7 @@ fragment metrics on Asset {
 }
 
 query Metrics ($from: Date!, $to: Date!, $sort: ACTION_TYPE!) {
-  metrics: assetMetrics(from: $from, to: $to, sort: $sort) {
+  assets: assetMetrics(from: $from, to: $to, sort: $sort) {
     ...metrics
   }
 }

From 111b956522df820b008b112406cf51f3c4b7e744 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Wed, 22 Feb 2017 13:10:50 -0700
Subject: [PATCH 009/132] change index route to Dashboard component

---
 client/coral-admin/src/AppRouter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-admin/src/AppRouter.js b/client/coral-admin/src/AppRouter.js
index d96bacfe0..38d06dcb1 100644
--- a/client/coral-admin/src/AppRouter.js
+++ b/client/coral-admin/src/AppRouter.js
@@ -15,7 +15,7 @@ const routes = (
   <div>
     <Route exact path="/admin/install" component={InstallContainer}/>
     <Route path='/admin' component={LayoutContainer}>
-      <IndexRoute component={ModerationContainer} />
+      <IndexRoute component={Dashboard} />
       <Route path='community' component={CommunityContainer} />
       <Route path='configure' component={Configure} />
       <Route path='streams' component={Streams} />

From e6b78a3e63fe3b5f336c1470ccbeee702afa1277 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Wed, 22 Feb 2017 13:33:50 -0700
Subject: [PATCH 010/132] change some copy

---
 client/coral-admin/src/containers/Dashboard/FlagWidget.js | 2 +-
 client/coral-admin/src/containers/Dashboard/LikeWidget.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/containers/Dashboard/FlagWidget.js b/client/coral-admin/src/containers/Dashboard/FlagWidget.js
index 8c334d2b8..370010c35 100644
--- a/client/coral-admin/src/containers/Dashboard/FlagWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/FlagWidget.js
@@ -19,7 +19,7 @@ const FlagWidget = (props) => {
 
   return (
     <div className={styles.widget}>
-      <h2 className={styles.heading}>Top Ten Articles with the most flagged comments</h2>
+      <h2 className={styles.heading}>Articles with the most flags</h2>
       <table className={styles.widgetTable}>
         <thead className={styles.widgetHead}>
           <tr>
diff --git a/client/coral-admin/src/containers/Dashboard/LikeWidget.js b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
index 09dc5606e..9c46fbbe0 100644
--- a/client/coral-admin/src/containers/Dashboard/LikeWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
@@ -19,7 +19,7 @@ const LikeWidget = (props) => {
 
   return (
     <div className={styles.widget}>
-      <h2 className={styles.heading}>Top Ten Articles with the most likes</h2>
+      <h2 className={styles.heading}>Articles with the most likes</h2>
       <table className={styles.widgetTable}>
         <thead className={styles.widgetHead}>
           <tr>

From 9e759c7667ceebd1fd4b975f78db3f1333866b9d Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 22 Feb 2017 13:55:48 -0700
Subject: [PATCH 011/132] Adjusted BE beheviour

---
 .../Dashboard/MostLikedCommentsWidget.js      |  8 ++-
 graph/loaders/metrics.js                      | 42 +++++++-----
 test/graph/loaders/metrics.js                 | 66 +++++++++++++++++++
 3 files changed, 96 insertions(+), 20 deletions(-)
 create mode 100644 test/graph/loaders/metrics.js

diff --git a/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js b/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
index 6e7d03185..39f01b41b 100644
--- a/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
@@ -1,13 +1,15 @@
 import React from 'react';
 import {compose} from 'react-apollo';
 import {mostLikedComments} from 'coral-admin/src/graphql/queries';
-import I18n from 'coral-framework/modules/i18n/i18n';
-import translations from 'coral-admin/src/translations';
+
+// import I18n from 'coral-framework/modules/i18n/i18n';
+// import translations from 'coral-admin/src/translations';
+
 import ModerationQueue from 'coral-admin/src/containers/ModerationQueue/ModerationQueue';
 import {Spinner} from 'coral-ui';
 import styles from './Widget.css';
 
-const lang = new I18n(translations);
+// const lang = new I18n(translations);
 
 const MostLikedCommentsWidget = props => {
 
diff --git a/graph/loaders/metrics.js b/graph/loaders/metrics.js
index 8591ecefe..1b0719d0f 100644
--- a/graph/loaders/metrics.js
+++ b/graph/loaders/metrics.js
@@ -17,6 +17,10 @@ const getAssetMetrics = ({loaders: {Metrics, Assets}}, {from, to, sort, limit})
     .then((actionSummaries) => {
 
       commentMetrics = actionSummaries.reduce((acc, {item_id, action_type, count}) => {
+        if (action_type !== sort) {
+          return acc;
+        }
+
         if (!(item_id in acc)) {
           acc[item_id] = [];
         }
@@ -47,29 +51,24 @@ const getAssetMetrics = ({loaders: {Metrics, Assets}}, {from, to, sort, limit})
         }));
 
         return {action_summaries, id: asset_id};
-      });
+      })
+
+      .filter((asset) => {
+        let contextActionSummary = asset.action_summaries.find((({action_type}) => action_type === sort));
+        if (contextActionSummary === null) {
+          return false;
+        }
+
+        return true;
+      })
 
       // Sort these metrics by the predefined sort order. This will ensure that
       // if the action summary does not exist on the object, that it is less
       // prefered over the one that does have it.
-      assetMetrics.sort((a, b) => {
+      .sort((a, b) => {
         let aActionSummary = a.action_summaries.find((({action_type}) => action_type === sort));
         let bActionSummary = b.action_summaries.find((({action_type}) => action_type === sort));
 
-        // If either a or b don't have this action type, then one of them will
-        // automatically win.
-        if (aActionSummary == null || bActionSummary == null) {
-          if (bActionSummary != null) {
-            return 1;
-          }
-
-          if (aActionSummary != null) {
-            return -1;
-          }
-
-          return 0;
-        }
-
         // Both of them had an actionCount, hence we can determine that we could
         // compare the actual values directly.
         return bActionSummary.actionCount - aActionSummary.actionCount;
@@ -138,7 +137,16 @@ const getCommentMetrics = ({loaders: {Metrics, Comments}}, {from, to, sort, limi
 
       commentActionSummaries = _.groupBy(actionSummaries, 'item_id');
 
-      let commentIDs = _.uniq(actionSummaries.map(({item_id}) => item_id));
+      // Grab the comment id's for comment where they have at least one of the
+      // actions being sorted by.
+      let commentIDs = Object.keys(commentActionSummaries).filter((item_id) => {
+        let contextActionSummary = commentActionSummaries[item_id].find(({action_type}) => action_type === sort);
+        if (contextActionSummary == null) {
+          return false;
+        }
+
+        return true;
+      });
 
       // Only keep the top `limit`.
       commentIDs = commentIDs.slice(0, limit);
diff --git a/test/graph/loaders/metrics.js b/test/graph/loaders/metrics.js
new file mode 100644
index 000000000..303b40897
--- /dev/null
+++ b/test/graph/loaders/metrics.js
@@ -0,0 +1,66 @@
+const {expect} = require('chai');
+const {graphql} = require('graphql');
+
+const schema = require('../../../graph/schema');
+const Context = require('../../../graph/context');
+const UserModel = require('../../../models/user');
+const SettingsService = require('../../../services/settings');
+const ActionModel = require('../../../models/action');
+const CommentModel = require('../../../models/comment');
+
+describe('graph.loaders.Metrics', () => {
+  beforeEach(() => SettingsService.init());
+
+  describe('#Comments', () => {
+    const query = `
+      query CommentMetrics($from: Date!, $to: Date!) {
+        liked: commentMetrics(from: $from, to: $to, sort: LIKE) {
+          id
+        }
+        flagged: commentMetrics(from: $from, to: $to, sort: FLAG) {
+          id
+        }
+      }
+    `;
+
+    describe('different comment states', () => {
+
+      beforeEach(() => CommentModel.create([
+        {id: '1', body: 'a new comment!'}
+      ]));
+
+      [
+        {liked: 0, flagged: 0, actions: []},
+        {liked: 1, flagged: 0, actions: [{action_type: 'LIKE', item_id: '1', item_type: 'COMMENTS'}]},
+        {liked: 0, flagged: 1, actions: [{action_type: 'FLAG', item_id: '1', item_type: 'COMMENTS'}]},
+        {liked: 1, flagged: 1, actions: [
+          {action_type: 'FLAG', item_id: '1', item_type: 'COMMENTS'},
+          {action_type: 'LIKE', item_id: '1', item_type: 'COMMENTS'}
+        ]}
+      ].forEach(({liked, flagged, actions}) => {
+
+        describe(`with actions=${actions.length}`, () => {
+
+          beforeEach(() => ActionModel.create(actions));
+
+          it(`returns the correct amount of metrics liked=${liked} flagged=${flagged}`, () => {
+            const context = new Context({user: new UserModel({roles: ['ADMIN']})});
+
+            return graphql(schema, query, {}, context, {
+              from: (new Date()).setMinutes((new Date()).getMinutes() - 5),
+              to: (new Date()).setMinutes((new Date()).getMinutes() + 5)
+            })
+              .then(({data, errors}) => {
+                expect(errors).to.be.undefined;
+                expect(data.liked).to.have.length(liked);
+                expect(data.flagged).to.have.length(flagged);
+              });
+          });
+
+        });
+
+      });
+
+    });
+  });
+});

From 2f314c6937069819b510502fa1a6a26c44220167 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Thu, 23 Feb 2017 14:29:51 -0700
Subject: [PATCH 012/132] omg, a bunch of UI madness

---
 .../src/containers/Dashboard/Dashboard.js     | 79 ++++++++++++++++---
 .../src/containers/Dashboard/FlagWidget.js    | 12 +--
 .../src/containers/Dashboard/LikeWidget.js    |  8 +-
 .../Dashboard/MostLikedCommentsWidget.js      | 63 ++++++++-------
 .../src/graphql/queries/assetMetrics.graphql  | 19 -----
 .../graphql/queries/commentMetrics.graphql    | 19 -----
 .../coral-admin/src/graphql/queries/index.js  | 66 ++++------------
 .../src/graphql/queries/metrics.graphql       | 39 +++++++++
 .../src/graphql/queries/mostFlags.graphql     | 14 ----
 9 files changed, 164 insertions(+), 155 deletions(-)
 delete mode 100644 client/coral-admin/src/graphql/queries/assetMetrics.graphql
 delete mode 100644 client/coral-admin/src/graphql/queries/commentMetrics.graphql
 create mode 100644 client/coral-admin/src/graphql/queries/metrics.graphql
 delete mode 100644 client/coral-admin/src/graphql/queries/mostFlags.graphql

diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.js b/client/coral-admin/src/containers/Dashboard/Dashboard.js
index 282772403..74bbce9fb 100644
--- a/client/coral-admin/src/containers/Dashboard/Dashboard.js
+++ b/client/coral-admin/src/containers/Dashboard/Dashboard.js
@@ -1,17 +1,76 @@
 import React from 'react';
 import styles from './Dashboard.css';
+import {graphql} from 'react-apollo';
+import {connect} from 'react-redux';
 import FlagWidget from './FlagWidget';
 import LikeWidget from './LikeWidget';
-import MostLikedCommentsWidget from './MostLikedCommentsWidget';
+import METRICS from 'coral-admin/src/graphql/queries/metrics.graphql';
+// import MostLikedCommentsWidget from './MostLikedCommentsWidget';
+import {showBanUserDialog, hideBanUserDialog} from 'coral-admin/src/actions/moderation';
+import {Spinner} from 'coral-ui';
 
-const Dashboard = () => {
-  return (
-    <div className={styles.Dashboard}>
-      <FlagWidget />
-      <MostLikedCommentsWidget />
-      <LikeWidget />
-    </div>
-  );
+class Dashboard extends React.Component {
+
+  render () {
+
+    if (this.props.data && this.props.data.loading) {
+      return <Spinner />;
+    }
+
+    console.log(this.props.data);
+
+    const {data: {assetsByLike, assetsByFlag}} = this.props;
+
+    console.log('assetsByLike', assetsByLike);
+    console.log('assetsByFlag', assetsByFlag);
+
+    // const {moderation, settings} = this.props;
+
+    return (
+      <div className={styles.Dashboard}>
+        {assetsByFlag && <FlagWidget assets={assetsByFlag} />}
+        {/*<MostLikedCommentsWidget
+          moderation={moderation}
+          settings={settings}
+          showBanUserDialog={this.props.showBanUserDialog}
+          hideBanUserDialog={this.props.hideBanUserDialog} />*/}
+        {assetsByLike && <LikeWidget assets={assetsByLike} />}
+      </div>
+    );
+  }
+}
+
+let fiveMinutesAgo = new Date();
+fiveMinutesAgo.setMinutes(fiveMinutesAgo.getMinutes() - 5);
+fiveMinutesAgo = fiveMinutesAgo.toISOString();
+const now = new Date().toISOString();
+
+const getMetrics = graphql(METRICS, {
+  options: () => {
+
+    return {
+      variables: {
+        from: fiveMinutesAgo,
+        // from: '2017-02-23T16:09:44.235Z',
+        to: now
+        // to: '2017-02-23T19:30:23.251Z'
+      }
+    };
+  }
+});
+
+const DashboardWithData = getMetrics(Dashboard);
+
+const mapStateToProps = state => {
+  return {
+    settings: state.settings.toJS(),
+    moderation: state.moderation.toJS()
+  };
 };
 
-export default Dashboard;
+const mapDispatchToProps = dispatch => ({
+  showBanUserDialog: (user, commentId) => dispatch(showBanUserDialog(user, commentId)),
+  hideBanUserDialog: () => dispatch(hideBanUserDialog(false))
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(DashboardWithData);
diff --git a/client/coral-admin/src/containers/Dashboard/FlagWidget.js b/client/coral-admin/src/containers/Dashboard/FlagWidget.js
index 370010c35..ada1f03f3 100644
--- a/client/coral-admin/src/containers/Dashboard/FlagWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/FlagWidget.js
@@ -1,21 +1,13 @@
 import React from 'react';
-import {compose} from 'react-apollo';
-import {mostFlags} from 'coral-admin/src/graphql/queries';
 import {Link} from 'react-router';
 import styles from './Widget.css';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from 'coral-admin/src/translations';
-import {Spinner} from 'coral-ui';
 
 const lang = new I18n(translations);
 
 const FlagWidget = (props) => {
-
-  if (props.data.loading) {
-    return <Spinner />;
-  }
-
-  const {data: {assets}} = props;
+  const {assets} = props;
 
   return (
     <div className={styles.widget}>
@@ -57,4 +49,4 @@ const FlagWidget = (props) => {
   );
 };
 
-export default compose(mostFlags)(FlagWidget);
+export default FlagWidget;
diff --git a/client/coral-admin/src/containers/Dashboard/LikeWidget.js b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
index 9c46fbbe0..9358b1f63 100644
--- a/client/coral-admin/src/containers/Dashboard/LikeWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
@@ -11,11 +11,7 @@ const lang = new I18n(translations);
 
 const LikeWidget = (props) => {
 
-  if (props.data.loading) {
-    return <Spinner />;
-  }
-
-  const {data: {assets}} = props;
+  const {assets} = props;
 
   return (
     <div className={styles.widget}>
@@ -58,4 +54,4 @@ const LikeWidget = (props) => {
   );
 };
 
-export default compose(mostLikes)(LikeWidget);
+export default LikeWidget;
diff --git a/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js b/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
index 39f01b41b..600a09c13 100644
--- a/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
@@ -1,37 +1,44 @@
 import React from 'react';
-import {compose} from 'react-apollo';
-import {mostLikedComments} from 'coral-admin/src/graphql/queries';
-
-// import I18n from 'coral-framework/modules/i18n/i18n';
-// import translations from 'coral-admin/src/translations';
-
+import I18n from 'coral-framework/modules/i18n/i18n';
+import translations from 'coral-admin/src/translations';
 import ModerationQueue from 'coral-admin/src/containers/ModerationQueue/ModerationQueue';
 import {Spinner} from 'coral-ui';
 import styles from './Widget.css';
+import BanUserDialog from 'coral-admin/src/components/BanUserDialog';
 
-// const lang = new I18n(translations);
+const lang = new I18n(translations);
 
-const MostLikedCommentsWidget = props => {
+class MostLikedCommentsWidget extends React.Component {
 
-  if (props.data.loading) {
-    return <Spinner />;
+  render () {
+    // console.log('render! loading?', this.props.data.loading);
+
+    // if (this.props.data.loading) {
+    //   return <Spinner />;
+    // }
+
+    // const {
+    //   comments,
+    //   moderation,
+    //   settings,
+    //   showBanUserDialog,
+    //   hideBanUserDialog
+    // } = this.props;
+
+    // console.log('MostLikedCommentsWidget', comments);
+
+    return (
+      <div className={styles.widget}>
+        <h2 className={styles.heading}>{lang.t('most_liked_comments')}</h2>
+        {/*<ModerationQueue
+          comments={comments}
+          suspectWords={settings.wordlist.suspect}
+          showBanUserDialog={showBanUserDialog}
+          acceptComment={() => {}}
+          rejectComment={() => {}} />*/}
+      </div>
+    );
   }
+}
 
-  const {data: {comments}} = props;
-
-  console.log('MostLikedCommentsWidget', comments);
-
-  return (
-    <div className={styles.widget}>
-      <h2 className={styles.heading}>most liked comments</h2>
-      <ModerationQueue
-        comments={comments}
-        suspectWords={[]}
-        showBanUserDialog={() => {}}
-        acceptComment={() => {}}
-        rejectComment={() => {}} />
-    </div>
-  );
-};
-
-export default compose(mostLikedComments)(MostLikedCommentsWidget);
+export default MostLikedCommentsWidget;
diff --git a/client/coral-admin/src/graphql/queries/assetMetrics.graphql b/client/coral-admin/src/graphql/queries/assetMetrics.graphql
deleted file mode 100644
index de0eb1fe8..000000000
--- a/client/coral-admin/src/graphql/queries/assetMetrics.graphql
+++ /dev/null
@@ -1,19 +0,0 @@
-fragment metrics on Asset {
-  id
-  title
-  url
-  commentCount
-  author
-  created_at
-  action_summaries {
-    type: __typename
-    actionCount
-    actionableItemCount
-  }
-}
-
-query Metrics ($from: Date!, $to: Date!, $sort: ACTION_TYPE!) {
-  assets: assetMetrics(from: $from, to: $to, sort: $sort) {
-    ...metrics
-  }
-}
diff --git a/client/coral-admin/src/graphql/queries/commentMetrics.graphql b/client/coral-admin/src/graphql/queries/commentMetrics.graphql
deleted file mode 100644
index 59a89739c..000000000
--- a/client/coral-admin/src/graphql/queries/commentMetrics.graphql
+++ /dev/null
@@ -1,19 +0,0 @@
-query CommentMetrics ($from: Date!, $to: Date!, $sort: ACTION_TYPE!) {
-  comments: commentMetrics(from: $from, to: $to, sort: $sort) {
-    id
-    body
-    user {
-      status
-      username
-    }
-    asset {
-      id
-      title
-    }
-    created_at
-    action_summaries {
-      type: __typename
-      count
-    }
-  }
-}
diff --git a/client/coral-admin/src/graphql/queries/index.js b/client/coral-admin/src/graphql/queries/index.js
index ceedffd9d..d6011e056 100644
--- a/client/coral-admin/src/graphql/queries/index.js
+++ b/client/coral-admin/src/graphql/queries/index.js
@@ -1,56 +1,24 @@
 import {graphql} from 'react-apollo';
 
-import ASSET_METRICS from './assetMetrics.graphql';
-import COMMENT_METRICS from './commentMetrics.graphql';
+import METRICS from './metrics.graphql';
 import MOD_QUEUE_QUERY from './modQueueQuery.graphql';
 
-export const mostFlags = graphql(ASSET_METRICS, {
-  options: () => {
-
-    // currently hard-coded per Greg's advice
-    const fiveMinutesAgo = new Date();
-    fiveMinutesAgo.setMinutes(fiveMinutesAgo.getMinutes() - 5);
-    return {
-      variables: {
-        sort: 'FLAG',
-        from: fiveMinutesAgo.toISOString(),
-        to: new Date().toISOString()
-      }
-    };
-  }
-});
-
-export const mostLikes = graphql(ASSET_METRICS, {
-  options: () => {
-
-    // currently hard-coded per Greg's advice
-    const fiveMinutesAgo = new Date();
-    fiveMinutesAgo.setMinutes(fiveMinutesAgo.getMinutes() - 5);
-    return {
-      variables: {
-        sort: 'LIKE',
-        from: fiveMinutesAgo.toISOString(),
-        to: new Date().toISOString()
-      }
-    };
-  }
-});
-
-export const mostLikedComments = graphql(COMMENT_METRICS, {
-  options: () => {
-
-    // currently hard-coded per Greg's advice
-    const fiveMinutesAgo = new Date();
-    fiveMinutesAgo.setMinutes(fiveMinutesAgo.getMinutes() - 5);
-    return {
-      variables: {
-        sort: 'LIKE',
-        from: fiveMinutesAgo.toISOString(),
-        to: new Date().toISOString()
-      }
-    };
-  }
-});
+// export const getMetrics = graphql(METRICS, {
+//   options: () => {
+//
+//     // currently hard-coded per Greg's advice
+//     const fiveMinutesAgo = new Date();
+//     fiveMinutesAgo.setMinutes(fiveMinutesAgo.getMinutes() - 5);
+//     return {
+//       variables: {
+//         // from: fiveMinutesAgo.toISOString(),
+//         from: '2017-02-23T16:09:44.235Z',
+//         // to: new Date().toISOString()
+//         to: '2017-02-23T19:30:23.251Z'
+//       }
+//     };
+//   }
+// });
 
 export const modQueueQuery = graphql(MOD_QUEUE_QUERY, {
   options: ({params: {id = null}}) => {
diff --git a/client/coral-admin/src/graphql/queries/metrics.graphql b/client/coral-admin/src/graphql/queries/metrics.graphql
new file mode 100644
index 000000000..4e713c0b7
--- /dev/null
+++ b/client/coral-admin/src/graphql/queries/metrics.graphql
@@ -0,0 +1,39 @@
+fragment metrics on Asset {
+  id
+  title
+  url
+  commentCount
+  author
+  created_at
+  action_summaries {
+    type: __typename
+    actionCount
+    actionableItemCount
+  }
+}
+
+query Metrics ($from: Date!, $to: Date!) {
+  assetsByFlag: assetMetrics(from: $from, to: $to, sort: FLAG) {
+    ...metrics
+  }
+  assetsByLike: assetMetrics(from: $from, to: $to, sort: LIKE) {
+    ...metrics
+  }
+  mostLikedComments: commentMetrics(from: $from, to: $to, sort: LIKE) {
+    id
+    body
+    user {
+      status
+      username
+    }
+    asset {
+      id
+      title
+    }
+    created_at
+    action_summaries {
+      type: __typename
+      count
+    }
+  }
+}
diff --git a/client/coral-admin/src/graphql/queries/mostFlags.graphql b/client/coral-admin/src/graphql/queries/mostFlags.graphql
deleted file mode 100644
index 182ea0c8b..000000000
--- a/client/coral-admin/src/graphql/queries/mostFlags.graphql
+++ /dev/null
@@ -1,14 +0,0 @@
-query Metrics ($from: Date!, $to: Date!, $sort: ACTION_TYPE!) {
-  metrics(from: $from, to: $to, sort: $sort) {
-    id
-    title
-    url
-    commentCount
-    author
-    created_at
-    action_summaries {
-      actionCount
-      actionableItemCount
-    }
-  }
-}

From 30b6259e872dfd65851d6bffc913df96f54f3a21 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 23 Feb 2017 14:43:25 -0700
Subject: [PATCH 013/132] Patched bug with asset metrics

---
 graph/loaders/metrics.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graph/loaders/metrics.js b/graph/loaders/metrics.js
index 1b0719d0f..a22cbb58f 100644
--- a/graph/loaders/metrics.js
+++ b/graph/loaders/metrics.js
@@ -31,7 +31,7 @@ const getAssetMetrics = ({loaders: {Metrics, Assets}}, {from, to, sort, limit})
       }, {});
 
       // Collect just the comment id's.
-      let commentIDs = _.uniq(actionSummaries.map((as) => as.item_id));
+      let commentIDs = Object.keys(commentMetrics);
 
       // Find those comments.
       return Metrics.getSpecificComments.loadMany(commentIDs);

From be25d6f56d9b2770493e05ee7886559e6ebb1587 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Thu, 23 Feb 2017 15:46:44 -0700
Subject: [PATCH 014/132] "works"

---
 .../src/containers/Dashboard/Dashboard.css    |  1 -
 .../src/containers/Dashboard/Dashboard.js     | 33 ++++++-----
 .../Dashboard/MostLikedCommentsWidget.js      | 59 +++++++++----------
 .../src/containers/Dashboard/Widget.css       |  2 +-
 4 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.css b/client/coral-admin/src/containers/Dashboard/Dashboard.css
index a23927d8a..72b9bd90c 100644
--- a/client/coral-admin/src/containers/Dashboard/Dashboard.css
+++ b/client/coral-admin/src/containers/Dashboard/Dashboard.css
@@ -1,6 +1,5 @@
 .Dashboard {
   display: flex;
-  flex-wrap: wrap;
 }
 
 .heading {
diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.js b/client/coral-admin/src/containers/Dashboard/Dashboard.js
index 74bbce9fb..10d3b3ba3 100644
--- a/client/coral-admin/src/containers/Dashboard/Dashboard.js
+++ b/client/coral-admin/src/containers/Dashboard/Dashboard.js
@@ -1,12 +1,13 @@
 import React from 'react';
 import styles from './Dashboard.css';
-import {graphql} from 'react-apollo';
+import {graphql, compose} from 'react-apollo';
 import {connect} from 'react-redux';
 import FlagWidget from './FlagWidget';
 import LikeWidget from './LikeWidget';
 import METRICS from 'coral-admin/src/graphql/queries/metrics.graphql';
-// import MostLikedCommentsWidget from './MostLikedCommentsWidget';
+import MostLikedCommentsWidget from './MostLikedCommentsWidget';
 import {showBanUserDialog, hideBanUserDialog} from 'coral-admin/src/actions/moderation';
+import {banUser, setCommentStatus} from 'coral-admin/src/graphql/mutations';
 import {Spinner} from 'coral-ui';
 
 class Dashboard extends React.Component {
@@ -19,30 +20,34 @@ class Dashboard extends React.Component {
 
     console.log(this.props.data);
 
-    const {data: {assetsByLike, assetsByFlag}} = this.props;
+    const {data: {assetsByLike, assetsByFlag, mostLikedComments}} = this.props;
 
     console.log('assetsByLike', assetsByLike);
     console.log('assetsByFlag', assetsByFlag);
 
-    // const {moderation, settings} = this.props;
+    const {moderation, settings} = this.props;
 
     return (
       <div className={styles.Dashboard}>
-        {assetsByFlag && <FlagWidget assets={assetsByFlag} />}
-        {/*<MostLikedCommentsWidget
+        <FlagWidget assets={assetsByFlag} />
+        <MostLikedCommentsWidget
+          comments={mostLikedComments}
           moderation={moderation}
           settings={settings}
+          acceptComment={this.props.acceptComment}
+          rejectComment={this.props.rejectComment}
+          handleBanUser={this.props.banUser}
           showBanUserDialog={this.props.showBanUserDialog}
-          hideBanUserDialog={this.props.hideBanUserDialog} />*/}
-        {assetsByLike && <LikeWidget assets={assetsByLike} />}
+          hideBanUserDialog={this.props.hideBanUserDialog} />
+        <LikeWidget assets={assetsByLike} />
       </div>
     );
   }
 }
 
-let fiveMinutesAgo = new Date();
-fiveMinutesAgo.setMinutes(fiveMinutesAgo.getMinutes() - 5);
-fiveMinutesAgo = fiveMinutesAgo.toISOString();
+let then = new Date();
+then.setMinutes(then.getMinutes() - 205);
+then = then.toISOString();
 const now = new Date().toISOString();
 
 const getMetrics = graphql(METRICS, {
@@ -50,16 +55,14 @@ const getMetrics = graphql(METRICS, {
 
     return {
       variables: {
-        from: fiveMinutesAgo,
-        // from: '2017-02-23T16:09:44.235Z',
+        from: then,
         to: now
-        // to: '2017-02-23T19:30:23.251Z'
       }
     };
   }
 });
 
-const DashboardWithData = getMetrics(Dashboard);
+const DashboardWithData = compose(getMetrics, setCommentStatus, banUser)(Dashboard);
 
 const mapStateToProps = state => {
   return {
diff --git a/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js b/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
index 600a09c13..5b0427acb 100644
--- a/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
@@ -8,37 +8,34 @@ import BanUserDialog from 'coral-admin/src/components/BanUserDialog';
 
 const lang = new I18n(translations);
 
-class MostLikedCommentsWidget extends React.Component {
+const MostLikedCommentsWidget = props => {
+  const {
+    comments,
+    moderation,
+    settings,
+    handleBanUser,
+    showBanUserDialog,
+    hideBanUserDialog,
+    acceptComment,
+    rejectComment
+  } = props;
 
-  render () {
-    // console.log('render! loading?', this.props.data.loading);
-
-    // if (this.props.data.loading) {
-    //   return <Spinner />;
-    // }
-
-    // const {
-    //   comments,
-    //   moderation,
-    //   settings,
-    //   showBanUserDialog,
-    //   hideBanUserDialog
-    // } = this.props;
-
-    // console.log('MostLikedCommentsWidget', comments);
-
-    return (
-      <div className={styles.widget}>
-        <h2 className={styles.heading}>{lang.t('most_liked_comments')}</h2>
-        {/*<ModerationQueue
-          comments={comments}
-          suspectWords={settings.wordlist.suspect}
-          showBanUserDialog={showBanUserDialog}
-          acceptComment={() => {}}
-          rejectComment={() => {}} />*/}
-      </div>
-    );
-  }
-}
+  return (
+    <div className={styles.widget}>
+      <h2 className={styles.heading}>{lang.t('most_liked_comments')}</h2>
+      <ModerationQueue
+        comments={comments}
+        suspectWords={settings.wordlist.suspect}
+        showBanUserDialog={showBanUserDialog}
+        acceptComment={acceptComment}
+        rejectComment={rejectComment} />
+      <BanUserDialog
+        open={moderation.banDialog}
+        user={moderation.user}
+        handleClose={hideBanUserDialog}
+        handleBanUser={handleBanUser} />
+    </div>
+  );
+};
 
 export default MostLikedCommentsWidget;
diff --git a/client/coral-admin/src/containers/Dashboard/Widget.css b/client/coral-admin/src/containers/Dashboard/Widget.css
index d9cce2043..624b72519 100644
--- a/client/coral-admin/src/containers/Dashboard/Widget.css
+++ b/client/coral-admin/src/containers/Dashboard/Widget.css
@@ -3,7 +3,7 @@
   margin: 10px 5px 5px 5px;
   box-shadow: 0px 0px 5px 0px rgba(0,0,0,0.2);
   padding: 15px;
-  width: calc(50% - 10px);
+  flex: 1;
 }
 
 .heading {

From dc5f95ec7f20cba1f6cdcd6e88fe18dcff04a19c Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Fri, 24 Feb 2017 08:50:52 -0700
Subject: [PATCH 015/132] simplify moderationqueue

---
 .../src/containers/ModerationQueue/ModerationQueue.js        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
index a0e6332b5..b1792f720 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
@@ -12,7 +12,8 @@ const ModerationQueue = ({comments, ...props}) => {
     <div id="moderationList">
       <ul style={{paddingLeft: 0}}>
       {
-        comments.map((comment, i) => {
+        comments.length
+        ? comments.map((comment, i) => {
           const status = comment.action_summaries ? 'FLAGGED' : comment.status;
           return <Comment
             key={i}
@@ -34,7 +35,7 @@ const ModerationQueue = ({comments, ...props}) => {
 };
 
 ModerationQueue.propTypes = {
-  suspectWords: PropTypes.arrayOf(PropTypes.string).isRequired
+  suspectWords: PropTypes.arrayOf(PropTypes.string).isRequired,
   currentAsset: PropTypes.object,
   showBanUserDialog: PropTypes.func.isRequired,
   rejectComment: PropTypes.func.isRequired,

From c8c3c4acaf2adcc2c0e35b782ccfb6e63650c5ff Mon Sep 17 00:00:00 2001
From: riley <riley.davis@gmail.com>
Date: Fri, 24 Feb 2017 08:59:23 -0700
Subject: [PATCH 016/132] lint

---
 .../src/containers/Dashboard/LikeWidget.js     |  3 ---
 .../Dashboard/MostLikedCommentsWidget.js       |  1 -
 .../coral-admin/src/graphql/queries/index.js   | 18 ------------------
 3 files changed, 22 deletions(-)

diff --git a/client/coral-admin/src/containers/Dashboard/LikeWidget.js b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
index 9358b1f63..076958bcd 100644
--- a/client/coral-admin/src/containers/Dashboard/LikeWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
@@ -1,8 +1,5 @@
 import React from 'react';
-import {compose} from 'react-apollo';
-import {mostLikes} from 'coral-admin/src/graphql/queries';
 import {Link} from 'react-router';
-import {Spinner} from 'coral-ui';
 import styles from './Widget.css';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from 'coral-admin/src/translations';
diff --git a/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js b/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
index 5b0427acb..0c41ac7c6 100644
--- a/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
@@ -2,7 +2,6 @@ import React from 'react';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from 'coral-admin/src/translations';
 import ModerationQueue from 'coral-admin/src/containers/ModerationQueue/ModerationQueue';
-import {Spinner} from 'coral-ui';
 import styles from './Widget.css';
 import BanUserDialog from 'coral-admin/src/components/BanUserDialog';
 
diff --git a/client/coral-admin/src/graphql/queries/index.js b/client/coral-admin/src/graphql/queries/index.js
index d6011e056..022522500 100644
--- a/client/coral-admin/src/graphql/queries/index.js
+++ b/client/coral-admin/src/graphql/queries/index.js
@@ -1,25 +1,7 @@
 import {graphql} from 'react-apollo';
 
-import METRICS from './metrics.graphql';
 import MOD_QUEUE_QUERY from './modQueueQuery.graphql';
 
-// export const getMetrics = graphql(METRICS, {
-//   options: () => {
-//
-//     // currently hard-coded per Greg's advice
-//     const fiveMinutesAgo = new Date();
-//     fiveMinutesAgo.setMinutes(fiveMinutesAgo.getMinutes() - 5);
-//     return {
-//       variables: {
-//         // from: fiveMinutesAgo.toISOString(),
-//         from: '2017-02-23T16:09:44.235Z',
-//         // to: new Date().toISOString()
-//         to: '2017-02-23T19:30:23.251Z'
-//       }
-//     };
-//   }
-// });
-
 export const modQueueQuery = graphql(MOD_QUEUE_QUERY, {
   options: ({params: {id = null}}) => {
     return {

From c283f193deceb61e5f07b423cd0e103933ff341c Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Fri, 24 Feb 2017 09:07:03 -0700
Subject: [PATCH 017/132] remove console.log

---
 client/coral-admin/src/containers/Dashboard/Dashboard.js  | 6 ------
 client/coral-admin/src/containers/Dashboard/LikeWidget.js | 1 -
 2 files changed, 7 deletions(-)

diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.js b/client/coral-admin/src/containers/Dashboard/Dashboard.js
index 10d3b3ba3..51e46408d 100644
--- a/client/coral-admin/src/containers/Dashboard/Dashboard.js
+++ b/client/coral-admin/src/containers/Dashboard/Dashboard.js
@@ -18,13 +18,7 @@ class Dashboard extends React.Component {
       return <Spinner />;
     }
 
-    console.log(this.props.data);
-
     const {data: {assetsByLike, assetsByFlag, mostLikedComments}} = this.props;
-
-    console.log('assetsByLike', assetsByLike);
-    console.log('assetsByFlag', assetsByFlag);
-
     const {moderation, settings} = this.props;
 
     return (
diff --git a/client/coral-admin/src/containers/Dashboard/LikeWidget.js b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
index 076958bcd..82eecb049 100644
--- a/client/coral-admin/src/containers/Dashboard/LikeWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
@@ -29,7 +29,6 @@ const LikeWidget = (props) => {
             ? assets.map((asset, index) => {
               const flagSummary = asset.action_summaries.find(s => s.type === 'FlagAssetActionSummary');
               const likeSummary = asset.action_summaries.find(s => s.type === 'LikeAssetActionSummary');
-              console.log('LikeWidget', likeSummary);
               return (
                 <tr key={asset.id}>
                   <td>{index + 1}.</td>

From f5277ce5e3cdbabd9423b8b825bfec52951d9677 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 24 Feb 2017 09:56:18 -0700
Subject: [PATCH 018/132] Patched silly bug

---
 client/.eslintrc.json         |  3 +-
 graph/loaders/metrics.js      | 18 +------
 test/graph/loaders/metrics.js | 89 ++++++++++++++++++++++++++++++++++-
 3 files changed, 92 insertions(+), 18 deletions(-)

diff --git a/client/.eslintrc.json b/client/.eslintrc.json
index a935eaec6..1144f985d 100644
--- a/client/.eslintrc.json
+++ b/client/.eslintrc.json
@@ -18,6 +18,7 @@
     ],
     "rules": {
       "react/jsx-uses-react": "error",
-      "react/jsx-uses-vars": "error"
+      "react/jsx-uses-vars": "error",
+      "no-console": ["warn", { "allow": ["warn", "error"] }]
     }
 }
diff --git a/graph/loaders/metrics.js b/graph/loaders/metrics.js
index a22cbb58f..2627d82d9 100644
--- a/graph/loaders/metrics.js
+++ b/graph/loaders/metrics.js
@@ -2,13 +2,12 @@ const _ = require('lodash');
 const DataLoader = require('dataloader');
 const {objectCacheKeyFn} = require('./util');
 
-const CommentModel = require('../../models/comment');
 const ActionModel = require('../../models/action');
 
 /**
  * Returns a list of assets with action metadata included on the models.
  */
-const getAssetMetrics = ({loaders: {Metrics, Assets}}, {from, to, sort, limit}) => {
+const getAssetMetrics = ({loaders: {Metrics, Assets, Comments}}, {from, to, sort, limit}) => {
 
   let commentMetrics = {};
   let assetMetrics = [];
@@ -34,7 +33,7 @@ const getAssetMetrics = ({loaders: {Metrics, Assets}}, {from, to, sort, limit})
       let commentIDs = Object.keys(commentMetrics);
 
       // Find those comments.
-      return Metrics.getSpecificComments.loadMany(commentIDs);
+      return Comments.get.loadMany(commentIDs);
     })
     .then((comments) => {
 
@@ -202,21 +201,8 @@ const getRecentActions = (context, {from, to}) => {
   ]);
 };
 
-const getSpecificComments = (context, ids) => {
-  return CommentModel.find({
-    id: {
-      $in: ids
-    }
-  })
-  .select({
-    id: 1,
-    asset_id: 1
-  });
-};
-
 module.exports = (context) => ({
   Metrics: {
-    getSpecificComments: new DataLoader((ids) => getSpecificComments(context, ids)),
     getRecentActions: new DataLoader(([{from, to}]) => getRecentActions(context, {from, to}).then((as) => [as]), {
       batch: false,
       cacheKeyFn: objectCacheKeyFn('from', 'to')
diff --git a/test/graph/loaders/metrics.js b/test/graph/loaders/metrics.js
index 303b40897..032a59536 100644
--- a/test/graph/loaders/metrics.js
+++ b/test/graph/loaders/metrics.js
@@ -4,6 +4,7 @@ const {graphql} = require('graphql');
 const schema = require('../../../graph/schema');
 const Context = require('../../../graph/context');
 const UserModel = require('../../../models/user');
+const AssetModel = require('../../../models/asset');
 const SettingsService = require('../../../services/settings');
 const ActionModel = require('../../../models/action');
 const CommentModel = require('../../../models/comment');
@@ -26,7 +27,9 @@ describe('graph.loaders.Metrics', () => {
     describe('different comment states', () => {
 
       beforeEach(() => CommentModel.create([
-        {id: '1', body: 'a new comment!'}
+        {id: '1', body: 'a new comment!'},
+        {id: '2', body: 'a new comment!'},
+        {id: '3', body: 'a new comment!'}
       ]));
 
       [
@@ -36,6 +39,12 @@ describe('graph.loaders.Metrics', () => {
         {liked: 1, flagged: 1, actions: [
           {action_type: 'FLAG', item_id: '1', item_type: 'COMMENTS'},
           {action_type: 'LIKE', item_id: '1', item_type: 'COMMENTS'}
+        ]},
+        {liked: 3, flagged: 1, actions: [
+          {action_type: 'LIKE', item_id: '1', item_type: 'COMMENTS'},
+          {action_type: 'LIKE', item_id: '2', item_type: 'COMMENTS'},
+          {action_type: 'LIKE', item_id: '3', item_type: 'COMMENTS'},
+          {action_type: 'FLAG', item_id: '3', item_type: 'COMMENTS'}
         ]}
       ].forEach(({liked, flagged, actions}) => {
 
@@ -63,4 +72,82 @@ describe('graph.loaders.Metrics', () => {
 
     });
   });
+
+  describe('#Assets', () => {
+    const query = `
+      fragment metrics on Asset {
+        id
+        action_summaries {
+          type: __typename
+          actionCount
+          actionableItemCount
+        }
+      }
+
+      query Metrics($from: Date!, $to: Date!) {
+        assetsByFlag: assetMetrics(from: $from, to: $to, sort: FLAG) {
+          ...metrics
+        }
+        assetsByLike: assetMetrics(from: $from, to: $to, sort: LIKE) {
+          ...metrics
+        }
+      }
+    `;
+
+    describe('different comment states', () => {
+
+      beforeEach(() => Promise.all([
+        AssetModel.create([
+          {id: 'a1', url: 'http://localhost:3030/article/1'},
+          {id: 'a2', url: 'http://localhost:3030/article/2'}
+        ]),
+        CommentModel.create([
+          {id: 'c1', asset_id: 'a1', body: 'a new comment!'},
+          {id: 'c2', asset_id: 'a1', body: 'a new comment!'},
+          {id: 'c3', asset_id: 'a1', body: 'a new comment!'}
+        ])
+      ]));
+
+      [
+        {liked: 0, flagged: 0, actions: []},
+        {liked: 1, flagged: 0, actions: [{action_type: 'LIKE', item_id: 'c1', item_type: 'COMMENTS'}]},
+        {liked: 0, flagged: 1, actions: [{action_type: 'FLAG', item_id: 'c1', item_type: 'COMMENTS'}]},
+        {liked: 1, flagged: 1, actions: [
+          {action_type: 'FLAG', item_id: 'c1', item_type: 'COMMENTS'},
+          {action_type: 'LIKE', item_id: 'c1', item_type: 'COMMENTS'}
+        ]},
+        {liked: 1, flagged: 1, actions: [
+          {action_type: 'LIKE', item_id: 'c1', item_type: 'COMMENTS'},
+          {action_type: 'LIKE', item_id: 'c2', item_type: 'COMMENTS'},
+          {action_type: 'LIKE', item_id: 'c3', item_type: 'COMMENTS'},
+          {action_type: 'FLAG', item_id: 'c3', item_type: 'COMMENTS'}
+        ]}
+      ].forEach(({liked, flagged, actions}) => {
+
+        describe(`with actions=${actions.length}`, () => {
+
+          beforeEach(() => ActionModel.create(actions));
+
+          it(`returns the correct amount of metrics liked=${liked} flagged=${flagged}`, () => {
+            const context = new Context({user: new UserModel({roles: ['ADMIN']})});
+
+            return graphql(schema, query, {}, context, {
+              from: (new Date()).setMinutes((new Date()).getMinutes() - 5),
+              to: (new Date()).setMinutes((new Date()).getMinutes() + 5)
+            })
+              .then(({data, errors}) => {
+                console.log(JSON.stringify(errors, null, 2));
+
+                expect(errors).to.be.undefined;
+                expect(data.assetsByLike).to.have.length(liked);
+                expect(data.assetsByFlag).to.have.length(flagged);
+              });
+          });
+
+        });
+
+      });
+
+    });
+  });
 });

From 799727264e6a42ad7c82925269af8760bbfe9628 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 24 Feb 2017 09:57:57 -0700
Subject: [PATCH 019/132] Removed log

---
 test/graph/loaders/metrics.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/graph/loaders/metrics.js b/test/graph/loaders/metrics.js
index 032a59536..29f2eeff1 100644
--- a/test/graph/loaders/metrics.js
+++ b/test/graph/loaders/metrics.js
@@ -136,8 +136,6 @@ describe('graph.loaders.Metrics', () => {
               to: (new Date()).setMinutes((new Date()).getMinutes() + 5)
             })
               .then(({data, errors}) => {
-                console.log(JSON.stringify(errors, null, 2));
-
                 expect(errors).to.be.undefined;
                 expect(data.assetsByLike).to.have.length(liked);
                 expect(data.assetsByFlag).to.have.length(flagged);

From 38e093aac32e48db9606ec46047ae4a79c4503c1 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Fri, 24 Feb 2017 11:26:23 -0700
Subject: [PATCH 020/132] remove most liked comments widget

---
 .../src/containers/Dashboard/Dashboard.js     | 12 ++++---
 .../src/containers/Dashboard/FlagWidget.js    |  3 --
 .../src/containers/Dashboard/LikeWidget.js    |  3 --
 .../src/graphql/queries/metrics.graphql       | 34 +++++++++----------
 client/coral-admin/src/translations.json      |  4 +--
 5 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.js b/client/coral-admin/src/containers/Dashboard/Dashboard.js
index 51e46408d..ba840c627 100644
--- a/client/coral-admin/src/containers/Dashboard/Dashboard.js
+++ b/client/coral-admin/src/containers/Dashboard/Dashboard.js
@@ -5,7 +5,8 @@ import {connect} from 'react-redux';
 import FlagWidget from './FlagWidget';
 import LikeWidget from './LikeWidget';
 import METRICS from 'coral-admin/src/graphql/queries/metrics.graphql';
-import MostLikedCommentsWidget from './MostLikedCommentsWidget';
+
+// import MostLikedCommentsWidget from './MostLikedCommentsWidget';
 import {showBanUserDialog, hideBanUserDialog} from 'coral-admin/src/actions/moderation';
 import {banUser, setCommentStatus} from 'coral-admin/src/graphql/mutations';
 import {Spinner} from 'coral-ui';
@@ -18,12 +19,14 @@ class Dashboard extends React.Component {
       return <Spinner />;
     }
 
-    const {data: {assetsByLike, assetsByFlag, mostLikedComments}} = this.props;
-    const {moderation, settings} = this.props;
+    const {data: {assetsByLike, assetsByFlag/* , mostLikedComments*/}} = this.props;
+
+    // const {moderation, settings} = this.props;
 
     return (
       <div className={styles.Dashboard}>
         <FlagWidget assets={assetsByFlag} />
+        {/*
         <MostLikedCommentsWidget
           comments={mostLikedComments}
           moderation={moderation}
@@ -33,6 +36,7 @@ class Dashboard extends React.Component {
           handleBanUser={this.props.banUser}
           showBanUserDialog={this.props.showBanUserDialog}
           hideBanUserDialog={this.props.hideBanUserDialog} />
+          */}
         <LikeWidget assets={assetsByLike} />
       </div>
     );
@@ -40,7 +44,7 @@ class Dashboard extends React.Component {
 }
 
 let then = new Date();
-then.setMinutes(then.getMinutes() - 205);
+then.setMinutes(then.getMinutes() - 5);
 then = then.toISOString();
 const now = new Date().toISOString();
 
diff --git a/client/coral-admin/src/containers/Dashboard/FlagWidget.js b/client/coral-admin/src/containers/Dashboard/FlagWidget.js
index ada1f03f3..34c67086e 100644
--- a/client/coral-admin/src/containers/Dashboard/FlagWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/FlagWidget.js
@@ -18,7 +18,6 @@ const FlagWidget = (props) => {
             <th></th>{/* empty on purpose */}
             <th>{lang.t('streams.article')}</th>
             <th>{lang.t('modqueue.flagged')}</th>
-            <th>{lang.t('modqueue.likes')}</th>
             <th>{lang.t('dashboard.comment_count')}</th>
           </tr>
         </thead>
@@ -27,7 +26,6 @@ const FlagWidget = (props) => {
             assets.length
             ? assets.map((asset, index) => {
               const flagSummary = asset.action_summaries.find(s => s.type === 'FlagAssetActionSummary');
-              const likeSummary = asset.action_summaries.find(s => s.type === 'LikeAssetActionSummary');
               return (
                 <tr key={asset.id}>
                   <td>{index + 1}.</td>
@@ -36,7 +34,6 @@ const FlagWidget = (props) => {
                     <p className={styles.lede}>{asset.author} - Published: {new Date(asset.created_at).toLocaleDateString()}</p>
                   </td>
                   <td>{flagSummary ? flagSummary.actionCount : 0}</td>
-                  <td>{likeSummary ? likeSummary.actionCount : 0}</td>
                   <td>{asset.commentCount}</td>
                 </tr>
               );
diff --git a/client/coral-admin/src/containers/Dashboard/LikeWidget.js b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
index 82eecb049..dd92a94ca 100644
--- a/client/coral-admin/src/containers/Dashboard/LikeWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
@@ -18,7 +18,6 @@ const LikeWidget = (props) => {
           <tr>
             <th></th>{/* empty on purpose */}
             <th>{lang.t('streams.article')}</th>
-            <th>{lang.t('modqueue.flagged')}</th>
             <th>{lang.t('modqueue.likes')}</th>
             <th>{lang.t('dashboard.comment_count')}</th>
           </tr>
@@ -27,7 +26,6 @@ const LikeWidget = (props) => {
           {
             assets.length
             ? assets.map((asset, index) => {
-              const flagSummary = asset.action_summaries.find(s => s.type === 'FlagAssetActionSummary');
               const likeSummary = asset.action_summaries.find(s => s.type === 'LikeAssetActionSummary');
               return (
                 <tr key={asset.id}>
@@ -36,7 +34,6 @@ const LikeWidget = (props) => {
                     <Link to={`/admin/moderate/flagged/${asset.id}`}>{asset.title}</Link>
                     <p className={styles.lede}>{asset.author} - Published: {new Date(asset.created_at).toLocaleDateString()}</p>
                   </td>
-                  <td>{flagSummary ? flagSummary.actionCount : 0}</td>
                   <td>{likeSummary ? likeSummary.actionCount : 0}</td>
                   <td>{asset.commentCount}</td>
                 </tr>
diff --git a/client/coral-admin/src/graphql/queries/metrics.graphql b/client/coral-admin/src/graphql/queries/metrics.graphql
index 4e713c0b7..da5125a48 100644
--- a/client/coral-admin/src/graphql/queries/metrics.graphql
+++ b/client/coral-admin/src/graphql/queries/metrics.graphql
@@ -19,21 +19,21 @@ query Metrics ($from: Date!, $to: Date!) {
   assetsByLike: assetMetrics(from: $from, to: $to, sort: LIKE) {
     ...metrics
   }
-  mostLikedComments: commentMetrics(from: $from, to: $to, sort: LIKE) {
-    id
-    body
-    user {
-      status
-      username
-    }
-    asset {
-      id
-      title
-    }
-    created_at
-    action_summaries {
-      type: __typename
-      count
-    }
-  }
+#  mostLikedComments: commentMetrics(from: $from, to: $to, sort: LIKE) {
+#    id
+#    body
+#    user {
+#      status
+#      username
+#    }
+#    asset {
+#      id
+#      title
+#    }
+#    created_at
+#    action_summaries {
+#      type: __typename
+#      count
+#    }
+#  }
 }
diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json
index f3deb6792..92e5d098a 100644
--- a/client/coral-admin/src/translations.json
+++ b/client/coral-admin/src/translations.json
@@ -112,7 +112,7 @@
     "dashboard": {
       "no_flags": "There have been no flags in the last 5 minutes! Hooray!",
       "no_likes": "There have been no likes in the last 5 minutes. All quiet.",
-      "comment_count": "Comments"
+      "comment_count": "comments"
     },
     "streams": {
       "empty_result": "No assets match this search. Maybe try widening your search?",
@@ -222,7 +222,7 @@
     "dashbord": {
       "no_flags": "¡Nadie ha marcado nada en los últimos 5 minutos! ¡Bravo!",
       "no_likes": "A nadie le ha gustado algún comentario en los últimos 5 minutos. Todo tranquilo.",
-      "comment_count": "Comentarios"
+      "comment_count": "comentarios"
     },
     "streams": {
       "empty_result": "No se encuentro articulo con esta busqueda. Tal vez extender la busqueda?",

From 1058bff8ad66a194cf1a8516f032c14ba9773c81 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Fri, 24 Feb 2017 11:30:59 -0700
Subject: [PATCH 021/132] remove logs

---
 client/coral-admin/src/actions/install.js     |   3 +-
 .../containers/Configure/CommentSettings.js   |   1 -
 .../ModerationQueue/ModerationContainer.js    |   1 -
 client/coral-framework/actions/auth.js        |   3 +-
 client/coral-plugin-commentbox/CommentBox.js  |   1 -
 .../RileysAwesomeCommentBox.js                |  58 ----------
 client/coral-plugin-stream/Stream.js          | 100 ------------------
 .../coral-settings/components/NotLoggedIn.js  |   1 -
 8 files changed, 2 insertions(+), 166 deletions(-)
 delete mode 100644 client/coral-plugin-stream/RileysAwesomeCommentBox.js
 delete mode 100644 client/coral-plugin-stream/Stream.js

diff --git a/client/coral-admin/src/actions/install.js b/client/coral-admin/src/actions/install.js
index c1d05d253..9fc308d2f 100644
--- a/client/coral-admin/src/actions/install.js
+++ b/client/coral-admin/src/actions/install.js
@@ -75,8 +75,7 @@ export const submitUser = () => (dispatch, getState) => {
     dispatch(installRequest());
     coralApi('/setup', {method: 'POST', body: data})
       .then(result => {
-        console.log(result);
-        dispatch(installSuccess());
+        dispatch(installSuccess(result));
         dispatch(nextStep());
       })
       .catch(error => {
diff --git a/client/coral-admin/src/containers/Configure/CommentSettings.js b/client/coral-admin/src/containers/Configure/CommentSettings.js
index 5a14cf565..90057c5fe 100644
--- a/client/coral-admin/src/containers/Configure/CommentSettings.js
+++ b/client/coral-admin/src/containers/Configure/CommentSettings.js
@@ -52,7 +52,6 @@ const updateClosedMessage = (updateSettings) => (event) => {
 };
 
 const updateCustomCssUrl = (updateSettings) => (event) => {
-  console.log('updateCustomCssUrl', event.target.value);
   const customCssUrl = event.target.value;
   updateSettings({customCssUrl});
 };
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
index 9c68d0728..a7d7110ae 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
@@ -54,7 +54,6 @@ class ModerationContainer extends Component {
     }
 
     if (data.error) {
-      console.log(data);
       return <div>Error</div>;
     }
 
diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js
index 4a12245eb..418acc5bb 100644
--- a/client/coral-framework/actions/auth.js
+++ b/client/coral-framework/actions/auth.js
@@ -192,9 +192,8 @@ export const requestConfirmEmail = (email, redirectUri) => dispatch => {
       dispatch(verifyEmailSuccess());
     })
     .catch(err => {
-      console.log('failed to send email verification', err);
 
       // email might have already been verifyed
-      dispatch(verifyEmailFailure());
+      dispatch(verifyEmailFailure(err));
     });
 };
diff --git a/client/coral-plugin-commentbox/CommentBox.js b/client/coral-plugin-commentbox/CommentBox.js
index 3d895df07..004f294b2 100644
--- a/client/coral-plugin-commentbox/CommentBox.js
+++ b/client/coral-plugin-commentbox/CommentBox.js
@@ -110,7 +110,6 @@ class CommentBox extends Component {
                 cStyle='darkGrey'
                 className={`${name}-cancel-button`}
                 onClick={() => {
-                  console.log('cancel button in comment box');
                   cancelButtonClicked('');
                 }}>
                 {lang.t('cancel')}
diff --git a/client/coral-plugin-stream/RileysAwesomeCommentBox.js b/client/coral-plugin-stream/RileysAwesomeCommentBox.js
deleted file mode 100644
index 73fa6407d..000000000
--- a/client/coral-plugin-stream/RileysAwesomeCommentBox.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import React, {Component} from 'react';
-import {graphql} from 'react-apollo';
-import gql from 'graphql-tag';
-
-export class RileysAwesomeCommentBox extends Component {
-
-  postComment() {
-    console.log(this.props);
-    console.log('postComment', this.props.asset_id);
-    this.props.mutate({
-      variables: {
-        asset_id: this.props.asset_id,
-        body: this.textarea.value,
-        parent_id: null
-      }
-    }).then(({data}) => {
-      console.log('it workt');
-      console.log(data);
-    });
-  }
-
-  render() {
-    return <div>
-      <textarea ref={textarea => this.textarea = textarea}></textarea>
-      <button onClick={this.postComment.bind(this)}>POST</button>
-    </div>;
-  }
-}
-
-const postComment = gql`
-  fragment commentView on Comment {
-    id
-    body
-    user {
-      name: username
-    }
-    actions {
-      type: action_type
-      count
-      current: current_user {
-        id
-        created_at
-      }
-    }
-  }
-
-  mutation CreateComment ($asset_id: ID!, $parent_id: ID, $body: String!) {
-    createComment(asset_id:$asset_id, parent_id:$parent_id, body:$body) {
-        ...commentView
-      }
-    }
-`;
-
-const RileysAwesomeCommentBoxWithData = graphql(
-  postComment
-)(RileysAwesomeCommentBox);
-
-export default RileysAwesomeCommentBoxWithData;
diff --git a/client/coral-plugin-stream/Stream.js b/client/coral-plugin-stream/Stream.js
deleted file mode 100644
index 72e03d4ae..000000000
--- a/client/coral-plugin-stream/Stream.js
+++ /dev/null
@@ -1,100 +0,0 @@
-import React, {Component} from 'react';
-import {graphql} from 'react-apollo';
-import gql from 'graphql-tag';
-import {fetchSignIn} from 'coral-framework/actions/auth';
-import RileysAwesomeCommentBox from 'coral-plugin-stream/RileysAwesomeCommentBox';
-
-const assetID = '6187a94b-0b6d-4a96-ac6b-62b529cd8410';
-
-// MyComponent is a "presentational" or apollo-unaware component,
-// It could be a simple React class:
-class Stream extends Component {
-
-  constructor(props) {
-    super(props);
-  }
-
-  logMeIn() {
-    fetchSignIn({email: 'your@example.com', password: 'dfasidfaisdufoiausdfoiuaspdoifas'})(() => {});
-  }
-
-  render() {
-    const {data} = this.props;
-    return <div>
-      <button onClick={this.logMeIn.bind(this)}>Login or whatever</button>
-      {
-        data.loading
-        ? 'loading!'
-        : <div>
-            <RileysAwesomeCommentBox asset_id={data.asset.id} />
-            <p>Asset ID: {data.asset.id}</p>
-            <ul>
-            {
-              data.asset.comments.map(comment => {
-                return <li key={comment.id}>
-                  {comment.body} [{comment.id}]
-                  <ul>
-                    {
-                      comment.replies.map(reply => {
-                        return <li key={reply.id}>{reply.body}</li>;
-                      })
-                    }
-                  </ul>
-                </li>;
-              })
-            }
-            </ul>
-          </div>
-      }
-    </div>;
-  }
-}
-
-// Initialize GraphQL queries or mutations with the gql tag
-const StreamQuery = gql`fragment commentView on Comment {
-  id
-  body
-  user {
-    name: username
-  }
-  tags {
-    name
-  }
-  actions {
-    type: action_type
-    count
-    current: current_user {
-      id
-      created_at
-    }
-  }
-}
-
-query AssetQuery($asset_id: ID!) {
-  asset(id: $asset_id) {
-    id
-    title
-    url
-    commentCount
-    comments {
-      ...commentView
-      replies {
-        ...commentView
-      }
-    }
-  }
-}`;
-
-// We then can use `graphql` to pass the query results returned by MyQuery
-// to MyComponent as a prop (and update them as the results change)
-const StreamWithData = graphql(
-  StreamQuery, {
-    options: {
-      variables: {
-        asset_id: assetID
-      }
-    }
-  }
-)(Stream);
-
-export default StreamWithData;
diff --git a/client/coral-settings/components/NotLoggedIn.js b/client/coral-settings/components/NotLoggedIn.js
index 2e2b64181..acd3ae7e6 100644
--- a/client/coral-settings/components/NotLoggedIn.js
+++ b/client/coral-settings/components/NotLoggedIn.js
@@ -10,7 +10,6 @@ export default ({showSignInDialog}) => (
     <SignInContainer noButton={true}/>
     <div>
       <a onClick={() => {
-        console.log('Signin click');
         showSignInDialog();
       }}>{lang.t('signIn')}</a> {lang.t('toAccess')}
     </div>

From dcc16dc5989700b4d44f13360c13fb38305f93f0 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Fri, 24 Feb 2017 14:45:47 -0500
Subject: [PATCH 022/132] Removing extra semicolon.

---
 client/coral-sign-in/components/FakeComment.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-sign-in/components/FakeComment.js b/client/coral-sign-in/components/FakeComment.js
index 75d4e51f1..b5af6bf1c 100644
--- a/client/coral-sign-in/components/FakeComment.js
+++ b/client/coral-sign-in/components/FakeComment.js
@@ -35,7 +35,7 @@ class FakeComment extends React.Component {
                   <i className={`${'coral-plugin-likes'}-icon material-icons`}
                     aria-hidden={true}>thumb_up</i>
                 </button>
-              </div>;
+              </div>
               <ReplyButton
                 onClick={() => {}}
                 parentCommentId={'commentID'}

From aefcb29877015b15dd4fd2ae4467c5f3c1183ffb Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Fri, 24 Feb 2017 12:58:06 -0700
Subject: [PATCH 023/132] remove comment count from results

---
 client/coral-admin/src/containers/Dashboard/FlagWidget.js | 2 --
 client/coral-admin/src/containers/Dashboard/LikeWidget.js | 2 --
 client/coral-admin/src/graphql/queries/metrics.graphql    | 1 -
 3 files changed, 5 deletions(-)

diff --git a/client/coral-admin/src/containers/Dashboard/FlagWidget.js b/client/coral-admin/src/containers/Dashboard/FlagWidget.js
index 34c67086e..537b89b8f 100644
--- a/client/coral-admin/src/containers/Dashboard/FlagWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/FlagWidget.js
@@ -18,7 +18,6 @@ const FlagWidget = (props) => {
             <th></th>{/* empty on purpose */}
             <th>{lang.t('streams.article')}</th>
             <th>{lang.t('modqueue.flagged')}</th>
-            <th>{lang.t('dashboard.comment_count')}</th>
           </tr>
         </thead>
         <tbody>
@@ -34,7 +33,6 @@ const FlagWidget = (props) => {
                     <p className={styles.lede}>{asset.author} - Published: {new Date(asset.created_at).toLocaleDateString()}</p>
                   </td>
                   <td>{flagSummary ? flagSummary.actionCount : 0}</td>
-                  <td>{asset.commentCount}</td>
                 </tr>
               );
             })
diff --git a/client/coral-admin/src/containers/Dashboard/LikeWidget.js b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
index dd92a94ca..ed6a0c0ae 100644
--- a/client/coral-admin/src/containers/Dashboard/LikeWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
@@ -19,7 +19,6 @@ const LikeWidget = (props) => {
             <th></th>{/* empty on purpose */}
             <th>{lang.t('streams.article')}</th>
             <th>{lang.t('modqueue.likes')}</th>
-            <th>{lang.t('dashboard.comment_count')}</th>
           </tr>
         </thead>
         <tbody>
@@ -35,7 +34,6 @@ const LikeWidget = (props) => {
                     <p className={styles.lede}>{asset.author} - Published: {new Date(asset.created_at).toLocaleDateString()}</p>
                   </td>
                   <td>{likeSummary ? likeSummary.actionCount : 0}</td>
-                  <td>{asset.commentCount}</td>
                 </tr>
               );
             })
diff --git a/client/coral-admin/src/graphql/queries/metrics.graphql b/client/coral-admin/src/graphql/queries/metrics.graphql
index da5125a48..68de89cab 100644
--- a/client/coral-admin/src/graphql/queries/metrics.graphql
+++ b/client/coral-admin/src/graphql/queries/metrics.graphql
@@ -2,7 +2,6 @@ fragment metrics on Asset {
   id
   title
   url
-  commentCount
   author
   created_at
   action_summaries {

From 6a9d8c0436097599cf4a9ae8f0c1ca2e277cc9d8 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Fri, 24 Feb 2017 15:51:43 -0500
Subject: [PATCH 024/132] Removing refetch and prevent 0 from displaying on
 empty comment streams.

---
 client/coral-embed-stream/src/Comment.js  | 3 ---
 client/coral-embed-stream/src/NewCount.js | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/client/coral-embed-stream/src/Comment.js b/client/coral-embed-stream/src/Comment.js
index 8371cec45..f42b22e44 100644
--- a/client/coral-embed-stream/src/Comment.js
+++ b/client/coral-embed-stream/src/Comment.js
@@ -38,7 +38,6 @@ class Comment extends React.Component {
     // id of currently opened ReplyBox. tracked in Stream.js
     activeReplyBox: PropTypes.string.isRequired,
     setActiveReplyBox: PropTypes.func.isRequired,
-    refetch: PropTypes.func.isRequired,
     showSignInDialog: PropTypes.func.isRequired,
     postFlag: PropTypes.func.isRequired,
     postLike: PropTypes.func.isRequired,
@@ -85,7 +84,6 @@ class Comment extends React.Component {
       asset,
       depth,
       postItem,
-      refetch,
       addNotification,
       showSignInDialog,
       postLike,
@@ -155,7 +153,6 @@ class Comment extends React.Component {
           comment.replies &&
           comment.replies.map(reply => {
             return <Comment
-              refetch={refetch}
               setActiveReplyBox={setActiveReplyBox}
               activeReplyBox={activeReplyBox}
               addNotification={addNotification}
diff --git a/client/coral-embed-stream/src/NewCount.js b/client/coral-embed-stream/src/NewCount.js
index 429ecc113..2368c1ab8 100644
--- a/client/coral-embed-stream/src/NewCount.js
+++ b/client/coral-embed-stream/src/NewCount.js
@@ -19,12 +19,13 @@ const NewCount = (props) => {
 
   return <div className='coral-new-comments'>
     {
-      props.countCache && newComments > 0 &&
+      props.countCache && newComments > 0 ?
       <button onClick={onLoadMoreClick(props)} className='coral-load-more'>
         {newComments === 1
           ? lang.t('newCount', newComments, lang.t('comment'))
           : lang.t('newCount', newComments, lang.t('comments'))}
       </button>
+      : null
     }
   </div>;
 };

From 66a890458c7548883303bd5daf974e126163798d Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Fri, 24 Feb 2017 17:42:29 -0500
Subject: [PATCH 025/132] Adding sort to moderation queue.

---
 .../ModerationQueue/ModerationContainer.js    |  3 +-
 .../components/ModerationMenu.js              | 82 ++++++++++++-------
 .../ModerationQueue/components/styles.css     | 44 ++++++++++
 .../coral-admin/src/graphql/queries/index.js  | 20 ++++-
 .../src/graphql/queries/modQueueQuery.graphql | 11 ++-
 5 files changed, 123 insertions(+), 37 deletions(-)

diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
index b1a44533e..d3e2f9194 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
@@ -43,7 +43,7 @@ class ModerationContainer extends Component {
   }
 
   render () {
-    const {data, moderation, settings, assets, ...props} = this.props;
+    const {data, moderation, settings, assets, modQueueResort, ...props} = this.props;
     const providedAssetId = this.props.params.id;
     const activeTab = this.props.route.path === ':id' ? 'premod' : this.props.route.path;
 
@@ -73,6 +73,7 @@ class ModerationContainer extends Component {
           premodCount={data.premodCount}
           rejectedCount={data.rejectedCount}
           flaggedCount={data.flaggedCount}
+          modQueueResort={modQueueResort}
         />
         <ModerationQueue
           data={data}
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js
index 767bc815d..a0f6b970b 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js
@@ -1,42 +1,64 @@
-import React, {PropTypes} from 'react';
+import React, {PropTypes, Component} from 'react';
 import CommentCount from './CommentCount';
 import styles from './styles.css';
+import {SelectField, Option} from 'react-mdl-selectfield';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from 'coral-admin/src/translations.json';
 import {Link} from 'react-router';
 
 const lang = new I18n(translations);
 
-const ModerationMenu = ({asset, premodCount, rejectedCount, flaggedCount}) => {
-  const premodPath = asset ? `/admin/moderate/premod/${asset.id}` : '/admin/moderate/premod';
-  const rejectPath = asset ? `/admin/moderate/rejected/${asset.id}` : '/admin/moderate/rejected';
-  const flagPath = asset ? `/admin/moderate/flagged/${asset.id}` : '/admin/moderate/flagged';
-  return (
-    <div className='mdl-tabs'>
-      <div className={`mdl-tabs__tab-bar ${styles.tabBar}`}>
-        <div>
-          <Link to={premodPath} className={`mdl-tabs__tab ${styles.tab}`} activeClassName={styles.active}>
-            {lang.t('modqueue.premod')} <CommentCount count={premodCount} />
-          </Link>
-          <Link to={rejectPath} className={`mdl-tabs__tab ${styles.tab}`} activeClassName={styles.active}>
-            {lang.t('modqueue.rejected')} <CommentCount count={rejectedCount} />
-          </Link>
-          <Link to={flagPath} className={`mdl-tabs__tab ${styles.tab}`} activeClassName={styles.active}>
-            {lang.t('modqueue.flagged')} <CommentCount count={flaggedCount} />
-        </Link>
+class ModerationMenu extends Component {
+  state = {
+    sort: '',
+  }
+
+  static propTypes = {
+    premodCount: PropTypes.number.isRequired,
+    rejectedCount: PropTypes.number.isRequired,
+    flaggedCount: PropTypes.number.isRequired,
+    asset: PropTypes.shape({
+      id: PropTypes.string
+    })
+  }
+
+  selectSort = (sort) => {
+    this.setState({sort});
+    this.props.modQueueResort(sort);
+  }
+
+  render() {
+    const {asset, premodCount, rejectedCount, flaggedCount} = this.props;
+    const premodPath = asset ? `/admin/moderate/premod/${asset.id}` : '/admin/moderate/premod';
+    const rejectPath = asset ? `/admin/moderate/rejected/${asset.id}` : '/admin/moderate/rejected';
+    const flagPath = asset ? `/admin/moderate/flagged/${asset.id}` : '/admin/moderate/flagged';
+    return (
+      <div className='mdl-tabs'>
+        <div className={`mdl-tabs__tab-bar ${styles.tabBar}`}>
+          <div className={styles.tabBarPadding}/>
+          <div>
+            <Link to={premodPath} className={`mdl-tabs__tab ${styles.tab}`} activeClassName={styles.active}>
+              {lang.t('modqueue.premod')} <CommentCount count={premodCount} />
+            </Link>
+            <Link to={rejectPath} className={`mdl-tabs__tab ${styles.tab}`} activeClassName={styles.active}>
+              {lang.t('modqueue.rejected')} <CommentCount count={rejectedCount} />
+            </Link>
+            <Link to={flagPath} className={`mdl-tabs__tab ${styles.tab}`} activeClassName={styles.active}>
+              {lang.t('modqueue.flagged')} <CommentCount count={flaggedCount} />
+            </Link>
+          </div>
+          <SelectField
+            className={styles.selectField}
+            label='Sort'
+            value={this.state.sort}
+            onChange={sort => this.selectSort(sort)}>
+            <Option value={'CHRONOLOGICAL'}>Newest First</Option>
+            <Option value={'REVERSE_CHRONOLOGICAL'}>Oldest First</Option>
+          </SelectField>
         </div>
       </div>
-    </div>
-  );
-};
-
-ModerationMenu.propTypes = {
-  premodCount: PropTypes.number.isRequired,
-  rejectedCount: PropTypes.number.isRequired,
-  flaggedCount: PropTypes.number.isRequired,
-  asset: PropTypes.shape({
-    id: PropTypes.string
-  })
-};
+    );
+  }
+}
 
 export default ModerationMenu;
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/styles.css b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
index e2fd31911..27d5c2533 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/styles.css
+++ b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
@@ -8,6 +8,12 @@
 .tabBar {
   background-color: rgba(44, 44, 44, 0.89);
   z-index: 5;
+  display: flex;
+  justify-content: space-between;
+}
+
+.tabBarPadding {
+  width: 150px;
 }
 
 .tab {
@@ -334,3 +340,41 @@ span {
     font-weight: 500;
   }
 }
+
+.selectField {
+  position: relative;
+  width: 140px;
+  height: 36px;
+  top: 5px;
+  margin-right: 10px;
+  background: #FFF;
+  padding: 10px 15px;
+  box-sizing: border-box;
+  border-radius: 2px;
+  box-shadow: 0 2px 2px 0 rgba(0,0,0,.14), 0 3px 1px -2px rgba(0,0,0,.2), 0 1px 5px 0 rgba(0,0,0,.12);
+
+  > div {
+    padding: 0;
+  }
+
+  i {
+    position: absolute;
+    top: 7px;
+    right: 7px;
+  }
+
+  input {
+    padding: 0;
+    font-size: 13px;
+    letter-spacing: 0.7px;
+    font-weight: 400;
+  }
+
+  label {
+    top: -4px;
+  }
+
+  &:hover {
+    cursor: pointer;
+   }
+}
diff --git a/client/coral-admin/src/graphql/queries/index.js b/client/coral-admin/src/graphql/queries/index.js
index 3325249e1..809769a13 100644
--- a/client/coral-admin/src/graphql/queries/index.js
+++ b/client/coral-admin/src/graphql/queries/index.js
@@ -23,8 +23,24 @@ export const modQueueQuery = graphql(MOD_QUEUE_QUERY, {
   options: ({params: {id = null}}) => {
     return {
       variables: {
-        asset_id: id
+        asset_id: id,
+        sort: 'REVERSE_CHRONOLOGICAL'
       }
     };
-  }
+  },
+  props: ({ownProps: {params: {id = null}}, data}) => ({
+    data,
+    modQueueResort: modQueueResort(id, data.fetchMore)
+  })
 });
+
+export const modQueueResort = (id, fetchMore) => (sort) => {
+  return fetchMore({
+    query: MOD_QUEUE_QUERY,
+    variables: {
+      asset_id: id,
+      sort
+    },
+    updateQuery: (oldData, {fetchMoreResult:{data}}) => data
+  });
+};
diff --git a/client/coral-admin/src/graphql/queries/modQueueQuery.graphql b/client/coral-admin/src/graphql/queries/modQueueQuery.graphql
index 86cd26bbd..b4f2a20a0 100644
--- a/client/coral-admin/src/graphql/queries/modQueueQuery.graphql
+++ b/client/coral-admin/src/graphql/queries/modQueueQuery.graphql
@@ -1,16 +1,18 @@
 #import "../fragments/commentView.graphql"
 
-query ModQueue ($asset_id: ID) {
+query ModQueue ($asset_id: ID, $sort: SORT_ORDER) {
     premod: comments(query: {
         statuses: [PREMOD],
-        asset_id: $asset_id
+        asset_id: $asset_id,
+        sort: $sort
     }) {
         ...commentView
     }
     flagged: comments(query: {
         action_type: FLAG,
         asset_id: $asset_id,
-        statuses: [NONE, PREMOD]
+        statuses: [NONE, PREMOD],
+        sort: $sort
     }) {
         ...commentView
         action_summaries {
@@ -22,7 +24,8 @@ query ModQueue ($asset_id: ID) {
     }
     rejected: comments(query: {
         statuses: [REJECTED],
-        asset_id: $asset_id
+        asset_id: $asset_id,
+        sort: $sort
     }) {
         ...commentView
     }

From 37b08fd4e400ea26947a340654d46605a5b45300 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Mon, 27 Feb 2017 12:28:13 -0500
Subject: [PATCH 026/132] Displaying oldest first by default.

---
 .../src/containers/ModerationQueue/components/ModerationMenu.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js
index a0f6b970b..d2520f784 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js
@@ -10,7 +10,7 @@ const lang = new I18n(translations);
 
 class ModerationMenu extends Component {
   state = {
-    sort: '',
+    sort: 'REVERSE_CHRONOLOGICAL',
   }
 
   static propTypes = {

From b1ec512721ba53c1fda474bd1eb34c0be6dba8cf Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 27 Feb 2017 14:42:57 -0300
Subject: [PATCH 027/132] Adding whitelist step, sending whitelist

---
 .../src/containers/Install/InstallContainer.js    |  2 ++
 .../Install/components/Steps/WhitelistStep.js     | 15 +++++++++++++++
 client/coral-admin/src/reducers/install.js        | 11 +++++++++--
 client/coral-ui/components/WizardNav.css          |  1 +
 4 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 client/coral-admin/src/containers/Install/components/Steps/WhitelistStep.js

diff --git a/client/coral-admin/src/containers/Install/InstallContainer.js b/client/coral-admin/src/containers/Install/InstallContainer.js
index 7a8634180..b015140ed 100644
--- a/client/coral-admin/src/containers/Install/InstallContainer.js
+++ b/client/coral-admin/src/containers/Install/InstallContainer.js
@@ -18,6 +18,7 @@ import {
 import InitialStep from './components/Steps/InitialStep';
 import AddOrganizationName from './components/Steps/AddOrganizationName';
 import CreateYourAccount from './components/Steps/CreateYourAccount';
+import WhitelistStep from './components/Steps/WhitelistStep';
 import FinalStep from './components/Steps/FinalStep';
 
 class InstallContainer extends Component {
@@ -43,6 +44,7 @@ class InstallContainer extends Component {
                   <InitialStep/>
                   <AddOrganizationName/>
                   <CreateYourAccount/>
+                  <WhitelistStep/>
                   <FinalStep/>
                 </Wizard>
               </div>
diff --git a/client/coral-admin/src/containers/Install/components/Steps/WhitelistStep.js b/client/coral-admin/src/containers/Install/components/Steps/WhitelistStep.js
new file mode 100644
index 000000000..e246b457e
--- /dev/null
+++ b/client/coral-admin/src/containers/Install/components/Steps/WhitelistStep.js
@@ -0,0 +1,15 @@
+import React from 'react';
+import styles from './style.css';
+import {Button} from 'coral-ui';
+
+const WhitelistStep = props => {
+  const {nextStep} = props;
+  return (
+    <div className={styles.step}>
+      <h3>Domain Whitelist</h3>
+      <Button cStyle='green' onClick={nextStep} raised>Add domains</Button>
+    </div>
+  );
+};
+
+export default WhitelistStep;
diff --git a/client/coral-admin/src/reducers/install.js b/client/coral-admin/src/reducers/install.js
index 596fd16cd..429d5cce0 100644
--- a/client/coral-admin/src/reducers/install.js
+++ b/client/coral-admin/src/reducers/install.js
@@ -1,4 +1,4 @@
-import {Map} from 'immutable';
+import {Map, List} from 'immutable';
 
 import * as actions from '../constants/install';
 
@@ -6,7 +6,10 @@ const initialState = Map({
   isLoading: false,
   data: Map({
     settings: Map({
-      organizationName: ''
+      organizationName: '',
+      domains: Map({
+        whitelist: List()
+      })
     }),
     user: Map({
       username: '',
@@ -33,6 +36,10 @@ const initialState = Map({
   {
     text: '2. Create your account',
     step: 2
+  },
+  {
+    text: '3. Domain Whitelist',
+    step: 3
   }],
   installRequest: null,
   installRequestError: null,
diff --git a/client/coral-ui/components/WizardNav.css b/client/coral-ui/components/WizardNav.css
index 001ee8603..1f0b78d86 100644
--- a/client/coral-ui/components/WizardNav.css
+++ b/client/coral-ui/components/WizardNav.css
@@ -13,6 +13,7 @@
     position: relative;
     padding-left: 40px;
     border-radius: 1px;
+    min-height: 24px;
 
     &:hover {
       cursor: pointer;

From 9305853502ca738bd70211a1d2ee0c15e9862efd Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 27 Feb 2017 15:50:07 -0300
Subject: [PATCH 028/132] Renamed to PermittedDomains

---
 client/coral-admin/src/actions/install.js     | 34 ++++++++++++-------
 .../containers/Install/InstallContainer.js    |  7 ++--
 .../components/Steps/PermittedDomainsStep.js  | 31 +++++++++++++++++
 .../Install/components/Steps/WhitelistStep.js | 15 --------
 .../src/containers/Install/translations.json  | 16 +++++++++
 client/coral-admin/src/reducers/install.js    |  5 +--
 6 files changed, 72 insertions(+), 36 deletions(-)
 create mode 100644 client/coral-admin/src/containers/Install/components/Steps/PermittedDomainsStep.js
 delete mode 100644 client/coral-admin/src/containers/Install/components/Steps/WhitelistStep.js
 create mode 100644 client/coral-admin/src/containers/Install/translations.json

diff --git a/client/coral-admin/src/actions/install.js b/client/coral-admin/src/actions/install.js
index c1d05d253..73e7aaa82 100644
--- a/client/coral-admin/src/actions/install.js
+++ b/client/coral-admin/src/actions/install.js
@@ -71,21 +71,31 @@ export const submitSettings = () => (dispatch, getState) => {
 export const submitUser = () => (dispatch, getState) => {
   const userFormData = getState().install.toJS().data.user;
   validation(userFormData, dispatch, function() {
-    const data = getState().install.toJS().data;
-    dispatch(installRequest());
-    coralApi('/setup', {method: 'POST', body: data})
-      .then(result => {
-        console.log(result);
-        dispatch(installSuccess());
-        dispatch(nextStep());
-      })
-      .catch(error => {
-        console.error(error);
-        dispatch(installFailure(`${error.translation_key}`));
-      });
+    dispatch(nextStep());
   });
 };
 
+export const submitWhitelistDomains = () => (dispatch) => {
+  submitForm().then(() => {
+    dispatch(installSuccess());
+  });
+};
+
+const submitForm = () => (dispatch, getState) => {
+  const data = getState().install.toJS().data;
+  dispatch(installRequest());
+  return coralApi('/setup', { method: 'POST', body: data })
+    .then(result => {
+      console.log(result);
+      dispatch(installSuccess());
+      dispatch(nextStep());
+    })
+    .catch(error => {
+      console.error(error);
+      dispatch(installFailure(`${error.translation_key}`));
+    });
+};
+
 export const updateSettingsFormData = (name, value) => ({type: actions.UPDATE_FORMDATA_SETTINGS, name, value});
 export const updateUserFormData = (name, value) => ({type: actions.UPDATE_FORMDATA_USER, name, value});
 
diff --git a/client/coral-admin/src/containers/Install/InstallContainer.js b/client/coral-admin/src/containers/Install/InstallContainer.js
index b015140ed..fe41e12e4 100644
--- a/client/coral-admin/src/containers/Install/InstallContainer.js
+++ b/client/coral-admin/src/containers/Install/InstallContainer.js
@@ -18,7 +18,7 @@ import {
 import InitialStep from './components/Steps/InitialStep';
 import AddOrganizationName from './components/Steps/AddOrganizationName';
 import CreateYourAccount from './components/Steps/CreateYourAccount';
-import WhitelistStep from './components/Steps/WhitelistStep';
+import PermittedDomainsStep from './components/Steps/PermittedDomainsStep';
 import FinalStep from './components/Steps/FinalStep';
 
 class InstallContainer extends Component {
@@ -41,10 +41,7 @@ class InstallContainer extends Component {
                 <h2>Welcome to the Coral Project</h2>
                 { install.step !== 0 ? <WizardNav items={install.navItems} currentStep={install.step} icon='check'/> : null }
                 <Wizard currentStep={install.step} {...this.props}>
-                  <InitialStep/>
-                  <AddOrganizationName/>
-                  <CreateYourAccount/>
-                  <WhitelistStep/>
+                  <PermittedDomainsStep/>
                   <FinalStep/>
                 </Wizard>
               </div>
diff --git a/client/coral-admin/src/containers/Install/components/Steps/PermittedDomainsStep.js b/client/coral-admin/src/containers/Install/components/Steps/PermittedDomainsStep.js
new file mode 100644
index 000000000..c5fae148e
--- /dev/null
+++ b/client/coral-admin/src/containers/Install/components/Steps/PermittedDomainsStep.js
@@ -0,0 +1,31 @@
+import React from 'react';
+import styles from './style.css';
+import {Button, Card} from 'coral-ui';
+import TagsInput from 'react-tagsinput';
+
+const lang = new I18n(translations);
+import translations from '../../translations.json';
+import I18n from 'coral-framework/modules/i18n/i18n';
+
+const PermittedDomainsStep = props => {
+  const {nextStep, onChangeDomainlist} = props;
+  const domains = [];
+  return (
+    <div className={styles.step}>
+      <h3>{lang.t('PERMITTED_DOMAINS.TITLE')}</h3>
+      <Card>
+        <p>{lang.t('PERMITTED_DOMAINS.DESCRIPTION')}</p>
+        <TagsInput
+          value={domains}
+          inputProps={{placeholder: 'URL'}}
+          addOnPaste={true}
+          pasteSplit={data => data.split(',').map(d => d.trim())}
+          onChange={tags => onChangeDomainlist(tags)}
+        />
+      </Card>
+      <Button cStyle='green' onClick={nextStep} raised>{lang.t('PERMITTED_DOMAINS.SUBMIT')}</Button>
+    </div>
+  );
+};
+
+export default PermittedDomainsStep;
diff --git a/client/coral-admin/src/containers/Install/components/Steps/WhitelistStep.js b/client/coral-admin/src/containers/Install/components/Steps/WhitelistStep.js
deleted file mode 100644
index e246b457e..000000000
--- a/client/coral-admin/src/containers/Install/components/Steps/WhitelistStep.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import React from 'react';
-import styles from './style.css';
-import {Button} from 'coral-ui';
-
-const WhitelistStep = props => {
-  const {nextStep} = props;
-  return (
-    <div className={styles.step}>
-      <h3>Domain Whitelist</h3>
-      <Button cStyle='green' onClick={nextStep} raised>Add domains</Button>
-    </div>
-  );
-};
-
-export default WhitelistStep;
diff --git a/client/coral-admin/src/containers/Install/translations.json b/client/coral-admin/src/containers/Install/translations.json
new file mode 100644
index 000000000..494a020f4
--- /dev/null
+++ b/client/coral-admin/src/containers/Install/translations.json
@@ -0,0 +1,16 @@
+{
+  "en": {
+    "PERMITTED_DOMAINS": {
+      "TITLE": "Permitted domains",
+      "DESCRIPTION": "Add permitted domains",
+      "SUBMIT": "Finish install"
+    }
+  },
+  "es": {
+    "PERMITTED_DOMAINS": {
+      "TITLE": "Dominios Permitidos",
+      "DESCRIPTION": "Agrega dominios permitidos",
+      "SUBMIT": "Finalizar instalación"
+    }
+  }
+}
diff --git a/client/coral-admin/src/reducers/install.js b/client/coral-admin/src/reducers/install.js
index 429d5cce0..8d3ea0f76 100644
--- a/client/coral-admin/src/reducers/install.js
+++ b/client/coral-admin/src/reducers/install.js
@@ -6,10 +6,7 @@ const initialState = Map({
   isLoading: false,
   data: Map({
     settings: Map({
-      organizationName: '',
-      domains: Map({
-        whitelist: List()
-      })
+      organizationName: ''
     }),
     user: Map({
       username: '',

From ab16e5bfe7a396377e4784873549384f9bffe125 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Mon, 27 Feb 2017 14:26:20 -0500
Subject: [PATCH 029/132] Retrieving comment y id from backend

---
 graph/loaders/comments.js     | 17 +++++++++++++++++
 graph/resolvers/comment.js    |  7 +++++++
 graph/resolvers/root_query.js |  4 +++-
 graph/typeDefs.graphql        |  6 ++++++
 4 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/graph/loaders/comments.js b/graph/loaders/comments.js
index ad78a1e92..b5f493831 100644
--- a/graph/loaders/comments.js
+++ b/graph/loaders/comments.js
@@ -270,6 +270,22 @@ const genRecentComments = (_, ids) => {
   .then(util.arrayJoinBy(ids, 'asset_id'));
 };
 
+/**
+ * genComments returns the comments by the id's specified that are considered
+ * public comments (i.e., accepted or not rejected).
+ */
+const genComments = (context, ids) => {
+  return CommentModel.find({
+    id: {
+      $in: ids
+    },
+    status: {
+      $in: ['NONE', 'ACCEPTED']
+    }
+  })
+  .then(util.singleJoinBy(ids, 'id'));
+};
+
 /**
  * Creates a set of loaders based on a GraphQL context.
  * @param  {Object} context the context of the GraphQL request
@@ -277,6 +293,7 @@ const genRecentComments = (_, ids) => {
  */
 module.exports = (context) => ({
   Comments: {
+    get: new DataLoader((ids) => genComments(context, ids)),
     getByQuery: (query) => getCommentsByQuery(context, query),
     getCountByQuery: (query) => getCommentCountByQuery(context, query),
     countByAssetID: new util.SharedCacheDataLoader('Comments.countByAssetID', 3600, (ids) => getCountsByAssetID(context, ids)),
diff --git a/graph/resolvers/comment.js b/graph/resolvers/comment.js
index ef77ff6b5..43577dca0 100644
--- a/graph/resolvers/comment.js
+++ b/graph/resolvers/comment.js
@@ -1,4 +1,11 @@
 const Comment = {
+  parent({parent_id}, _, {loaders: {Comments}}) {
+    if (parent_id == null) {
+      return null;
+    }
+
+    return Comments.get.load(parent_id);
+  },
   user({author_id}, _, {loaders: {Users}}) {
     return Users.getByID.load(author_id);
   },
diff --git a/graph/resolvers/root_query.js b/graph/resolvers/root_query.js
index ced4e65cf..6622fd17f 100644
--- a/graph/resolvers/root_query.js
+++ b/graph/resolvers/root_query.js
@@ -38,7 +38,9 @@ const RootQuery = {
 
     return Comments.getByQuery(query);
   },
-
+  comment(_, {id}, {loaders: {Comments}}) {
+    return Comments.get.load(id);
+  },
   commentCount(_, {query: {action_type, statuses, asset_id, parent_id}}, {user, loaders: {Actions, Comments}}) {
     if (user == null || !user.hasRoles('ADMIN')) {
       return null;
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index fbdeb4279..b9ab770ac 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -149,6 +149,9 @@ input CommentCountQuery {
 # Comment is the base representation of user interaction in Talk.
 type Comment {
 
+  # The parent of the comment (if there is one).
+  parent: Comment
+
   # The ID of the comment.
   id: ID!
 
@@ -477,6 +480,9 @@ type RootQuery {
   # Site wide settings and defaults.
   settings: Settings
 
+  # Finds a specific comment based on it's id.
+  comment(id: ID!): Comment
+
   # All assets. Requires the `ADMIN` role.
   assets: [Asset]
 

From 013625df274c2e8b40743bd798592bff9299bc01 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 27 Feb 2017 16:39:52 -0300
Subject: [PATCH 030/132] no validation for domains

---
 client/coral-admin/src/actions/install.js     | 38 ++++++++---------
 client/coral-admin/src/constants/install.js   |  1 +
 .../src/containers/Configure/Domainlist.js    | 42 ++++++++++---------
 .../containers/Install/InstallContainer.js    | 23 ++++++----
 .../components/Steps/PermittedDomainsStep.js  | 10 ++---
 .../Install/components/Steps/style.css        |  6 +++
 client/coral-admin/src/reducers/install.js    |  8 +++-
 7 files changed, 76 insertions(+), 52 deletions(-)

diff --git a/client/coral-admin/src/actions/install.js b/client/coral-admin/src/actions/install.js
index 73e7aaa82..970c15141 100644
--- a/client/coral-admin/src/actions/install.js
+++ b/client/coral-admin/src/actions/install.js
@@ -20,13 +20,17 @@ const validation = (formData, dispatch, next) => {
     return dispatch(hasError());
   }
 
+  const validKeys = Object.keys(formData)
+    .filter(name => name !== 'domains');
+
   // Required Validation
-  const empty = Object.keys(formData).filter(name => {
+  const empty = validKeys
+  .filter(name => {
     const cond = !formData[name].length;
 
     if (cond) {
 
-      // Adding Error
+    // Adding Error
       dispatch(addError(name, 'This field is required.'));
     } else {
       dispatch(addError(name, ''));
@@ -40,18 +44,19 @@ const validation = (formData, dispatch, next) => {
   }
 
   // RegExp Validation
-  const validation = Object.keys(formData).filter(name => {
-    const cond = !validate[name](formData[name]);
-    if (cond) {
+  const validation = validKeys
+    .filter(name => {
+      const cond = !validate[name](formData[name]);
+      if (cond) {
 
       // Adding Error
-      dispatch(addError(name, errorMsj[name]));
-    } else {
-      dispatch(addError(name, ''));
-    }
+        dispatch(addError(name, errorMsj[name]));
+      } else {
+        dispatch(addError(name, ''));
+      }
 
-    return cond;
-  });
+      return cond;
+    });
 
   if (validation.length) {
     return dispatch(hasError());
@@ -75,16 +80,10 @@ export const submitUser = () => (dispatch, getState) => {
   });
 };
 
-export const submitWhitelistDomains = () => (dispatch) => {
-  submitForm().then(() => {
-    dispatch(installSuccess());
-  });
-};
-
-const submitForm = () => (dispatch, getState) => {
+export const finishInstall = () => (dispatch, getState) => {
   const data = getState().install.toJS().data;
   dispatch(installRequest());
-  return coralApi('/setup', { method: 'POST', body: data })
+  return coralApi('/setup', {method: 'POST', body: data})
     .then(result => {
       console.log(result);
       dispatch(installSuccess());
@@ -98,6 +97,7 @@ const submitForm = () => (dispatch, getState) => {
 
 export const updateSettingsFormData = (name, value) => ({type: actions.UPDATE_FORMDATA_SETTINGS, name, value});
 export const updateUserFormData = (name, value) => ({type: actions.UPDATE_FORMDATA_USER, name, value});
+export const updatePermittedDomains = (value) => ({type: actions.UPDATE_PERMITTED_DOMAINS_SETTINGS, value});
 
 const checkInstallRequest = () => ({type: actions.CHECK_INSTALL_REQUEST});
 const checkInstallSuccess = installed => ({type: actions.CHECK_INSTALL_SUCCESS, installed});
diff --git a/client/coral-admin/src/constants/install.js b/client/coral-admin/src/constants/install.js
index b3fd7e0d0..743d68593 100644
--- a/client/coral-admin/src/constants/install.js
+++ b/client/coral-admin/src/constants/install.js
@@ -10,6 +10,7 @@ export const INSTALL_SUCCESS = 'INSTALL_SUCCESS';
 export const INSTALL_FAILURE = 'INSTALL_FAILURE';
 export const UPDATE_FORMDATA_USER = 'UPDATE_FORMDATA_USER';
 export const UPDATE_FORMDATA_SETTINGS = 'UPDATE_FORMDATA_SETTINGS';
+export const UPDATE_PERMITTED_DOMAINS_SETTINGS = 'UPDATE_PERMITTED_DOMAINS_SETTINGS';
 
 export const CHECK_INSTALL_REQUEST = 'CHECK_INSTALL_REQUEST';
 export const CHECK_INSTALL_SUCCESS = 'CHECK_INSTALL_SUCCESS';
diff --git a/client/coral-admin/src/containers/Configure/Domainlist.js b/client/coral-admin/src/containers/Configure/Domainlist.js
index f845dfeaa..6918c0471 100644
--- a/client/coral-admin/src/containers/Configure/Domainlist.js
+++ b/client/coral-admin/src/containers/Configure/Domainlist.js
@@ -1,26 +1,28 @@
 import React from 'react';
+import {Card} from 'coral-ui';
+import styles from './Configure.css';
+import TagsInput from 'react-tagsinput';
+
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../../translations.json';
-import TagsInput from 'react-tagsinput';
-import styles from './Configure.css';
-import {Card} from 'coral-ui';
+const lang = new I18n(translations);
 
-const Domainlist = ({domains, onChangeDomainlist}) => (
-  <div>
-    <h3>{lang.t('configure.domain-list-title')}</h3>
-    <Card id={styles.domainlist}>
-      <p className={styles.domainlistDesc}>{lang.t('configure.domain-list-text')}</p>
-      <TagsInput
-        value={domains}
-        inputProps={{placeholder: 'URL'}}
-        addOnPaste={true}
-        pasteSplit={data => data.split(',').map(d => d.trim())}
-        onChange={tags => onChangeDomainlist('whitelist', tags)}
-      />
-    </Card>
-  </div>
-);
+const Domainlist = ({domains, onChangeDomainlist}) => {
+  return (
+    <div>
+      <h3>{lang.t('configure.domain-list-title')}</h3>
+      <Card id={styles.domainlist}>
+        <p className={styles.domainlistDesc}>{lang.t('configure.domain-list-text')}</p>
+        <TagsInput
+          value={domains}
+          inputProps={{placeholder: 'URL'}}
+          addOnPaste={true}
+          pasteSplit={data => data.split(',').map(d => d.trim())}
+          onChange={tags => onChangeDomainlist('whitelist', tags)}
+        />
+      </Card>
+    </div>
+  );
+};
 
 export default Domainlist;
-
-const lang = new I18n(translations);
diff --git a/client/coral-admin/src/containers/Install/InstallContainer.js b/client/coral-admin/src/containers/Install/InstallContainer.js
index fe41e12e4..b70d3b8c9 100644
--- a/client/coral-admin/src/containers/Install/InstallContainer.js
+++ b/client/coral-admin/src/containers/Install/InstallContainer.js
@@ -5,14 +5,16 @@ import {Wizard, WizardNav} from 'coral-ui';
 import {Layout} from '../../components/ui/Layout';
 
 import {
-  nextStep,
-  previousStep,
   goToStep,
+  nextStep,
+  submitUser,
+  checkInstall,
+  previousStep,
+  finishInstall,
+  submitSettings,
   updateUserFormData,
   updateSettingsFormData,
-  submitSettings,
-  submitUser,
-  checkInstall
+  updatePermittedDomains
 } from '../../actions/install';
 
 import InitialStep from './components/Steps/InitialStep';
@@ -41,6 +43,9 @@ class InstallContainer extends Component {
                 <h2>Welcome to the Coral Project</h2>
                 { install.step !== 0 ? <WizardNav items={install.navItems} currentStep={install.step} icon='check'/> : null }
                 <Wizard currentStep={install.step} {...this.props}>
+                  <InitialStep/>
+                  <AddOrganizationName/>
+                  <CreateYourAccount/>
                   <PermittedDomainsStep/>
                   <FinalStep/>
                 </Wizard>
@@ -64,10 +69,14 @@ const mapStateToProps = state => ({
 });
 
 const mapDispatchToProps = dispatch => ({
-  checkInstall: next => dispatch(checkInstall(next)),
   nextStep: () => dispatch(nextStep()),
-  previousStep: () => dispatch(previousStep()),
   goToStep: step => dispatch(goToStep(step)),
+  previousStep: () => dispatch(previousStep()),
+  finishInstall: () => dispatch(finishInstall()),
+  checkInstall: next => dispatch(checkInstall(next)),
+  handleDomainsChange: value => {
+    dispatch(updatePermittedDomains(value));
+  },
   handleSettingsChange: e => {
     const {name, value} = e.currentTarget;
     dispatch(updateSettingsFormData(name, value));
diff --git a/client/coral-admin/src/containers/Install/components/Steps/PermittedDomainsStep.js b/client/coral-admin/src/containers/Install/components/Steps/PermittedDomainsStep.js
index c5fae148e..f2c1546f6 100644
--- a/client/coral-admin/src/containers/Install/components/Steps/PermittedDomainsStep.js
+++ b/client/coral-admin/src/containers/Install/components/Steps/PermittedDomainsStep.js
@@ -8,22 +8,22 @@ import translations from '../../translations.json';
 import I18n from 'coral-framework/modules/i18n/i18n';
 
 const PermittedDomainsStep = props => {
-  const {nextStep, onChangeDomainlist} = props;
-  const domains = [];
+  const {finishInstall, install, handleDomainsChange} = props;
+  const domains = install.data.settings.domains.whitelist;
   return (
     <div className={styles.step}>
       <h3>{lang.t('PERMITTED_DOMAINS.TITLE')}</h3>
-      <Card>
+      <Card className={styles.card}>
         <p>{lang.t('PERMITTED_DOMAINS.DESCRIPTION')}</p>
         <TagsInput
           value={domains}
           inputProps={{placeholder: 'URL'}}
           addOnPaste={true}
           pasteSplit={data => data.split(',').map(d => d.trim())}
-          onChange={tags => onChangeDomainlist(tags)}
+          onChange={tags => handleDomainsChange(tags)}
         />
       </Card>
-      <Button cStyle='green' onClick={nextStep} raised>{lang.t('PERMITTED_DOMAINS.SUBMIT')}</Button>
+      <Button cStyle='green' onClick={finishInstall} raised>{lang.t('PERMITTED_DOMAINS.SUBMIT')}</Button>
     </div>
   );
 };
diff --git a/client/coral-admin/src/containers/Install/components/Steps/style.css b/client/coral-admin/src/containers/Install/components/Steps/style.css
index a5867e960..dea752298 100644
--- a/client/coral-admin/src/containers/Install/components/Steps/style.css
+++ b/client/coral-admin/src/containers/Install/components/Steps/style.css
@@ -59,6 +59,12 @@
       }
     }
   }
+
+  .card {
+    max-width: 500px;
+    margin: 20px auto;
+    text-align: left;
+  }
 }
 
 .finalStep {
diff --git a/client/coral-admin/src/reducers/install.js b/client/coral-admin/src/reducers/install.js
index 8d3ea0f76..1f0f079ff 100644
--- a/client/coral-admin/src/reducers/install.js
+++ b/client/coral-admin/src/reducers/install.js
@@ -6,7 +6,10 @@ const initialState = Map({
   isLoading: false,
   data: Map({
     settings: Map({
-      organizationName: ''
+      organizationName: '',
+      domains: Map({
+        whitelist: List()
+      })
     }),
     user: Map({
       username: '',
@@ -54,6 +57,9 @@ export default function install (state = initialState, action) {
   case actions.GO_TO_STEP:
     return state
       .set('step', action.step);
+  case actions.UPDATE_PERMITTED_DOMAINS_SETTINGS:
+    return state
+      .setIn(['data', 'settings', 'domains', 'whitelist'], action.value);
   case actions.UPDATE_FORMDATA_SETTINGS:
     return state
       .setIn(['data', 'settings', action.name], action.value);

From 1e52c579cc318703494d5170c6cb03c8d1b467b3 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 27 Feb 2017 16:50:04 -0300
Subject: [PATCH 031/132] =?UTF-8?q?=C3=8Dnitial=20translations?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Install/components/Steps/InitialStep.js          | 12 ++++++------
 .../src/containers/Install/translations.json         |  8 ++++++++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/client/coral-admin/src/containers/Install/components/Steps/InitialStep.js b/client/coral-admin/src/containers/Install/components/Steps/InitialStep.js
index 9f9770fe9..1838e3178 100644
--- a/client/coral-admin/src/containers/Install/components/Steps/InitialStep.js
+++ b/client/coral-admin/src/containers/Install/components/Steps/InitialStep.js
@@ -2,16 +2,16 @@ import React from 'react';
 import styles from './style.css';
 import {Button} from 'coral-ui';
 
+const lang = new I18n(translations);
+import translations from '../../translations.json';
+import I18n from 'coral-framework/modules/i18n/i18n';
+
 const InitialStep = props => {
   const {nextStep} = props;
   return (
     <div className={styles.step}>
-      <p>
-        The remainder of the Talk installation will take about ten minutes.
-        Once you complete the following two steps, you will have a free
-        installation and provision of Mongo and Redis.
-      </p>
-      <Button cStyle='green' onClick={nextStep} raised>Get Started</Button>
+      <p>{lang.t('INITIAL.DESCRIPTION')}</p>
+      <Button cStyle='green' onClick={nextStep} raised>{lang.t('INITIAL.SUBMIT')}</Button>
     </div>
   );
 };
diff --git a/client/coral-admin/src/containers/Install/translations.json b/client/coral-admin/src/containers/Install/translations.json
index 494a020f4..5b3c5f036 100644
--- a/client/coral-admin/src/containers/Install/translations.json
+++ b/client/coral-admin/src/containers/Install/translations.json
@@ -1,5 +1,9 @@
 {
   "en": {
+    "INITIAL" : {
+      "DESCRIPTION": "The remainder of the Talk installation will take about ten minutes. Once you complete the following two steps, you will have a free installation and provision of Mongo and Redis.",
+      "SUBMIT": "Get Started"
+    },
     "PERMITTED_DOMAINS": {
       "TITLE": "Permitted domains",
       "DESCRIPTION": "Add permitted domains",
@@ -7,6 +11,10 @@
     }
   },
   "es": {
+    "INITIAL" : {
+      "DESCRIPTION": "La instalación de Talk tomará aproximadamente diez minutos. Tan pronto como termines los tres pasos, tendrás una gratis instalación y provision de Mongo y Redis",
+      "SUBMIT": "Empezá!"
+    },
     "PERMITTED_DOMAINS": {
       "TITLE": "Dominios Permitidos",
       "DESCRIPTION": "Agrega dominios permitidos",

From 7341fdff4eb9b3b5bf1cfd36f7b628555cc18dbf Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 27 Feb 2017 16:54:03 -0300
Subject: [PATCH 032/132] add Organization translations

---
 .../Install/components/Steps/AddOrganizationName.js | 13 +++++++------
 .../src/containers/Install/translations.json        | 10 ++++++++++
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/client/coral-admin/src/containers/Install/components/Steps/AddOrganizationName.js b/client/coral-admin/src/containers/Install/components/Steps/AddOrganizationName.js
index ae23d0048..127c4afa1 100644
--- a/client/coral-admin/src/containers/Install/components/Steps/AddOrganizationName.js
+++ b/client/coral-admin/src/containers/Install/components/Steps/AddOrganizationName.js
@@ -2,25 +2,26 @@ import React from 'react';
 import styles from './style.css';
 import {TextField, Button} from 'coral-ui';
 
+const lang = new I18n(translations);
+import translations from '../../translations.json';
+import I18n from 'coral-framework/modules/i18n/i18n';
+
 const AddOrganizationName = props => {
   const {handleSettingsChange, handleSettingsSubmit, install} = props;
   return (
     <div className={styles.step}>
-      <p>
-        Please tell us the name of your organization. This will appear in emails when
-        inviting new team members
-      </p>
+      <p>{lang.t('ADD_ORGANIZATION.DESCRIPTION')}</p>
       <div className={styles.form}>
         <form onSubmit={handleSettingsSubmit}>
           <TextField
             className={styles.TextField}
             id="organizationName"
             type="text"
-            label='Organization name'
+            label={lang.t('ADD_ORGANIZATION.DESCRIPTION')}
             onChange={handleSettingsChange}
             showErrors={install.showErrors}
             errorMsg={install.errors.organizationName} />
-          <Button type="submit" cStyle='black' full>Save</Button>
+          <Button type="submit" cStyle='black' full>{lang.t('ADD_ORGANIZATION.SAVE')}</Button>
         </form>
       </div>
     </div>
diff --git a/client/coral-admin/src/containers/Install/translations.json b/client/coral-admin/src/containers/Install/translations.json
index 5b3c5f036..aee01c3cd 100644
--- a/client/coral-admin/src/containers/Install/translations.json
+++ b/client/coral-admin/src/containers/Install/translations.json
@@ -4,6 +4,11 @@
       "DESCRIPTION": "The remainder of the Talk installation will take about ten minutes. Once you complete the following two steps, you will have a free installation and provision of Mongo and Redis.",
       "SUBMIT": "Get Started"
     },
+    "ADD_ORGANIZATION": {
+      "DESCRIPTION": "Please tell us the name of your organization. This will appear in emails when inviting new team members",
+      "LABEL": "Organization Name",
+      "SAVE": "Save"
+    },
     "PERMITTED_DOMAINS": {
       "TITLE": "Permitted domains",
       "DESCRIPTION": "Add permitted domains",
@@ -15,6 +20,11 @@
       "DESCRIPTION": "La instalación de Talk tomará aproximadamente diez minutos. Tan pronto como termines los tres pasos, tendrás una gratis instalación y provision de Mongo y Redis",
       "SUBMIT": "Empezá!"
     },
+    "ADD_ORGANIZATION": {
+      "DESCRIPTION": "Por favor, dinos el nombre de tu organización. Este aparecerá en los emails cuando invites nuevos miembros",
+      "LABEL": "Nombre de la Organización",
+      "SAVE": "Guardar"
+    },
     "PERMITTED_DOMAINS": {
       "TITLE": "Dominios Permitidos",
       "DESCRIPTION": "Agrega dominios permitidos",

From b47fd3543740c55fc61779710196a0c6f7727773 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 27 Feb 2017 16:58:16 -0300
Subject: [PATCH 033/132] add user translations

---
 .../Install/components/Steps/CreateYourAccount.js  | 10 +++++-----
 .../src/containers/Install/translations.json       | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/client/coral-admin/src/containers/Install/components/Steps/CreateYourAccount.js b/client/coral-admin/src/containers/Install/components/Steps/CreateYourAccount.js
index cb0f4635f..ec1e34607 100644
--- a/client/coral-admin/src/containers/Install/components/Steps/CreateYourAccount.js
+++ b/client/coral-admin/src/containers/Install/components/Steps/CreateYourAccount.js
@@ -12,7 +12,7 @@ const InitialStep = props => {
             className={styles.textField}
             id="email"
             type="email"
-            label='Email address'
+            label={lang.t('CREATE.EMAIL')}
             onChange={handleUserChange}
             showErrors={install.showErrors}
             errorMsg={install.errors.email}
@@ -23,7 +23,7 @@ const InitialStep = props => {
             className={styles.textField}
             id="username"
             type="text"
-            label='Username'
+            label={lang.t('CREATE.USERNAME')}
             onChange={handleUserChange}
             showErrors={install.showErrors}
             errorMsg={install.errors.username}
@@ -33,7 +33,7 @@ const InitialStep = props => {
             className={styles.textField}
             id="password"
             type="password"
-            label='Password'
+            label={lang.t('CREATE.PASSWORD')}
             onChange={handleUserChange}
             showErrors={install.showErrors}
             errorMsg={install.errors.password}
@@ -43,7 +43,7 @@ const InitialStep = props => {
             className={styles.textField}
             id="confirmPassword"
             type="password"
-            label='Confirm Password'
+            label={lang.t('CREATE.CONFIRM_PASSWORD')}
             onChange={handleUserChange}
             showErrors={install.showErrors}
             errorMsg={install.errors.confirmPassword}
@@ -51,7 +51,7 @@ const InitialStep = props => {
 
           {
             !props.install.isLoading ?
-            <Button cStyle='black' type="submit" full>Save</Button>
+            <Button cStyle='black' type="submit" full>{lang.t('CREATE.SAVE')}</Button>
             :
             <Spinner />
           }
diff --git a/client/coral-admin/src/containers/Install/translations.json b/client/coral-admin/src/containers/Install/translations.json
index aee01c3cd..64b18101a 100644
--- a/client/coral-admin/src/containers/Install/translations.json
+++ b/client/coral-admin/src/containers/Install/translations.json
@@ -9,6 +9,13 @@
       "LABEL": "Organization Name",
       "SAVE": "Save"
     },
+    "CREATE": {
+      "EMAIL": "Email address",
+      "USERNAME": "Username",
+      "PASSWORD": "Password",
+      "CONFIRM_PASSWORD": "Confirm Password",
+      "SAVE": "Save"
+    },
     "PERMITTED_DOMAINS": {
       "TITLE": "Permitted domains",
       "DESCRIPTION": "Add permitted domains",
@@ -25,6 +32,13 @@
       "LABEL": "Nombre de la Organización",
       "SAVE": "Guardar"
     },
+    "CREATE": {
+      "EMAIL": "Dirección de E-Mail",
+      "USERNAME": "Usuario",
+      "PASSWORD": "Contraseña",
+      "CONFIRM_PASSWORD": "Confirmar contraseña",
+      "SAVE": "Guardar"
+    },
     "PERMITTED_DOMAINS": {
       "TITLE": "Dominios Permitidos",
       "DESCRIPTION": "Agrega dominios permitidos",

From 628e8844f3ff6dcdd087e7380f37a8d9e7a5fbd6 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 27 Feb 2017 17:04:14 -0300
Subject: [PATCH 034/132] final translations

---
 .../Install/components/Steps/CreateYourAccount.js  |  4 ++++
 .../Install/components/Steps/FinalStep.js          | 14 +++++++-------
 .../src/containers/Install/translations.json       | 10 ++++++++++
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/client/coral-admin/src/containers/Install/components/Steps/CreateYourAccount.js b/client/coral-admin/src/containers/Install/components/Steps/CreateYourAccount.js
index ec1e34607..416fac195 100644
--- a/client/coral-admin/src/containers/Install/components/Steps/CreateYourAccount.js
+++ b/client/coral-admin/src/containers/Install/components/Steps/CreateYourAccount.js
@@ -2,6 +2,10 @@ import React from 'react';
 import styles from './style.css';
 import {TextField, Button, Spinner} from 'coral-ui';
 
+const lang = new I18n(translations);
+import translations from '../../translations.json';
+import I18n from 'coral-framework/modules/i18n/i18n';
+
 const InitialStep = props => {
   const {handleUserChange, handleUserSubmit, install} = props;
   return (
diff --git a/client/coral-admin/src/containers/Install/components/Steps/FinalStep.js b/client/coral-admin/src/containers/Install/components/Steps/FinalStep.js
index e549ebe63..0ad918487 100644
--- a/client/coral-admin/src/containers/Install/components/Steps/FinalStep.js
+++ b/client/coral-admin/src/containers/Install/components/Steps/FinalStep.js
@@ -3,16 +3,16 @@ import styles from './style.css';
 import {Button} from 'coral-ui';
 import {Link} from 'react-router';
 
+const lang = new I18n(translations);
+import translations from '../../translations.json';
+import I18n from 'coral-framework/modules/i18n/i18n';
+
 const InitialStep = () => {
   return (
     <div className={`${styles.step} ${styles.finalStep}`}>
-      <p>
-        Thanks for installing Talk! We sent an email to verify your email
-        address. While you finish setting the account, you can start engaging
-        with your readers now.
-      </p>
-      <Button raised><Link to='/admin'>Launch Talk</Link></Button>
-      <Button cStyle='black' raised><a href="http://coralproject.net">Close this Installer</a></Button>
+      <p>{lang.t('FINAL.DESCRIPTION')}</p>
+      <Button raised><Link to='/admin'>{lang.t('FINAL.LAUNCH')}</Link></Button>
+      <Button cStyle='black' raised><a href="http://coralproject.net">{lang.t('FINAL.CLOSE')}</a></Button>
     </div>
   );
 };
diff --git a/client/coral-admin/src/containers/Install/translations.json b/client/coral-admin/src/containers/Install/translations.json
index 64b18101a..3bae62c3a 100644
--- a/client/coral-admin/src/containers/Install/translations.json
+++ b/client/coral-admin/src/containers/Install/translations.json
@@ -20,6 +20,11 @@
       "TITLE": "Permitted domains",
       "DESCRIPTION": "Add permitted domains",
       "SUBMIT": "Finish install"
+    },
+    "FINAL": {
+      "DESCRIPTION": "Thanks for installing Talk! We sent an email to verify your email address. While you finish setting the account, you can start engaging with your readers now.",
+      "LAUNCH": "Launch Talk",
+      "CLOSE": "Close this Installer"
     }
   },
   "es": {
@@ -43,6 +48,11 @@
       "TITLE": "Dominios Permitidos",
       "DESCRIPTION": "Agrega dominios permitidos",
       "SUBMIT": "Finalizar instalación"
+    },
+    "FINAL": {
+      "DESCRIPTION": "Gracias por instalar Talk! Te enviamos un email para verificar tu identidad. Mientras se termina de configurar la cuenta, ya puedes empezar a interactuar con tus lectores",
+      "LAUNCH": "Lanzar Talk",
+      "CLOSE": "Cerrar este instalador"
     }
   }
 }

From b9e9d3e7fa60b5e1e11141d27df9dc339a62b3d9 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 27 Feb 2017 17:06:22 -0300
Subject: [PATCH 035/132] status

---
 .../containers/Install/components/Steps/AddOrganizationName.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-admin/src/containers/Install/components/Steps/AddOrganizationName.js b/client/coral-admin/src/containers/Install/components/Steps/AddOrganizationName.js
index 127c4afa1..bcac6ef29 100644
--- a/client/coral-admin/src/containers/Install/components/Steps/AddOrganizationName.js
+++ b/client/coral-admin/src/containers/Install/components/Steps/AddOrganizationName.js
@@ -17,7 +17,7 @@ const AddOrganizationName = props => {
             className={styles.TextField}
             id="organizationName"
             type="text"
-            label={lang.t('ADD_ORGANIZATION.DESCRIPTION')}
+            label={lang.t('ADD_ORGANIZATION.LABEL')}
             onChange={handleSettingsChange}
             showErrors={install.showErrors}
             errorMsg={install.errors.organizationName} />

From 1234a99a0d75d634fc94f11babe12635655fb1a4 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 27 Feb 2017 17:16:19 -0300
Subject: [PATCH 036/132] copy for install permitted domains updated

---
 client/coral-admin/src/containers/Install/translations.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/containers/Install/translations.json b/client/coral-admin/src/containers/Install/translations.json
index 3bae62c3a..8f651240c 100644
--- a/client/coral-admin/src/containers/Install/translations.json
+++ b/client/coral-admin/src/containers/Install/translations.json
@@ -18,7 +18,7 @@
     },
     "PERMITTED_DOMAINS": {
       "TITLE": "Permitted domains",
-      "DESCRIPTION": "Add permitted domains",
+      "DESCRIPTION": "Enter the domains you would like to permit for Talk, e.g. your local, staging and production environments (ex. localhost:3000, staging.domain.com, domain.com).",
       "SUBMIT": "Finish install"
     },
     "FINAL": {
@@ -46,7 +46,7 @@
     },
     "PERMITTED_DOMAINS": {
       "TITLE": "Dominios Permitidos",
-      "DESCRIPTION": "Agrega dominios permitidos",
+      "DESCRIPTION": "Agrega dominios permitidos a Talk, e.g. tu localhost, staging y ambientes de production  (ex. localhost:3000, staging.domain.com, domain.com).",
       "SUBMIT": "Finalizar instalación"
     },
     "FINAL": {

From 555faa02f5629eb4d97a7e0522af5c890cc8a8a0 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 27 Feb 2017 17:18:37 -0300
Subject: [PATCH 037/132] new translations for configure

---
 client/coral-admin/src/translations.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json
index 7219a22ca..e32d3fb9d 100644
--- a/client/coral-admin/src/translations.json
+++ b/client/coral-admin/src/translations.json
@@ -86,7 +86,7 @@
       "comment-count-text-post": " characters.",
       "comment-count-error": "Please enter a valid number.",
       "domain-list-title": "Domain Whitelist",
-      "domain-list-text": "Some instructions on how to type the urls."
+      "domain-list-text": "Enter the domains you would like to permit for Talk, e.g. your local, staging and production environments (ex. localhost:3000, staging.domain.com, domain.com)."
     },
     "bandialog": {
       "ban_user": "Ban User?",
@@ -206,7 +206,7 @@
       "comment-count-text-post": " caracteres",
       "comment-count-error": "Por favor escribe un número válido.",
       "domain-list-title": "Lista de Dominios Permitidos",
-      "domain-list-text": "Instrucciones de como ingresar las URLs."
+      "domain-list-text": "Agrega dominios permitidos a Talk, e.g. tu localhost, staging y ambientes de production  (ex. localhost:3000, staging.domain.com, domain.com)."
     },
     "embedlink": {
       "copy": "Copiar"

From 6cd3c84853a59b90c08e37a82fbbbfb62fff31bb Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Mon, 27 Feb 2017 14:21:48 -0700
Subject: [PATCH 038/132] Moved route definitions into env wrapped check,
 webpackified embed

---
 client/coral-embed/index.js     | 193 --------------------------------
 client/coral-embed/src/index.js | 119 ++++++++++++++++++++
 routes/index.js                 |  21 ++--
 webpack.config.js               |   9 +-
 4 files changed, 138 insertions(+), 204 deletions(-)
 delete mode 100644 client/coral-embed/index.js
 create mode 100644 client/coral-embed/src/index.js

diff --git a/client/coral-embed/index.js b/client/coral-embed/index.js
deleted file mode 100644
index 4a7e753ca..000000000
--- a/client/coral-embed/index.js
+++ /dev/null
@@ -1,193 +0,0 @@
-/* eslint-disable no-var, prefer-template */
-/**
- * @file Exposes the main 'window.Coral.Talk' API that developers can use to
- * render Talk streams in their webpages
- * @todo Currently implemented to be included directly via <script> tag
- * (including copypasta dependencies like pym.js), but later there will be a
- * build step and this code may use import statements 
- */
-
-// using umd.js (https://github.com/umdjs/umd/blob/master/templates/returnExports.js)
-(function (root, factory) {
-  /* eslint-disable */
-  if (typeof define === 'function' && define.amd) {
-
-    // AMD. Register as an anonymous module.
-    define([], factory);
-  } else if (typeof module === 'object' && module.exports) {
-
-    // Node. Does not work with strict CommonJS, but
-    // only CommonJS-like environments that support module.exports,
-    // like Node.
-    module.exports = factory();
-  } else {
-
-    // Browser globals (root is window)
-    root.Coral = factory();
-  }
-  /* eslint-enable */
-}(this, function () {
-
-  // This function should return value of window.Coral
-  var pym = requirePym();
-  var Coral = {};
-  var Talk = Coral.Talk = {};
-
-  /**
-   * Render a Talk stream
-   * @param {HTMLElement} el - Element to render the stream in
-   * @param {Object} opts - Configuration options for talk
-   * @param {String} opts.talk - Talk base URL
-   * @param {String} [opts.title] - Title of Stream (rendered in iframe)
-   * @param {String} [opts.asset] - parent Asset ID or URL. Comments in the
-   * stream will replies to this asset
-   */
-  Talk.render = function (el, opts) {
-    if ( ! el) {
-      throw new Error('Please provide Coral.Talk.render() the HTMLElement you want to render Talk in.');
-    }
-    if (typeof el !== 'object') {
-      throw new Error('Coral.Talk.render() expected HTMLElement but got ' + el + ' (' + typeof el + ')');
-    }
-    opts = opts || {};
-
-    // @todo infer this URL without explicit user input (if possible, may have to be added at build/render time of this script)
-    if (! opts.talk) {
-      throw new Error('Coral.Talk.render() expects opts.talk as the Talk Base URL');
-    }
-
-    // ensure el has an id, as pym can't directly accept the HTMLElement
-    if ( ! el.id) {el.id = '_' + String(Math.random());}
-    var asset = opts.asset || window.location;
-    var pymParent = new pym.Parent(
-      el.id,
-      buildStreamIframeUrl(opts.talk, asset),
-      {
-        title: opts.title,
-        asset_url: asset,
-        id: el.id + '_iframe',
-        name: el.id + '_iframe'
-      }
-    );
-
-    configurePymParent(pymParent, asset);
-  };
-
-  return Coral;
-
-  // build the URL to load in the pym iframe
-  function buildStreamIframeUrl(talkBaseUrl, asset) {
-    var iframeUrl = [
-      talkBaseUrl,
-      (talkBaseUrl.match(/\/$/) ? '' : '/'), // make sure no double-'/' if opts.talk already ends with '/'
-      'embed/stream?asset_url=',
-      encodeURIComponent(asset)
-    ].join('');
-    return iframeUrl;
-  }
-
-  // Set up postMessage listeners/handlers on the pymParent
-  // e.g. to resize the iframe, and navigate the host page
-  function configurePymParent(pymParent, assetUrl) {
-    var notificationOffset = 200;
-    var ready = false;
-
-    // Resize parent iframe height when child height changes
-    pymParent.onMessage('height', function(height) {
-
-      // TODO: In local testing, this is firing nonstop. Maybe there's a bug on the inside?
-      // Or it's by design of pym... but that's very wasteful of CPU and DOM reflows (jank)
-      pymParent.el.querySelector('iframe').height = height + 'px';
-    });
-
-    // Helps child show notifications at the right scrollTop
-    pymParent.onMessage('getPosition', function() {
-      var position = viewport().height + document.body.scrollTop;
-
-      if (position > notificationOffset) {
-        position = position - notificationOffset;
-      }
-
-      pymParent.sendMessage('position', position);
-    });
-
-    // Tell child when parent's DOMContentLoaded
-    pymParent.onMessage('childReady', function () {
-      var interval = setInterval(function () {
-        if (ready) {
-          window.clearInterval(interval);
-
-          // @todo - It's weird to me that this is sent here in addition to the iframe URL. Could it just be in one place?
-          pymParent.sendMessage('DOMContentLoaded', assetUrl);
-        }
-      }, 100);
-    });
-
-    // When end-user clicks link in iframe, open it in parent context
-    pymParent.onMessage('navigate', function (url) {
-      window.open(url, '_blank').focus();
-    });
-
-    // wait till images and other iframes are loaded before scrolling the page.
-    // or do we want to be more aggressive and scroll when we hit DOM ready?
-    document.addEventListener('DOMContentLoaded', function () {
-      ready = true;
-    });
-
-    // get dimensions of viewport
-    function viewport() {
-      var e = window, a = 'inner';
-      if ( !( 'innerWidth' in window ) ){
-        a = 'client';
-        e = document.documentElement || document.body;
-      }
-      return {
-        width : e[a + 'Width'],
-        height : e[a + 'Height']
-      };
-    }
-  }
-
-  // return a reference to pym.js
-  function requirePym() {
-    var pym;
-
-    // fake AMD `define` so that the pym.js copypasta doesn't create a global
-    function define(createPym) {
-      pym = createPym();
-    }
-    define.amd = true;
-
-    /* eslint-disable */
-    /*! pym.js - v1.1.2 - 2016-10-25 */
-    !function(a){"function"==typeof define&&define.amd?define(a):"undefined"!=typeof module&&module.exports?module.exports=a():window.pym=a.call(this)}(function(){var a="xPYMx",b={},c=function(a){var b=new RegExp("[\\?&]"+a.replace(/[\[]/,"\\[").replace(/[\]]/,"\\]")+"=([^&#]*)"),c=b.exec(location.search);return null===c?"":decodeURIComponent(c[1].replace(/\+/g," "))},d=function(a,b){if("*"===b.xdomain||a.origin.match(new RegExp(b.xdomain+"$")))return!0},e=function(b,c,d){var e=["pym",b,c,d];return e.join(a)},f=function(b){var c=["pym",b,"(\\S+)","(.*)"];return new RegExp("^"+c.join(a)+"$")},g=function(){for(var a=b.autoInitInstances.length,c=a-1;c>=0;c--){var d=b.autoInitInstances[c];d.el.getElementsByTagName("iframe").length&&d.el.getElementsByTagName("iframe")[0].contentWindow||b.autoInitInstances.splice(c,1)}};return b.autoInitInstances=[],b.autoInit=function(){var a=document.querySelectorAll("[data-pym-src]:not([data-pym-auto-initialized])"),c=a.length;g();for(var d=0;d<c;++d){var e=a[d];e.setAttribute("data-pym-auto-initialized",""),""===e.id&&(e.id="pym-"+d);var f=e.getAttribute("data-pym-src"),h={xdomain:"string",title:"string",name:"string",id:"string",sandbox:"string",allowfullscreen:"boolean"},i={};for(var j in h)if(null!==e.getAttribute("data-pym-"+j))switch(h[j]){case"boolean":i[j]=!("false"===e.getAttribute("data-pym-"+j));break;case"string":i[j]=e.getAttribute("data-pym-"+j);break;default:console.err("unrecognized attribute type")}var k=new b.Parent(e.id,f,i);b.autoInitInstances.push(k)}return b.autoInitInstances},b.Parent=function(a,b,c){this.id=a,this.url=b,this.el=document.getElementById(a),this.iframe=null,this.settings={xdomain:"*"},this.messageRegex=f(this.id),this.messageHandlers={},c=c||{},this._constructIframe=function(){var a=this.el.offsetWidth.toString();this.iframe=document.createElement("iframe");var b="",c=this.url.indexOf("#");for(c>-1&&(b=this.url.substring(c,this.url.length),this.url=this.url.substring(0,c)),this.url.indexOf("?")<0?this.url+="?":this.url+="&",this.iframe.src=this.url+"initialWidth="+a+"&childId="+this.id+"&parentTitle="+encodeURIComponent(document.title)+"&parentUrl="+encodeURIComponent(window.location.href)+b,this.iframe.setAttribute("width","100%"),this.iframe.setAttribute("scrolling","no"),this.iframe.setAttribute("marginheight","0"),this.iframe.setAttribute("frameborder","0"),this.settings.title&&this.iframe.setAttribute("title",this.settings.title),void 0!==this.settings.allowfullscreen&&this.settings.allowfullscreen!==!1&&this.iframe.setAttribute("allowfullscreen",""),void 0!==this.settings.sandbox&&"string"==typeof this.settings.sandbox&&this.iframe.setAttribute("sandbox",this.settings.sandbox),this.settings.id&&(document.getElementById(this.settings.id)||this.iframe.setAttribute("id",this.settings.id)),this.settings.name&&this.iframe.setAttribute("name",this.settings.name);this.el.firstChild;)this.el.removeChild(this.el.firstChild);this.el.appendChild(this.iframe),window.addEventListener("resize",this._onResize)},this._onResize=function(){this.sendWidth()}.bind(this),this._fire=function(a,b){if(a in this.messageHandlers)for(var c=0;c<this.messageHandlers[a].length;c++)this.messageHandlers[a][c].call(this,b)},this.remove=function(){window.removeEventListener("message",this._processMessage),window.removeEventListener("resize",this._onResize),this.el.removeChild(this.iframe),g()},this._processMessage=function(a){if(d(a,this.settings)&&"string"==typeof a.data){var b=a.data.match(this.messageRegex);if(!b||3!==b.length)return!1;var c=b[1],e=b[2];this._fire(c,e)}}.bind(this),this._onHeightMessage=function(a){var b=parseInt(a);this.iframe.setAttribute("height",b+"px")},this._onNavigateToMessage=function(a){document.location.href=a},this._onScrollToChildPosMessage=function(a){var b=document.getElementById(this.id).getBoundingClientRect().top+window.pageYOffset,c=b+parseInt(a);window.scrollTo(0,c)},this.onMessage=function(a,b){a in this.messageHandlers||(this.messageHandlers[a]=[]),this.messageHandlers[a].push(b)},this.sendMessage=function(a,b){this.el.getElementsByTagName("iframe").length&&(this.el.getElementsByTagName("iframe")[0].contentWindow?this.el.getElementsByTagName("iframe")[0].contentWindow.postMessage(e(this.id,a,b),"*"):this.remove())},this.sendWidth=function(){var a=this.el.offsetWidth.toString();this.sendMessage("width",a)};for(var h in c)this.settings[h]=c[h];return this.onMessage("height",this._onHeightMessage),this.onMessage("navigateTo",this._onNavigateToMessage),this.onMessage("scrollToChildPos",this._onScrollToChildPosMessage),window.addEventListener("message",this._processMessage,!1),this._constructIframe(),this},b.Child=function(b){this.parentWidth=null,this.id=null,this.parentTitle=null,this.parentUrl=null,this.settings={renderCallback:null,xdomain:"*",polling:0},this.timerId=null,this.messageRegex=null,this.messageHandlers={},b=b||{},this.onMessage=function(a,b){a in this.messageHandlers||(this.messageHandlers[a]=[]),this.messageHandlers[a].push(b)},this._fire=function(a,b){if(a in this.messageHandlers)for(var c=0;c<this.messageHandlers[a].length;c++)this.messageHandlers[a][c].call(this,b)},this._processMessage=function(a){if(d(a,this.settings)&&"string"==typeof a.data){var b=a.data.match(this.messageRegex);if(b&&3===b.length){var c=b[1],e=b[2];this._fire(c,e)}}}.bind(this),this._onWidthMessage=function(a){var b=parseInt(a);b!==this.parentWidth&&(this.parentWidth=b,this.settings.renderCallback&&this.settings.renderCallback(b),this.sendHeight())},this.sendMessage=function(a,b){window.parent.postMessage(e(this.id,a,b),"*")},this.sendHeight=function(){var a=document.getElementsByTagName("body")[0].offsetHeight.toString();return this.sendMessage("height",a),a}.bind(this),this.scrollParentTo=function(a){this.sendMessage("navigateTo","#"+a)},this.navigateParentTo=function(a){this.sendMessage("navigateTo",a)},this.scrollParentToChildEl=function(a){var b=document.getElementById(a).getBoundingClientRect().top+window.pageYOffset;this.scrollParentToChildPos(b)},this.scrollParentToChildPos=function(a){this.sendMessage("scrollToChildPos",a.toString())},this._markWhetherEmbedded=function(a){var b,c=document.getElementsByTagName("html")[0],d=c.className;try{b=window.self!==window.top?"embedded":"not-embedded"}catch(a){b="embedded"}d.indexOf(b)<0&&(c.className=d?d+" "+b:b,a&&a(b))},this.remove=function(){window.removeEventListener("message",this._processMessage),this.timerId&&clearInterval(this.timerId)},this.id=c("childId")||b.id,this.messageRegex=new RegExp("^pym"+a+this.id+a+"(\\S+)"+a+"(.*)$");var f=parseInt(c("initialWidth"));this.parentUrl=c("parentUrl"),this.parentTitle=c("parentTitle"),this.onMessage("width",this._onWidthMessage);for(var g in b)this.settings[g]=b[g];return window.addEventListener("message",this._processMessage,!1),this.settings.renderCallback&&this.settings.renderCallback(f),this.sendHeight(),this.settings.polling&&(this.timerId=window.setInterval(this.sendHeight,this.settings.polling)),this._markWhetherEmbedded(b.onMarkedEmbeddedStatus),this},b.autoInit(),b});
-    /* eslint-enable */
-    return pym;
-  }
-}));
-
-/*
-pym.js LICENSE (https://github.com/nprapps/pym.js/blob/master/LICENSE)
-Copyright (c) 2014 NPR
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-*/
diff --git a/client/coral-embed/src/index.js b/client/coral-embed/src/index.js
new file mode 100644
index 000000000..88ec57b47
--- /dev/null
+++ b/client/coral-embed/src/index.js
@@ -0,0 +1,119 @@
+import pym from 'pym.js';
+
+// This function should return value of window.Coral
+const Coral = {};
+const Talk = Coral.Talk = {};
+
+// build the URL to load in the pym iframe
+function buildStreamIframeUrl(talkBaseUrl, asset) {
+  let iframeUrl = [
+    talkBaseUrl,
+    (talkBaseUrl.match(/\/$/) ? '' : '/'), // make sure no double-'/' if opts.talk already ends with '/'
+    'embed/stream?asset_url=',
+    encodeURIComponent(asset)
+  ].join('');
+  return iframeUrl;
+}
+
+// Set up postMessage listeners/handlers on the pymParent
+// e.g. to resize the iframe, and navigate the host page
+function configurePymParent(pymParent, assetUrl) {
+  let notificationOffset = 200;
+  let ready = false;
+
+  // Resize parent iframe height when child height changes
+  pymParent.onMessage('height', function(height) {
+
+    // TODO: In local testing, this is firing nonstop. Maybe there's a bug on the inside?
+    // Or it's by design of pym... but that's very wasteful of CPU and DOM reflows (jank)
+    pymParent.el.querySelector('iframe').height = `${height  }px`;
+  });
+
+  // Helps child show notifications at the right scrollTop
+  pymParent.onMessage('getPosition', function() {
+    let position = viewport().height + document.body.scrollTop;
+
+    if (position > notificationOffset) {
+      position = position - notificationOffset;
+    }
+
+    pymParent.sendMessage('position', position);
+  });
+
+  // Tell child when parent's DOMContentLoaded
+  pymParent.onMessage('childReady', function () {
+    const interval = setInterval(function () {
+      if (ready) {
+        window.clearInterval(interval);
+
+        // @todo - It's weird to me that this is sent here in addition to the iframe URL. Could it just be in one place?
+        pymParent.sendMessage('DOMContentLoaded', assetUrl);
+      }
+    }, 100);
+  });
+
+  // When end-user clicks link in iframe, open it in parent context
+  pymParent.onMessage('navigate', function (url) {
+    window.open(url, '_blank').focus();
+  });
+
+  // wait till images and other iframes are loaded before scrolling the page.
+  // or do we want to be more aggressive and scroll when we hit DOM ready?
+  document.addEventListener('DOMContentLoaded', function () {
+    ready = true;
+  });
+
+  // get dimensions of viewport
+  const viewport = () => {
+    let e = window, a = 'inner';
+    if ( !( 'innerWidth' in window ) ){
+      a = 'client';
+      e = document.documentElement || document.body;
+    }
+    return {
+      width : e[`${a}Width`],
+      height : e[`${a}Height`]
+    };
+  };
+}
+
+/**
+ * Render a Talk stream
+ * @param {HTMLElement} el - Element to render the stream in
+ * @param {Object} opts - Configuration options for talk
+ * @param {String} opts.talk - Talk base URL
+ * @param {String} [opts.title] - Title of Stream (rendered in iframe)
+ * @param {String} [opts.asset] - parent Asset ID or URL. Comments in the
+ * stream will replies to this asset
+ */
+Talk.render = function (el, opts) {
+  if ( ! el) {
+    throw new Error('Please provide Coral.Talk.render() the HTMLElement you want to render Talk in.');
+  }
+  if (typeof el !== 'object') {
+    throw new Error(`Coral.Talk.render() expected HTMLElement but got ${el} (${typeof el})`);
+  }
+  opts = opts || {};
+
+  // @todo infer this URL without explicit user input (if possible, may have to be added at build/render time of this script)
+  if (! opts.talk) {
+    throw new Error('Coral.Talk.render() expects opts.talk as the Talk Base URL');
+  }
+
+  // ensure el has an id, as pym can't directly accept the HTMLElement
+  if (!el.id) {
+    el.id = `_${Math.random()}`;
+  }
+
+  let asset = opts.asset || window.location;
+  let pymParent = new pym.Parent(el.id, buildStreamIframeUrl(opts.talk, asset), {
+    title: opts.title,
+    asset_url: asset,
+    id: `${el.id}_iframe`,
+    name: `${el.id}_iframe`
+  });
+
+  configurePymParent(pymParent, asset);
+};
+
+export default Coral;
diff --git a/routes/index.js b/routes/index.js
index add288b10..a771ff50b 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -5,16 +5,19 @@ const router = express.Router();
 router.use('/api/v1', require('./api'));
 router.use('/admin', require('./admin'));
 router.use('/embed', require('./embed'));
-router.get('/embed.js', (req, res) => res.sendFile(path.join(__dirname, '../client/coral-embed/index.js')));
-router.use('/assets', require('./assets'));
+router.get('/embed.js', (req, res) => res.sendFile(path.join(__dirname, '../dist/coral-embed/bundle.js')));
 
-router.get('/', (req, res) => {
-  return res.render('article', {
-    title: 'Coral Talk',
-    asset_url: '',
-    body: '',
-    basePath: '/client/embed/stream'
+if (process.env.NODE_ENV !== 'production') {
+  router.use('/assets', require('./assets'));
+
+  router.get('/', (req, res) => {
+    return res.render('article', {
+      title: 'Coral Talk',
+      asset_url: '',
+      body: '',
+      basePath: '/client/embed/stream'
+    });
   });
-});
+}
 
 module.exports = router;
diff --git a/webpack.config.js b/webpack.config.js
index 5a7bb297b..ecd138e2b 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -8,7 +8,8 @@ const webpack = require('webpack');
 
 const buildTargets = [
   'coral-admin',
-  'coral-docs'
+  'coral-docs',
+  'coral-embed'
 ];
 
 const buildEmbeds = [
@@ -38,7 +39,11 @@ module.exports = {
   }, {})),
   output: {
     path: path.join(__dirname, 'dist'),
-    filename: '[name].js'
+    filename: '[name].js',
+
+    // NOTE: this causes all exports to override the global.Coral, so no more
+    // than one bundle.js can be included on a page.
+    library: 'Coral'
   },
   module: {
     rules: [

From aa88eb2374546ff2d83ef6afd80185acad91061e Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Mon, 27 Feb 2017 15:33:52 -0700
Subject: [PATCH 039/132] Adjusted build process

---
 README.md         |  5 ++++-
 package.json      |  5 +++--
 routes/index.js   |  3 ++-
 webpack.config.js | 23 ++++++++++++++++++-----
 yarn.lock         |  6 ++++++
 5 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index f47fbd2f6..64fe2739c 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,9 @@
 # Talk [![CircleCI](https://circleci.com/gh/coralproject/talk.svg?style=svg)](https://circleci.com/gh/coralproject/talk)
 
-A commenting platform from [The Coral Project](https://coralproject.net). Talk enters a closed beta in March 2017, but you can download the code for our alpha here. [Read more about Talk here.](https://coralproject.net/products/talk.html) 
+A commenting platform from [The Coral Project](https://coralproject.net). Talk enters a closed beta in March 2017, but you can download the code for our alpha here. [Read more about Talk here.](https://coralproject.net/products/talk.html)
+
+Third party licenses are available via the `/client/3rdpartylicenses.txt`
+endpoint when the server is running with built assets.
 
 ## Contributing to Talk
 
diff --git a/package.json b/package.json
index 70b0e17b1..cbf3a1267 100644
--- a/package.json
+++ b/package.json
@@ -6,8 +6,8 @@
   "scripts": {
     "start": "./bin/cli serve --jobs",
     "dev-start": "nodemon --config .nodemon.json --exec \"./bin/cli -c .env serve --jobs\"",
-    "build": "NODE_ENV=production webpack -p --config webpack.config.js --bail",
-    "build-watch": "NODE_ENV=development webpack --config webpack.config.js --watch",
+    "build": "NODE_ENV=production webpack --progress -p --config webpack.config.js --bail",
+    "build-watch": "NODE_ENV=development webpack --progress --config webpack.config.js --watch",
     "lint": "eslint bin/* .",
     "lint-fix": "eslint bin/* . --fix",
     "test": "TEST_MODE=unit NODE_ENV=test mocha -R ${MOCHA_REPORTER:-spec}",
@@ -130,6 +130,7 @@
     "jsdom": "^9.8.3",
     "json-loader": "^0.5.4",
     "keymaster": "^1.6.2",
+    "license-webpack-plugin": "^0.4.2",
     "material-design-lite": "^1.2.1",
     "mocha": "^3.1.2",
     "mocha-junit-reporter": "^1.12.1",
diff --git a/routes/index.js b/routes/index.js
index a771ff50b..b1e61659a 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -5,7 +5,8 @@ const router = express.Router();
 router.use('/api/v1', require('./api'));
 router.use('/admin', require('./admin'));
 router.use('/embed', require('./embed'));
-router.get('/embed.js', (req, res) => res.sendFile(path.join(__dirname, '../dist/coral-embed/bundle.js')));
+router.get('/embed.js', (req, res) => res.sendFile(path.join(__dirname, '../dist/embed.js')));
+router.get('/embed.js.map', (req, res) => res.sendFile(path.join(__dirname, '../dist/embed.js.map')));
 
 if (process.env.NODE_ENV !== 'production') {
   router.use('/assets', require('./assets'));
diff --git a/webpack.config.js b/webpack.config.js
index ecd138e2b..cd00696d8 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -2,14 +2,14 @@ const path = require('path');
 const autoprefixer = require('autoprefixer');
 const precss = require('precss');
 const Copy = require('copy-webpack-plugin');
+const LicenseWebpackPlugin = require('license-webpack-plugin');
 const webpack = require('webpack');
 
 // Edit the build targets and embeds below.
 
 const buildTargets = [
   'coral-admin',
-  'coral-docs',
-  'coral-embed'
+  'coral-docs'
 ];
 
 const buildEmbeds = [
@@ -18,7 +18,12 @@ const buildEmbeds = [
 
 module.exports = {
   devtool: 'cheap-source-map',
-  entry: buildTargets.reduce((entry, target) => {
+  entry: Object.assign({}, {
+    'embed': [
+      'babel-polyfill',
+      path.join(__dirname, 'client/coral-embed/src/index')
+    ]
+  }, buildTargets.reduce((entry, target) => {
 
     // Add the entry for the bundle.
     entry[`${target}/bundle`] = [
@@ -27,7 +32,7 @@ module.exports = {
     ];
 
     return entry;
-  }, buildEmbeds.reduce((entry, embed) => {
+  }, {}), buildEmbeds.reduce((entry, embed) => {
 
     // Add the entry for the bundle.
     entry[`embed/${embed}/bundle`] = [
@@ -39,6 +44,7 @@ module.exports = {
   }, {})),
   output: {
     path: path.join(__dirname, 'dist'),
+    publicPath: '/client/',
     filename: '[name].js',
 
     // NOTE: this causes all exports to override the global.Coral, so no more
@@ -50,7 +56,10 @@ module.exports = {
       {
         loader: 'babel-loader',
         exclude: /node_modules/,
-        test: /\.js$/
+        test: /\.js$/,
+        query: {
+          cacheDirectory: true
+        }
       },
       {
         loader: 'json-loader',
@@ -85,6 +94,10 @@ module.exports = {
     ]
   },
   plugins: [
+    new LicenseWebpackPlugin({
+      pattern: /^(MIT|ISC|BSD.*)$/,
+      addUrl: true
+    }),
     new Copy([
       ...buildEmbeds.map(embed => ({
         from: path.join(__dirname, 'client', `coral-embed-${embed}`, 'style'),
diff --git a/yarn.lock b/yarn.lock
index 5413439fa..0331202ef 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4385,6 +4385,12 @@ libqp@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/libqp/-/libqp-1.1.0.tgz#f5e6e06ad74b794fb5b5b66988bf728ef1dedbe8"
 
+license-webpack-plugin@^0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-0.4.2.tgz#188df5418a72ab61cad648b9ffd9355be270242b"
+  dependencies:
+    object-assign "^4.1.0"
+
 linkify-it@^1.2.0:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-1.2.4.tgz#0773526c317c8fd13bd534ee1d180ff88abf881a"

From a26a60cc678411b7a2483cc1c20164da2eac2957 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Mon, 27 Feb 2017 19:16:27 +0800
Subject: [PATCH 040/132] minial best button uionly and e2e

---
 client/coral-embed-stream/src/Comment.js    |  5 ++
 client/coral-embed-stream/style/default.css | 10 ++++
 client/coral-plugin-best/BestButton.js      | 65 +++++++++++++++++++++
 client/coral-plugin-best/translations.json  | 10 ++++
 client/coral-plugin-replies/ReplyButton.js  |  3 +-
 test/e2e/pages/embedStreamPage.js           |  5 +-
 test/e2e/tests/Moderator/BestCommentTest.js | 42 +++++++++++++
 7 files changed, 138 insertions(+), 2 deletions(-)
 create mode 100644 client/coral-plugin-best/BestButton.js
 create mode 100644 client/coral-plugin-best/translations.json
 create mode 100644 test/e2e/tests/Moderator/BestCommentTest.js

diff --git a/client/coral-embed-stream/src/Comment.js b/client/coral-embed-stream/src/Comment.js
index e52c4aff4..0a11ee6a5 100644
--- a/client/coral-embed-stream/src/Comment.js
+++ b/client/coral-embed-stream/src/Comment.js
@@ -17,6 +17,7 @@ import PubDate from 'coral-plugin-pubdate/PubDate';
 import {ReplyBox, ReplyButton} from 'coral-plugin-replies';
 import FlagComment from 'coral-plugin-flags/FlagComment';
 import LikeButton from 'coral-plugin-likes/LikeButton';
+import BestButton from 'coral-plugin-best/BestButton';
 import LoadMore from 'coral-embed-stream/src/LoadMore';
 
 import styles from './Comment.css';
@@ -125,6 +126,10 @@ class Comment extends React.Component {
                 parentCommentId={parentId || comment.id}
                 currentUserId={currentUser && currentUser.id}
                 banned={false} />
+              <BestButton
+                isBest={false}
+                setBestTag={() => {}}
+                removeBestTag={() => {}} />
             </div>
         <div className="commentActionsRight">
           <PermalinkButton articleURL={asset.url} commentId={comment.id} />
diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css
index 52876ff79..46edc44e1 100644
--- a/client/coral-embed-stream/style/default.css
+++ b/client/coral-embed-stream/style/default.css
@@ -213,10 +213,20 @@ hr {
   width: 50%;
 }
 
+.comment__action-button {
+  cursor: pointer;
+}
+
+.comment__action-button--nowrap {
+  white-space: nowrap;
+}
+
 .material-icons {
   font-size: 12px !important;
   margin-left: 3px;
   vertical-align: middle;
+  width: 1em;
+  overflow: hidden;
 }
 
 .likedButton {
diff --git a/client/coral-plugin-best/BestButton.js b/client/coral-plugin-best/BestButton.js
new file mode 100644
index 000000000..c88b750ce
--- /dev/null
+++ b/client/coral-plugin-best/BestButton.js
@@ -0,0 +1,65 @@
+import React, {Component, PropTypes} from 'react';
+import {I18n} from '../coral-framework';
+import translations from './translations.json';
+import classnames from 'classnames';
+
+const name = 'coral-plugin-best';
+const lang = new I18n(translations);
+
+/**
+ * Button that lets a moderator tag a comment as "Best".
+ * Used to recognize really good comments.
+ */
+class BestButton extends Component {
+  static propTypes = {
+
+    // whether the comment is already tagged as best
+    isBest: PropTypes.bool.isRequired,
+
+    // set that this comment is best
+    setBestTag: PropTypes.func.isRequired,
+
+    // remove the best status
+    removeBestTag: PropTypes.func.isRequired,
+  }
+
+  state = {
+    best: false
+  }
+
+  constructor(props) {
+    super(props);
+    this.onClickSetBest = this.onClickSetBest.bind(this);
+    this.onClickUnsetBest = this.onClickUnsetBest.bind(this);
+  }
+
+  onClickSetBest(e) {
+    e.preventDefault();
+    this.setState({isBest: true});
+  }
+
+  onClickUnsetBest(e) {
+    e.preventDefault();
+    this.setState({isBest: false});
+  }
+
+  render() {
+
+    // @TODO(bengo) Consider adding the comment__action classes to other buttons to add cursor:pointer and never wrap the icons
+    // @TODO(bengo) Should I reuse another element like coral-ui button? Just doing what LikeButton does for now
+    // Oh. I think that's styled for the admin. Don't use coral-ui button until the whole comment bottom bar does.
+    const {isBest} = this.state;
+    return <div className={classnames(`${name}-container`, `${name}-button`, 'comment__action-button--nowrap',
+                                      `e2e__${isBest ? 'unset' : 'set'}-best-comment`)}>
+      <button onClick={isBest ? this.onClickUnsetBest : this.onClickSetBest}
+              className='comment__action-button'>
+        <span className={`${name}-button-text`}>{lang.t(isBest ? 'unsetBest' : 'setBest')}</span>
+        <i className={`${name}-icon material-icons`} aria-hidden={true}>
+          { isBest ? 'favorite' : 'favorite_border' }
+        </i>
+      </button>
+    </div>;
+  }
+}
+
+export default BestButton;
diff --git a/client/coral-plugin-best/translations.json b/client/coral-plugin-best/translations.json
new file mode 100644
index 000000000..cfdfc04a1
--- /dev/null
+++ b/client/coral-plugin-best/translations.json
@@ -0,0 +1,10 @@
+{
+  "en": {
+    "setBest": "Tag as Best",
+    "unsetBest": "Untag as Best"
+  },
+  "es": {
+    "like": "Establecer como mejor",
+    "liked": "Desarmado como mejor"
+  }
+}
diff --git a/client/coral-plugin-replies/ReplyButton.js b/client/coral-plugin-replies/ReplyButton.js
index 68374fd2f..cd1859afc 100644
--- a/client/coral-plugin-replies/ReplyButton.js
+++ b/client/coral-plugin-replies/ReplyButton.js
@@ -1,13 +1,14 @@
 import React, {PropTypes} from 'react';
 import {I18n} from '../coral-framework';
 import translations from './translations.json';
+import classnames from 'classnames';
 
 const name = 'coral-plugin-replies';
 
 const ReplyButton = ({banned, onClick}) => {
   return (
     <button
-      className={`${name}-reply-button`}
+      className={classnames(`${name}-reply-button`, 'comment__action-button--nowrap')}
       onClick={onClick}>
       {lang.t('reply')}
       <i className={`${name}-icon material-icons`}
diff --git a/test/e2e/pages/embedStreamPage.js b/test/e2e/pages/embedStreamPage.js
index ca72df1db..a861b4c2e 100644
--- a/test/e2e/pages/embedStreamPage.js
+++ b/test/e2e/pages/embedStreamPage.js
@@ -38,7 +38,10 @@ const embedStreamCommands = {
       .setValue('@signInDialogEmail', user.email)
       .setValue('@signInDialogPassword', user.pass)
       .waitForElementVisible('@logInButton')
-      .click('@logInButton')
+      .click('@logInButton', () => {
+
+        // this.api.pause()
+      })
       .waitForElementVisible('@logoutButton', 5000);
   },
   logout() {
diff --git a/test/e2e/tests/Moderator/BestCommentTest.js b/test/e2e/tests/Moderator/BestCommentTest.js
new file mode 100644
index 000000000..ca8cacda4
--- /dev/null
+++ b/test/e2e/tests/Moderator/BestCommentTest.js
@@ -0,0 +1,42 @@
+module.exports = {
+  '@tags': ['like', 'comments', 'commenter'],
+  before: client => {
+    const embedStreamPage = client.page.embedStreamPage();
+    const {users} = client.globals;
+
+    embedStreamPage
+      .navigate()
+      .ready();
+
+    embedStreamPage
+      .login(users.commenter);
+  },
+  'Moderator marks their comment as BEST': client => {
+    const embedStreamPage = client.page.embedStreamPage();
+
+    const setBestCommentButton = '.comment:nth-of-type(1) .e2e__set-best-comment';
+    const unsetBestCommentButton = '.comment:nth-of-type(1) .e2e__unset-best-comment';
+    embedStreamPage
+      .postComment('Hi everyone. Isn\'t this the BEST comment!?')
+      .waitForElementVisible(setBestCommentButton, 2000, () => {
+        client.expect.element(setBestCommentButton).text.to.contain('Tag as Best');        
+      })
+      .click(setBestCommentButton)
+      .waitForElementVisible(unsetBestCommentButton, 2000, () => {
+        client.assert.elementNotPresent(setBestCommentButton);
+        client.expect.element(unsetBestCommentButton).text.to.contain('Untag as Best');
+      });
+
+    // on refresh, it should still be tagged as best :)
+    // client
+    //   .refresh(() => {
+
+    //   })
+    //   .waitForElementVisible(unsetBestCommentButton, 2000)
+
+    // client.pause()
+  },
+  after: client => {
+    client.end();
+  }
+};

From 907c4526da3a0ad173c3be59cf9876dca0650ad4 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Mon, 27 Feb 2017 20:30:16 +0800
Subject: [PATCH 041/132] BestButton only shows if currentUser can use it (and
 e2e)

---
 client/coral-embed-stream/src/Comment.js    | 12 +++++-----
 client/coral-plugin-best/BestButton.js      | 11 +++++++++
 test/e2e/pages/embedStreamPage.js           |  6 +++++
 test/e2e/tests/Commenter/BestCommentTest.js | 25 +++++++++++++++++++++
 test/e2e/tests/Moderator/BestCommentTest.js | 11 ++++-----
 5 files changed, 53 insertions(+), 12 deletions(-)
 create mode 100644 test/e2e/tests/Commenter/BestCommentTest.js

diff --git a/client/coral-embed-stream/src/Comment.js b/client/coral-embed-stream/src/Comment.js
index 0a11ee6a5..0c7591ddf 100644
--- a/client/coral-embed-stream/src/Comment.js
+++ b/client/coral-embed-stream/src/Comment.js
@@ -17,7 +17,7 @@ import PubDate from 'coral-plugin-pubdate/PubDate';
 import {ReplyBox, ReplyButton} from 'coral-plugin-replies';
 import FlagComment from 'coral-plugin-flags/FlagComment';
 import LikeButton from 'coral-plugin-likes/LikeButton';
-import BestButton from 'coral-plugin-best/BestButton';
+import BestButton, {IfUserCanModifyBest} from 'coral-plugin-best/BestButton';
 import LoadMore from 'coral-embed-stream/src/LoadMore';
 
 import styles from './Comment.css';
@@ -126,10 +126,12 @@ class Comment extends React.Component {
                 parentCommentId={parentId || comment.id}
                 currentUserId={currentUser && currentUser.id}
                 banned={false} />
-              <BestButton
-                isBest={false}
-                setBestTag={() => {}}
-                removeBestTag={() => {}} />
+              <IfUserCanModifyBest user={currentUser}>
+                <BestButton
+                  isBest={false}
+                  setBestTag={() => {}}
+                  removeBestTag={() => {}} />
+              </IfUserCanModifyBest>
             </div>
         <div className="commentActionsRight">
           <PermalinkButton articleURL={asset.url} commentId={comment.id} />
diff --git a/client/coral-plugin-best/BestButton.js b/client/coral-plugin-best/BestButton.js
index c88b750ce..3010db7c6 100644
--- a/client/coral-plugin-best/BestButton.js
+++ b/client/coral-plugin-best/BestButton.js
@@ -6,6 +6,17 @@ import classnames from 'classnames';
 const name = 'coral-plugin-best';
 const lang = new I18n(translations);
 
+// It would be best if the backend/api held this business logic
+const canModifyBestTag = ({roles = []} = {}) => roles && ['ADMIN', 'MODERATOR'].some(role => roles.includes(role));
+
+/**
+ * Component that only renders children if the provided user prop can modify best tags
+ */
+export const IfUserCanModifyBest = ({user, children}) => {
+  if ( ! ( user && canModifyBestTag(user))) {return null;}
+  return children;
+};
+
 /**
  * Button that lets a moderator tag a comment as "Best".
  * Used to recognize really good comments.
diff --git a/test/e2e/pages/embedStreamPage.js b/test/e2e/pages/embedStreamPage.js
index a861b4c2e..5799fa8c9 100644
--- a/test/e2e/pages/embedStreamPage.js
+++ b/test/e2e/pages/embedStreamPage.js
@@ -163,6 +163,12 @@ module.exports = {
     },
     registerButton: {
       selector: '#signInDialog #coralRegister'
+    },
+    setBestButton: {
+      selector: '.e2e__set-best-comment'
+    },
+    unsetBestButton: {
+      selector: '.e2e__unset-best-comment'
     }
   }
 };
diff --git a/test/e2e/tests/Commenter/BestCommentTest.js b/test/e2e/tests/Commenter/BestCommentTest.js
new file mode 100644
index 000000000..f5747bd6e
--- /dev/null
+++ b/test/e2e/tests/Commenter/BestCommentTest.js
@@ -0,0 +1,25 @@
+module.exports = {
+  '@tags': ['like', 'comments', 'commenter'],
+  before: client => {
+    const embedStreamPage = client.page.embedStreamPage();
+    const {users} = client.globals;
+
+    embedStreamPage
+      .navigate()
+      .ready();
+
+    embedStreamPage
+      .login(users.commenter);
+  },
+  'Commenters should not see the set-best-comment button': client => {
+    const embedStreamPage = client.page.embedStreamPage();
+
+    embedStreamPage
+      .likeComment()
+      .waitForElementVisible('@likesCount', 2000)
+      .expect.element('@setBestButton').to.not.be.present;
+  },
+  after: client => {
+    client.end();
+  }
+};
diff --git a/test/e2e/tests/Moderator/BestCommentTest.js b/test/e2e/tests/Moderator/BestCommentTest.js
index ca8cacda4..f25fd7d93 100644
--- a/test/e2e/tests/Moderator/BestCommentTest.js
+++ b/test/e2e/tests/Moderator/BestCommentTest.js
@@ -9,22 +9,19 @@ module.exports = {
       .ready();
 
     embedStreamPage
-      .login(users.commenter);
+      .login(users.moderator);
   },
   'Moderator marks their comment as BEST': client => {
     const embedStreamPage = client.page.embedStreamPage();
 
-    const setBestCommentButton = '.comment:nth-of-type(1) .e2e__set-best-comment';
-    const unsetBestCommentButton = '.comment:nth-of-type(1) .e2e__unset-best-comment';
+    const setBestCommentButton = '@setBestButton';
+    const unsetBestCommentButton = '@unsetBestButton';
     embedStreamPage
       .postComment('Hi everyone. Isn\'t this the BEST comment!?')
-      .waitForElementVisible(setBestCommentButton, 2000, () => {
-        client.expect.element(setBestCommentButton).text.to.contain('Tag as Best');        
-      })
+      .waitForElementVisible(setBestCommentButton, 2000)
       .click(setBestCommentButton)
       .waitForElementVisible(unsetBestCommentButton, 2000, () => {
         client.assert.elementNotPresent(setBestCommentButton);
-        client.expect.element(unsetBestCommentButton).text.to.contain('Untag as Best');
       });
 
     // on refresh, it should still be tagged as best :)

From fc9c67b05cf3cdd7802f2986dfa9270f22f2d854 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Mon, 27 Feb 2017 21:24:56 +0800
Subject: [PATCH 042/132] BestButton sends mutations to backend, but they
 aren't implemented yet

---
 client/coral-embed-stream/src/Comment.js      | 32 +++++++++++---
 client/coral-embed-stream/src/Embed.js        | 14 ++++++-
 client/coral-embed-stream/src/Stream.js       | 14 ++++++-
 client/coral-embed-stream/style/default.css   |  4 ++
 .../graphql/mutations/addCommentTag.graphql   | 12 ++++++
 .../graphql/mutations/index.js                | 24 +++++++++++
 .../mutations/removeCommentTag.graphql        | 12 ++++++
 client/coral-plugin-best/BestButton.js        | 42 +++++++++++++------
 8 files changed, 131 insertions(+), 23 deletions(-)
 create mode 100644 client/coral-framework/graphql/mutations/addCommentTag.graphql
 create mode 100644 client/coral-framework/graphql/mutations/removeCommentTag.graphql

diff --git a/client/coral-embed-stream/src/Comment.js b/client/coral-embed-stream/src/Comment.js
index 0c7591ddf..e4ca10743 100644
--- a/client/coral-embed-stream/src/Comment.js
+++ b/client/coral-embed-stream/src/Comment.js
@@ -17,7 +17,7 @@ import PubDate from 'coral-plugin-pubdate/PubDate';
 import {ReplyBox, ReplyButton} from 'coral-plugin-replies';
 import FlagComment from 'coral-plugin-flags/FlagComment';
 import LikeButton from 'coral-plugin-likes/LikeButton';
-import BestButton, {IfUserCanModifyBest} from 'coral-plugin-best/BestButton';
+import {BestButton, IfUserCanModifyBest, BEST_TAG, commentIsBest} from 'coral-plugin-best/BestButton';
 import LoadMore from 'coral-embed-stream/src/LoadMore';
 
 import styles from './Comment.css';
@@ -74,7 +74,13 @@ class Comment extends React.Component {
         id: PropTypes.string.isRequired,
         name: PropTypes.string.isRequired
       }).isRequired
-    }).isRequired
+    }).isRequired,
+
+    // dispatch action to add a tag to a comment
+    addCommentTag: React.PropTypes.func,
+
+    // dispatch action to remove a tag from a comment
+    removeCommentTag: React.PropTypes.func,
   }
 
   render () {
@@ -93,13 +99,27 @@ class Comment extends React.Component {
       loadMore,
       setActiveReplyBox,
       activeReplyBox,
-      deleteAction
+      deleteAction,
+      addCommentTag,
+      removeCommentTag,
     } = this.props;
 
     const like = getActionSummary('LikeActionSummary', comment);
     const flag = getActionSummary('FlagActionSummary', comment);
     const dontagree = getActionSummary('DontAgreeActionSummary', comment);
 
+    // @TODO(bengo) Should I do this for addCommentTag and/or best button
+
+    // @TODO(bengo) Would be best to only create these funcs on prop change
+    const addBestTag = () => addCommentTag({
+      comment_id: comment.id,
+      tag: BEST_TAG,
+    });
+    const removeBestTag = () => removeCommentTag({
+      comment_id: comment.id,
+      tag: BEST_TAG,
+    });
+
     return (
       <div
         className={parentId ? `reply ${styles.Reply}` : `comment ${styles.Comment}`}
@@ -128,9 +148,9 @@ class Comment extends React.Component {
                 banned={false} />
               <IfUserCanModifyBest user={currentUser}>
                 <BestButton
-                  isBest={false}
-                  setBestTag={() => {}}
-                  removeBestTag={() => {}} />
+                  isBest={commentIsBest(comment)}
+                  addBest={addBestTag}
+                  removeBest={removeBestTag} />
               </IfUserCanModifyBest>
             </div>
         <div className="commentActionsRight">
diff --git a/client/coral-embed-stream/src/Embed.js b/client/coral-embed-stream/src/Embed.js
index ac9c09eac..3290e2c8e 100644
--- a/client/coral-embed-stream/src/Embed.js
+++ b/client/coral-embed-stream/src/Embed.js
@@ -13,7 +13,7 @@ const {addNotification, clearNotification} = notificationActions;
 const {fetchAssetSuccess} = assetActions;
 
 import {queryStream} from 'coral-framework/graphql/queries';
-import {postComment, postFlag, postLike, postDontAgree, deleteAction} from 'coral-framework/graphql/mutations';
+import {postComment, postFlag, postLike, postDontAgree, deleteAction, addCommentTag, removeCommentTag} from 'coral-framework/graphql/mutations';
 import {editName} from 'coral-framework/actions/user';
 import {updateCountCache} from 'coral-framework/actions/asset';
 import {Notification, notificationActions, authActions, assetActions, pym} from 'coral-framework';
@@ -54,7 +54,13 @@ class Embed extends Component {
     data: React.PropTypes.shape({
       loading: React.PropTypes.bool,
       error: React.PropTypes.object
-    }).isRequired
+    }).isRequired,
+
+    // dispatch action to add a tag to a comment
+    addCommentTag: React.PropTypes.func,
+
+    // dispatch action to remove a tag from a comment
+    removeCommentTag: React.PropTypes.func,
   }
 
   componentDidMount () {
@@ -176,6 +182,8 @@ class Embed extends Component {
               postLike={this.props.postLike}
               postFlag={this.props.postFlag}
               postDontAgree={this.props.postDontAgree}
+              addCommentTag={this.props.addCommentTag}
+              removeCommentTag={this.props.removeCommentTag}
               getCounts={this.props.getCounts}
               updateCountCache={this.props.updateCountCache}
               loadMore={this.props.loadMore}
@@ -250,6 +258,8 @@ export default compose(
   postFlag,
   postLike,
   postDontAgree,
+  addCommentTag,
+  removeCommentTag,
   deleteAction,
   queryStream
 )(Embed);
diff --git a/client/coral-embed-stream/src/Stream.js b/client/coral-embed-stream/src/Stream.js
index a7f360d59..a1756c50e 100644
--- a/client/coral-embed-stream/src/Stream.js
+++ b/client/coral-embed-stream/src/Stream.js
@@ -13,7 +13,13 @@ class Stream extends React.Component {
     currentUser: PropTypes.shape({
       username: PropTypes.string,
       id: PropTypes.string
-    })
+    }),
+
+    // dispatch action to add a tag to a comment
+    addCommentTag: React.PropTypes.func,
+
+    // dispatch action to remove a tag from a comment
+    removeCommentTag: React.PropTypes.func,
   }
 
   constructor(props) {
@@ -64,7 +70,9 @@ class Stream extends React.Component {
       loadMore,
       deleteAction,
       showSignInDialog,
-      refetch
+      refetch,
+      addCommentTag,
+      removeCommentTag,
     } = this.props;
 
     return (
@@ -83,6 +91,8 @@ class Stream extends React.Component {
               postLike={postLike}
               postFlag={postFlag}
               postDontAgree={postDontAgree}
+              addCommentTag={addCommentTag}
+              removeCommentTag={removeCommentTag}
               loadMore={loadMore}
               deleteAction={deleteAction}
               showSignInDialog={showSignInDialog}
diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css
index 46edc44e1..143b0f78c 100644
--- a/client/coral-embed-stream/style/default.css
+++ b/client/coral-embed-stream/style/default.css
@@ -217,6 +217,10 @@ hr {
   cursor: pointer;
 }
 
+.comment__action-button[disabled] {
+  cursor: inherit;
+}
+
 .comment__action-button--nowrap {
   white-space: nowrap;
 }
diff --git a/client/coral-framework/graphql/mutations/addCommentTag.graphql b/client/coral-framework/graphql/mutations/addCommentTag.graphql
new file mode 100644
index 000000000..27d369775
--- /dev/null
+++ b/client/coral-framework/graphql/mutations/addCommentTag.graphql
@@ -0,0 +1,12 @@
+mutation AddCommentTag ($comment_id: ID!, $tag: String!) {
+  addCommentTag(comment_id:$comment_id, tag:$tag) {
+  	comment {
+	    tags {
+	      name
+	    }
+  	}
+    errors {
+      translation_key
+    }
+  }
+}
diff --git a/client/coral-framework/graphql/mutations/index.js b/client/coral-framework/graphql/mutations/index.js
index 67af2df4a..b65a6a339 100644
--- a/client/coral-framework/graphql/mutations/index.js
+++ b/client/coral-framework/graphql/mutations/index.js
@@ -4,6 +4,8 @@ import POST_FLAG from './postFlag.graphql';
 import POST_LIKE from './postLike.graphql';
 import POST_DONT_AGREE from './postDontAgree.graphql';
 import DELETE_ACTION from './deleteAction.graphql';
+import ADD_COMMENT_TAG from './addCommentTag.graphql';
+import REMOVE_COMMENT_TAG from './removeCommentTag.graphql';
 
 import commentView from '../fragments/commentView.graphql';
 
@@ -122,3 +124,25 @@ export const deleteAction = graphql(DELETE_ACTION, {
       });
     }}),
 });
+
+export const addCommentTag = graphql(ADD_COMMENT_TAG, {
+  props: ({mutate}) => ({
+    addCommentTag: (tag) => {
+      return mutate({
+        variables: {
+          tag
+        }
+      });
+    }}),
+});
+
+export const removeCommentTag = graphql(REMOVE_COMMENT_TAG, {
+  props: ({mutate}) => ({
+    removeCommentTag: (tag) => {
+      return mutate({
+        variables: {
+          tag
+        }
+      });
+    }}),
+});
diff --git a/client/coral-framework/graphql/mutations/removeCommentTag.graphql b/client/coral-framework/graphql/mutations/removeCommentTag.graphql
new file mode 100644
index 000000000..2871a2fae
--- /dev/null
+++ b/client/coral-framework/graphql/mutations/removeCommentTag.graphql
@@ -0,0 +1,12 @@
+mutation RemoveCommentTag ($comment_id: ID!, $tag: String!) {
+  removeCommentTag(comment_id:$comment_id, tag:$tag) {
+  	comment {
+	    tags {
+	      name
+	    }
+  	}
+    errors {
+      translation_key
+    }
+  }
+}
diff --git a/client/coral-plugin-best/BestButton.js b/client/coral-plugin-best/BestButton.js
index 3010db7c6..9af8b1638 100644
--- a/client/coral-plugin-best/BestButton.js
+++ b/client/coral-plugin-best/BestButton.js
@@ -3,6 +3,10 @@ import {I18n} from '../coral-framework';
 import translations from './translations.json';
 import classnames from 'classnames';
 
+// tag string for best comments
+export const BEST_TAG = 'BEST';
+export const commentIsBest = ({tags} = {}) => Array.isArray(tags) && tags.some(t => t === BEST_TAG);
+
 const name = 'coral-plugin-best';
 const lang = new I18n(translations);
 
@@ -21,17 +25,17 @@ export const IfUserCanModifyBest = ({user, children}) => {
  * Button that lets a moderator tag a comment as "Best".
  * Used to recognize really good comments.
  */
-class BestButton extends Component {
+export class BestButton extends Component {
   static propTypes = {
 
     // whether the comment is already tagged as best
     isBest: PropTypes.bool.isRequired,
 
     // set that this comment is best
-    setBestTag: PropTypes.func.isRequired,
+    addBest: PropTypes.func.isRequired,
 
     // remove the best status
-    removeBestTag: PropTypes.func.isRequired,
+    removeBest: PropTypes.func.isRequired,
   }
 
   state = {
@@ -40,18 +44,30 @@ class BestButton extends Component {
 
   constructor(props) {
     super(props);
-    this.onClickSetBest = this.onClickSetBest.bind(this);
-    this.onClickUnsetBest = this.onClickUnsetBest.bind(this);
+    this.onClickAddBest = this.onClickAddBest.bind(this);
+    this.onClickRemoveBest = this.onClickRemoveBest.bind(this);
   }
 
-  onClickSetBest(e) {
+  async onClickAddBest(e) {
     e.preventDefault();
-    this.setState({isBest: true});
+    const {addBest} = this.props;
+    if ( ! addBest) {
+      console.warn('BestButton#onClickAddBest called even though there is no addBest prop. doing nothing');
+      return;
+    }
+    const addBestRet = await addBest();
+    console.log('addBestRet', addBestRet);
   }
 
-  onClickUnsetBest(e) {
+  async onClickRemoveBest(e) {
     e.preventDefault();
-    this.setState({isBest: false});
+    const {removeBest} = this.props;
+    if ( ! removeBest) {
+      console.warn('BestButton#onClickAddBest called even though there is no removeBest prop. doing nothing');
+      return;
+    }
+    const removeBestRet = await removeBest();
+    console.log('removeBestRet', removeBestRet);
   }
 
   render() {
@@ -59,10 +75,12 @@ class BestButton extends Component {
     // @TODO(bengo) Consider adding the comment__action classes to other buttons to add cursor:pointer and never wrap the icons
     // @TODO(bengo) Should I reuse another element like coral-ui button? Just doing what LikeButton does for now
     // Oh. I think that's styled for the admin. Don't use coral-ui button until the whole comment bottom bar does.
-    const {isBest} = this.state;
+    let {isBest} = this.state;
+    const {addBest, removeBest} = this.props;
     return <div className={classnames(`${name}-container`, `${name}-button`, 'comment__action-button--nowrap',
                                       `e2e__${isBest ? 'unset' : 'set'}-best-comment`)}>
-      <button onClick={isBest ? this.onClickUnsetBest : this.onClickSetBest}
+      <button onClick={isBest ? this.onClickRemoveBest : this.onClickAddBest}
+              disabled={ ! (isBest ? removeBest : addBest)}
               className='comment__action-button'>
         <span className={`${name}-button-text`}>{lang.t(isBest ? 'unsetBest' : 'setBest')}</span>
         <i className={`${name}-icon material-icons`} aria-hidden={true}>
@@ -72,5 +90,3 @@ class BestButton extends Component {
     </div>;
   }
 }
-
-export default BestButton;

From 6e338290a1ebeb286221f040fef147b600a013ff Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Tue, 28 Feb 2017 02:31:02 +0800
Subject: [PATCH 043/132] addCommentTag mutation works

---
 .eslintrc.json                                |   1 +
 client/coral-embed-stream/src/Comment.js      |   4 +-
 .../graphql/mutations/addCommentTag.graphql   |  15 +-
 .../graphql/mutations/index.js                |   3 +-
 client/coral-plugin-best/BestButton.js        |  12 +-
 graph/mutators/comment.js                     |  15 +-
 graph/resolvers/root_mutation.js              |   3 +
 graph/typeDefs.graphql                        |  10 +
 models/user.js                                |   3 +-
 package.json                                  |   1 +
 services/comments.js                          |  53 +-
 test/e2e/tests/Moderator/BestCommentTest.js   |  11 +-
 test/graph/mutations/addCommentTag.js         |  42 ++
 test/mocha.opts                               |   1 +
 test/services/comments.js                     |  47 +-
 yarn.lock                                     | 681 +++++++++---------
 16 files changed, 523 insertions(+), 379 deletions(-)
 create mode 100644 test/graph/mutations/addCommentTag.js

diff --git a/.eslintrc.json b/.eslintrc.json
index 34b46b83b..eca2dda1f 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -3,6 +3,7 @@
         "es6": true,
         "node": true
     },
+    "parser": "babel-eslint",
     "extends": "eslint:recommended",
     "rules": {
         "indent": ["error",
diff --git a/client/coral-embed-stream/src/Comment.js b/client/coral-embed-stream/src/Comment.js
index e4ca10743..47fd86cc8 100644
--- a/client/coral-embed-stream/src/Comment.js
+++ b/client/coral-embed-stream/src/Comment.js
@@ -112,11 +112,11 @@ class Comment extends React.Component {
 
     // @TODO(bengo) Would be best to only create these funcs on prop change
     const addBestTag = () => addCommentTag({
-      comment_id: comment.id,
+      id: comment.id,
       tag: BEST_TAG,
     });
     const removeBestTag = () => removeCommentTag({
-      comment_id: comment.id,
+      id: comment.id,
       tag: BEST_TAG,
     });
 
diff --git a/client/coral-framework/graphql/mutations/addCommentTag.graphql b/client/coral-framework/graphql/mutations/addCommentTag.graphql
index 27d369775..5fd63868e 100644
--- a/client/coral-framework/graphql/mutations/addCommentTag.graphql
+++ b/client/coral-framework/graphql/mutations/addCommentTag.graphql
@@ -1,10 +1,11 @@
-mutation AddCommentTag ($comment_id: ID!, $tag: String!) {
-  addCommentTag(comment_id:$comment_id, tag:$tag) {
-  	comment {
-	    tags {
-	      name
-	    }
-  	}
+mutation AddCommentTag ($id: ID!, $tag: String!) {
+  addCommentTag(id:$id, tag:$tag) {
+    comment {
+      id
+      tags {
+        name
+      }
+    }
     errors {
       translation_key
     }
diff --git a/client/coral-framework/graphql/mutations/index.js b/client/coral-framework/graphql/mutations/index.js
index b65a6a339..6f6cdc04b 100644
--- a/client/coral-framework/graphql/mutations/index.js
+++ b/client/coral-framework/graphql/mutations/index.js
@@ -127,9 +127,10 @@ export const deleteAction = graphql(DELETE_ACTION, {
 
 export const addCommentTag = graphql(ADD_COMMENT_TAG, {
   props: ({mutate}) => ({
-    addCommentTag: (tag) => {
+    addCommentTag: ({id, tag}) => {
       return mutate({
         variables: {
+          id,
           tag
         }
       });
diff --git a/client/coral-plugin-best/BestButton.js b/client/coral-plugin-best/BestButton.js
index 9af8b1638..52367c4e0 100644
--- a/client/coral-plugin-best/BestButton.js
+++ b/client/coral-plugin-best/BestButton.js
@@ -5,7 +5,10 @@ import classnames from 'classnames';
 
 // tag string for best comments
 export const BEST_TAG = 'BEST';
-export const commentIsBest = ({tags} = {}) => Array.isArray(tags) && tags.some(t => t === BEST_TAG);
+export const commentIsBest = ({tags} = {}) => {
+  const isBest = Array.isArray(tags) && tags.some(t => t.name === BEST_TAG);
+  return isBest;
+};
 
 const name = 'coral-plugin-best';
 const lang = new I18n(translations);
@@ -38,10 +41,6 @@ export class BestButton extends Component {
     removeBest: PropTypes.func.isRequired,
   }
 
-  state = {
-    best: false
-  }
-
   constructor(props) {
     super(props);
     this.onClickAddBest = this.onClickAddBest.bind(this);
@@ -75,8 +74,7 @@ export class BestButton extends Component {
     // @TODO(bengo) Consider adding the comment__action classes to other buttons to add cursor:pointer and never wrap the icons
     // @TODO(bengo) Should I reuse another element like coral-ui button? Just doing what LikeButton does for now
     // Oh. I think that's styled for the admin. Don't use coral-ui button until the whole comment bottom bar does.
-    let {isBest} = this.state;
-    const {addBest, removeBest} = this.props;
+    const {isBest, addBest, removeBest} = this.props;
     return <div className={classnames(`${name}-container`, `${name}-button`, 'comment__action-button--nowrap',
                                       `e2e__${isBest ? 'unset' : 'set'}-best-comment`)}>
       <button onClick={isBest ? this.onClickRemoveBest : this.onClickAddBest}
diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index 5112ba829..42a02609e 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -187,11 +187,20 @@ const setCommentStatus = ({loaders: {Comments}}, {id, status}) => {
     });
 };
 
+/**
+ * Adds a tag to a Comment
+ */
+const addCommentTag = ({user, loaders: {Comments}}, {id, tag}) => {
+  return CommentsService.addTag(id, tag, user.id)
+    .then(() => CommentsService.findById( id ));
+};
+
 module.exports = (context) => {
   let mutators = {
     Comment: {
       create: () => Promise.reject(errors.ErrNotAuthorized),
-      setCommentStatus: () => Promise.reject(errors.ErrNotAuthorized)
+      setCommentStatus: () => Promise.reject(errors.ErrNotAuthorized),
+      addCommentTag: () => Promise.reject(errors.ErrNotAuthorized),
     }
   };
 
@@ -203,5 +212,9 @@ module.exports = (context) => {
     mutators.Comment.setCommentStatus = (action) => setCommentStatus(context, action);
   }
 
+  if (context.user && context.user.can('mutation:addCommentTag')) {
+    mutators.Comment.addCommentTag = (action) => addCommentTag(context, action);
+  }
+
   return mutators;
 };
diff --git a/graph/resolvers/root_mutation.js b/graph/resolvers/root_mutation.js
index 2462962c6..ac862af88 100644
--- a/graph/resolvers/root_mutation.js
+++ b/graph/resolvers/root_mutation.js
@@ -48,6 +48,9 @@ const RootMutation = {
   },
   setCommentStatus(_, {id, status}, {mutators: {Comment}}) {
     return wrapResponse(null)(Comment.setCommentStatus({id, status}));
+  },
+  addCommentTag(_, {id, tag}, {mutators: {Comment}}) {
+    return wrapResponse('comment')(Comment.addCommentTag({id, tag}));
   }
 };
 
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index fbdeb4279..adb349fe2 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -631,6 +631,13 @@ type SetCommentStatusResponse implements Response {
   errors: [UserError]
 }
 
+# Response to addCommentTag mutation
+type AddCommentTagResponse implements Response {
+  # An array of errors relating to the mutation that occured.
+  comment: Comment
+  errors: [UserError]  
+}
+
 # All mutations for the application are defined on this object.
 type RootMutation {
 
@@ -654,6 +661,9 @@ type RootMutation {
 
   # Sets Comment status. Requires the `ADMIN` role.
   setCommentStatus(id: ID!, status: COMMENT_STATUS!): SetCommentStatusResponse
+
+  # Add tag to comment.
+  addCommentTag(id: ID!, tag: String!): AddCommentTagResponse
 }
 
 ################################################################################
diff --git a/models/user.js b/models/user.js
index d56f030f3..f74d63519 100644
--- a/models/user.js
+++ b/models/user.js
@@ -156,7 +156,8 @@ const USER_GRAPH_OPERATIONS = [
   'mutation:deleteAction',
   'mutation:editName',
   'mutation:setUserStatus',
-  'mutation:setCommentStatus'
+  'mutation:setCommentStatus',
+  'mutation:addCommentTag',
 ];
 
 /**
diff --git a/package.json b/package.json
index 70b0e17b1..7e4c6dfa6 100644
--- a/package.json
+++ b/package.json
@@ -103,6 +103,7 @@
     "babel-preset-es2015": "^6.18.0",
     "babel-preset-stage-0": "^6.16.0",
     "chai": "^3.5.0",
+    "chai-as-promised": "^6.0.0",
     "chai-http": "^3.0.0",
     "copy-webpack-plugin": "^4.0.0",
     "css-loader": "^0.25.0",
diff --git a/services/comments.js b/services/comments.js
index 4dda82b04..91bd814e1 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -4,7 +4,8 @@ const ActionModel = require('../models/action');
 const ActionsService = require('./actions');
 
 const ALLOWED_TAGS = [
-  {name: 'STAFF'}
+  'STAFF',
+  'BEST',
 ];
 
 const STATUSES = [
@@ -44,29 +45,49 @@ module.exports = class CommentsService {
 
   /**
    * Adds a tag if it doesn't already exist on the comment.
+   * @param {String} id the id of the comment to tag
+   * @param {String} name the name of the tag to add
+   * @param {String} assigned_by the user id for the user who added the tag
    */
   static addTag(id, name, assigned_by) {
 
-    if (ALLOWED_TAGS.find((t) => t.name === name) == null) {
+    if (ALLOWED_TAGS.find((t) => t === name) == null) {
       return Promise.reject(new Error('tag not allowed'));
     }
 
-    return CommentModel.update({
+    const filter = {
       id,
-      tags: {
-        $ne: {
-          name
+      tags: {$not: {$elemMatch: {name}}}
+    };
+    const update = {
+      $push: {tags: {
+        name,
+        assigned_by,
+        created_at: new Date()
+      }}
+    };
+    return CommentModel.update(filter, update)
+      .then(({nModified}) => {
+        switch (nModified) {
+        case 0:
+
+            // either the tag was already there, or the comment doesn't exist with that id...
+          return this.findById(id)
+              .then(result => {
+                if ( ! result) {
+                  throw new Error(`Can't add tag to comment. There is no comment with id ${id}`);
+                }
+                throw new Error(`Can't add tag ${name} to comment. Comment already has that tag.`);
+              });
+        case 1:
+
+            // tag added
+          return;
+        default:
+          console.warn('CommentsService#addTag modified multiple comments, but it should only have modified 1. '
+                        + `You may have bad data. Check for multiple comments with id=${id}`);
         }
-      }
-    }, {
-      $push: {
-        tags: {
-          name,
-          assigned_by,
-          created_at: new Date()
-        }
-      }
-    });
+      });
   }
 
   /**
diff --git a/test/e2e/tests/Moderator/BestCommentTest.js b/test/e2e/tests/Moderator/BestCommentTest.js
index f25fd7d93..b4c9e1356 100644
--- a/test/e2e/tests/Moderator/BestCommentTest.js
+++ b/test/e2e/tests/Moderator/BestCommentTest.js
@@ -16,6 +16,7 @@ module.exports = {
 
     const setBestCommentButton = '@setBestButton';
     const unsetBestCommentButton = '@unsetBestButton';
+
     embedStreamPage
       .postComment('Hi everyone. Isn\'t this the BEST comment!?')
       .waitForElementVisible(setBestCommentButton, 2000)
@@ -25,13 +26,9 @@ module.exports = {
       });
 
     // on refresh, it should still be tagged as best :)
-    // client
-    //   .refresh(() => {
-
-    //   })
-    //   .waitForElementVisible(unsetBestCommentButton, 2000)
-
-    // client.pause()
+    client.refresh();
+    client.page.embedStreamPage().ready()
+      .waitForElementVisible('.e2e__unset-best-comment', 2000);
   },
   after: client => {
     client.end();
diff --git a/test/graph/mutations/addCommentTag.js b/test/graph/mutations/addCommentTag.js
new file mode 100644
index 000000000..25576a5f1
--- /dev/null
+++ b/test/graph/mutations/addCommentTag.js
@@ -0,0 +1,42 @@
+const expect = require('chai').expect;
+const {graphql} = require('graphql');
+
+const schema = require('../../../graph/schema');
+const Context = require('../../../graph/context');
+const UserModel = require('../../../models/user');
+const SettingsService = require('../../../services/settings');
+const CommentsService = require('../../../services/comments');
+
+describe('graph.mutations.addCommentTag', () => {
+  let comment;
+  beforeEach(async () => {
+    SettingsService.init();
+    comment = await CommentsService.publicCreate({body: `hello there! ${  String(Math.random()).slice(2)}`});
+  });
+
+  const query = `
+    mutation AddCommentTag ($id: ID!, $tag: String!) {
+      addCommentTag(id:$id, tag:$tag) {
+        comment {
+          tags {
+            name
+          }
+        }
+        errors {
+          translation_key
+        }
+      }
+    }
+  `;
+
+  it('can add tags to comments', async () => {
+    const user = new UserModel({});
+    const context = new Context({user});
+    const response = await graphql(schema, query, {}, context, {id: comment.id, tag: 'BEST'});
+    if (response.errors && response.errors.length) {
+      console.error(response.errors);
+    }
+    expect(response.errors).to.be.empty;
+    expect(response.data.addCommentTag.comment.tags).to.deep.equal([{name: 'BEST'}]);
+  });
+});
diff --git a/test/mocha.opts b/test/mocha.opts
index a159ae7aa..76ca86399 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -2,6 +2,7 @@ test/helpers/*.js
 test
 --compilers js:babel-core/register
 --require ignore-styles
+--require babel-polyfill
 --recursive
 --colors
 --sort
diff --git a/test/services/comments.js b/test/services/comments.js
index 0bab40bfa..525b70c06 100644
--- a/test/services/comments.js
+++ b/test/services/comments.js
@@ -8,7 +8,7 @@ const CommentsService = require('../../services/comments');
 
 const settings = {id: '1', moderation: 'PRE', wordlist: {banned: ['bad words'], suspect: ['suspect words']}};
 
-const expect = require('chai').expect;
+const expect = require('chai').use(require('chai-as-promised')).expect;
 
 describe('services.CommentsService', () => {
   const comments = [{
@@ -68,6 +68,7 @@ describe('services.CommentsService', () => {
   }];
 
   const users = [{
+    id: 'u1',
     email: 'stampi@gmail.com',
     username: 'Stampi',
     password: '1Coral!!'
@@ -218,6 +219,50 @@ describe('services.CommentsService', () => {
 
   });
 
+  describe('#addTag', () => {
+    it('adds a tag', async () => {
+      const commentId = comments[0].id;
+      const tagName = 'BEST';
+      const userId = users[0].id;
+      await CommentsService.addTag(commentId, tagName, userId);
+      const updatedComment = await CommentsService.findById(commentId);
+      expect(updatedComment.tags.length).to.equal(1);
+      expect(updatedComment.tags[0].name).to.equal(tagName);
+      expect(updatedComment.tags[0].assigned_by).to.equal(userId);
+      expect(updatedComment.tags[0].created_at).to.be.an.instanceof(Date);
+    });
+    it('can\'t add a tag to comment id that doesn\'t exist', async () => {
+      const commentId = 'fakenews';
+      const tagName = 'BEST';
+      const userId = users[0].id;
+      await expect(CommentsService.addTag(commentId, tagName, userId)).to.be.rejected;
+    });
+    it('can\'t add same tag.name twice', async () => {
+      const commentId = comments[0].id;
+      const tagName = 'BEST';
+      const userId = users[0].id;
+
+      // first time
+      await CommentsService.addTag(commentId, tagName, userId);
+
+      // second time should fail
+      await expect(CommentsService.addTag(commentId, tagName, userId)).to.be.rejected;
+    });
+  });
+
+  describe('#removeTag', () => {
+    it.skip('removes a tag', async () => {
+      const commentId = comments[0].id;
+      const tagName = 'BEST';
+      await CommentsService.addTag(commentId, tagName, users[0].id);
+      let updatedComment = await CommentsService.findById(commentId);
+      expect(updatedComment.tags.length).to.equal(1);
+
+      // ok now to remove it
+      await CommentsService.removeTag(commentId, tagName);
+    });
+  });
+
   describe('#changeStatus', () => {
 
     it('should change the status of a comment from no status', () => {
diff --git a/yarn.lock b/yarn.lock
index 5413439fa..ac0aaa609 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1,7 +1,5 @@
 # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 # yarn lockfile v1
-
-
 "@kadira/storybook-deployer@^1.1.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@kadira/storybook-deployer/-/storybook-deployer-1.2.0.tgz#1708f5cb37fa08ab4173b1bd99df6f4717dfae12"
@@ -291,14 +289,14 @@ assert@^1.1.1:
   dependencies:
     util "0.10.3"
 
-assertion-error@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.0.tgz#c7f85438fdd466bc7ca16ab90c81513797a5d23b"
-
 assertion-error@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.2.tgz#13ca515d86206da0bac66e834dd397d87581094c"
 
+assertion-error@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.0.tgz#c7f85438fdd466bc7ca16ab90c81513797a5d23b"
+
 ast-traverse@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ast-traverse/-/ast-traverse-0.1.1.tgz#69cf2b8386f19dcda1bb1e05d68fe359d8897de6"
@@ -315,15 +313,11 @@ async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
 
-async@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.2.1.tgz#a4816a17cd5ff516dfa2c7698a453369b9790de0"
-
-async@1.x, async@^1.4.0, async@^1.4.2, async@^1.5.2:
+async@^1.4.0, async@^1.4.2, async@^1.5.2, async@1.x:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
-async@2.1.4, async@^2.1.2, async@^2.1.4:
+async@^2.1.2, async@^2.1.4, async@2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/async/-/async-2.1.4.tgz#2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4"
   dependencies:
@@ -337,6 +331,10 @@ async@~0.9.0:
   version "0.9.2"
   resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
 
+async@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.2.1.tgz#a4816a17cd5ff516dfa2c7698a453369b9790de0"
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -1055,10 +1053,6 @@ babylon@^6.11.0, babylon@^6.13.0, babylon@^6.15.0:
   version "6.15.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.15.0.tgz#ba65cfa1a80e1759b0e89fb562e27dccae70348e"
 
-balanced-match@0.1.0, balanced-match@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.1.0.tgz#b504bd05869b39259dd0c5efc35d843176dccc4a"
-
 balanced-match@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.2.1.tgz#7bc658b4bed61eee424ad74f75f5c3e2c4df3cc7"
@@ -1067,6 +1061,10 @@ balanced-match@^0.4.1, balanced-match@^0.4.2:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
 
+balanced-match@~0.1.0, balanced-match@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.1.0.tgz#b504bd05869b39259dd0c5efc35d843176dccc4a"
+
 base64-js@^1.0.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"
@@ -1075,7 +1073,7 @@ base64-url@1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/base64-url/-/base64-url-1.3.3.tgz#f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f"
 
-base64url@2.0.0, base64url@^2.0.0:
+base64url@^2.0.0, base64url@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/base64url/-/base64url-2.0.0.tgz#eac16e03ea1438eff9423d69baa36262ed1f70bb"
 
@@ -1120,6 +1118,10 @@ block-stream@*:
   dependencies:
     inherits "~2.0.0"
 
+bluebird@^2.10.2:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
+
 bluebird@2.10.2:
   version "2.10.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.10.2.tgz#024a5517295308857f14f91f1106fc3b555f446b"
@@ -1136,10 +1138,6 @@ bluebird@3.4.6:
   version "3.4.6"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.6.tgz#01da8d821d87813d158967e743d5fe6c62cf8c0f"
 
-bluebird@^2.10.2:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
-
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.6"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215"
@@ -1353,6 +1351,12 @@ center-align@^0.1.1:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
+chai-as-promised:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-6.0.0.tgz#1a02a433a6f24dafac63b9c96fa1684db1aa8da6"
+  dependencies:
+    check-error "^1.0.2"
+
 chai-http@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/chai-http/-/chai-http-3.0.0.tgz#5460d8036e1f1a12b0b5b5cbd529e6dc1d31eb4b"
@@ -1378,7 +1382,7 @@ chai@^3.5.0:
     deep-eql "^0.1.3"
     type-detect "^1.0.0"
 
-chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
+chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3, chalk@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   dependencies:
@@ -1408,6 +1412,10 @@ chdir-promise@0.2.1:
     q "1.1.2"
     spots "0.3.0"
 
+check-error@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
+
 check-more-types@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-1.1.0.tgz#3d0e36cbfbe907b3e5ec0a14f6b256086452c216"
@@ -1533,7 +1541,7 @@ cli-cursor@^2.1.0:
   dependencies:
     restore-cursor "^2.0.0"
 
-cli-table@0.3.1, cli-table@^0.3.1:
+cli-table@^0.3.1, cli-table@0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"
   dependencies:
@@ -1617,18 +1625,18 @@ colormin@^1.0.5:
     css-color-names "0.0.4"
     has "^1.0.1"
 
-colors@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
-
-colors@1.1.2, colors@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
-
 colors@~0.6.0-1:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-0.6.2.tgz#2423fe6678ac0c5dae8852e5d0e5be08c997abcc"
 
+colors@~1.1.2, colors@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
+
+colors@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
+
 combined-stream@^1.0.5, combined-stream@~1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
@@ -1641,6 +1649,16 @@ combined-stream@~0.0.4:
   dependencies:
     delayed-stream "0.0.5"
 
+commander@^2.5.0, commander@^2.9.0, commander@2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
+  dependencies:
+    graceful-readlink ">= 1.0.0"
+
+commander@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.1.0.tgz#d121bbae860d9992a3d517ba96f56588e47c6781"
+
 commander@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-0.6.1.tgz#fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"
@@ -1659,16 +1677,6 @@ commander@2.8.x:
   dependencies:
     graceful-readlink ">= 1.0.0"
 
-commander@2.9.0, commander@^2.5.0, commander@^2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
-  dependencies:
-    graceful-readlink ">= 1.0.0"
-
-commander@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.1.0.tgz#d121bbae860d9992a3d517ba96f56588e47c6781"
-
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -1796,7 +1804,7 @@ cookie@0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
 
-cookiejar@2.0.x, cookiejar@^2.0.6:
+cookiejar@^2.0.6, cookiejar@2.0.x:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.0.6.tgz#0abf356ad00d1c5a219d88d44518046dd026acfe"
 
@@ -1821,7 +1829,7 @@ core-js@^2.4.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
 
-core-util-is@1.0.2, core-util-is@~1.0.0:
+core-util-is@~1.0.0, core-util-is@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
@@ -2011,7 +2019,7 @@ csso@~2.3.1:
     clap "^1.0.9"
     source-map "^0.5.3"
 
-cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0":
+"cssom@>= 0.3.0 < 0.4.0", cssom@0.3.x:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
 
@@ -2036,16 +2044,16 @@ cz-conventional-changelog@1.1.5:
   dependencies:
     word-wrap "^1.0.3"
 
-d3-helpers@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/d3-helpers/-/d3-helpers-0.3.0.tgz#4b31dce4a2121a77336384574d893fbed5fb293d"
-
 d@^0.1.1, d@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/d/-/d-0.1.1.tgz#da184c535d18d8ee7ba2aa229b914009fae11309"
   dependencies:
     es5-ext "~0.10.2"
 
+d3-helpers@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/d3-helpers/-/d3-helpers-0.3.0.tgz#4b31dce4a2121a77336384574d893fbed5fb293d"
+
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
@@ -2076,13 +2084,17 @@ date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
 
-debug@*, debug@2, debug@2.6.0, debug@^2.1.1, debug@^2.2.0:
+debug@*, debug@^2.1.1, debug@^2.2.0, debug@2, debug@2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b"
   dependencies:
     ms "0.7.2"
 
-debug@2.2.0, debug@~2.2.0:
+debug@^0.7.2, debug@~0.7.4:
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39"
+
+debug@~2.2.0, debug@2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
   dependencies:
@@ -2094,15 +2106,11 @@ debug@2.3.3:
   dependencies:
     ms "0.7.2"
 
-debug@^0.7.2, debug@~0.7.4:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39"
-
 decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
-deep-eql@0.1.3, deep-eql@^0.1.3:
+deep-eql@^0.1.3, deep-eql@0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-0.1.3.tgz#ef558acab8de25206cd713906d74e56930eb69f2"
   dependencies:
@@ -2168,14 +2176,14 @@ del@^2.0.2:
     pinkie-promise "^2.0.0"
     rimraf "^2.2.8"
 
-delayed-stream@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-0.0.5.tgz#d4b1f43a93e8296dfe02694f4680bc37a313c73f"
-
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
 
+delayed-stream@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-0.0.5.tgz#d4b1f43a93e8296dfe02694f4680bc37a313c73f"
+
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
@@ -2232,7 +2240,7 @@ dns-prefetch-control@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/dns-prefetch-control/-/dns-prefetch-control-0.1.0.tgz#60ddb457774e178f1f9415f0cabb0e85b0b300b2"
 
-doctrine@1.5.0, doctrine@^1.2.2:
+doctrine@^1.2.2, doctrine@1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
   dependencies:
@@ -2243,7 +2251,7 @@ doctypes@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9"
 
-dom-serializer@0, dom-serializer@~0.1.0:
+dom-serializer@~0.1.0, dom-serializer@0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
   dependencies:
@@ -2254,21 +2262,21 @@ domain-browser@^1.1.1:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
 
-domelementtype@1, domelementtype@~1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
-
 domelementtype@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
 
-domhandler@2.3, domhandler@^2.3.0:
+domelementtype@~1.1.1, domelementtype@1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
+
+domhandler@^2.3.0, domhandler@2.3:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.3.0.tgz#2de59a0822d5027fabff6f032c2b25a2a8abe738"
   dependencies:
     domelementtype "1"
 
-domutils@1.5, domutils@1.5.1, domutils@^1.5.1:
+domutils@^1.5.1, domutils@1.5, domutils@1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
   dependencies:
@@ -2352,18 +2360,18 @@ encoding@^0.1.11:
   dependencies:
     iconv-lite "~0.4.13"
 
-end-of-stream@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.0.0.tgz#d4596e702734a93e40e9af864319eabd99ff2f0e"
-  dependencies:
-    once "~1.3.0"
-
 end-of-stream@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.1.0.tgz#e9353258baa9108965efc41cb0ef8ade2f3cfb07"
   dependencies:
     once "~1.3.0"
 
+end-of-stream@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.0.0.tgz#d4596e702734a93e40e9af864319eabd99ff2f0e"
+  dependencies:
+    once "~1.3.0"
+
 enhanced-resolve@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.0.3.tgz#df14c06b5fc5eecade1094c9c5a12b4b3edc0b62"
@@ -2373,14 +2381,14 @@ enhanced-resolve@^3.0.0:
     object-assign "^4.0.1"
     tapable "^0.2.5"
 
-entities@1.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-1.0.0.tgz#b2987aa3821347fcde642b24fdfc9e4fb712bf26"
-
 entities@^1.1.1, entities@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
 
+entities@1.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.0.0.tgz#b2987aa3821347fcde642b24fdfc9e4fb712bf26"
+
 env-rewrite@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/env-rewrite/-/env-rewrite-1.0.2.tgz#3e344a95af1bdaab34a559479b8be3abd0804183"
@@ -2454,14 +2462,14 @@ es6-map@^0.1.3:
     es6-symbol "~3.1.0"
     event-emitter "~0.3.4"
 
-es6-promise@3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.2.1.tgz#ec56233868032909207170c39448e24449dd1fc4"
-
 es6-promise@^3.0.2:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.3.1.tgz#a08cdde84ccdbf34d027a1451bc91d4bcd28a613"
 
+es6-promise@3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.2.1.tgz#ec56233868032909207170c39448e24449dd1fc4"
+
 es6-set@~0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.4.tgz#9516b6761c2964b92ff479456233a247dc707ce8"
@@ -2476,7 +2484,7 @@ es6-shim@^0.35.3:
   version "0.35.3"
   resolved "https://registry.yarnpkg.com/es6-shim/-/es6-shim-0.35.3.tgz#9bfb7363feffff87a6cdb6cd93e405ec3c4b6f26"
 
-es6-symbol@3, es6-symbol@~3.1, es6-symbol@~3.1.0:
+es6-symbol@~3.1, es6-symbol@~3.1.0, es6-symbol@3:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.0.tgz#94481c655e7a7cad82eba832d97d5433496d7ffa"
   dependencies:
@@ -2500,15 +2508,15 @@ escape-regexp-component@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/escape-regexp-component/-/escape-regexp-component-1.0.2.tgz#9c63b6d0b25ff2a88c3adbd18c5b61acc3b9faa2"
 
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5, escape-string-regexp@1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+
 escape-string-regexp@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz#4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1"
 
-escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-
-escodegen@1.x.x, escodegen@^1.6.1:
+escodegen@^1.6.1, escodegen@1.x.x:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
   dependencies:
@@ -2644,14 +2652,14 @@ esprima-fb@~15001.1001.0-dev-harmony-fb:
   version "15001.1001.0-dev-harmony-fb"
   resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz#43beb57ec26e8cf237d3dd8b33e42533577f2659"
 
-esprima@3.x.x, esprima@~3.1.0:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
-
 esprima@^2.6.0, esprima@^2.7.1:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
 
+esprima@~3.1.0, esprima@3.x.x:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+
 esrecurse@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.1.0.tgz#4713b6536adf7f2ac4f327d559e7756bff648220"
@@ -2776,14 +2784,14 @@ express@^4.12.2, express@^4.14.0:
     utils-merge "1.0.0"
     vary "~1.1.0"
 
-extend@3, extend@^3.0.0, extend@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.0.tgz#5a474353b9f3353ddd8176dfd37b91c83a46f1d4"
-
 extend@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extend/-/extend-1.3.0.tgz#d1516fb0ff5624d2ebf9123ea1dac5a1994004f8"
 
+extend@^3.0.0, extend@~3.0.0, extend@3:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.0.tgz#5a474353b9f3353ddd8176dfd37b91c83a46f1d4"
+
 external-editor@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.0.1.tgz#4c597c6c88fa6410e41dbbaa7b1be2336aa31095"
@@ -2952,14 +2960,6 @@ forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
 
-form-data@1.0.0-rc4:
-  version "1.0.0-rc4"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-1.0.0-rc4.tgz#05ac6bc22227b43e4461f488161554699d4f8b5e"
-  dependencies:
-    async "^1.5.2"
-    combined-stream "^1.0.5"
-    mime-types "^2.1.10"
-
 form-data@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-0.2.0.tgz#26f8bc26da6440e299cbdcfb69035c4f77a6e466"
@@ -2976,6 +2976,14 @@ form-data@~2.1.1:
     combined-stream "^1.0.5"
     mime-types "^2.1.12"
 
+form-data@1.0.0-rc4:
+  version "1.0.0-rc4"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-1.0.0-rc4.tgz#05ac6bc22227b43e4461f488161554699d4f8b5e"
+  dependencies:
+    async "^1.5.2"
+    combined-stream "^1.0.5"
+    mime-types "^2.1.10"
+
 formidable@^1.0.17:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.1.1.tgz#96b8886f7c3c3508b932d6bd70c4d3a88f35f1a9"
@@ -3190,6 +3198,37 @@ glob-to-regexp@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
 
+glob@^5.0.15, glob@^5.0.3:
+  version "5.0.15"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "2 || 3"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^6.0.4:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "2 || 3"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.2"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 glob@3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.3.tgz#e313eeb249c7affaa5c475286b0e115b59839467"
@@ -3219,37 +3258,6 @@ glob@7.0.5, glob@7.0.x:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@7.1.1, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.2"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^5.0.15, glob@^5.0.3:
-  version "5.0.15"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^6.0.4:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 globals@^9.0.0, globals@^9.14.0:
   version "9.14.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.14.0.tgz#8859936af0038741263053b39d0e76ca241e4034"
@@ -3591,15 +3599,15 @@ https-proxy-agent@1:
     debug "2"
     extend "3"
 
+iconv-lite@^0.4.13, iconv-lite@^0.4.5, iconv-lite@~0.4.13, iconv-lite@0.4.15:
+  version "0.4.15"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
+
 iconv-lite@0.4.13:
   version "0.4.13"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
 
-iconv-lite@0.4.15, iconv-lite@^0.4.13, iconv-lite@^0.4.5, iconv-lite@~0.4.13:
-  version "0.4.15"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
-
-icss-replace-symbols@1.0.2, icss-replace-symbols@^1.0.2:
+icss-replace-symbols@^1.0.2, icss-replace-symbols@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.0.2.tgz#cb0b6054eb3af6edc9ab1d62d01933e2d4c8bfa5"
 
@@ -3657,7 +3665,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1:
+inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@2, inherits@2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -3676,24 +3684,7 @@ inquirer-confirm@0.2.2:
     bluebird "2.9.24"
     inquirer "0.8.2"
 
-inquirer@0.11.1:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.11.1.tgz#623b6e0c101d2fe9e8e8ed902e651e0519d143e5"
-  dependencies:
-    ansi-escapes "^1.1.0"
-    ansi-regex "^2.0.0"
-    chalk "^1.0.0"
-    cli-cursor "^1.0.1"
-    cli-width "^1.0.1"
-    figures "^1.3.5"
-    lodash "^3.3.1"
-    readline2 "^1.0.1"
-    run-async "^0.1.0"
-    rx-lite "^3.1.2"
-    strip-ansi "^3.0.0"
-    through "^2.3.6"
-
-inquirer@0.12.0, inquirer@^0.12.0:
+inquirer@^0.12.0, inquirer@0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
   dependencies:
@@ -3711,19 +3702,6 @@ inquirer@0.12.0, inquirer@^0.12.0:
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
-inquirer@0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.8.2.tgz#41586548e1c5d9b3f81df7325034baacab6f58ab"
-  dependencies:
-    ansi-regex "^1.1.1"
-    chalk "^1.0.0"
-    cli-width "^1.0.1"
-    figures "^1.3.5"
-    lodash "^3.3.1"
-    readline2 "^0.1.1"
-    rx "^2.4.3"
-    through "^2.3.6"
-
 inquirer@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.0.1.tgz#6dfbffaf4d697dd76c8fe349f919de01c28afc4d"
@@ -3742,6 +3720,36 @@ inquirer@^3.0.1:
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
+inquirer@0.11.1:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.11.1.tgz#623b6e0c101d2fe9e8e8ed902e651e0519d143e5"
+  dependencies:
+    ansi-escapes "^1.1.0"
+    ansi-regex "^2.0.0"
+    chalk "^1.0.0"
+    cli-cursor "^1.0.1"
+    cli-width "^1.0.1"
+    figures "^1.3.5"
+    lodash "^3.3.1"
+    readline2 "^1.0.1"
+    run-async "^0.1.0"
+    rx-lite "^3.1.2"
+    strip-ansi "^3.0.0"
+    through "^2.3.6"
+
+inquirer@0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.8.2.tgz#41586548e1c5d9b3f81df7325034baacab6f58ab"
+  dependencies:
+    ansi-regex "^1.1.1"
+    chalk "^1.0.0"
+    cli-width "^1.0.1"
+    figures "^1.3.5"
+    lodash "^3.3.1"
+    readline2 "^0.1.1"
+    rx "^2.4.3"
+    through "^2.3.6"
+
 interpret@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.1.tgz#d579fb7f693b858004947af39fa0db49f795602c"
@@ -3989,14 +3997,14 @@ is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
 
+isarray@^1.0.0, isarray@~1.0.0, isarray@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
 
-isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-
 isemail@1.x.x:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/isemail/-/isemail-1.2.0.tgz#be03df8cc3e29de4d2c5df6501263f1fa4595e9a"
@@ -4137,7 +4145,7 @@ js-tokens@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
 
-js-yaml@3.x, js-yaml@^3.4.3, js-yaml@^3.5.1, js-yaml@^3.7.0, js-yaml@~3.7.0:
+js-yaml@^3.4.3, js-yaml@^3.5.1, js-yaml@^3.7.0, js-yaml@~3.7.0, js-yaml@3.x:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
   dependencies:
@@ -4405,7 +4413,7 @@ loader-runner@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
 
-loader-utils@0.2.x, loader-utils@^0.2.11, loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@^0.2.7, loader-utils@~0.2.2:
+loader-utils@^0.2.11, loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@^0.2.7, loader-utils@~0.2.2, loader-utils@0.2.x:
   version "0.2.16"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d"
   dependencies:
@@ -4525,7 +4533,7 @@ lodash.cond@^4.3.0:
   version "4.5.2"
   resolved "https://registry.yarnpkg.com/lodash.cond/-/lodash.cond-4.5.2.tgz#f471a1da486be60f6ab955d17115523dd1d255d5"
 
-lodash.create@3.1.1, lodash.create@^3.1.1:
+lodash.create@^3.1.1, lodash.create@3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/lodash.create/-/lodash.create-3.1.1.tgz#d7f2849f0dbda7e04682bb8cd72ab022461debe7"
   dependencies:
@@ -4618,7 +4626,7 @@ lodash.pickby@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.pickby/-/lodash.pickby-4.6.0.tgz#7dea21d8c18d7703a27c704c15d3b84a67e33aff"
 
-lodash.reduce@4.6.0, lodash.reduce@^4.4.0:
+lodash.reduce@^4.4.0, lodash.reduce@4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b"
 
@@ -4644,18 +4652,18 @@ lodash.words@^3.0.0:
   dependencies:
     lodash._root "^3.0.0"
 
-lodash@3.10.1, lodash@^3.3.1:
+lodash@^3.3.1, lodash@3.10.1:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
-lodash@3.9.3:
-  version "3.9.3"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.9.3.tgz#0159e86832feffc6d61d852b12a953b99496bd32"
-
 lodash@^4.0.0, lodash@^4.1.0, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.6, lodash@^4.17.2, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
+lodash@3.9.3:
+  version "3.9.3"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.9.3.tgz#0159e86832feffc6d61d852b12a953b99496bd32"
+
 log4js@*:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-1.1.0.tgz#c7d2b616d91bbf47cc65fb79d6fe04581c8096fa"
@@ -4678,7 +4686,7 @@ lowercase-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
 
-lru-cache@2, lru-cache@^2.5.0:
+lru-cache@^2.5.0, lru-cache@2:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
 
@@ -4759,7 +4767,7 @@ metascraper@^1.0.6:
     popsicle "^6.2.0"
     to-title-case "^1.0.0"
 
-methods@1.x, methods@^1.1.1, methods@^1.1.2, methods@~1.1.2:
+methods@^1.1.1, methods@^1.1.2, methods@~1.1.2, methods@1.x:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
 
@@ -4808,7 +4816,7 @@ mime-types@~2.0.3:
   dependencies:
     mime-db "~1.12.0"
 
-mime@1.3.4, mime@^1.3.4:
+mime@^1.3.4, mime@1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
 
@@ -4820,7 +4828,7 @@ minimalistic-assert@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
 
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3:
+minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, "minimatch@2 || 3":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
   dependencies:
@@ -4833,7 +4841,11 @@ minimatch@~0.2.11, minimatch@~0.2.14:
     lru-cache "2"
     sigmund "~1.0.0"
 
-minimist@0.0.8, minimist@~0.0.1:
+minimist@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+
+minimist@~0.0.1, minimist@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
@@ -4841,9 +4853,11 @@ minimist@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.1.0.tgz#cdf225e8898f840a258ded44fc91776770afdc93"
 
-minimist@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+mkdirp@^0.5.0, mkdirp@^0.5.1, "mkdirp@>=0.5 0", mkdirp@~0.5.0, mkdirp@~0.5.1, mkdirp@0.5.1, mkdirp@0.5.x:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  dependencies:
+    minimist "0.0.8"
 
 mkdirp@0.3.0:
   version "0.3.0"
@@ -4855,12 +4869,6 @@ mkdirp@0.5.0:
   dependencies:
     minimist "0.0.8"
 
-mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  dependencies:
-    minimist "0.0.8"
-
 mkpath@>=0.1.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/mkpath/-/mkpath-1.0.0.tgz#ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"
@@ -4905,6 +4913,10 @@ mocha@^3.1.2:
     mkdirp "0.5.1"
     supports-color "3.1.2"
 
+moment@^2.10.3, moment@2.x.x:
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.17.1.tgz#fed9506063f36b10f066c8b59a144d7faebe1d82"
+
 moment@2.12.0:
   version "2.12.0"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.12.0.tgz#dc2560d19838d6c0731b1a6afa04675264d360d6"
@@ -4913,10 +4925,6 @@ moment@2.17.0:
   version "2.17.0"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.17.0.tgz#a4c292e02aac5ddefb29a6eed24f51938dd3b74f"
 
-moment@2.x.x, moment@^2.10.3:
-  version "2.17.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.17.1.tgz#fed9506063f36b10f066c8b59a144d7faebe1d82"
-
 mongodb-core@2.1.7:
   version "2.1.7"
   resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-2.1.7.tgz#6a27909b98142ef2508d924c274969008954fa29"
@@ -4976,14 +4984,14 @@ mquery@2.2.1:
     regexp-clone "0.0.1"
     sliced "0.0.5"
 
+ms@^0.7.1, ms@0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
+
 ms@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
 
-ms@0.7.2, ms@^0.7.1:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
-
 muri@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/muri/-/muri-1.2.0.tgz#b86383c902920b09ebe62af0e75c94de5f33cd3d"
@@ -5000,7 +5008,7 @@ mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
-nan@2.3.5, nan@^2.3.0:
+nan@^2.3.0, nan@2.3.5:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.3.5.tgz#822a0dc266290ce4cd3a12282ca3e7e364668a08"
 
@@ -5197,18 +5205,18 @@ nodemon@^1.11.0:
     undefsafe "0.0.3"
     update-notifier "0.5.0"
 
-nopt@3.x, nopt@~3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
-  dependencies:
-    abbrev "1"
-
 nopt@~1.0.10:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
   dependencies:
     abbrev "1"
 
+nopt@~3.0.6, nopt@3.x:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  dependencies:
+    abbrev "1"
+
 normalize-package-data@^2.3.2:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.5.tgz#8d924f142960e1777e7ffe170543631cc7cb02df"
@@ -5351,7 +5359,7 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
-optimist@0.6.1, optimist@>=0.3.5, optimist@^0.6.1:
+optimist@^0.6.1, optimist@>=0.3.5, optimist@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
   dependencies:
@@ -5527,16 +5535,16 @@ path-parse@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
 
-path-to-regexp@0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-
 path-to-regexp@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
   dependencies:
     isarray "0.0.1"
 
+path-to-regexp@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+
 path-type@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
@@ -5842,33 +5850,33 @@ postcss-mixins@^2.1.0:
     postcss "^5.0.10"
     postcss-simple-vars "^1.0.1"
 
-postcss-modules-extract-imports@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.0.0.tgz#5b07f368e350cda6fd5c8844b79123a7bd3e37be"
-  dependencies:
-    postcss "^5.0.4"
-
 postcss-modules-extract-imports@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.0.1.tgz#8fb3fef9a6dd0420d3f6d4353cf1ff73f2b2a341"
   dependencies:
     postcss "^5.0.4"
 
-postcss-modules-local-by-default@1.1.1, postcss-modules-local-by-default@^1.0.1:
+postcss-modules-extract-imports@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.0.0.tgz#5b07f368e350cda6fd5c8844b79123a7bd3e37be"
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-modules-local-by-default@^1.0.1, postcss-modules-local-by-default@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.1.1.tgz#29a10673fa37d19251265ca2ba3150d9040eb4ce"
   dependencies:
     css-selector-tokenizer "^0.6.0"
     postcss "^5.0.4"
 
-postcss-modules-scope@1.0.2, postcss-modules-scope@^1.0.0:
+postcss-modules-scope@^1.0.0, postcss-modules-scope@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.0.2.tgz#ff977395e5e06202d7362290b88b1e8cd049de29"
   dependencies:
     css-selector-tokenizer "^0.6.0"
     postcss "^5.0.4"
 
-postcss-modules-values@1.2.2, postcss-modules-values@^1.1.0:
+postcss-modules-values@^1.1.0, postcss-modules-values@1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.2.2.tgz#f0e7d476fe1ed88c5e4c7f97533a3e772ad94ca1"
   dependencies:
@@ -6034,14 +6042,6 @@ postcss-zindex@^2.0.1:
     postcss "^5.0.4"
     uniqs "^2.0.0"
 
-postcss@5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.1.2.tgz#bd84886a66bcad489afaf7c673eed5ef639551e2"
-  dependencies:
-    js-base64 "^2.1.9"
-    source-map "^0.5.6"
-    supports-color "^3.1.2"
-
 postcss@^5.0.0, postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.19, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.1.2, postcss@^5.2.11, postcss@^5.2.4, postcss@^5.2.5, postcss@^5.2.9:
   version "5.2.11"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.11.tgz#ff29bcd6d2efb98bfe08a022055ec599bbe7b761"
@@ -6051,6 +6051,14 @@ postcss@^5.0.0, postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.
     source-map "^0.5.6"
     supports-color "^3.2.3"
 
+postcss@5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.1.2.tgz#bd84886a66bcad489afaf7c673eed5ef639551e2"
+  dependencies:
+    js-base64 "^2.1.9"
+    source-map "^0.5.6"
+    supports-color "^3.1.2"
+
 pre-git@^3.10.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/pre-git/-/pre-git-3.12.0.tgz#8291899a15ba86f9cdaa8ca180e47096deff8dc3"
@@ -6115,7 +6123,7 @@ process@^0.11.0:
   version "0.11.9"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.9.tgz#7bd5ad21aa6253e7da8682264f1e11d11c0318c1"
 
-progress@1.1.8, progress@^1.1.8:
+progress@^1.1.8, progress@1.1.8:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
 
@@ -6268,18 +6276,22 @@ pug@^2.0.0-beta3:
     pug-runtime "^2.0.3"
     pug-strip-comments "^1.0.2"
 
+punycode@^1.2.4, punycode@^1.4.1, punycode@1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+
 punycode@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
 
-punycode@1.4.1, punycode@^1.2.4, punycode@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-
 pym.js@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/pym.js/-/pym.js-1.1.1.tgz#3b5eb9e8499e5c95e5cb8fe29888ea7edf10a507"
 
+q@^1.1.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
+
 q@1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/q/-/q-1.1.2.tgz#6357e291206701d99f197ab84e57e8ad196f2a89"
@@ -6292,15 +6304,7 @@ q@2.0.3:
     pop-iterate "^1.0.1"
     weak-map "^1.0.5"
 
-q@^1.1.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
-
-qs@6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.0.tgz#3b7848c03c2dece69a9522b0fae8c4126d745f3b"
-
-qs@6.2.1, qs@^6.1.0, qs@^6.2.0:
+qs@^6.1.0, qs@^6.2.0, qs@6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.1.tgz#ce03c5ff0935bc1d9d69a9f14cbd18e568d67625"
 
@@ -6308,6 +6312,10 @@ qs@~6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442"
 
+qs@6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.0.tgz#3b7848c03c2dece69a9522b0fae8c4126d745f3b"
+
 query-string@^4.1.0, query-string@^4.2.2:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.1.tgz#54baada6713eafc92be75c47a731f2ebd09cd11d"
@@ -6327,14 +6335,14 @@ quote@0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/quote/-/quote-0.4.0.tgz#10839217f6c1362b89194044d29b233fd7f32f01"
 
-ramda@0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.9.1.tgz#cc914dc3a82c608d003090203787c3f6826c1d87"
-
 ramda@^0.22.1:
   version "0.22.1"
   resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.22.1.tgz#031da0c3df417c5b33c96234757eb37033f36a0e"
 
+ramda@0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.9.1.tgz#cc914dc3a82c608d003090203787c3f6826c1d87"
+
 random-bytes@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/random-bytes/-/random-bytes-1.0.0.tgz#4f68a1dc0ae58bd3fb95848c30324db75d64360b"
@@ -6390,7 +6398,7 @@ react-apollo@^0.10.0:
   optionalDependencies:
     react-dom "0.14.x || 15.* || ^15.0.0"
 
-"react-dom@0.14.x || 15.* || ^15.0.0", react-dom@15.3.2, react-dom@^15.3.1:
+react-dom@^15.3.1, "react-dom@0.14.x || 15.* || ^15.0.0", react-dom@15.3.2:
   version "15.3.2"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.3.2.tgz#c46b0aa5380d7b838e7a59c4a7beff2ed315531f"
 
@@ -6452,7 +6460,7 @@ react-tagsinput@^3.14.0:
   version "3.14.0"
   resolved "https://registry.yarnpkg.com/react-tagsinput/-/react-tagsinput-3.14.0.tgz#6729f8d5b313ed8fbb35496205ec2a97654af6bc"
 
-react@15.3.2, react@^15.3.1:
+react@^15.3.1, react@15.3.2:
   version "15.3.2"
   resolved "https://registry.yarnpkg.com/react/-/react-15.3.2.tgz#a7bccd2fee8af126b0317e222c28d1d54528d09e"
   dependencies:
@@ -6488,7 +6496,7 @@ read-pkg@^1.0.0:
     normalize-package-data "^2.3.2"
     path-type "^1.0.0"
 
-readable-stream@1.1, readable-stream@1.1.x, readable-stream@^1.1.7:
+readable-stream@^1.1.7, readable-stream@1.1, readable-stream@1.1.x:
   version "1.1.13"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.13.tgz#f6eef764f514c89e2b9e23146a75ba106756d23e"
   dependencies:
@@ -6497,7 +6505,7 @@ readable-stream@1.1, readable-stream@1.1.x, readable-stream@^1.1.7:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@2, readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.0, readable-stream@^2.2.2:
+readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.0, readable-stream@^2.2.2, readable-stream@2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"
   dependencies:
@@ -6509,7 +6517,7 @@ readable-stream@2, readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13",
     string_decoder "~0.10.x"
     util-deprecate "~1.0.1"
 
-readable-stream@2.1.5, readable-stream@^2.0.5, readable-stream@~2.1.4:
+readable-stream@^2.0.5, readable-stream@~2.1.4, readable-stream@2.1.5:
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0"
   dependencies:
@@ -6545,15 +6553,6 @@ readline2@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     mute-stream "0.0.5"
 
-recast@0.10.33:
-  version "0.10.33"
-  resolved "https://registry.yarnpkg.com/recast/-/recast-0.10.33.tgz#942808f7aa016f1fa7142c461d7e5704aaa8d697"
-  dependencies:
-    ast-types "0.8.12"
-    esprima-fb "~15001.1001.0-dev-harmony-fb"
-    private "~0.1.5"
-    source-map "~0.5.0"
-
 recast@^0.11.17:
   version "0.11.20"
   resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.20.tgz#2cb9bec269c03b36d0598118a936cd0a293ca3f3"
@@ -6563,6 +6562,15 @@ recast@^0.11.17:
     private "~0.1.5"
     source-map "~0.5.0"
 
+recast@0.10.33:
+  version "0.10.33"
+  resolved "https://registry.yarnpkg.com/recast/-/recast-0.10.33.tgz#942808f7aa016f1fa7142c461d7e5704aaa8d697"
+  dependencies:
+    ast-types "0.8.12"
+    esprima-fb "~15001.1001.0-dev-harmony-fb"
+    private "~0.1.5"
+    source-map "~0.5.0"
+
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
@@ -6726,7 +6734,7 @@ repeating@^2.0.0:
   dependencies:
     is-finite "^1.0.0"
 
-request@2.79.0, request@^2.55.0, request@^2.74.0, request@^2.79.0:
+request@^2.55.0, request@^2.74.0, request@^2.79.0, request@2.79.0:
   version "2.79.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
   dependencies:
@@ -6751,6 +6759,13 @@ request@2.79.0, request@^2.55.0, request@^2.74.0, request@^2.79.0:
     tunnel-agent "~0.4.1"
     uuid "^3.0.0"
 
+require_optional@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/require_optional/-/require_optional-1.0.0.tgz#52a86137a849728eb60a55533617f8f914f59abf"
+  dependencies:
+    resolve-from "^2.0.0"
+    semver "^5.1.0"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -6774,13 +6789,6 @@ require-uncached@^1.0.2:
     caller-path "^0.1.0"
     resolve-from "^1.0.0"
 
-require_optional@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/require_optional/-/require_optional-1.0.0.tgz#52a86137a849728eb60a55533617f8f914f59abf"
-  dependencies:
-    resolve-from "^2.0.0"
-    semver "^5.1.0"
-
 resolve-from@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
@@ -6817,7 +6825,7 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@~2.5.1, rimraf@~2.5.4:
+rimraf@^2.2.8, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@~2.5.1, rimraf@~2.5.4, rimraf@2:
   version "2.5.4"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04"
   dependencies:
@@ -6859,14 +6867,14 @@ safe-buffer@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
 
-sax@0.5.x:
-  version "0.5.8"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
-
 sax@^1.1.4, sax@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a"
 
+sax@0.5.x:
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
+
 selenium-standalone@^5.11.2:
   version "5.11.2"
   resolved "https://registry.yarnpkg.com/selenium-standalone/-/selenium-standalone-5.11.2.tgz#724ccaa72fb26f3711e0e20989e478c4133df844"
@@ -6893,18 +6901,18 @@ semver-regex@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-1.0.0.tgz#92a4969065f9c70c694753d55248fc68f8f652c9"
 
-"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@~5.3.0:
+semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@~5.3.0, "semver@2 || 3 || 4 || 5":
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
 
-semver@5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.1.0.tgz#85f2cf8550465c4df000cf7d86f6b054106ab9e5"
-
 semver@~5.0.1:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.0.3.tgz#77466de589cd5d3c95f138aa78bc569a3cb5d27a"
 
+semver@5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.1.0.tgz#85f2cf8550465c4df000cf7d86f6b054106ab9e5"
+
 send@0.14.2:
   version "0.14.2"
   resolved "https://registry.yarnpkg.com/send/-/send-0.14.2.tgz#39b0438b3f510be5dc6f667a11f71689368cdeef"
@@ -6954,10 +6962,6 @@ sha.js@^2.3.6:
   dependencies:
     inherits "^2.0.1"
 
-shelljs@0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.6.0.tgz#ce1ed837b4b0e55b5ec3dab84251ab9dbdc0c7ec"
-
 shelljs@^0.7.0, shelljs@^0.7.5:
   version "0.7.6"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.6.tgz#379cccfb56b91c8601e4793356eb5382924de9ad"
@@ -6966,6 +6970,10 @@ shelljs@^0.7.0, shelljs@^0.7.5:
     interpret "^1.0.0"
     rechoir "^0.6.2"
 
+shelljs@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.6.0.tgz#ce1ed837b4b0e55b5ec3dab84251ab9dbdc0c7ec"
+
 sigmund@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
@@ -7040,7 +7048,7 @@ socks-proxy-agent@2:
     extend "3"
     socks "~1.1.5"
 
-socks@1.1.9, socks@~1.1.5:
+socks@~1.1.5, socks@1.1.9:
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/socks/-/socks-1.1.9.tgz#628d7e4d04912435445ac0b6e459376cb3e6d691"
   dependencies:
@@ -7063,13 +7071,7 @@ source-map-support@^0.4.2:
   dependencies:
     source-map "^0.5.3"
 
-source-map@0.1.x:
-  version "0.1.43"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
-  dependencies:
-    amdefine ">=0.0.4"
-
-source-map@0.4.x, source-map@^0.4.4:
+source-map@^0.4.4, source-map@0.4.x:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   dependencies:
@@ -7085,6 +7087,12 @@ source-map@~0.2.0:
   dependencies:
     amdefine ">=0.0.4"
 
+source-map@0.1.x:
+  version "0.1.43"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
+  dependencies:
+    amdefine ">=0.0.4"
+
 spdx-correct@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
@@ -7185,6 +7193,10 @@ strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
 
+string_decoder@^0.10.25, string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+
 string-hash@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string-hash/-/string-hash-1.1.1.tgz#8e85bed291e0763b8f6809d9c3368fea048db3dc"
@@ -7210,10 +7222,6 @@ string-width@^2.0.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^3.0.0"
 
-string_decoder@^0.10.25, string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-
 stringmap@~0.2.2:
   version "0.2.2"
   resolved "http://registry.npmjs.org/stringmap/-/stringmap-0.2.2.tgz#556c137b258f942b8776f5b2ef582aa069d7d1b1"
@@ -7262,7 +7270,7 @@ style-loader@^0.13.1:
   dependencies:
     loader-utils "^0.2.7"
 
-stylus@0.54.5, stylus@~0.54.5:
+stylus@~0.54.5, stylus@0.54.5:
   version "0.54.5"
   resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79"
   dependencies:
@@ -7301,16 +7309,6 @@ supertest@^2.0.1:
     methods "1.x"
     superagent "^2.0.0"
 
-supports-color@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-1.2.0.tgz#ff1ed1e61169d06b3cf2d588e188b18d8847e17e"
-
-supports-color@3.1.2, supports-color@^3.1.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
-  dependencies:
-    has-flag "^1.0.0"
-
 supports-color@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a"
@@ -7319,12 +7317,22 @@ supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
+supports-color@^3.1.0, supports-color@3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
+  dependencies:
+    has-flag "^1.0.0"
+
 supports-color@^3.1.2, supports-color@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
   dependencies:
     has-flag "^1.0.0"
 
+supports-color@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-1.2.0.tgz#ff1ed1e61169d06b3cf2d588e188b18d8847e17e"
+
 svgo@^0.7.0:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
@@ -7412,7 +7420,7 @@ text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
-through@2, through@^2.3.6, through@~2.3, through@~2.3.1, through@~2.3.8:
+through@^2.3.6, through@~2.3, through@~2.3.1, through@~2.3.8, through@2:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
@@ -7549,14 +7557,14 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
-type-detect@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-0.1.1.tgz#0ba5ec2a885640e470ea4e8505971900dac58822"
-
 type-detect@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2"
 
+type-detect@0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-0.1.1.tgz#0ba5ec2a885640e470ea4e8505971900dac58822"
+
 type-is@~1.6.14:
   version "1.6.14"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.14.tgz#e219639c17ded1ca0789092dd54a03826b817cb2"
@@ -7593,7 +7601,7 @@ uid-number@~0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
 
-uid-safe@2.1.3, uid-safe@~2.1.3:
+uid-safe@~2.1.3, uid-safe@2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/uid-safe/-/uid-safe-2.1.3.tgz#077e264a00b3187936b270bb7376a26473631071"
   dependencies:
@@ -7630,7 +7638,7 @@ uniqs@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
 
-unpipe@1.0.0, unpipe@~1.0.0:
+unpipe@~1.0.0, unpipe@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
 
@@ -7667,7 +7675,7 @@ util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
-util@0.10.3, util@^0.10.3:
+util@^0.10.3, util@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
   dependencies:
@@ -7787,7 +7795,7 @@ whatwg-encoding@^1.0.1:
   dependencies:
     iconv-lite "0.4.13"
 
-whatwg-fetch@>=0.10.0, whatwg-fetch@^2.0.0:
+whatwg-fetch@^2.0.0, whatwg-fetch@>=0.10.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.2.tgz#fe294d1d89e36c5be8b3195057f2e4bc74fc980e"
 
@@ -7812,28 +7820,24 @@ which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
 
-which@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.1.1.tgz#9ce512459946166e12c083f08ec073380fc8cbbb"
-  dependencies:
-    is-absolute "^0.1.7"
-
 which@^1.1.1:
   version "1.2.12"
   resolved "https://registry.yarnpkg.com/which/-/which-1.2.12.tgz#de67b5e450269f194909ef23ece4ebe416fa1192"
   dependencies:
     isexe "^1.1.1"
 
+which@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.1.1.tgz#9ce512459946166e12c083f08ec073380fc8cbbb"
+  dependencies:
+    is-absolute "^0.1.7"
+
 wide-align@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.0.tgz#40edde802a71fea1f070da3e62dcda2e7add96ad"
   dependencies:
     string-width "^1.0.1"
 
-window-size@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
-
 window-size@^0.1.2:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"
@@ -7842,6 +7846,10 @@ window-size@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075"
 
+window-size@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
+
 with@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/with/-/with-5.1.1.tgz#fa4daa92daf32c4ea94ed453c81f04686b575dfe"
@@ -7849,14 +7857,10 @@ with@^5.0.0:
     acorn "^3.1.0"
     acorn-globals "^3.0.0"
 
-word-wrap@1.1.0, word-wrap@^1.0.3:
+word-wrap@^1.0.3, word-wrap@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.1.0.tgz#356153d61d10610d600785c5d701288e0ae764a6"
 
-wordwrap@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
-
 wordwrap@^1.0.0, wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
@@ -7865,6 +7869,10 @@ wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
 
+wordwrap@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
@@ -8022,3 +8030,4 @@ yauzl@^2.5.0:
   dependencies:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.0.1"
+

From 1bb20923a2d0fbc21e1f2e794c1a629b335b50e4 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Tue, 28 Feb 2017 13:49:57 +0800
Subject: [PATCH 044/132] Fix Commenter/BestCommentTest to postComment before
 checking things.

---
 test/e2e/tests/Commenter/BestCommentTest.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/e2e/tests/Commenter/BestCommentTest.js b/test/e2e/tests/Commenter/BestCommentTest.js
index f5747bd6e..765ef070f 100644
--- a/test/e2e/tests/Commenter/BestCommentTest.js
+++ b/test/e2e/tests/Commenter/BestCommentTest.js
@@ -15,8 +15,8 @@ module.exports = {
     const embedStreamPage = client.page.embedStreamPage();
 
     embedStreamPage
-      .likeComment()
-      .waitForElementVisible('@likesCount', 2000)
+      .postComment('Hi everyone. Isn\'t this the BEST comment!?')
+      .waitForElementVisible('@likeButton')
       .expect.element('@setBestButton').to.not.be.present;
   },
   after: client => {

From 4ff6bce8ec7e13e58539df07fe7bacbe6ca10801 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Tue, 28 Feb 2017 14:49:51 +0800
Subject: [PATCH 045/132] Add ComentsService#removeTag

---
 services/comments.js      | 40 ++++++++++++++++++++++++++++++++++++++-
 test/services/comments.js | 18 ++++++++++++++++--
 2 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/services/comments.js b/services/comments.js
index 91bd814e1..7820106ed 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -45,6 +45,8 @@ module.exports = class CommentsService {
 
   /**
    * Adds a tag if it doesn't already exist on the comment.
+   * @throws if tag is already added to the comment
+   * @throws if tag name is not in ALLOWED_TAGS
    * @param {String} id the id of the comment to tag
    * @param {String} name the name of the tag to add
    * @param {String} assigned_by the user id for the user who added the tag
@@ -85,7 +87,43 @@ module.exports = class CommentsService {
           return;
         default:
           console.warn('CommentsService#addTag modified multiple comments, but it should only have modified 1. '
-                        + `You may have bad data. Check for multiple comments with id=${id}`);
+                      + `You may have bad data. Check for multiple comments with id=${id}`);
+        }
+      });
+  }
+
+  /**
+   * Removes a tag from a comment
+   * @throws if the tag is not on the comment
+   * @param {String} id the id of the comment to tag
+   * @param {String} name the name of the tag to add
+   */
+  static removeTag(id, name) {
+    const filter = {
+      id,
+      tags: {$elemMatch: {name}}
+    };
+    const update = {$pull: {tags: {name}}};
+    return CommentModel.update(filter, update)
+      .then(({nModified}) => {
+        switch (nModified) {
+        case 0:
+
+            // either the tag was already there, or the comment doesn't exist with that id...
+          return this.findById(id)
+              .then(result => {
+                if ( ! result) {
+                  throw new Error(`Can't remove tag from comment. There is no comment with id ${id}`);
+                }
+                throw new Error(`Can't remove tag ${name} from comment. Comment doesn't have that tag.`);
+              });
+        case 1:
+
+            // tag removed
+          return;
+        default:
+          console.warn('CommentsService#removeTag modified multiple comments, but it should only have modified 1. '
+                      + `You may have bad data. Check for multiple comments with id=${id}`);
         }
       });
   }
diff --git a/test/services/comments.js b/test/services/comments.js
index 525b70c06..782c00560 100644
--- a/test/services/comments.js
+++ b/test/services/comments.js
@@ -251,15 +251,29 @@ describe('services.CommentsService', () => {
   });
 
   describe('#removeTag', () => {
-    it.skip('removes a tag', async () => {
+    it('removes a tag', async () => {
       const commentId = comments[0].id;
       const tagName = 'BEST';
       await CommentsService.addTag(commentId, tagName, users[0].id);
-      let updatedComment = await CommentsService.findById(commentId);
+      const updatedComment = await CommentsService.findById(commentId);
       expect(updatedComment.tags.length).to.equal(1);
 
       // ok now to remove it
       await CommentsService.removeTag(commentId, tagName);
+      const updatedComment2 = await CommentsService.findById(commentId);
+      expect(updatedComment2.tags.length).to.equal(0);
+    });
+    it('throws if removing a tag that isn\'t there', async () => {
+      const commentId = comments[0].id;
+
+      // just make sure it has no tags to start
+      const updatedComment2 = await CommentsService.findById(commentId);
+      expect(updatedComment2.tags.length).to.equal(0);
+
+      const tagName = 'BEST';
+
+      // ok now to remove it
+      await expect(CommentsService.removeTag(commentId, tagName)).to.be.rejected;
     });
   });
 

From 30ee80b12c28c11f5268ee6d2a52f7c1e2cddb79 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Tue, 28 Feb 2017 15:02:02 +0800
Subject: [PATCH 046/132] basic working removeCommentTag mutation

---
 graph/mutators/comment.js                | 17 +++++++++
 graph/resolvers/root_mutation.js         |  5 ++-
 graph/typeDefs.graphql                   | 10 ++++++
 models/user.js                           |  1 +
 test/graph/mutations/removeCommentTag.js | 45 ++++++++++++++++++++++++
 5 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 test/graph/mutations/removeCommentTag.js

diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index 42a02609e..c9b3b0ab0 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -189,18 +189,31 @@ const setCommentStatus = ({loaders: {Comments}}, {id, status}) => {
 
 /**
  * Adds a tag to a Comment
+ * @param {String} id          identifier of the comment  (uuid)
+ * @param {String} tag     name of the tag
  */
 const addCommentTag = ({user, loaders: {Comments}}, {id, tag}) => {
   return CommentsService.addTag(id, tag, user.id)
     .then(() => CommentsService.findById( id ));
 };
 
+/**
+ * Removes a tag from a Comment
+ * @param {String} id          identifier of the comment  (uuid)
+ * @param {String} tag     name of the tag
+ */
+const removeCommentTag = ({user, loaders: {Comments}}, {id, tag}) => {
+  return CommentsService.removeTag(id, tag)
+    .then(() => CommentsService.findById( id ));
+};
+
 module.exports = (context) => {
   let mutators = {
     Comment: {
       create: () => Promise.reject(errors.ErrNotAuthorized),
       setCommentStatus: () => Promise.reject(errors.ErrNotAuthorized),
       addCommentTag: () => Promise.reject(errors.ErrNotAuthorized),
+      removeCommentTag: () => Promise.reject(errors.ErrNotAuthorized),
     }
   };
 
@@ -216,5 +229,9 @@ module.exports = (context) => {
     mutators.Comment.addCommentTag = (action) => addCommentTag(context, action);
   }
 
+  if (context.user && context.user.can('mutation:removeCommentTag')) {
+    mutators.Comment.removeCommentTag = (action) => removeCommentTag(context, action);
+  }
+
   return mutators;
 };
diff --git a/graph/resolvers/root_mutation.js b/graph/resolvers/root_mutation.js
index ac862af88..61c4367c1 100644
--- a/graph/resolvers/root_mutation.js
+++ b/graph/resolvers/root_mutation.js
@@ -51,7 +51,10 @@ const RootMutation = {
   },
   addCommentTag(_, {id, tag}, {mutators: {Comment}}) {
     return wrapResponse('comment')(Comment.addCommentTag({id, tag}));
-  }
+  },
+  removeCommentTag(_, {id, tag}, {mutators: {Comment}}) {
+    return wrapResponse('comment')(Comment.removeCommentTag({id, tag}));
+  },
 };
 
 module.exports = RootMutation;
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index adb349fe2..8bcc39ac5 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -638,6 +638,13 @@ type AddCommentTagResponse implements Response {
   errors: [UserError]  
 }
 
+# Response to removeCommentTag mutation
+type RemoveCommentTagResponse implements Response {
+  # An array of errors relating to the mutation that occured.
+  comment: Comment
+  errors: [UserError]  
+}
+
 # All mutations for the application are defined on this object.
 type RootMutation {
 
@@ -664,6 +671,9 @@ type RootMutation {
 
   # Add tag to comment.
   addCommentTag(id: ID!, tag: String!): AddCommentTagResponse
+
+  # Remove tag from comment.
+  removeCommentTag(id: ID!, tag: String!): RemoveCommentTagResponse
 }
 
 ################################################################################
diff --git a/models/user.js b/models/user.js
index f74d63519..67d479471 100644
--- a/models/user.js
+++ b/models/user.js
@@ -158,6 +158,7 @@ const USER_GRAPH_OPERATIONS = [
   'mutation:setUserStatus',
   'mutation:setCommentStatus',
   'mutation:addCommentTag',
+  'mutation:removeCommentTag',
 ];
 
 /**
diff --git a/test/graph/mutations/removeCommentTag.js b/test/graph/mutations/removeCommentTag.js
new file mode 100644
index 000000000..fe60a0f4c
--- /dev/null
+++ b/test/graph/mutations/removeCommentTag.js
@@ -0,0 +1,45 @@
+const expect = require('chai').expect;
+const {graphql} = require('graphql');
+
+const schema = require('../../../graph/schema');
+const Context = require('../../../graph/context');
+const UserModel = require('../../../models/user');
+const SettingsService = require('../../../services/settings');
+const CommentsService = require('../../../services/comments');
+
+describe('graph.mutations.removeCommentTag', () => {
+  let comment;
+  beforeEach(async () => {
+    SettingsService.init();
+    comment = await CommentsService.publicCreate({body: `hello there! ${  String(Math.random()).slice(2)}`});
+  });
+
+  const query = `
+    mutation RemoveCommentTag ($id: ID!, $tag: String!) {
+      removeCommentTag(id:$id, tag:$tag) {
+        comment {
+          tags {
+            name
+          }
+        }
+        errors {
+          translation_key
+        }
+      }
+    }
+  `;
+
+  it('can add remove tags from comments', async () => {
+    const user = new UserModel({});
+    const context = new Context({user});
+
+    // add a tag first
+    await CommentsService.addTag(comment.id, 'BEST');
+    const response = await graphql(schema, query, {}, context, {id: comment.id, tag: 'BEST'});
+    if (response.errors && response.errors.length) {
+      console.error(response.errors);
+    }
+    expect(response.errors).to.be.empty;
+    expect(response.data.removeCommentTag.comment.tags).to.deep.equal([]);
+  });
+});

From 98f303332695c32a969072a3d46e74910524cb3a Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Tue, 28 Feb 2017 15:30:48 +0800
Subject: [PATCH 047/132] Add permission checking to
 addCommentTag,removeCommentTag

---
 models/user.js                           |  6 +++++
 test/graph/mutations/addCommentTag.js    | 24 ++++++++++++++++++--
 test/graph/mutations/removeCommentTag.js | 28 ++++++++++++++++++++++--
 3 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/models/user.js b/models/user.js
index 67d479471..2b65bd300 100644
--- a/models/user.js
+++ b/models/user.js
@@ -178,6 +178,12 @@ UserSchema.method('can', function(...actions) {
     return false;
   }
 
+  // {add,remove}CommentTag - requires admin and/or moderator role
+  const userCanModifyTags = user => ['ADMIN', 'MODERATOR'].some(r => user.hasRoles(r));
+  if (actions.some(a => ['mutation:removeCommentTag', 'mutation:addCommentTag'].includes(a)) && ! userCanModifyTags(this)) {
+    return false;
+  }
+
   return true;
 });
 
diff --git a/test/graph/mutations/addCommentTag.js b/test/graph/mutations/addCommentTag.js
index 25576a5f1..fcbb0d0e8 100644
--- a/test/graph/mutations/addCommentTag.js
+++ b/test/graph/mutations/addCommentTag.js
@@ -29,8 +29,8 @@ describe('graph.mutations.addCommentTag', () => {
     }
   `;
 
-  it('can add tags to comments', async () => {
-    const user = new UserModel({});
+  it('moderators can add tags to comments', async () => {
+    const user = new UserModel({roles: ['MODERATOR' ]});
     const context = new Context({user});
     const response = await graphql(schema, query, {}, context, {id: comment.id, tag: 'BEST'});
     if (response.errors && response.errors.length) {
@@ -39,4 +39,24 @@ describe('graph.mutations.addCommentTag', () => {
     expect(response.errors).to.be.empty;
     expect(response.data.addCommentTag.comment.tags).to.deep.equal([{name: 'BEST'}]);
   });
+
+  describe('users who cant add tags', () => {
+    Object.entries({
+      'anonymous': undefined,
+      'regular commenter': new UserModel({}),
+      'banned moderator': new UserModel({roles: ['MODERATOR'], status: 'BANNED'})
+    }).forEach(([ userDescription, user ]) => {
+      it(userDescription, async function () {
+        const context = new Context({user});
+        const response = await graphql(schema, query, {}, context, {id: comment.id, tag: 'BEST'});
+        if (response.errors && response.errors.length) {
+          console.error(response.errors);
+        }
+        expect(response.errors).to.be.empty;
+        expect(response.data.addCommentTag.errors).to.deep.equal([{'translation_key':'NOT_AUTHORIZED'}]);
+        expect(response.data.addCommentTag.comment).to.be.null;        
+      });
+    });
+  });
+
 });
diff --git a/test/graph/mutations/removeCommentTag.js b/test/graph/mutations/removeCommentTag.js
index fe60a0f4c..c10f70172 100644
--- a/test/graph/mutations/removeCommentTag.js
+++ b/test/graph/mutations/removeCommentTag.js
@@ -29,8 +29,8 @@ describe('graph.mutations.removeCommentTag', () => {
     }
   `;
 
-  it('can add remove tags from comments', async () => {
-    const user = new UserModel({});
+  it('moderators can add remove tags from comments', async () => {
+    const user = new UserModel({roles: ['MODERATOR' ]});
     const context = new Context({user});
 
     // add a tag first
@@ -40,6 +40,30 @@ describe('graph.mutations.removeCommentTag', () => {
       console.error(response.errors);
     }
     expect(response.errors).to.be.empty;
+    expect(response.data.removeCommentTag.errors).to.be.null;
     expect(response.data.removeCommentTag.comment.tags).to.deep.equal([]);
   });
+
+  describe('users who cant remove tags', () => {
+    Object.entries({
+      'anonymous': undefined,
+      'regular commenter': new UserModel({}),
+      'banned moderator': new UserModel({roles: ['MODERATOR'], status: 'BANNED'})
+    }).forEach(([ userDescription, user ]) => {
+      it(userDescription, async function () {
+        const context = new Context({user});
+
+        // add a tag first
+        await CommentsService.addTag(comment.id, 'BEST');
+        const response = await graphql(schema, query, {}, context, {id: comment.id, tag: 'BEST'});
+        if (response.errors && response.errors.length) {
+          console.error(response.errors);
+        }
+        expect(response.errors).to.be.empty;
+        expect(response.data.removeCommentTag.errors).to.deep.equal([{'translation_key':'NOT_AUTHORIZED'}]);
+        expect(response.data.removeCommentTag.comment).to.be.null;        
+      });
+    });
+  });
+
 });

From bce84f24fd57e959816f9aaaad989f479da246da Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Tue, 28 Feb 2017 15:55:19 +0800
Subject: [PATCH 048/132] Embed can remove best tag

---
 .../graphql/mutations/index.js                |  3 +-
 .../mutations/removeCommentTag.graphql        | 15 +++++----
 client/coral-plugin-best/BestButton.js        |  6 ++--
 test/e2e/tests/Moderator/BestCommentTest.js   | 32 +++++++++++++------
 4 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/client/coral-framework/graphql/mutations/index.js b/client/coral-framework/graphql/mutations/index.js
index 6f6cdc04b..f25bddbd6 100644
--- a/client/coral-framework/graphql/mutations/index.js
+++ b/client/coral-framework/graphql/mutations/index.js
@@ -139,9 +139,10 @@ export const addCommentTag = graphql(ADD_COMMENT_TAG, {
 
 export const removeCommentTag = graphql(REMOVE_COMMENT_TAG, {
   props: ({mutate}) => ({
-    removeCommentTag: (tag) => {
+    removeCommentTag: ({id, tag}) => {
       return mutate({
         variables: {
+          id,
           tag
         }
       });
diff --git a/client/coral-framework/graphql/mutations/removeCommentTag.graphql b/client/coral-framework/graphql/mutations/removeCommentTag.graphql
index 2871a2fae..3826b0703 100644
--- a/client/coral-framework/graphql/mutations/removeCommentTag.graphql
+++ b/client/coral-framework/graphql/mutations/removeCommentTag.graphql
@@ -1,10 +1,11 @@
-mutation RemoveCommentTag ($comment_id: ID!, $tag: String!) {
-  removeCommentTag(comment_id:$comment_id, tag:$tag) {
-  	comment {
-	    tags {
-	      name
-	    }
-  	}
+mutation RemoveCommentTag ($id: ID!, $tag: String!) {
+  removeCommentTag(id:$id, tag:$tag) {
+    comment {
+      id
+      tags {
+        name
+      }
+    }
     errors {
       translation_key
     }
diff --git a/client/coral-plugin-best/BestButton.js b/client/coral-plugin-best/BestButton.js
index 52367c4e0..bcf0bae10 100644
--- a/client/coral-plugin-best/BestButton.js
+++ b/client/coral-plugin-best/BestButton.js
@@ -54,8 +54,7 @@ export class BestButton extends Component {
       console.warn('BestButton#onClickAddBest called even though there is no addBest prop. doing nothing');
       return;
     }
-    const addBestRet = await addBest();
-    console.log('addBestRet', addBestRet);
+    await addBest();
   }
 
   async onClickRemoveBest(e) {
@@ -65,8 +64,7 @@ export class BestButton extends Component {
       console.warn('BestButton#onClickAddBest called even though there is no removeBest prop. doing nothing');
       return;
     }
-    const removeBestRet = await removeBest();
-    console.log('removeBestRet', removeBestRet);
+    await removeBest();
   }
 
   render() {
diff --git a/test/e2e/tests/Moderator/BestCommentTest.js b/test/e2e/tests/Moderator/BestCommentTest.js
index b4c9e1356..8b8be708d 100644
--- a/test/e2e/tests/Moderator/BestCommentTest.js
+++ b/test/e2e/tests/Moderator/BestCommentTest.js
@@ -11,24 +11,38 @@ module.exports = {
     embedStreamPage
       .login(users.moderator);
   },
-  'Moderator marks their comment as BEST': client => {
+  'Moderator marks/unmarks their comment as BEST': client => {
     const embedStreamPage = client.page.embedStreamPage();
 
-    const setBestCommentButton = '@setBestButton';
-    const unsetBestCommentButton = '@unsetBestButton';
+    const setBestCommentButton = '.e2e__set-best-comment';
+    const unsetBestCommentButton = '.e2e__unset-best-comment';
 
     embedStreamPage
-      .postComment('Hi everyone. Isn\'t this the BEST comment!?')
+      .postComment(`Hi everyone. Isn't this the BEST comment!? ${String(Math.random()).slice(2)}`)
       .waitForElementVisible(setBestCommentButton, 2000)
       .click(setBestCommentButton)
-      .waitForElementVisible(unsetBestCommentButton, 2000, () => {
-        client.assert.elementNotPresent(setBestCommentButton);
-      });
+      .waitForElementVisible(unsetBestCommentButton, 2000);
 
     // on refresh, it should still be tagged as best :)
     client.refresh();
-    client.page.embedStreamPage().ready()
-      .waitForElementVisible('.e2e__unset-best-comment', 2000);
+    embedStreamPage.ready()
+
+      // (bengo) I have no idea why, but if the selector here is '@unsetBestButton', it doesn't find it... I think nightwatch bug?
+      // this is why I am not using @elements. Advice appreciated.
+      .waitForElementVisible(unsetBestCommentButton, 2000);
+
+    // now remove the best tag
+    embedStreamPage
+      .click(unsetBestCommentButton);
+
+    embedStreamPage
+      .waitForElementVisible(setBestCommentButton, 2000);
+
+    // on refresh it should still be untagged best
+    client.refresh();
+    embedStreamPage.ready()
+      .waitForElementVisible(setBestCommentButton);
+
   },
   after: client => {
     client.end();

From 7e3c5820dcd1eab0010d0ccc52f54a78b59f6420 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Tue, 28 Feb 2017 16:08:30 +0800
Subject: [PATCH 049/132] BestButton is disabled while its saving

---
 client/coral-plugin-best/BestButton.js | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/client/coral-plugin-best/BestButton.js b/client/coral-plugin-best/BestButton.js
index bcf0bae10..dac70c155 100644
--- a/client/coral-plugin-best/BestButton.js
+++ b/client/coral-plugin-best/BestButton.js
@@ -47,6 +47,10 @@ export class BestButton extends Component {
     this.onClickRemoveBest = this.onClickRemoveBest.bind(this);
   }
 
+  state = {
+    isSaving: false
+  }
+
   async onClickAddBest(e) {
     e.preventDefault();
     const {addBest} = this.props;
@@ -54,7 +58,12 @@ export class BestButton extends Component {
       console.warn('BestButton#onClickAddBest called even though there is no addBest prop. doing nothing');
       return;
     }
-    await addBest();
+    this.setState({isSaving: true});
+    try {
+      await addBest();
+    } finally {
+      this.setState({isSaving: false});      
+    }
   }
 
   async onClickRemoveBest(e) {
@@ -64,7 +73,12 @@ export class BestButton extends Component {
       console.warn('BestButton#onClickAddBest called even though there is no removeBest prop. doing nothing');
       return;
     }
-    await removeBest();
+    this.setState({isSaving: true});
+    try {
+      await removeBest();
+    } finally {
+      this.setState({isSaving: false});      
+    }
   }
 
   render() {
@@ -73,10 +87,12 @@ export class BestButton extends Component {
     // @TODO(bengo) Should I reuse another element like coral-ui button? Just doing what LikeButton does for now
     // Oh. I think that's styled for the admin. Don't use coral-ui button until the whole comment bottom bar does.
     const {isBest, addBest, removeBest} = this.props;
+    const {isSaving} = this.state;
+    const disabled = isSaving || ! (isBest ? removeBest : addBest);
     return <div className={classnames(`${name}-container`, `${name}-button`, 'comment__action-button--nowrap',
                                       `e2e__${isBest ? 'unset' : 'set'}-best-comment`)}>
       <button onClick={isBest ? this.onClickRemoveBest : this.onClickAddBest}
-              disabled={ ! (isBest ? removeBest : addBest)}
+              disabled={disabled}
               className='comment__action-button'>
         <span className={`${name}-button-text`}>{lang.t(isBest ? 'unsetBest' : 'setBest')}</span>
         <i className={`${name}-icon material-icons`} aria-hidden={true}>

From 51452a6b33533e0d771d34f7b276fd5fa2747a29 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Tue, 28 Feb 2017 16:17:48 +0800
Subject: [PATCH 050/132] Comment component passes addTag,removeTag to its
 replies' Comments

---
 client/coral-embed-stream/src/Comment.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-embed-stream/src/Comment.js b/client/coral-embed-stream/src/Comment.js
index 47fd86cc8..19af229dc 100644
--- a/client/coral-embed-stream/src/Comment.js
+++ b/client/coral-embed-stream/src/Comment.js
@@ -108,8 +108,6 @@ class Comment extends React.Component {
     const flag = getActionSummary('FlagActionSummary', comment);
     const dontagree = getActionSummary('DontAgreeActionSummary', comment);
 
-    // @TODO(bengo) Should I do this for addCommentTag and/or best button
-
     // @TODO(bengo) Would be best to only create these funcs on prop change
     const addBestTag = () => addCommentTag({
       id: comment.id,
@@ -194,6 +192,8 @@ class Comment extends React.Component {
               postLike={postLike}
               postFlag={postFlag}
               deleteAction={deleteAction}
+              addCommentTag={addCommentTag}
+              removeCommentTag={removeCommentTag}
               showSignInDialog={showSignInDialog}
               reactKey={reply.id}
               key={reply.id}

From c6df602b945983de10d7c6e21300a36363577083 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Tue, 28 Feb 2017 16:26:15 +0800
Subject: [PATCH 051/132] Remove cursor: pointer from BestButton for now. And
 remove unneeded container

---
 client/coral-plugin-best/BestButton.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/client/coral-plugin-best/BestButton.js b/client/coral-plugin-best/BestButton.js
index dac70c155..0ba36d553 100644
--- a/client/coral-plugin-best/BestButton.js
+++ b/client/coral-plugin-best/BestButton.js
@@ -89,16 +89,17 @@ export class BestButton extends Component {
     const {isBest, addBest, removeBest} = this.props;
     const {isSaving} = this.state;
     const disabled = isSaving || ! (isBest ? removeBest : addBest);
-    return <div className={classnames(`${name}-container`, `${name}-button`, 'comment__action-button--nowrap',
-                                      `e2e__${isBest ? 'unset' : 'set'}-best-comment`)}>
+    return (
       <button onClick={isBest ? this.onClickRemoveBest : this.onClickAddBest}
               disabled={disabled}
-              className='comment__action-button'>
+              className={classnames('comment__action-button', `${name}-button`,
+                                    'comment__action-button--nowrap', /* Can I do this to all buttons? 'comment__action-button--cursor-pointer', */
+                                    `e2e__${isBest ? 'unset' : 'set'}-best-comment`)}>
         <span className={`${name}-button-text`}>{lang.t(isBest ? 'unsetBest' : 'setBest')}</span>
         <i className={`${name}-icon material-icons`} aria-hidden={true}>
           { isBest ? 'favorite' : 'favorite_border' }
         </i>
       </button>
-    </div>;
+    )
   }
 }

From c2d199a21cd4d8fd4bb7dc86a56bca68f1e2ff25 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Tue, 28 Feb 2017 16:28:23 +0800
Subject: [PATCH 052/132] Remove BestButton copy for now

---
 client/coral-plugin-best/BestButton.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-plugin-best/BestButton.js b/client/coral-plugin-best/BestButton.js
index 0ba36d553..b7a6a4766 100644
--- a/client/coral-plugin-best/BestButton.js
+++ b/client/coral-plugin-best/BestButton.js
@@ -95,11 +95,11 @@ export class BestButton extends Component {
               className={classnames('comment__action-button', `${name}-button`,
                                     'comment__action-button--nowrap', /* Can I do this to all buttons? 'comment__action-button--cursor-pointer', */
                                     `e2e__${isBest ? 'unset' : 'set'}-best-comment`)}>
-        <span className={`${name}-button-text`}>{lang.t(isBest ? 'unsetBest' : 'setBest')}</span>
+        <span className={`${name}-button-text`}>/* {lang.t(isBest ? 'unsetBest' : 'setBest')} */</span>
         <i className={`${name}-icon material-icons`} aria-hidden={true}>
           { isBest ? 'favorite' : 'favorite_border' }
         </i>
       </button>
-    )
+    );
   }
 }

From af23717988f5711032b50cc67c8819c85228c527 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Tue, 28 Feb 2017 17:19:11 +0800
Subject: [PATCH 053/132] Indicate best comments. Add some aria labels

---
 client/coral-embed-stream/src/Comment.js   | 12 ++++++++----
 client/coral-plugin-best/BestButton.js     | 11 +++++++++--
 client/coral-plugin-best/translations.json |  6 ++++--
 client/coral-plugin-tag-label/TagLabel.js  |  4 ++--
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/client/coral-embed-stream/src/Comment.js b/client/coral-embed-stream/src/Comment.js
index 19af229dc..679699c94 100644
--- a/client/coral-embed-stream/src/Comment.js
+++ b/client/coral-embed-stream/src/Comment.js
@@ -17,7 +17,7 @@ import PubDate from 'coral-plugin-pubdate/PubDate';
 import {ReplyBox, ReplyButton} from 'coral-plugin-replies';
 import FlagComment from 'coral-plugin-flags/FlagComment';
 import LikeButton from 'coral-plugin-likes/LikeButton';
-import {BestButton, IfUserCanModifyBest, BEST_TAG, commentIsBest} from 'coral-plugin-best/BestButton';
+import {BestButton, IfUserCanModifyBest, BEST_TAG, commentIsBest, BestIndicator} from 'coral-plugin-best/BestButton';
 import LoadMore from 'coral-embed-stream/src/LoadMore';
 
 import styles from './Comment.css';
@@ -127,11 +127,15 @@ class Comment extends React.Component {
         <AuthorName
           author={comment.user}/>
         { isStaff(comment.tags)
-          ? <TagLabel isStaff={true}/>
+          ? <TagLabel>Staff</TagLabel>
+          : null }
+
+        { commentIsBest(comment)
+          ? <TagLabel><BestIndicator /></TagLabel>
           : null }
         <PubDate created_at={comment.created_at} />
         <Content body={comment.body} />
-          <div className="commentActionsLeft">
+          <div className="commentActionsLeft comment__action-container">
               <LikeButton
                 like={like}
                 id={comment.id}
@@ -151,7 +155,7 @@ class Comment extends React.Component {
                   removeBest={removeBestTag} />
               </IfUserCanModifyBest>
             </div>
-        <div className="commentActionsRight">
+        <div className="commentActionsRight comment__action-container">
           <PermalinkButton articleURL={asset.url} commentId={comment.id} />
           <FlagComment
             flag={flag && flag.current_user ? flag : dontagree}
diff --git a/client/coral-plugin-best/BestButton.js b/client/coral-plugin-best/BestButton.js
index b7a6a4766..50a0820d1 100644
--- a/client/coral-plugin-best/BestButton.js
+++ b/client/coral-plugin-best/BestButton.js
@@ -16,6 +16,13 @@ const lang = new I18n(translations);
 // It would be best if the backend/api held this business logic
 const canModifyBestTag = ({roles = []} = {}) => roles && ['ADMIN', 'MODERATOR'].some(role => roles.includes(role));
 
+// Put this on a comment to show that it is best
+export const BestIndicator = ({children = <i className={'material-icons'} aria-hidden={true}>favorite</i>}) => (
+  <span aria-label={lang.t('commentIsBest')}>
+    { children } 
+  </span>
+);
+
 /**
  * Component that only renders children if the provided user prop can modify best tags
  */
@@ -94,8 +101,8 @@ export class BestButton extends Component {
               disabled={disabled}
               className={classnames('comment__action-button', `${name}-button`,
                                     'comment__action-button--nowrap', /* Can I do this to all buttons? 'comment__action-button--cursor-pointer', */
-                                    `e2e__${isBest ? 'unset' : 'set'}-best-comment`)}>
-        <span className={`${name}-button-text`}>/* {lang.t(isBest ? 'unsetBest' : 'setBest')} */</span>
+                                    `e2e__${isBest ? 'unset' : 'set'}-best-comment`)}
+              aria-label={lang.t(isBest ? 'unsetBest' : 'setBest')}>
         <i className={`${name}-icon material-icons`} aria-hidden={true}>
           { isBest ? 'favorite' : 'favorite_border' }
         </i>
diff --git a/client/coral-plugin-best/translations.json b/client/coral-plugin-best/translations.json
index cfdfc04a1..c7dd42be8 100644
--- a/client/coral-plugin-best/translations.json
+++ b/client/coral-plugin-best/translations.json
@@ -1,10 +1,12 @@
 {
   "en": {
     "setBest": "Tag as Best",
-    "unsetBest": "Untag as Best"
+    "unsetBest": "Untag as Best",
+    "commentIsBest": "This comment is one of the best"
   },
   "es": {
     "like": "Establecer como mejor",
-    "liked": "Desarmado como mejor"
+    "liked": "Desarmado como mejor",
+    "commentIsBest": "Este comentario es uno de los mejores"
   }
 }
diff --git a/client/coral-plugin-tag-label/TagLabel.js b/client/coral-plugin-tag-label/TagLabel.js
index ba7403f5c..4a5d3632f 100644
--- a/client/coral-plugin-tag-label/TagLabel.js
+++ b/client/coral-plugin-tag-label/TagLabel.js
@@ -1,7 +1,7 @@
 import React from 'react';
 
-const TagLabel = ({isStaff}) => <div className='coral-plugin-tag-label'>
-  {isStaff ? 'Staff' : ''}
+const TagLabel = ({children}) => <div className='coral-plugin-tag-label'>
+  {children}
 </div>;
 
 export default TagLabel;

From 96d1447602841bd79170ba07abb1b4b777e433ae Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Tue, 28 Feb 2017 17:27:19 +0800
Subject: [PATCH 054/132] remove debugging code from embedStreamPage

---
 test/e2e/pages/embedStreamPage.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/test/e2e/pages/embedStreamPage.js b/test/e2e/pages/embedStreamPage.js
index 5799fa8c9..60a54f0f7 100644
--- a/test/e2e/pages/embedStreamPage.js
+++ b/test/e2e/pages/embedStreamPage.js
@@ -38,10 +38,7 @@ const embedStreamCommands = {
       .setValue('@signInDialogEmail', user.email)
       .setValue('@signInDialogPassword', user.pass)
       .waitForElementVisible('@logInButton')
-      .click('@logInButton', () => {
-
-        // this.api.pause()
-      })
+      .click('@logInButton')
       .waitForElementVisible('@logoutButton', 5000);
   },
   logout() {

From fe8cf2c61220bd7b6da647b8888e2cdfe1923554 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Tue, 28 Feb 2017 18:57:27 +0800
Subject: [PATCH 055/132] Style multiple tag labels and material-icon therein
 (edited dist/../default.css before :/)

---
 client/coral-embed-stream/style/default.css | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css
index 143b0f78c..6a8c58059 100644
--- a/client/coral-embed-stream/style/default.css
+++ b/client/coral-embed-stream/style/default.css
@@ -172,7 +172,7 @@ hr {
 
 .coral-plugin-author-name-text {
   display: inline-block;
-  margin: 10px 8px 10px 0;
+  margin: 10px 5px 10px 0;
   font-weight: bold;
 }
 
@@ -186,7 +186,7 @@ hr {
   background-color: #4C1066;
   color: white;
   display: inline-block;
-  margin: 10px 10px;
+  margin: 0px 5px;
   padding: 5px 5px;
   border-radius: 2px;
 }
@@ -213,6 +213,11 @@ hr {
   width: 50%;
 }
 
+.comment__action-container .material-icons {
+  font-size: 12px !important;
+  margin-left: 3px;  
+}
+
 .comment__action-button {
   cursor: pointer;
 }
@@ -225,11 +230,10 @@ hr {
   white-space: nowrap;
 }
 
-.material-icons {
-  font-size: 12px !important;
-  margin-left: 3px;
+.commentStream .material-icons {
   vertical-align: middle;
   width: 1em;
+  font-size: 1em;
   overflow: hidden;
 }
 
@@ -245,6 +249,7 @@ hr {
   color: #696969;
   display: inline-block;
   font-size: .75rem;
+  margin-left: 5px;
 }
 
 .coral-plugin-permalinks-container {

From f8479a86612cce1ff2d1a479871454b1e7abc4dc Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Tue, 28 Feb 2017 19:30:25 +0800
Subject: [PATCH 056/132] fix e2e tests with .comment selector that avoids
 hidden dialog

---
 client/coral-embed-stream/src/Embed.js      | 36 +++++++++++----------
 client/coral-plugin-likes/LikeButton.js     |  2 +-
 test/e2e/pages/embedStreamPage.js           | 28 ++++++++--------
 test/e2e/tests/Commenter/LikeCommentTest.js |  1 +
 test/e2e/tests/EmbedStreamTests.js          | 17 ++++------
 5 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/client/coral-embed-stream/src/Embed.js b/client/coral-embed-stream/src/Embed.js
index 3290e2c8e..4f092bb7c 100644
--- a/client/coral-embed-stream/src/Embed.js
+++ b/client/coral-embed-stream/src/Embed.js
@@ -173,23 +173,25 @@ class Embed extends Component {
               assetId={asset.id}
               updateCountCache={this.props.updateCountCache}
               />
-            <Stream
-              refetch={refetch}
-              addNotification={this.props.addNotification}
-              postItem={this.props.postItem}
-              asset={asset}
-              currentUser={user}
-              postLike={this.props.postLike}
-              postFlag={this.props.postFlag}
-              postDontAgree={this.props.postDontAgree}
-              addCommentTag={this.props.addCommentTag}
-              removeCommentTag={this.props.removeCommentTag}
-              getCounts={this.props.getCounts}
-              updateCountCache={this.props.updateCountCache}
-              loadMore={this.props.loadMore}
-              deleteAction={this.props.deleteAction}
-              showSignInDialog={this.props.showSignInDialog}
-              comments={asset.comments} />
+            <div className="embed__stream">
+              <Stream
+                refetch={refetch}
+                addNotification={this.props.addNotification}
+                postItem={this.props.postItem}
+                asset={asset}
+                currentUser={user}
+                postLike={this.props.postLike}
+                postFlag={this.props.postFlag}
+                postDontAgree={this.props.postDontAgree}
+                addCommentTag={this.props.addCommentTag}
+                removeCommentTag={this.props.removeCommentTag}
+                getCounts={this.props.getCounts}
+                updateCountCache={this.props.updateCountCache}
+                loadMore={this.props.loadMore}
+                deleteAction={this.props.deleteAction}
+                showSignInDialog={this.props.showSignInDialog}
+                comments={asset.comments} />
+            </div>
             <Notification
               notifLength={4500}
               clearNotification={this.props.clearNotification}
diff --git a/client/coral-plugin-likes/LikeButton.js b/client/coral-plugin-likes/LikeButton.js
index 9b3abfb00..51854c57f 100644
--- a/client/coral-plugin-likes/LikeButton.js
+++ b/client/coral-plugin-likes/LikeButton.js
@@ -57,7 +57,7 @@ class LikeButton extends Component {
     };
 
     return <div className={`${name}-container`}>
-      <button onClick={onLikeClick} className={`${name}-button ${liked && 'likedButton'}`}>
+      <button onClick={onLikeClick} className={`${name}-button ${liked ? 'likedButton' : ''}`}>
         <span className={`${name}-button-text`}>{lang.t(liked ? 'liked' : 'like')}</span>
         <i className={`${name}-icon material-icons`}
           aria-hidden={true}>thumb_up</i>
diff --git a/test/e2e/pages/embedStreamPage.js b/test/e2e/pages/embedStreamPage.js
index 60a54f0f7..12b18874b 100644
--- a/test/e2e/pages/embedStreamPage.js
+++ b/test/e2e/pages/embedStreamPage.js
@@ -117,46 +117,46 @@ module.exports = {
       selector: '#commentBox .coral-plugin-commentbox-button'
     },
     likeButton: {
-      selector: '.comment .coral-plugin-likes-container .coral-plugin-likes-button'
+      selector: '.embed__stream .comment .coral-plugin-likes-container .coral-plugin-likes-button'
     },
     likeText: {
-      selector: '.comment .coral-plugin-likes-container .coral-plugin-likes-button .coral-plugin-likes-button-text'
+      selector: '.embed__stream .comment .coral-plugin-likes-container .coral-plugin-likes-button .coral-plugin-likes-button-text'
     },
     likesCount: {
-      selector: '.comment .coral-plugin-likes-container .coral-plugin-likes-button .coral-plugin-likes-like-count'
+      selector: '.embed__stream .comment .coral-plugin-likes-container .coral-plugin-likes-button .coral-plugin-likes-like-count'
     },
     flagButton: {
-      selector: '.comment .coral-plugin-flags-container .coral-plugin-flags-button'
+      selector: '.embed__stream .comment .coral-plugin-flags-container .coral-plugin-flags-button'
     },
     flagPopUp: {
-      selector: '.comment .coral-plugin-flags-popup'
+      selector: '.embed__stream .comment .coral-plugin-flags-popup'
     },
     flagCommentOption: {
-      selector: '.comment .coral-plugin-flags-popup .coral-plugin-flags-popup-radio-label[for="COMMENTS"]'
+      selector: '.embed__stream .comment .coral-plugin-flags-popup .coral-plugin-flags-popup-radio-label[for="COMMENTS"]'
     },
     flagUsernameOption: {
-      selector: '.comment .coral-plugin-flags-popup .coral-plugin-flags-popup-radio-label[for="USERS"]'
+      selector: '.embed__stream .comment .coral-plugin-flags-popup .coral-plugin-flags-popup-radio-label[for="USERS"]'
     },
     flagOtherOption: {
-      selector: '.comment .coral-plugin-flags-popup .coral-plugin-flags-popup-radio-label[for="other"]'
+      selector: '.embed__stream .comment .coral-plugin-flags-popup .coral-plugin-flags-popup-radio-label[for="other"]'
     },
     flagHeaderMessage: {
-      selector: '.comment .coral-plugin-flags-popup .coral-plugin-flags-popup-header'
+      selector: '.embed__stream .comment .coral-plugin-flags-popup .coral-plugin-flags-popup-header'
     },
     flagButtonText: {
-      selector: '.comment .coral-plugin-flags-button-text'
+      selector: '.embed__stream .comment .coral-plugin-flags-button-text'
     },
     flagDoneButton: {
-      selector: '.comment .coral-plugin-flags-popup .coral-plugin-flags-popup-button'
+      selector: '.embed__stream .comment .coral-plugin-flags-popup .coral-plugin-flags-popup-button'
     },
     permalinkButton: {
-      selector: '.comment .coral-plugin-permalinks-button'
+      selector: '.embed__stream .comment .coral-plugin-permalinks-button'
     },
     permalinkPopUp: {
-      selector: '.comment .coral-plugin-permalinks-popover.active'
+      selector: '.embed__stream .comment .coral-plugin-permalinks-popover.active'
     },
     permalinkInput: {
-      selector: '.comment .coral-plugin-permalinks-popover.active input'
+      selector: '.embed__stream .comment .coral-plugin-permalinks-popover.active input'
     },
     registerButton: {
       selector: '#signInDialog #coralRegister'
diff --git a/test/e2e/tests/Commenter/LikeCommentTest.js b/test/e2e/tests/Commenter/LikeCommentTest.js
index 59e964969..c9915cd81 100644
--- a/test/e2e/tests/Commenter/LikeCommentTest.js
+++ b/test/e2e/tests/Commenter/LikeCommentTest.js
@@ -15,6 +15,7 @@ module.exports = {
     const embedStreamPage = client.page.embedStreamPage();
 
     embedStreamPage
+      .postComment(`hi ${Math.random()}`)
       .likeComment()
       .waitForElementVisible('@likesCount', 2000)
       .expect.element('@likeText').text.to.equal('Liked');
diff --git a/test/e2e/tests/EmbedStreamTests.js b/test/e2e/tests/EmbedStreamTests.js
index 09d07c6c5..2da2340f3 100644
--- a/test/e2e/tests/EmbedStreamTests.js
+++ b/test/e2e/tests/EmbedStreamTests.js
@@ -49,10 +49,10 @@ module.exports = {
           // Post a comment
           .setValue('.coral-plugin-commentbox-textarea', mockComment)
           .click('.coral-plugin-commentbox-button')
-          .waitForElementVisible('.coral-plugin-content-text', 1000)
+          .waitForElementVisible('.embed__stream .coral-plugin-commentcontent-text', 1000)
 
           // Verify that it appears
-          .assert.containsText('.coral-plugin-content-text', mockComment);
+          .assert.containsText('.embed__stream .coral-plugin-commentcontent-text', mockComment);
         done();
       })
       .catch((err) => {
@@ -95,22 +95,19 @@ module.exports = {
         client.resizeWindow(1200, 800)
           .url(client.globals.baseUrl)
           .frame('coralStreamEmbed_iframe');
-
           // Post a comment
         client.waitForElementVisible('.coral-plugin-commentbox-button', 2000)
           .setValue('.coral-plugin-commentbox-textarea', mockComment)
           .click('.coral-plugin-commentbox-button')
-
           // Post a reply
-          .waitForElementVisible('.coral-plugin-replies-reply-button', 5000)
-          .click('.coral-plugin-replies-reply-button')
+          .waitForElementVisible('.embed__stream .coral-plugin-replies-reply-button', 5000)
+          .click('.embed__stream .coral-plugin-replies-reply-button')
           .waitForElementVisible('#replyText')
           .setValue('#replyText', mockReply)
-          .click('.coral-plugin-replies-textarea .coral-plugin-commentbox-button')
-          .waitForElementVisible('.reply', 20000)
-
+          .click('.embed__stream .coral-plugin-replies-textarea .coral-plugin-commentbox-button')
+          .waitForElementVisible('.embed__stream .reply', 20000)
           // Verify that it appears
-          .assert.containsText('.reply', mockReply);
+          .assert.containsText('.embed__stream .reply', mockReply);
         done();
       })
       .catch((err) => {

From d9df38fc3a5d91f91fb6686c846f3b3a8a65dcd6 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Tue, 28 Feb 2017 19:31:13 +0800
Subject: [PATCH 057/132] fix e2e tests with .comment selector that avoids
 hidden dialog

---
 test/e2e/tests/EmbedStreamTests.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/e2e/tests/EmbedStreamTests.js b/test/e2e/tests/EmbedStreamTests.js
index 2da2340f3..fc550be47 100644
--- a/test/e2e/tests/EmbedStreamTests.js
+++ b/test/e2e/tests/EmbedStreamTests.js
@@ -95,10 +95,12 @@ module.exports = {
         client.resizeWindow(1200, 800)
           .url(client.globals.baseUrl)
           .frame('coralStreamEmbed_iframe');
+
           // Post a comment
         client.waitForElementVisible('.coral-plugin-commentbox-button', 2000)
           .setValue('.coral-plugin-commentbox-textarea', mockComment)
           .click('.coral-plugin-commentbox-button')
+
           // Post a reply
           .waitForElementVisible('.embed__stream .coral-plugin-replies-reply-button', 5000)
           .click('.embed__stream .coral-plugin-replies-reply-button')
@@ -106,6 +108,7 @@ module.exports = {
           .setValue('#replyText', mockReply)
           .click('.embed__stream .coral-plugin-replies-textarea .coral-plugin-commentbox-button')
           .waitForElementVisible('.embed__stream .reply', 20000)
+
           // Verify that it appears
           .assert.containsText('.embed__stream .reply', mockReply);
         done();

From 061efd47343e3797a65a60451b78c09577d403eb Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Tue, 28 Feb 2017 09:03:19 -0300
Subject: [PATCH 058/132] Comment Component Design

---
 client/coral-admin/src/components/ui/Logo.css |  1 +
 .../ModerationQueue/ModerationQueue.js        |  1 +
 .../ModerationQueue/components/Comment.css    |  0
 .../ModerationQueue/components/Comment.js     |  4 ++-
 .../components/CommentType.css                | 25 ++++++++++++++++
 .../ModerationQueue/components/CommentType.js | 30 +++++++++++++++++++
 .../ModerationQueue/components/styles.css     |  5 ++++
 client/coral-admin/src/services/client.js     |  1 +
 8 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 client/coral-admin/src/containers/ModerationQueue/components/Comment.css
 create mode 100644 client/coral-admin/src/containers/ModerationQueue/components/CommentType.css
 create mode 100644 client/coral-admin/src/containers/ModerationQueue/components/CommentType.js

diff --git a/client/coral-admin/src/components/ui/Logo.css b/client/coral-admin/src/components/ui/Logo.css
index 498d5596c..af2758bcb 100644
--- a/client/coral-admin/src/components/ui/Logo.css
+++ b/client/coral-admin/src/components/ui/Logo.css
@@ -19,6 +19,7 @@
   background: #E5E5E5;
   height: 100%;
   width: 128px;
+  z-index: 10;
 }
 
 .base {
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
index 0d48acc92..23ed45f2e 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
@@ -21,6 +21,7 @@ const ModerationQueue = ({activeTab = 'premod', ...props}) => {
             key={i}
             index={i}
             comment={comment}
+            commentType={activeTab}
             suspectWords={props.suspectWords}
             actions={actionsMap[status]}
             showBanUserDialog={props.showBanUserDialog}
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.css b/client/coral-admin/src/containers/ModerationQueue/components/Comment.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
index b39eeb2f8..61ed1552d 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
@@ -8,6 +8,7 @@ import styles from './styles.css';
 import {Icon} from 'coral-ui';
 import ActionButton from '../../../components/ActionButton';
 import FlagBox from './FlagBox';
+import CommentType from './CommentType';
 
 const linkify = new Linkify();
 
@@ -18,6 +19,7 @@ const lang = new I18n(translations);
 const Comment = ({actions = [], ...props}) => {
   const links = linkify.getMatches(props.comment.body);
   const actionSummaries = props.comment.action_summaries;
+  console.log(props)
   return (
     <li tabIndex={props.index}
         className={`mdl-card mdl-shadow--2dp ${styles.Comment} ${styles.listItem} ${props.isActive && !props.hideActive ? styles.activeItem : ''}`}>
@@ -27,7 +29,7 @@ const Comment = ({actions = [], ...props}) => {
           <span className={styles.created}>
             {timeago().format(props.comment.created_at || (Date.now() - props.index * 60 * 1000), lang.getLocale().replace('-', '_'))}
           </span>
-          {props.comment.action_summaries ? <p className={styles.flagged}>{lang.t('comment.flagged')}</p> : null}
+          <CommentType type={props.commentType}/>
         </div>
         <div className={styles.sideActions}>
           {links ? <span className={styles.hasLinks}><Icon name='error_outline'/> Contains Link</span> : null}
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/CommentType.css b/client/coral-admin/src/containers/ModerationQueue/components/CommentType.css
new file mode 100644
index 000000000..5d8eeea12
--- /dev/null
+++ b/client/coral-admin/src/containers/ModerationQueue/components/CommentType.css
@@ -0,0 +1,25 @@
+.commentType {
+  position: absolute;
+  right: 5px;
+  top: 5px;
+  color: white;
+  background: grey;
+  padding: 2px 7px;
+  font-size: 14px;
+  height: 32px;
+  box-sizing: border-box;
+  line-height: 29px;
+
+  i {
+    font-size: 14px;
+    margin-right: 7px;
+  }
+
+  &.premod {
+    background: #063B9A;
+  }
+
+  &.flagged {
+    background: #d03235;
+  }
+}
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/CommentType.js b/client/coral-admin/src/containers/ModerationQueue/components/CommentType.js
new file mode 100644
index 000000000..b2e58cf5e
--- /dev/null
+++ b/client/coral-admin/src/containers/ModerationQueue/components/CommentType.js
@@ -0,0 +1,30 @@
+import React, {PropTypes} from 'react';
+import styles from './CommentType.css';
+import {Icon} from 'coral-ui';
+
+const CommentType = props => {
+  const typeData = getTypeData(props.type);
+
+  return (
+    <span className={`${styles.commentType} ${styles[typeData.className]}`}>
+      <Icon name={typeData.icon}/>{typeData.text}
+    </span>
+  );
+};
+
+const getTypeData = type => {
+  switch (type) {
+  case 'premod':
+    return {icon: 'clock', text: 'Pre-Mod', className: 'premod'};
+  case 'flagged':
+    return {icon: 'flag', text: 'Flagged', className: 'flagged'};
+  default:
+    return {icon: 'flag', text: 'no-type', className: 'non'};
+  }
+};
+
+CommentType.propTypes = {
+  type: PropTypes.string.isRequired
+};
+
+export default CommentType;
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/styles.css b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
index 27d5c2533..a50d7d6e0 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/styles.css
+++ b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
@@ -310,6 +310,11 @@ span {
 }
 
 .Comment {
+
+  .commentType {
+    background: red;
+  }
+
   .moderateArticle {
     font-size: 12px;
     a {
diff --git a/client/coral-admin/src/services/client.js b/client/coral-admin/src/services/client.js
index 40a539634..7f6a0567d 100644
--- a/client/coral-admin/src/services/client.js
+++ b/client/coral-admin/src/services/client.js
@@ -2,6 +2,7 @@ import ApolloClient, {addTypename} from 'apollo-client';
 import getNetworkInterface from './transport';
 
 export const client = new ApolloClient({
+  addTypename: true,
   queryTransformer: addTypename,
   dataIdFromObject: (result) => {
     if (result.id && result.__typename) { // eslint-disable-line no-underscore-dangle

From 97ebb66f8c45c38e01f354826ad0fab416e699f9 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Tue, 28 Feb 2017 20:09:24 +0800
Subject: [PATCH 059/132] Remove @TODOs I don't care about

---
 client/coral-embed-stream/src/Comment.js | 1 -
 client/coral-plugin-best/BestButton.js   | 5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/client/coral-embed-stream/src/Comment.js b/client/coral-embed-stream/src/Comment.js
index 679699c94..3cc13174a 100644
--- a/client/coral-embed-stream/src/Comment.js
+++ b/client/coral-embed-stream/src/Comment.js
@@ -108,7 +108,6 @@ class Comment extends React.Component {
     const flag = getActionSummary('FlagActionSummary', comment);
     const dontagree = getActionSummary('DontAgreeActionSummary', comment);
 
-    // @TODO(bengo) Would be best to only create these funcs on prop change
     const addBestTag = () => addCommentTag({
       id: comment.id,
       tag: BEST_TAG,
diff --git a/client/coral-plugin-best/BestButton.js b/client/coral-plugin-best/BestButton.js
index 50a0820d1..ff45beafa 100644
--- a/client/coral-plugin-best/BestButton.js
+++ b/client/coral-plugin-best/BestButton.js
@@ -89,10 +89,7 @@ export class BestButton extends Component {
   }
 
   render() {
-
-    // @TODO(bengo) Consider adding the comment__action classes to other buttons to add cursor:pointer and never wrap the icons
-    // @TODO(bengo) Should I reuse another element like coral-ui button? Just doing what LikeButton does for now
-    // Oh. I think that's styled for the admin. Don't use coral-ui button until the whole comment bottom bar does.
+    // @TODO(bengo) Consider adding the comment__action--cursor-pointer to all buttons to add cursor:pointer and never wrap the icons
     const {isBest, addBest, removeBest} = this.props;
     const {isSaving} = this.state;
     const disabled = isSaving || ! (isBest ? removeBest : addBest);

From 3a2f893c24e523b785bf03a8257072ab412ebf37 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Tue, 28 Feb 2017 23:46:02 +0800
Subject: [PATCH 060/132] eslintrc.json doesn't use babel-eslint parser, but
 does set ecmaVersion to 2017

---
 .eslintrc.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index eca2dda1f..293657679 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -3,8 +3,10 @@
         "es6": true,
         "node": true
     },
-    "parser": "babel-eslint",
     "extends": "eslint:recommended",
+    "parserOptions": {
+        "ecmaVersion": 2017
+    },
     "rules": {
         "indent": ["error",
             2

From 32152fee7e5d2826ccddc2b0354b0c9fdb75c0d1 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Tue, 28 Feb 2017 23:56:53 +0800
Subject: [PATCH 061/132] add newline that eslint wants

---
 client/coral-plugin-best/BestButton.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/coral-plugin-best/BestButton.js b/client/coral-plugin-best/BestButton.js
index ff45beafa..182bd27c2 100644
--- a/client/coral-plugin-best/BestButton.js
+++ b/client/coral-plugin-best/BestButton.js
@@ -89,6 +89,7 @@ export class BestButton extends Component {
   }
 
   render() {
+
     // @TODO(bengo) Consider adding the comment__action--cursor-pointer to all buttons to add cursor:pointer and never wrap the icons
     const {isBest, addBest, removeBest} = this.props;
     const {isSaving} = this.state;

From d6167e10bac096eecdb301ddbb4a49a808008924 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Tue, 28 Feb 2017 23:57:35 +0800
Subject: [PATCH 062/132] Revert ALLOWED_TAGS declaration to be arr of objects,
 not strings

---
 services/comments.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/comments.js b/services/comments.js
index 7820106ed..4b11f3622 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -4,8 +4,8 @@ const ActionModel = require('../models/action');
 const ActionsService = require('./actions');
 
 const ALLOWED_TAGS = [
-  'STAFF',
-  'BEST',
+  {name: 'STAFF'},
+  {name: 'BEST'},
 ];
 
 const STATUSES = [
@@ -53,7 +53,7 @@ module.exports = class CommentsService {
    */
   static addTag(id, name, assigned_by) {
 
-    if (ALLOWED_TAGS.find((t) => t === name) == null) {
+    if (ALLOWED_TAGS.find((t) => t.name === name) == null) {
       return Promise.reject(new Error('tag not allowed'));
     }
 

From bf23fc29740ba1f70cd15dbbde9acfef555cbf2e Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Tue, 28 Feb 2017 12:02:51 -0500
Subject: [PATCH 063/132] Moving comment id into query.

---
 client/coral-embed-stream/src/Embed.js          |  3 ++-
 client/coral-embed/index.js                     | 17 +++++++++++------
 .../graphql/queries/commentQuery.graphql        | 13 +++++++++++++
 client/coral-framework/graphql/queries/index.js |  9 +++++++++
 4 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 client/coral-framework/graphql/queries/commentQuery.graphql

diff --git a/client/coral-embed-stream/src/Embed.js b/client/coral-embed-stream/src/Embed.js
index ac9c09eac..b0f5d5c5a 100644
--- a/client/coral-embed-stream/src/Embed.js
+++ b/client/coral-embed-stream/src/Embed.js
@@ -12,7 +12,7 @@ const {logout, showSignInDialog, requestConfirmEmail} = authActions;
 const {addNotification, clearNotification} = notificationActions;
 const {fetchAssetSuccess} = assetActions;
 
-import {queryStream} from 'coral-framework/graphql/queries';
+import {queryStream, commentQuery} from 'coral-framework/graphql/queries';
 import {postComment, postFlag, postLike, postDontAgree, deleteAction} from 'coral-framework/graphql/mutations';
 import {editName} from 'coral-framework/actions/user';
 import {updateCountCache} from 'coral-framework/actions/asset';
@@ -251,5 +251,6 @@ export default compose(
   postLike,
   postDontAgree,
   deleteAction,
+  commentQuery,
   queryStream
 )(Embed);
diff --git a/client/coral-embed/index.js b/client/coral-embed/index.js
index 4a7e753ca..9f3b23aaf 100644
--- a/client/coral-embed/index.js
+++ b/client/coral-embed/index.js
@@ -58,10 +58,11 @@
 
     // ensure el has an id, as pym can't directly accept the HTMLElement
     if ( ! el.id) {el.id = '_' + String(Math.random());}
-    var asset = opts.asset || window.location;
+    var asset = opts.asset || window.location.href.split('#')[0];
+    var comment = window.location.hash.slice(1);
     var pymParent = new pym.Parent(
       el.id,
-      buildStreamIframeUrl(opts.talk, asset),
+      buildStreamIframeUrl(opts.talk, asset, comment),
       {
         title: opts.title,
         asset_url: asset,
@@ -76,14 +77,18 @@
   return Coral;
 
   // build the URL to load in the pym iframe
-  function buildStreamIframeUrl(talkBaseUrl, asset) {
-    var iframeUrl = [
+  function buildStreamIframeUrl(talkBaseUrl, asset, comment) {
+    var iframeArray = [
       talkBaseUrl,
       (talkBaseUrl.match(/\/$/) ? '' : '/'), // make sure no double-'/' if opts.talk already ends with '/'
       'embed/stream?asset_url=',
       encodeURIComponent(asset)
-    ].join('');
-    return iframeUrl;
+    ];
+    
+    if (comment) {
+      iframeArray.push(`&comment_id=${comment}`);
+    }
+    return iframeArray.join('');
   }
 
   // Set up postMessage listeners/handlers on the pymParent
diff --git a/client/coral-framework/graphql/queries/commentQuery.graphql b/client/coral-framework/graphql/queries/commentQuery.graphql
new file mode 100644
index 000000000..83f92b8f5
--- /dev/null
+++ b/client/coral-framework/graphql/queries/commentQuery.graphql
@@ -0,0 +1,13 @@
+#import "../fragments/commentView.graphql"
+
+query commentQuery($id: ID!) {
+  comment(id: $id) {
+    ...commentView
+    parent {
+      ...commentView
+      replies {
+        ...commentView
+      }
+    }
+  }
+}
diff --git a/client/coral-framework/graphql/queries/index.js b/client/coral-framework/graphql/queries/index.js
index c993dfb6a..8d61c9f8b 100644
--- a/client/coral-framework/graphql/queries/index.js
+++ b/client/coral-framework/graphql/queries/index.js
@@ -2,6 +2,7 @@ import {graphql} from 'react-apollo';
 import STREAM_QUERY from './streamQuery.graphql';
 import LOAD_MORE from './loadMore.graphql';
 import GET_COUNTS from './getCounts.graphql';
+import COMMENT_QUERY from './commentQuery.graphql';
 import MY_COMMENT_HISTORY from './myCommentHistory.graphql';
 
 function getQueryVariable(variable) {
@@ -97,4 +98,12 @@ export const queryStream = graphql(STREAM_QUERY, {
   })
 });
 
+export const commentQuery = graphql(COMMENT_QUERY, {
+  options: () => ({
+    variables: {
+      id: getQueryVariable('comment_id')
+    }
+  })
+});
+
 export const myCommentHistory = graphql(MY_COMMENT_HISTORY, {});

From 95a9259c06e6194017c242bad74399218a5a4bcd Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Tue, 28 Feb 2017 12:06:27 -0500
Subject: [PATCH 064/132] Fixing bug with mod queue sorting.

---
 .../containers/ModerationQueue/components/ModerationMenu.js   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js
index d2520f784..f9b0c266f 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js
@@ -52,8 +52,8 @@ class ModerationMenu extends Component {
             label='Sort'
             value={this.state.sort}
             onChange={sort => this.selectSort(sort)}>
-            <Option value={'CHRONOLOGICAL'}>Newest First</Option>
-            <Option value={'REVERSE_CHRONOLOGICAL'}>Oldest First</Option>
+            <Option value={'REVERSE_CHRONOLOGICAL'}>Newest First</Option>
+            <Option value={'CHRONOLOGICAL'}>Oldest First</Option>
           </SelectField>
         </div>
       </div>

From 3bfde67d5821d7fbc25c01488675ab94cff7ad34 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Tue, 28 Feb 2017 12:32:51 -0500
Subject: [PATCH 065/132] Copy updates with translations

---
 .../src/containers/Install/translations.json           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/coral-admin/src/containers/Install/translations.json b/client/coral-admin/src/containers/Install/translations.json
index 8f651240c..0b702a81d 100644
--- a/client/coral-admin/src/containers/Install/translations.json
+++ b/client/coral-admin/src/containers/Install/translations.json
@@ -1,11 +1,11 @@
 {
   "en": {
     "INITIAL" : {
-      "DESCRIPTION": "The remainder of the Talk installation will take about ten minutes. Once you complete the following two steps, you will have a free installation and provision of Mongo and Redis.",
+      "DESCRIPTION": "Let's set up your Talk community in just a few short steps.",
       "SUBMIT": "Get Started"
     },
     "ADD_ORGANIZATION": {
-      "DESCRIPTION": "Please tell us the name of your organization. This will appear in emails when inviting new team members",
+      "DESCRIPTION": "Please tell us the name of your organization. This will appear in emails when inviting new team members.",
       "LABEL": "Organization Name",
       "SAVE": "Save"
     },
@@ -22,18 +22,18 @@
       "SUBMIT": "Finish install"
     },
     "FINAL": {
-      "DESCRIPTION": "Thanks for installing Talk! We sent an email to verify your email address. While you finish setting the account, you can start engaging with your readers now.",
+      "DESCRIPTION": "Thanks for installing Talk! We sent an email to verify your email address. While you finish setting up the account, you can start engaging with your readers now.",
       "LAUNCH": "Launch Talk",
       "CLOSE": "Close this Installer"
     }
   },
   "es": {
     "INITIAL" : {
-      "DESCRIPTION": "La instalación de Talk tomará aproximadamente diez minutos. Tan pronto como termines los tres pasos, tendrás una gratis instalación y provision de Mongo y Redis",
+      "DESCRIPTION": "Configuremos su comunidad de Talk en sólo algunos pasos.",
       "SUBMIT": "Empezá!"
     },
     "ADD_ORGANIZATION": {
-      "DESCRIPTION": "Por favor, dinos el nombre de tu organización. Este aparecerá en los emails cuando invites nuevos miembros",
+      "DESCRIPTION": "Por favor, dinos el nombre de tu organización. Este aparecerá en los emails cuando invites nuevos miembros.",
       "LABEL": "Nombre de la Organización",
       "SAVE": "Guardar"
     },

From b3b10efbbabfd1016eaeb3c5fbf094f5cf6e0b19 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Tue, 28 Feb 2017 12:35:20 -0500
Subject: [PATCH 066/132] =?UTF-8?q?Use=20t=C3=BA=20to=20match=20other=20tr?=
 =?UTF-8?q?anslations?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/coral-admin/src/containers/Install/translations.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-admin/src/containers/Install/translations.json b/client/coral-admin/src/containers/Install/translations.json
index 0b702a81d..e5b9f1542 100644
--- a/client/coral-admin/src/containers/Install/translations.json
+++ b/client/coral-admin/src/containers/Install/translations.json
@@ -29,7 +29,7 @@
   },
   "es": {
     "INITIAL" : {
-      "DESCRIPTION": "Configuremos su comunidad de Talk en sólo algunos pasos.",
+      "DESCRIPTION": "Configuremos tu comunidad de Talk en sólo algunos pasos.",
       "SUBMIT": "Empezá!"
     },
     "ADD_ORGANIZATION": {

From 65e8e42ae6ad42dede3b5d00154237348ea43582 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Tue, 28 Feb 2017 10:51:14 -0700
Subject: [PATCH 067/132] remove query from Dashboard component per belen's
 advice

---
 .../src/containers/Dashboard/Dashboard.js     | 47 ++++---------------
 .../coral-admin/src/graphql/queries/index.js  | 13 +++++
 client/coral-admin/src/reducers/settings.js   |  9 ++++
 3 files changed, 30 insertions(+), 39 deletions(-)

diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.js b/client/coral-admin/src/containers/Dashboard/Dashboard.js
index ba840c627..96e837a9e 100644
--- a/client/coral-admin/src/containers/Dashboard/Dashboard.js
+++ b/client/coral-admin/src/containers/Dashboard/Dashboard.js
@@ -1,14 +1,12 @@
 import React from 'react';
 import styles from './Dashboard.css';
-import {graphql, compose} from 'react-apollo';
+import {compose} from 'react-apollo';
 import {connect} from 'react-redux';
+import {getMetrics} from 'coral-admin/src/graphql/queries';
 import FlagWidget from './FlagWidget';
 import LikeWidget from './LikeWidget';
-import METRICS from 'coral-admin/src/graphql/queries/metrics.graphql';
-
-// import MostLikedCommentsWidget from './MostLikedCommentsWidget';
 import {showBanUserDialog, hideBanUserDialog} from 'coral-admin/src/actions/moderation';
-import {banUser, setCommentStatus} from 'coral-admin/src/graphql/mutations';
+
 import {Spinner} from 'coral-ui';
 
 class Dashboard extends React.Component {
@@ -19,49 +17,17 @@ class Dashboard extends React.Component {
       return <Spinner />;
     }
 
-    const {data: {assetsByLike, assetsByFlag/* , mostLikedComments*/}} = this.props;
-
-    // const {moderation, settings} = this.props;
+    const {data: {assetsByLike, assetsByFlag}} = this.props;
 
     return (
       <div className={styles.Dashboard}>
         <FlagWidget assets={assetsByFlag} />
-        {/*
-        <MostLikedCommentsWidget
-          comments={mostLikedComments}
-          moderation={moderation}
-          settings={settings}
-          acceptComment={this.props.acceptComment}
-          rejectComment={this.props.rejectComment}
-          handleBanUser={this.props.banUser}
-          showBanUserDialog={this.props.showBanUserDialog}
-          hideBanUserDialog={this.props.hideBanUserDialog} />
-          */}
         <LikeWidget assets={assetsByLike} />
       </div>
     );
   }
 }
 
-let then = new Date();
-then.setMinutes(then.getMinutes() - 5);
-then = then.toISOString();
-const now = new Date().toISOString();
-
-const getMetrics = graphql(METRICS, {
-  options: () => {
-
-    return {
-      variables: {
-        from: then,
-        to: now
-      }
-    };
-  }
-});
-
-const DashboardWithData = compose(getMetrics, setCommentStatus, banUser)(Dashboard);
-
 const mapStateToProps = state => {
   return {
     settings: state.settings.toJS(),
@@ -74,4 +40,7 @@ const mapDispatchToProps = dispatch => ({
   hideBanUserDialog: () => dispatch(hideBanUserDialog(false))
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(DashboardWithData);
+export default compose(
+  connect(mapStateToProps, mapDispatchToProps),
+  getMetrics
+)(Dashboard);
diff --git a/client/coral-admin/src/graphql/queries/index.js b/client/coral-admin/src/graphql/queries/index.js
index 97320591f..a2140a502 100644
--- a/client/coral-admin/src/graphql/queries/index.js
+++ b/client/coral-admin/src/graphql/queries/index.js
@@ -1,6 +1,7 @@
 import {graphql} from 'react-apollo';
 
 import MOD_QUEUE_QUERY from './modQueueQuery.graphql';
+import METRICS from './metrics.graphql';
 
 export const modQueueQuery = graphql(MOD_QUEUE_QUERY, {
   options: ({params: {id = null}}) => {
@@ -17,6 +18,18 @@ export const modQueueQuery = graphql(MOD_QUEUE_QUERY, {
   })
 });
 
+export const getMetrics = graphql(METRICS, {
+  options: ({settings: {dashboardWindowStart, dashboardWindowEnd}}) => {
+
+    return {
+      variables: {
+        from: dashboardWindowStart,
+        to: dashboardWindowEnd
+      }
+    };
+  }
+});
+
 export const modQueueResort = (id, fetchMore) => (sort) => {
   return fetchMore({
     query: MOD_QUEUE_QUERY,
diff --git a/client/coral-admin/src/reducers/settings.js b/client/coral-admin/src/reducers/settings.js
index a02cac198..a6e0c9339 100644
--- a/client/coral-admin/src/reducers/settings.js
+++ b/client/coral-admin/src/reducers/settings.js
@@ -1,11 +1,20 @@
 import {Map, List} from 'immutable';
 import * as actions from '../actions/settings';
 
+// this is initialized here because
+// currently you have to reload the dashboard to get new stats
+// cleaner updates are planned in the future.
+const DASHBOARD_WINDOW_MINUTES = 5;
+let then = new Date();
+then.setMinutes(then.getMinutes() - DASHBOARD_WINDOW_MINUTES);
+
 const initialState = Map({
   wordlist: Map({
     banned: List(),
     suspect: List()
   }),
+  dashboardWindowStart: then.toISOString(),
+  dashboardWindowEnd: new Date().toISOString(),
   domains: Map({
     whitelist: List()
   }),

From 86a6b545cc637cfcc9284281fadf17610374078a Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Tue, 28 Feb 2017 11:15:44 -0700
Subject: [PATCH 068/132] create a fragment for asset metrics. add some
 comments

---
 .../fragments/assetMetricsView.graphql        | 12 ++++++
 .../coral-admin/src/graphql/queries/index.js  |  2 +-
 .../src/graphql/queries/metrics.graphql       | 38 -------------------
 .../src/graphql/queries/metricsQuery.graphql  | 10 +++++
 client/coral-admin/src/reducers/settings.js   |  2 +
 5 files changed, 25 insertions(+), 39 deletions(-)
 create mode 100644 client/coral-admin/src/graphql/fragments/assetMetricsView.graphql
 delete mode 100644 client/coral-admin/src/graphql/queries/metrics.graphql
 create mode 100644 client/coral-admin/src/graphql/queries/metricsQuery.graphql

diff --git a/client/coral-admin/src/graphql/fragments/assetMetricsView.graphql b/client/coral-admin/src/graphql/fragments/assetMetricsView.graphql
new file mode 100644
index 000000000..37335aeaa
--- /dev/null
+++ b/client/coral-admin/src/graphql/fragments/assetMetricsView.graphql
@@ -0,0 +1,12 @@
+fragment metrics on Asset {
+  id
+  title
+  url
+  author
+  created_at
+  action_summaries {
+    type: __typename
+    actionCount
+    actionableItemCount
+  }
+}
diff --git a/client/coral-admin/src/graphql/queries/index.js b/client/coral-admin/src/graphql/queries/index.js
index a2140a502..c4a30ad44 100644
--- a/client/coral-admin/src/graphql/queries/index.js
+++ b/client/coral-admin/src/graphql/queries/index.js
@@ -1,7 +1,7 @@
 import {graphql} from 'react-apollo';
 
 import MOD_QUEUE_QUERY from './modQueueQuery.graphql';
-import METRICS from './metrics.graphql';
+import METRICS from './metricsQuery.graphql';
 
 export const modQueueQuery = graphql(MOD_QUEUE_QUERY, {
   options: ({params: {id = null}}) => {
diff --git a/client/coral-admin/src/graphql/queries/metrics.graphql b/client/coral-admin/src/graphql/queries/metrics.graphql
deleted file mode 100644
index 68de89cab..000000000
--- a/client/coral-admin/src/graphql/queries/metrics.graphql
+++ /dev/null
@@ -1,38 +0,0 @@
-fragment metrics on Asset {
-  id
-  title
-  url
-  author
-  created_at
-  action_summaries {
-    type: __typename
-    actionCount
-    actionableItemCount
-  }
-}
-
-query Metrics ($from: Date!, $to: Date!) {
-  assetsByFlag: assetMetrics(from: $from, to: $to, sort: FLAG) {
-    ...metrics
-  }
-  assetsByLike: assetMetrics(from: $from, to: $to, sort: LIKE) {
-    ...metrics
-  }
-#  mostLikedComments: commentMetrics(from: $from, to: $to, sort: LIKE) {
-#    id
-#    body
-#    user {
-#      status
-#      username
-#    }
-#    asset {
-#      id
-#      title
-#    }
-#    created_at
-#    action_summaries {
-#      type: __typename
-#      count
-#    }
-#  }
-}
diff --git a/client/coral-admin/src/graphql/queries/metricsQuery.graphql b/client/coral-admin/src/graphql/queries/metricsQuery.graphql
new file mode 100644
index 000000000..42a9fb70e
--- /dev/null
+++ b/client/coral-admin/src/graphql/queries/metricsQuery.graphql
@@ -0,0 +1,10 @@
+#import "../fragments/assetMetricsView.graphql"
+
+query Metrics ($from: Date!, $to: Date!) {
+  assetsByFlag: assetMetrics(from: $from, to: $to, sort: FLAG) {
+    ...metrics
+  }
+  assetsByLike: assetMetrics(from: $from, to: $to, sort: LIKE) {
+    ...metrics
+  }
+}
diff --git a/client/coral-admin/src/reducers/settings.js b/client/coral-admin/src/reducers/settings.js
index a6e0c9339..f74eb659f 100644
--- a/client/coral-admin/src/reducers/settings.js
+++ b/client/coral-admin/src/reducers/settings.js
@@ -4,6 +4,8 @@ import * as actions from '../actions/settings';
 // this is initialized here because
 // currently you have to reload the dashboard to get new stats
 // cleaner updates are planned in the future.
+// TODO: if there are more than two fields for the dashboard being created here,
+// please create a new reducer specifically for the Dashboard.
 const DASHBOARD_WINDOW_MINUTES = 5;
 let then = new Date();
 then.setMinutes(then.getMinutes() - DASHBOARD_WINDOW_MINUTES);

From 158f31d603d8f1d755d08a17dba61e246758ee30 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Tue, 28 Feb 2017 13:55:28 -0500
Subject: [PATCH 069/132] Highlighting permalinked comment.

---
 client/coral-embed-stream/src/Comment.js      | 10 ++-
 client/coral-embed-stream/src/Embed.js        | 78 ++++++++++++++-----
 client/coral-embed-stream/src/Stream.js       | 19 +----
 client/coral-embed-stream/style/default.css   |  5 ++
 .../coral-framework/graphql/queries/index.js  | 12 +--
 .../graphql/queries/streamQuery.graphql       | 11 ++-
 6 files changed, 85 insertions(+), 50 deletions(-)

diff --git a/client/coral-embed-stream/src/Comment.js b/client/coral-embed-stream/src/Comment.js
index 7262d10ed..8a81f9fe6 100644
--- a/client/coral-embed-stream/src/Comment.js
+++ b/client/coral-embed-stream/src/Comment.js
@@ -38,12 +38,12 @@ class Comment extends React.Component {
     // id of currently opened ReplyBox. tracked in Stream.js
     activeReplyBox: PropTypes.string.isRequired,
     setActiveReplyBox: PropTypes.func.isRequired,
-    refetch: PropTypes.func.isRequired,
     showSignInDialog: PropTypes.func.isRequired,
     postFlag: PropTypes.func.isRequired,
     postLike: PropTypes.func.isRequired,
     deleteAction: PropTypes.func.isRequired,
     parentId: PropTypes.string,
+    highlighted: PropTypes.string,
     addNotification: PropTypes.func.isRequired,
     postItem: PropTypes.func.isRequired,
     depth: PropTypes.number.isRequired,
@@ -85,10 +85,10 @@ class Comment extends React.Component {
       asset,
       depth,
       postItem,
-      refetch,
       addNotification,
       showSignInDialog,
       postLike,
+      highlighted,
       postFlag,
       postDontAgree,
       loadMore,
@@ -100,10 +100,12 @@ class Comment extends React.Component {
     const like = getActionSummary('LikeActionSummary', comment);
     const flag = getActionSummary('FlagActionSummary', comment);
     const dontagree = getActionSummary('DontAgreeActionSummary', comment);
+    let commentClass = parentId ? `reply ${styles.Reply}` : `comment ${styles.Comment}`;
+    commentClass += highlighted === comment.id ? ' highlighted-comment' : '';
 
     return (
       <div
-        className={parentId ? `reply ${styles.Reply}` : `comment ${styles.Comment}`}
+        className={commentClass}
         id={`c_${comment.id}`}
         style={{marginLeft: depth * 30}}>
         <hr aria-hidden={true} />
@@ -158,7 +160,6 @@ class Comment extends React.Component {
           comment.replies &&
           comment.replies.map(reply => {
             return <Comment
-              refetch={refetch}
               setActiveReplyBox={setActiveReplyBox}
               activeReplyBox={activeReplyBox}
               addNotification={addNotification}
@@ -166,6 +167,7 @@ class Comment extends React.Component {
               postItem={postItem}
               depth={depth + 1}
               asset={asset}
+              highlighted={highlighted}
               currentUser={currentUser}
               postLike={postLike}
               postFlag={postFlag}
diff --git a/client/coral-embed-stream/src/Embed.js b/client/coral-embed-stream/src/Embed.js
index b0f5d5c5a..2854de68c 100644
--- a/client/coral-embed-stream/src/Embed.js
+++ b/client/coral-embed-stream/src/Embed.js
@@ -12,7 +12,7 @@ const {logout, showSignInDialog, requestConfirmEmail} = authActions;
 const {addNotification, clearNotification} = notificationActions;
 const {fetchAssetSuccess} = assetActions;
 
-import {queryStream, commentQuery} from 'coral-framework/graphql/queries';
+import {queryStream} from 'coral-framework/graphql/queries';
 import {postComment, postFlag, postLike, postDontAgree, deleteAction} from 'coral-framework/graphql/mutations';
 import {editName} from 'coral-framework/actions/user';
 import {updateCountCache} from 'coral-framework/actions/asset';
@@ -31,12 +31,13 @@ import ChangeUsernameContainer from '../../coral-sign-in/containers/ChangeUserna
 import ProfileContainer from 'coral-settings/containers/ProfileContainer';
 import RestrictedContent from 'coral-framework/components/RestrictedContent';
 import ConfigureStreamContainer from 'coral-configure/containers/ConfigureStreamContainer';
+import Comment from './Comment';
 import LoadMore from './LoadMore';
 import NewCount from './NewCount';
 
 class Embed extends Component {
 
-  state = {activeTab: 0, showSignInDialog: false};
+  state = {activeTab: 0, showSignInDialog: false, activeReplyBox: ''};
 
   changeTab = (tab) => {
 
@@ -60,22 +61,24 @@ class Embed extends Component {
   componentDidMount () {
     pym.sendMessage('childReady');
 
-    pym.onMessage('DOMContentLoaded', hash => {
-      const commentId = hash.replace('#', 'c_');
-      let count = 0;
-      const interval = setInterval(() => {
-        if (document.getElementById(commentId)) {
-          window.clearInterval(interval);
-          pym.scrollParentToChildEl(commentId);
-        }
+    // pym.onMessage('DOMContentLoaded', hash => {
 
-        if (++count > 100) { // ~10 seconds
-          // give up waiting for the comments to load.
-          // it would be weird for the page to jump after that long.
-          window.clearInterval(interval);
-        }
-      }, 100);
-    });
+      // const commentId = hash.replace('#', 'c_');
+      // let count = 0;
+
+      // const interval = setInterval(() => {
+      //   if (document.getElementById(commentId)) {
+      //     window.clearInterval(interval);
+      //     pym.scrollParentToChildEl(commentId);
+      //   }
+      //
+      //   if (++count > 100) { // ~10 seconds
+      //     // give up waiting for the comments to load.
+      //     // it would be weird for the page to jump after that long.
+      //     window.clearInterval(interval);
+      //   }
+      // }, 100);
+    // });
   }
 
   componentWillReceiveProps (nextProps) {
@@ -83,13 +86,27 @@ class Embed extends Component {
     if(!isEqual(nextProps.data.asset, this.props.data.asset)) {
       loadAsset(nextProps.data.asset);
     }
+
+    // if(!isEqual(nextProps.data.comment, this.props.data.comment)) {
+      // pym.scrollParentToChildEl(nextProps.data.comment.id);
+    // }
+  }
+
+  setActiveReplyBox (reactKey) {
+    if (!this.props.currentUser) {
+      const offset = document.getElementById(`c_${reactKey}`).getBoundingClientRect().top - 75;
+      this.props.showSignInDialog(offset);
+    } else {
+      this.setState({activeReplyBox: reactKey});
+    }
   }
 
   render () {
     const {activeTab} = this.state;
     const {closedAt, countCache = {}} = this.props.asset;
-    const {loading, asset, refetch} = this.props.data;
+    const {loading, asset, refetch, comment} = this.props.data;
     const {loggedIn, isAdmin, user, showSignInDialog, signInOffset} = this.props.auth;
+    const highlightedComment = comment && comment.parent ? comment.parent : comment;
 
     const openStream = closedAt === null;
 
@@ -159,6 +176,28 @@ class Embed extends Component {
             }
             {!loggedIn && <SignInContainer requireEmailConfirmation={asset.settings.requireEmailConfirmation} offset={signInOffset}/>}
             {loggedIn &&  user && <ChangeUsernameContainer loggedIn={loggedIn} offset={signInOffset} user={user} />}
+            {
+              highlightedComment &&
+              <Comment
+                refetch={refetch}
+                setActiveReplyBox={this.setActiveReplyBox}
+                activeReplyBox={this.state.activeReplyBox}
+                addNotification={addNotification}
+                depth={0}
+                postItem={this.props.postItem}
+                asset={asset}
+                currentUser={user}
+                highlighted={comment.id}
+                postLike={this.props.postLike}
+                postFlag={this.props.postFlag}
+                postDontAgree={this.props.postDontAgree}
+                loadMore={this.props.loadMore}
+                deleteAction={this.props.deleteAction}
+                showSignInDialog={this.props.showSignInDialog}
+                key={highlightedComment.id}
+                reactKey={highlightedComment.id}
+                comment={highlightedComment} />
+            }
             <NewCount
               commentCount={asset.commentCount}
               countCache={countCache[asset.id]}
@@ -171,6 +210,8 @@ class Embed extends Component {
               refetch={refetch}
               addNotification={this.props.addNotification}
               postItem={this.props.postItem}
+              setActiveReplyBox={this.setActiveReplyBox}
+              activeReplyBox={this.state.activeReplyBox}
               asset={asset}
               currentUser={user}
               postLike={this.props.postLike}
@@ -251,6 +292,5 @@ export default compose(
   postLike,
   postDontAgree,
   deleteAction,
-  commentQuery,
   queryStream
 )(Embed);
diff --git a/client/coral-embed-stream/src/Stream.js b/client/coral-embed-stream/src/Stream.js
index a7f360d59..9d24d7f42 100644
--- a/client/coral-embed-stream/src/Stream.js
+++ b/client/coral-embed-stream/src/Stream.js
@@ -5,7 +5,6 @@ import {NEW_COMMENT_COUNT_POLL_INTERVAL} from 'coral-framework/constants/comment
 class Stream extends React.Component {
 
   static propTypes = {
-    refetch: PropTypes.func.isRequired,
     addNotification: PropTypes.func.isRequired,
     postItem: PropTypes.func.isRequired,
     asset: PropTypes.object.isRequired,
@@ -19,7 +18,6 @@ class Stream extends React.Component {
   constructor(props) {
     super(props);
     this.state = {activeReplyBox: '', countPoll: null};
-    this.setActiveReplyBox = this.setActiveReplyBox.bind(this);
   }
 
   componentDidMount() {
@@ -42,15 +40,6 @@ class Stream extends React.Component {
     clearInterval(this.state.countPoll);
   }
 
-  setActiveReplyBox (reactKey) {
-    if (!this.props.currentUser) {
-      const offset = document.getElementById(`c_${reactKey}`).getBoundingClientRect().top - 75;
-      this.props.showSignInDialog(offset);
-    } else {
-      this.setState({activeReplyBox: reactKey});
-    }
-  }
-
   render () {
     const {
       comments,
@@ -63,8 +52,7 @@ class Stream extends React.Component {
       postDontAgree,
       loadMore,
       deleteAction,
-      showSignInDialog,
-      refetch
+      showSignInDialog
     } = this.props;
 
     return (
@@ -72,9 +60,8 @@ class Stream extends React.Component {
         {
           comments.map(comment =>
             <Comment
-              refetch={refetch}
-              setActiveReplyBox={this.setActiveReplyBox}
-              activeReplyBox={this.state.activeReplyBox}
+              setActiveReplyBox={this.props.setActiveReplyBox}
+              activeReplyBox={this.props.activeReplyBox}
               addNotification={addNotification}
               depth={0}
               postItem={postItem}
diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css
index 52876ff79..0481f6527 100644
--- a/client/coral-embed-stream/style/default.css
+++ b/client/coral-embed-stream/style/default.css
@@ -180,6 +180,11 @@ hr {
   float: right;
 }
 
+.highlighted-comment {
+  padding-left: 10px;
+  border-left: 3px solid rgb(35,118,216);
+}
+
 /* Tag Labels */
 
 .coral-plugin-tag-label {
diff --git a/client/coral-framework/graphql/queries/index.js b/client/coral-framework/graphql/queries/index.js
index 8d61c9f8b..26a72498d 100644
--- a/client/coral-framework/graphql/queries/index.js
+++ b/client/coral-framework/graphql/queries/index.js
@@ -2,7 +2,6 @@ import {graphql} from 'react-apollo';
 import STREAM_QUERY from './streamQuery.graphql';
 import LOAD_MORE from './loadMore.graphql';
 import GET_COUNTS from './getCounts.graphql';
-import COMMENT_QUERY from './commentQuery.graphql';
 import MY_COMMENT_HISTORY from './myCommentHistory.graphql';
 
 function getQueryVariable(variable) {
@@ -88,7 +87,8 @@ export const loadMore = (data) => ({limit, cursor, parent_id, asset_id, sort}, n
 export const queryStream = graphql(STREAM_QUERY, {
   options: () => ({
     variables: {
-      asset_url: getQueryVariable('asset_url')
+      asset_url: getQueryVariable('asset_url'),
+      comment_id: getQueryVariable('comment_id')
     }
   }),
   props: ({data}) => ({
@@ -98,12 +98,4 @@ export const queryStream = graphql(STREAM_QUERY, {
   })
 });
 
-export const commentQuery = graphql(COMMENT_QUERY, {
-  options: () => ({
-    variables: {
-      id: getQueryVariable('comment_id')
-    }
-  })
-});
-
 export const myCommentHistory = graphql(MY_COMMENT_HISTORY, {});
diff --git a/client/coral-framework/graphql/queries/streamQuery.graphql b/client/coral-framework/graphql/queries/streamQuery.graphql
index 0a7f6c549..4f09f628e 100644
--- a/client/coral-framework/graphql/queries/streamQuery.graphql
+++ b/client/coral-framework/graphql/queries/streamQuery.graphql
@@ -1,6 +1,15 @@
 #import "../fragments/commentView.graphql"
 
-query AssetQuery($asset_url: String!) {
+query AssetQuery($asset_url: String!, $comment_id: ID!) {
+    comment(id: $comment_id) {
+      ...commentView
+      parent {
+        ...commentView
+        replies {
+          ...commentView
+        }
+      }
+    }
     asset(url: $asset_url) {
         id
         title

From 62fe63d323c34cb42ebc5fa2e5f60271669f889e Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Tue, 28 Feb 2017 14:27:53 -0500
Subject: [PATCH 070/132] Scrolling to permalinked comment or reply.

---
 client/coral-embed-stream/src/Embed.js | 29 +++++++-------------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/client/coral-embed-stream/src/Embed.js b/client/coral-embed-stream/src/Embed.js
index 2854de68c..5526d70e1 100644
--- a/client/coral-embed-stream/src/Embed.js
+++ b/client/coral-embed-stream/src/Embed.js
@@ -60,25 +60,6 @@ class Embed extends Component {
 
   componentDidMount () {
     pym.sendMessage('childReady');
-
-    // pym.onMessage('DOMContentLoaded', hash => {
-
-      // const commentId = hash.replace('#', 'c_');
-      // let count = 0;
-
-      // const interval = setInterval(() => {
-      //   if (document.getElementById(commentId)) {
-      //     window.clearInterval(interval);
-      //     pym.scrollParentToChildEl(commentId);
-      //   }
-      //
-      //   if (++count > 100) { // ~10 seconds
-      //     // give up waiting for the comments to load.
-      //     // it would be weird for the page to jump after that long.
-      //     window.clearInterval(interval);
-      //   }
-      // }, 100);
-    // });
   }
 
   componentWillReceiveProps (nextProps) {
@@ -86,10 +67,14 @@ class Embed extends Component {
     if(!isEqual(nextProps.data.asset, this.props.data.asset)) {
       loadAsset(nextProps.data.asset);
     }
+  }
 
-    // if(!isEqual(nextProps.data.comment, this.props.data.comment)) {
-      // pym.scrollParentToChildEl(nextProps.data.comment.id);
-    // }
+  componentDidUpdate(prevProps) {
+    if(!isEqual(prevProps.data.comment, this.props.data.comment)) {
+
+      // Scroll to a permalinked comment if one is in the URL once the page is done rendering.
+      setTimeout(()=>pym.scrollParentToChildEl(`c_${this.props.data.comment.id}`), 0);
+    }
   }
 
   setActiveReplyBox (reactKey) {

From fed28b3eecd8e0bdec4b17d62b0112f0c8b85233 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Tue, 28 Feb 2017 16:13:51 -0500
Subject: [PATCH 071/132] Refetching on login and logout.

---
 client/coral-admin/src/actions/auth.js             | 2 +-
 client/coral-embed-stream/src/Embed.js             | 8 +++++---
 client/coral-embed-stream/src/Stream.js            | 5 +----
 client/coral-framework/actions/auth.js             | 4 ++--
 client/coral-sign-in/containers/SignInContainer.js | 3 ++-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/client/coral-admin/src/actions/auth.js b/client/coral-admin/src/actions/auth.js
index c2f3a8056..6762bd70a 100644
--- a/client/coral-admin/src/actions/auth.js
+++ b/client/coral-admin/src/actions/auth.js
@@ -28,7 +28,7 @@ const logOutFailure = () => ({type: actions.LOGOUT_FAILURE});
 
 export const logout = () => dispatch => {
   dispatch(logOutRequest());
-  coralApi('/auth', {method: 'DELETE'})
+  return coralApi('/auth', {method: 'DELETE'})
     .then(() => dispatch(logOutSuccess()))
     .catch(error => dispatch(logOutFailure(error)));
 };
diff --git a/client/coral-embed-stream/src/Embed.js b/client/coral-embed-stream/src/Embed.js
index ac9c09eac..d44c44086 100644
--- a/client/coral-embed-stream/src/Embed.js
+++ b/client/coral-embed-stream/src/Embed.js
@@ -116,7 +116,7 @@ class Embed extends Component {
             <Tab>{lang.t('profile')}</Tab>
             <Tab restricted={!isAdmin}>Configure Stream</Tab>
           </TabBar>
-          {loggedIn && <UserBox user={user} logout={this.props.logout}  changeTab={this.changeTab}/>}
+          {loggedIn && <UserBox user={user} logout={() => this.props.logout().then(refetch)}  changeTab={this.changeTab}/>}
           <TabContent show={activeTab === 0}>
             {
               openStream
@@ -157,7 +157,10 @@ class Embed extends Component {
                  </div>
                : <p>{asset.settings.closedMessage}</p>
             }
-            {!loggedIn && <SignInContainer requireEmailConfirmation={asset.settings.requireEmailConfirmation} offset={signInOffset}/>}
+            {!loggedIn && <SignInContainer
+              requireEmailConfirmation={asset.settings.requireEmailConfirmation}
+              refetch={refetch}
+              offset={signInOffset}/>}
             {loggedIn &&  user && <ChangeUsernameContainer loggedIn={loggedIn} offset={signInOffset} user={user} />}
             <NewCount
               commentCount={asset.commentCount}
@@ -168,7 +171,6 @@ class Embed extends Component {
               updateCountCache={this.props.updateCountCache}
               />
             <Stream
-              refetch={refetch}
               addNotification={this.props.addNotification}
               postItem={this.props.postItem}
               asset={asset}
diff --git a/client/coral-embed-stream/src/Stream.js b/client/coral-embed-stream/src/Stream.js
index a7f360d59..cf358c08d 100644
--- a/client/coral-embed-stream/src/Stream.js
+++ b/client/coral-embed-stream/src/Stream.js
@@ -5,7 +5,6 @@ import {NEW_COMMENT_COUNT_POLL_INTERVAL} from 'coral-framework/constants/comment
 class Stream extends React.Component {
 
   static propTypes = {
-    refetch: PropTypes.func.isRequired,
     addNotification: PropTypes.func.isRequired,
     postItem: PropTypes.func.isRequired,
     asset: PropTypes.object.isRequired,
@@ -63,8 +62,7 @@ class Stream extends React.Component {
       postDontAgree,
       loadMore,
       deleteAction,
-      showSignInDialog,
-      refetch
+      showSignInDialog
     } = this.props;
 
     return (
@@ -72,7 +70,6 @@ class Stream extends React.Component {
         {
           comments.map(comment =>
             <Comment
-              refetch={refetch}
               setActiveReplyBox={this.setActiveReplyBox}
               activeReplyBox={this.state.activeReplyBox}
               addNotification={addNotification}
diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js
index 418acc5bb..ba1952e29 100644
--- a/client/coral-framework/actions/auth.js
+++ b/client/coral-framework/actions/auth.js
@@ -46,7 +46,7 @@ const signInFailure = error => ({type: actions.FETCH_SIGNIN_FAILURE, error});
 
 export const fetchSignIn = (formData) => (dispatch) => {
   dispatch(signInRequest());
-  coralApi('/auth/local', {method: 'POST', body: formData})
+  return coralApi('/auth/local', {method: 'POST', body: formData})
     .then(({user}) => {
       const isAdmin = !!user.roles.filter(i => i === 'ADMIN').length;
       dispatch(signInSuccess(user, isAdmin));
@@ -148,7 +148,7 @@ const logOutFailure = () => ({type: actions.LOGOUT_FAILURE});
 
 export const logout = () => dispatch => {
   dispatch(logOutRequest());
-  coralApi('/auth', {method: 'DELETE'})
+  return coralApi('/auth', {method: 'DELETE'})
     .then(() => dispatch(logOutSuccess()))
     .catch(error => dispatch(logOutFailure(error)));
 };
diff --git a/client/coral-sign-in/containers/SignInContainer.js b/client/coral-sign-in/containers/SignInContainer.js
index fd9762ee3..0ef2b42b4 100644
--- a/client/coral-sign-in/containers/SignInContainer.js
+++ b/client/coral-sign-in/containers/SignInContainer.js
@@ -147,7 +147,8 @@ class SignInContainer extends Component {
 
   handleSignIn(e) {
     e.preventDefault();
-    this.props.fetchSignIn(this.state.formData);
+    this.props.fetchSignIn(this.state.formData)
+      .then(this.props.refetch);
   }
 
   render() {

From e2273f581038aca6a1a28c42da8b1619e9a51e7f Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Tue, 28 Feb 2017 14:32:01 -0700
Subject: [PATCH 072/132] change PermissionRequired to LoginView and create a
 login form. delete old login page

---
 client/coral-admin/src/actions/auth.js        |  13 ++
 .../coral-admin/src/components/LoginView.js   |  49 +++++++
 .../coral-admin/src/components/NotFound.css   |  10 +-
 .../src/components/PermissionRequired.js      |  13 --
 .../coral-admin/src/components/ui/Drawer.js   |  10 +-
 .../coral-admin/src/components/ui/Header.js   |  11 +-
 .../coral-admin/src/components/ui/Layout.js   |  17 ++-
 client/coral-admin/src/constants/auth.js      |   4 +
 .../containers/Install/InstallContainer.js    |   2 +-
 .../src/containers/LayoutContainer.js         |  20 +--
 routes/admin/index.js                         |   4 -
 views/admin/login.ejs                         | 132 ------------------
 12 files changed, 109 insertions(+), 176 deletions(-)
 create mode 100644 client/coral-admin/src/components/LoginView.js
 delete mode 100644 client/coral-admin/src/components/PermissionRequired.js
 delete mode 100644 views/admin/login.ejs

diff --git a/client/coral-admin/src/actions/auth.js b/client/coral-admin/src/actions/auth.js
index c2f3a8056..0eb17f74c 100644
--- a/client/coral-admin/src/actions/auth.js
+++ b/client/coral-admin/src/actions/auth.js
@@ -1,6 +1,19 @@
 import * as actions from '../constants/auth';
 import coralApi from '../../../coral-framework/helpers/response';
 
+// Log In.
+export const handleLogin = (email, password) => dispatch => {
+  dispatch({type: actions.LOGIN_REQUEST});
+  return coralApi('/auth/local', {method: 'POST', body: {email, password}})
+    .then(result => {
+      const isAdmin = !!result.user.roles.filter(i => i === 'ADMIN').length;
+      dispatch(checkLoginSuccess(result.user, isAdmin));
+    })
+    .catch(error => {
+      console.error(error);
+    });
+};
+
 // Check Login
 
 const checkLoginRequest = () => ({type: actions.CHECK_LOGIN_REQUEST});
diff --git a/client/coral-admin/src/components/LoginView.js b/client/coral-admin/src/components/LoginView.js
new file mode 100644
index 000000000..e9b740683
--- /dev/null
+++ b/client/coral-admin/src/components/LoginView.js
@@ -0,0 +1,49 @@
+import React, {PropTypes} from 'react';
+import Layout from 'coral-admin/src/components/ui/Layout';
+import styles from './NotFound.css';
+import {Button, TextField} from 'coral-ui';
+
+class LoginView extends React.Component {
+
+  constructor (props) {
+    super(props);
+    this.state = {email: '', password: ''};
+  }
+
+  handleSignIn = e => {
+    e.preventDefault();
+    this.props.handleLogin(this.state.email, this.state.password);
+  }
+
+  render () {
+    return (
+      <Layout fixedDrawer restricted={true}>
+        <div className={styles.layout}>
+          <h1>Permission Required</h1>
+          <p>Sign in to interact with your community.</p>
+          <form onSubmit={this.handleSignIn}>
+            <TextField
+              label='email'
+              value={this.state.email}
+              onChange={e => this.setState({email: e.target.value})} />
+            <TextField
+              label='password'
+              value={this.state.password}
+              onChange={e => this.setState({password: e.target.value})}
+              type='password' />
+            <Button
+              type='submit'
+              cStyle='black'
+              onClick={this.handleSignIn} full>Sign In</Button>
+          </form>
+        </div>
+      </Layout>
+    );
+  }
+}
+
+LoginView.propTypes = {
+  handleLogin: PropTypes.func.isRequired
+};
+
+export default LoginView;
diff --git a/client/coral-admin/src/components/NotFound.css b/client/coral-admin/src/components/NotFound.css
index fc9aedc6b..e0e04e0fd 100644
--- a/client/coral-admin/src/components/NotFound.css
+++ b/client/coral-admin/src/components/NotFound.css
@@ -1,12 +1,8 @@
 .layout {
-    max-width: 800px;
-    margin: 0 auto;
+  max-width: 400px;
+  margin: 0 auto;
 }
 
 .layout h1 {
-    font-size: 40px;
-}
-
-.layout img {
-    width: 100%;
+  font-size: 40px;
 }
diff --git a/client/coral-admin/src/components/PermissionRequired.js b/client/coral-admin/src/components/PermissionRequired.js
deleted file mode 100644
index c61ab1cef..000000000
--- a/client/coral-admin/src/components/PermissionRequired.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import React from 'react';
-import {Layout} from 'react-mdl';
-import styles from './NotFound.css';
-
-export const PermissionRequired = () => (
-  <Layout fixedDrawer>
-    <div className={styles.layout} >
-      <h1>Permission Required</h1>
-      <p>We’re sorry, but you don’t have access to that page.</p>
-      <img src="https://coralproject.net/images/communicorn.jpg" alt="Communicorn"/>
-    </div>
-  </Layout>
-);
diff --git a/client/coral-admin/src/components/ui/Drawer.js b/client/coral-admin/src/components/ui/Drawer.js
index 8fdf4f19d..9af651f3b 100644
--- a/client/coral-admin/src/components/ui/Drawer.js
+++ b/client/coral-admin/src/components/ui/Drawer.js
@@ -1,11 +1,11 @@
-import React from 'react';
+import React, {PropTypes} from 'react';
 import {Navigation, Drawer} from 'react-mdl';
 import {IndexLink, Link} from 'react-router';
 import styles from './Drawer.css';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../../translations.json';
 
-export default ({handleLogout, restricted = false}) => (
+const CoralDrawer = ({handleLogout, restricted = false}) => (
   <Drawer className={styles.header}>
     { !restricted ?
       <div>
@@ -45,5 +45,11 @@ export default ({handleLogout, restricted = false}) => (
   </Drawer>
 );
 
+CoralDrawer.propTypes = {
+  handleLogout: PropTypes.func.isRequired,
+  restricted: PropTypes.bool // hide app elements from a logged out user
+};
+
 const lang = new I18n(translations);
 
+export default CoralDrawer;
diff --git a/client/coral-admin/src/components/ui/Header.js b/client/coral-admin/src/components/ui/Header.js
index 556b33b6c..4a2314926 100644
--- a/client/coral-admin/src/components/ui/Header.js
+++ b/client/coral-admin/src/components/ui/Header.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {PropTypes} from 'react';
 import {Navigation, Header, IconButton, MenuItem, Menu} from 'react-mdl';
 import {Link, IndexLink} from 'react-router';
 import styles from './Header.css';
@@ -6,7 +6,7 @@ import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../../translations.json';
 import {Logo} from './Logo';
 
-export default ({handleLogout, restricted = false}) => (
+const CoralHeader = ({handleLogout, restricted = false}) => (
   <Header className={styles.header}>
     <Logo className={styles.logo} />
     {
@@ -64,4 +64,11 @@ export default ({handleLogout, restricted = false}) => (
   </Header>
 );
 
+CoralHeader.propTypes = {
+  handleLogout: PropTypes.func.isRequired,
+  restricted: PropTypes.bool // hide elemnts from a user that's logged out
+};
+
 const lang = new I18n(translations);
+
+export default CoralHeader;
diff --git a/client/coral-admin/src/components/ui/Layout.js b/client/coral-admin/src/components/ui/Layout.js
index f28e8dd80..c8b5bf57a 100644
--- a/client/coral-admin/src/components/ui/Layout.js
+++ b/client/coral-admin/src/components/ui/Layout.js
@@ -1,15 +1,22 @@
-import React from 'react';
+import React, {PropTypes} from 'react';
 import {Layout as LayoutMDL} from 'react-mdl';
 import Header from './Header';
 import Drawer from './Drawer';
 import styles from './Layout.css';
 
-export const Layout = ({children, ...props}) => (
+const Layout = ({children, handleLogout = () => {}, restricted = false, ...props}) => (
   <LayoutMDL fixedDrawer>
-    <Header {...props} />
-    <Drawer {...props} />
-    <div className={styles.layout} >
+    <Header handleLogout={handleLogout} restricted={restricted} {...props} />
+    <Drawer handleLogout={handleLogout} restricted={restricted} {...props} />
+    <div className={styles.layout}>
       {children}
     </div>
   </LayoutMDL>
 );
+
+Layout.propTypes = {
+  handleLogout: PropTypes.func,
+  restricted: PropTypes.bool // hide elements from a user that's logged out
+};
+
+export default Layout;
diff --git a/client/coral-admin/src/constants/auth.js b/client/coral-admin/src/constants/auth.js
index f77deb670..88a9c4a3f 100644
--- a/client/coral-admin/src/constants/auth.js
+++ b/client/coral-admin/src/constants/auth.js
@@ -7,3 +7,7 @@ export const CHECK_CSRF_TOKEN = 'CHECK_CSRF_TOKEN';
 export const LOGOUT_REQUEST = 'LOGOUT_REQUEST';
 export const LOGOUT_SUCCESS = 'LOGOUT_SUCCESS';
 export const LOGOUT_FAILURE = 'LOGOUT_FAILURE';
+
+export const LOGIN_REQUEST = 'LOGIN_REQUEST';
+export const LOGIN_SUCCESS = 'LOGIN_SUCCESS';
+export const LOGIN_FAILURE = 'LOGIN_FAILURE';
diff --git a/client/coral-admin/src/containers/Install/InstallContainer.js b/client/coral-admin/src/containers/Install/InstallContainer.js
index 7a8634180..123a1493b 100644
--- a/client/coral-admin/src/containers/Install/InstallContainer.js
+++ b/client/coral-admin/src/containers/Install/InstallContainer.js
@@ -2,7 +2,7 @@ import React, {Component} from 'react';
 import {connect} from 'react-redux';
 import styles from './style.css';
 import {Wizard, WizardNav} from 'coral-ui';
-import {Layout} from '../../components/ui/Layout';
+import Layout from 'coral-admin/src/components/ui/Layout';
 
 import {
   nextStep,
diff --git a/client/coral-admin/src/containers/LayoutContainer.js b/client/coral-admin/src/containers/LayoutContainer.js
index 5ce208503..ce3c7d1bf 100644
--- a/client/coral-admin/src/containers/LayoutContainer.js
+++ b/client/coral-admin/src/containers/LayoutContainer.js
@@ -1,24 +1,23 @@
 import React, {Component} from 'react';
 import {connect} from 'react-redux';
-import {Layout} from '../components/ui/Layout';
-import {checkLogin, logout} from '../actions/auth';
+import Layout from '../components/ui/Layout';
+import {checkLogin, handleLogin, logout} from '../actions/auth';
 import {FullLoading} from '../components/FullLoading';
-import {PermissionRequired} from '../components/PermissionRequired';
+import LoginView from '../components/LoginView';
 
 class LayoutContainer extends Component {
   componentWillMount () {
     const {checkLogin} = this.props;
-    checkLogin().then(() => {
-      if (!this.props.auth.isAdmin) {
-        location.href = '/admin/login';
-      }
-    });
+    checkLogin();
   }
   render () {
     const {isAdmin, loggedIn, loadingUser} = this.props.auth;
+    const {handleLogout} = this.props;
     if (loadingUser) { return <FullLoading />; }
-    if (!isAdmin) { return <PermissionRequired />; }
-    if (isAdmin && loggedIn) { return <Layout {...this.props} />; }
+    if (!isAdmin) {
+      return <LoginView handleLogin={this.props.handleLogin} />;
+    }
+    if (isAdmin && loggedIn) { return <Layout handleLogout={handleLogout} {...this.props} />; }
     return <FullLoading />;
   }
 }
@@ -29,6 +28,7 @@ const mapStateToProps = state => ({
 
 const mapDispatchToProps = dispatch => ({
   checkLogin: () => dispatch(checkLogin()),
+  handleLogin: (username, password) => dispatch(handleLogin(username, password)),
   handleLogout: () => dispatch(logout())
 });
 
diff --git a/routes/admin/index.js b/routes/admin/index.js
index a3699143e..e2473bca9 100644
--- a/routes/admin/index.js
+++ b/routes/admin/index.js
@@ -15,10 +15,6 @@ router.get('/password-reset', (req, res) => {
   res.render('password-reset', {redirectUri: process.env.TALK_ROOT_URL});
 });
 
-router.get('/login', (req, res, next) => {
-  res.render('admin/login');
-});
-
 router.get('*', (req, res) => {
   res.render('admin', {basePath: '/client/coral-admin'});
 });
diff --git a/views/admin/login.ejs b/views/admin/login.ejs
deleted file mode 100644
index e88dd86fd..000000000
--- a/views/admin/login.ejs
+++ /dev/null
@@ -1,132 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="initial-scale=1, maximum-scale=1">
-    <title>Admin Login</title>
-    <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
-    <link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.indigo-pink.min.css">
-
-    <style media="screen">
-      body, #root {
-        width: 100%;
-        height: 100%;
-        margin: 0;
-        background: #fff;
-      }
-
-      #root form {
-        max-width: 300px;
-        border: 1px solid lightgrey;
-        box-shadow: 0px 10px 24px 2px rgba(0,0,0,0.2);
-        margin: 50px auto;
-        padding: 15px;
-      }
-
-      .legend {
-        text-align: center;
-        width: 100%;
-        font-weight: bold;
-      }
-
-      label {
-        display: block;
-        margin-top: 10px;
-        margin-bottom: 3px;
-        padding-right: 30px;
-      }
-
-      small {
-        color: #888;
-      }
-
-      input {
-        border-radius: 4px;
-        margin-top: 3px;
-        border: 1px solid lightgrey;
-        font-size: 16px;
-        width: 100%;
-        padding: 14px;
-        height: 100%;
-        display: inline-block;
-      }
-
-      .submit-password-reset {
-        border-radius: 4px;
-        border: none;
-        display: block;
-        background-color: #333;
-        color: white;
-        text-align: center;
-        width: 100%;
-        padding: 10px;
-        margin-top: 10px;
-        cursor: pointer;
-      }
-
-      .error-console {
-        display: none;
-        margin-top: 10px;
-        border-radius: 4px;
-        background-color: pink;
-        color: red;
-        border: 1px solid red;
-        padding: 10px;
-      }
-
-      .error-console.active {
-        display: block;
-      }
-    </style>
-  </head>
-  <body>
-    <div id="root">
-      <form id="login-form">
-        <legend class="legend">Admin Login</legend>
-        <label for="email">
-          Email
-          <input type="email" name="email" placeholder=""/>
-        </label>
-
-        <label for="password">
-          Password
-          <input type="password" name="password" placeholder="" />
-        </label>
-        <button class="submit-password-reset" type="submit">Login</button>
-        <div class="error-console"></div>
-      </form>
-    </div>
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
-    <script>
-      $(function () {
-        function showError(message) {
-          $('.error-console').text(message).addClass('active');
-        }
-
-        function handleSubmit (e) {
-          e.preventDefault();
-          $('.error-console').removeClass('active');
-
-          var password = $('[name="password"]').val();
-          var email = $('[name="email"]').val();
-
-          $.ajax({
-            url: '/api/v1/auth/local',
-            contentType: 'application/json',
-            method: 'POST',
-            headers: {
-              'X-CSRF-Token': '<%= csrfToken %>'
-            },
-            data: JSON.stringify({password: password, email: email})
-          }).then(function (success) {
-            location.href = '/admin';
-          }).catch(function (error) {
-            showError(error.responseText);
-          });
-        }
-
-        $('#login-form').on('submit', handleSubmit);
-      });
-    </script>
-  </body>
-</html>

From bb1aea63baf7fa9fc58b4d20b0be43ddedc56b84 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Tue, 28 Feb 2017 14:33:57 -0700
Subject: [PATCH 073/132] add a couple of routes

---
 client/coral-admin/src/AppRouter.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/coral-admin/src/AppRouter.js b/client/coral-admin/src/AppRouter.js
index d96bacfe0..a1ba32ea7 100644
--- a/client/coral-admin/src/AppRouter.js
+++ b/client/coral-admin/src/AppRouter.js
@@ -14,6 +14,8 @@ import Dashboard from 'containers/Dashboard/Dashboard';
 const routes = (
   <div>
     <Route exact path="/admin/install" component={InstallContainer}/>
+    <Route path='/admin/login' component={LayoutContainer} />
+    <Route path='/admin/logon' component={LayoutContainer} />
     <Route path='/admin' component={LayoutContainer}>
       <IndexRoute component={ModerationContainer} />
       <Route path='community' component={CommunityContainer} />

From b369fb910106f5314128df43f567387f8f1f50ae Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Tue, 28 Feb 2017 14:38:19 -0700
Subject: [PATCH 074/132] re-rename

---
 .../src/components/{LoginView.js => AdminLogin.js}          | 6 +++---
 client/coral-admin/src/containers/LayoutContainer.js        | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename client/coral-admin/src/components/{LoginView.js => AdminLogin.js} (92%)

diff --git a/client/coral-admin/src/components/LoginView.js b/client/coral-admin/src/components/AdminLogin.js
similarity index 92%
rename from client/coral-admin/src/components/LoginView.js
rename to client/coral-admin/src/components/AdminLogin.js
index e9b740683..b96a84031 100644
--- a/client/coral-admin/src/components/LoginView.js
+++ b/client/coral-admin/src/components/AdminLogin.js
@@ -3,7 +3,7 @@ import Layout from 'coral-admin/src/components/ui/Layout';
 import styles from './NotFound.css';
 import {Button, TextField} from 'coral-ui';
 
-class LoginView extends React.Component {
+class AdminLogin extends React.Component {
 
   constructor (props) {
     super(props);
@@ -42,8 +42,8 @@ class LoginView extends React.Component {
   }
 }
 
-LoginView.propTypes = {
+AdminLogin.propTypes = {
   handleLogin: PropTypes.func.isRequired
 };
 
-export default LoginView;
+export default AdminLogin;
diff --git a/client/coral-admin/src/containers/LayoutContainer.js b/client/coral-admin/src/containers/LayoutContainer.js
index ce3c7d1bf..94ce98c55 100644
--- a/client/coral-admin/src/containers/LayoutContainer.js
+++ b/client/coral-admin/src/containers/LayoutContainer.js
@@ -3,7 +3,7 @@ import {connect} from 'react-redux';
 import Layout from '../components/ui/Layout';
 import {checkLogin, handleLogin, logout} from '../actions/auth';
 import {FullLoading} from '../components/FullLoading';
-import LoginView from '../components/LoginView';
+import AdminLogin from '../components/AdminLogin';
 
 class LayoutContainer extends Component {
   componentWillMount () {
@@ -15,7 +15,7 @@ class LayoutContainer extends Component {
     const {handleLogout} = this.props;
     if (loadingUser) { return <FullLoading />; }
     if (!isAdmin) {
-      return <LoginView handleLogin={this.props.handleLogin} />;
+      return <AdminLogin handleLogin={this.props.handleLogin} />;
     }
     if (isAdmin && loggedIn) { return <Layout handleLogout={handleLogout} {...this.props} />; }
     return <FullLoading />;

From d8117494d1f968bb6452bcd3a98ab6141959699c Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Tue, 28 Feb 2017 18:18:17 -0500
Subject: [PATCH 075/132] Cleaning up after merge conflict.

---
 graph/loaders/comments.js | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/graph/loaders/comments.js b/graph/loaders/comments.js
index 6c9d4bcbc..afa79ea5c 100644
--- a/graph/loaders/comments.js
+++ b/graph/loaders/comments.js
@@ -39,14 +39,7 @@ const getCountsByAssetID = (context, asset_ids) => {
 /**
  * Returns the comment count for all comments that are public based on their
  * parent ids.
- * @param {Object}        
- 
- 
- 
- 
- 
- 
- graph context
+ *
  * @param {Array<String>} parent_ids  the ids of parents for which there are
  *                                    comments that we want to get
  */
@@ -284,7 +277,7 @@ const genRecentComments = (_, ids) => {
  * @return {Promise}       resolves to the comments
  */
 const genComments = ({user}, ids) => {
-  let comments
+  let comments;
   if (user && user.hasRoles('ADMIN')) {
     comments = CommentModel.find({
       id: {
@@ -300,11 +293,8 @@ const genComments = ({user}, ids) => {
         $in: ['NONE', 'ACCEPTED']
       }
     });
+  }
   return comments.then(util.singleJoinBy(ids, 'id'));
-    
- */
-const genCommentsByID = (context, ids) => {
-
 };
 
 /**

From 8f23ca678d93144cc86c3c7a46f8d1e66bb64c7a Mon Sep 17 00:00:00 2001
From: riley <riley.davis@gmail.com>
Date: Tue, 28 Feb 2017 16:30:05 -0700
Subject: [PATCH 076/132] add Alert component to coral-ui

---
 client/coral-admin/src/actions/auth.js          |  4 ++--
 client/coral-admin/src/components/AdminLogin.js | 10 ++++++++--
 .../src/containers/LayoutContainer.js           |  6 ++++--
 client/coral-admin/src/reducers/auth.js         |  7 ++++++-
 client/coral-admin/src/translations.json        |  8 +++++++-
 .../components/CreateUsernameDialog.js          |  3 +--
 .../coral-sign-in/components/SignInContent.js   |  3 +--
 .../coral-sign-in/components/SignUpContent.js   |  3 +--
 client/coral-sign-in/components/styles.css      | 17 -----------------
 client/coral-ui/components/Alert.css            | 16 ++++++++++++++++
 .../components/Alert.js                         |  2 +-
 client/coral-ui/index.js                        |  1 +
 12 files changed, 48 insertions(+), 32 deletions(-)
 create mode 100644 client/coral-ui/components/Alert.css
 rename client/{coral-sign-in => coral-ui}/components/Alert.js (87%)

diff --git a/client/coral-admin/src/actions/auth.js b/client/coral-admin/src/actions/auth.js
index 0eb17f74c..66c063d00 100644
--- a/client/coral-admin/src/actions/auth.js
+++ b/client/coral-admin/src/actions/auth.js
@@ -1,5 +1,5 @@
 import * as actions from '../constants/auth';
-import coralApi from '../../../coral-framework/helpers/response';
+import coralApi from 'coral-framework/helpers/response';
 
 // Log In.
 export const handleLogin = (email, password) => dispatch => {
@@ -10,7 +10,7 @@ export const handleLogin = (email, password) => dispatch => {
       dispatch(checkLoginSuccess(result.user, isAdmin));
     })
     .catch(error => {
-      console.error(error);
+      dispatch({type: actions.LOGIN_FAILURE, message: error.translation_key});
     });
 };
 
diff --git a/client/coral-admin/src/components/AdminLogin.js b/client/coral-admin/src/components/AdminLogin.js
index b96a84031..1475ccce7 100644
--- a/client/coral-admin/src/components/AdminLogin.js
+++ b/client/coral-admin/src/components/AdminLogin.js
@@ -1,7 +1,10 @@
 import React, {PropTypes} from 'react';
 import Layout from 'coral-admin/src/components/ui/Layout';
 import styles from './NotFound.css';
-import {Button, TextField} from 'coral-ui';
+import {Button, TextField, Alert} from 'coral-ui';
+import I18n from 'coral-framework/modules/i18n/i18n';
+import translations from '../translations';
+const lang = new I18n(translations);
 
 class AdminLogin extends React.Component {
 
@@ -16,12 +19,14 @@ class AdminLogin extends React.Component {
   }
 
   render () {
+    const {errorMessage} = this.props;
     return (
       <Layout fixedDrawer restricted={true}>
         <div className={styles.layout}>
           <h1>Permission Required</h1>
           <p>Sign in to interact with your community.</p>
           <form onSubmit={this.handleSignIn}>
+            {errorMessage && <Alert>{lang.t(`errors.${errorMessage}`)}</Alert>}
             <TextField
               label='email'
               value={this.state.email}
@@ -43,7 +48,8 @@ class AdminLogin extends React.Component {
 }
 
 AdminLogin.propTypes = {
-  handleLogin: PropTypes.func.isRequired
+  handleLogin: PropTypes.func.isRequired,
+  loginError: PropTypes.string
 };
 
 export default AdminLogin;
diff --git a/client/coral-admin/src/containers/LayoutContainer.js b/client/coral-admin/src/containers/LayoutContainer.js
index 94ce98c55..ca9ff2e7b 100644
--- a/client/coral-admin/src/containers/LayoutContainer.js
+++ b/client/coral-admin/src/containers/LayoutContainer.js
@@ -11,11 +11,13 @@ class LayoutContainer extends Component {
     checkLogin();
   }
   render () {
-    const {isAdmin, loggedIn, loadingUser} = this.props.auth;
+    const {isAdmin, loggedIn, loadingUser, loginError} = this.props.auth;
     const {handleLogout} = this.props;
     if (loadingUser) { return <FullLoading />; }
     if (!isAdmin) {
-      return <AdminLogin handleLogin={this.props.handleLogin} />;
+      return <AdminLogin
+        handleLogin={this.props.handleLogin}
+        errorMessage={loginError} />;
     }
     if (isAdmin && loggedIn) { return <Layout handleLogout={handleLogout} {...this.props} />; }
     return <FullLoading />;
diff --git a/client/coral-admin/src/reducers/auth.js b/client/coral-admin/src/reducers/auth.js
index 095ef7aac..d2f178773 100644
--- a/client/coral-admin/src/reducers/auth.js
+++ b/client/coral-admin/src/reducers/auth.js
@@ -4,7 +4,8 @@ import * as actions from '../constants/auth';
 const initialState = Map({
   loggedIn: false,
   user: null,
-  isAdmin: false
+  isAdmin: false,
+  loginError: null
 });
 
 export default function auth (state = initialState, action) {
@@ -25,6 +26,10 @@ export default function auth (state = initialState, action) {
       .set('user', action.user);
   case actions.LOGOUT_SUCCESS:
     return initialState;
+  case actions.LOGIN_REQUEST:
+    return state.set('loginError', null);
+  case actions.LOGIN_FAILURE:
+    return state.set('loginError', action.message);
   default :
     return state;
   }
diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json
index 7219a22ca..0fbd09011 100644
--- a/client/coral-admin/src/translations.json
+++ b/client/coral-admin/src/translations.json
@@ -1,5 +1,8 @@
 {
   "en": {
+    "errors": {
+      "NOT_AUTHORIZED": "Your username or password is not recognized by our system."
+    },
     "community": {
       "username_and_email": "Username and Email",
       "account_creation_date": "Account Creation Date",
@@ -132,6 +135,9 @@
     }
   },
   "es": {
+    "errors": {
+      "NOT_AUTHORIZED": "Acción no autorizada."
+    },
     "community": {
       "username_and_email": "Usuario y E-mail",
       "account_creation_date": "Fecha de creación de la cuenta",
@@ -213,7 +219,7 @@
     },
     "bandialog": {
       "ban_user": "Quieres suspender el Usuario?",
-      "are_you_sure": "Estas segura que quieres suspender a {props.author.username}?",
+      "are_you_sure": "Estas segura que quieres suspender a {0}?",
       "note": "Nota: Suspender este usuario también va a colocar este comentario en la cola de Rechazados.",
       "cancel": "Cancelar",
       "yes_ban_user": "Si, Suspendan el usuario"
diff --git a/client/coral-sign-in/components/CreateUsernameDialog.js b/client/coral-sign-in/components/CreateUsernameDialog.js
index d0e348046..4a7a99b81 100644
--- a/client/coral-sign-in/components/CreateUsernameDialog.js
+++ b/client/coral-sign-in/components/CreateUsernameDialog.js
@@ -1,8 +1,7 @@
 import React from 'react';
 import TextField from 'coral-ui/components/TextField';
-import Alert from './Alert';
 import Button from 'coral-ui/components/Button';
-import {Dialog} from 'coral-ui';
+import {Dialog, Alert} from 'coral-ui';
 import FakeComment from './FakeComment';
 
 import styles from './styles.css';
diff --git a/client/coral-sign-in/components/SignInContent.js b/client/coral-sign-in/components/SignInContent.js
index 1f339979b..a0ed5b5b4 100644
--- a/client/coral-sign-in/components/SignInContent.js
+++ b/client/coral-sign-in/components/SignInContent.js
@@ -1,6 +1,5 @@
 import React, {PropTypes} from 'react';
-import Alert from './Alert';
-import {Button, TextField, Spinner, Success} from 'coral-ui';
+import {Button, TextField, Spinner, Success, Alert} from 'coral-ui';
 import styles from './styles.css';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../translations';
diff --git a/client/coral-sign-in/components/SignUpContent.js b/client/coral-sign-in/components/SignUpContent.js
index 6a781675b..c1e1d36cc 100644
--- a/client/coral-sign-in/components/SignUpContent.js
+++ b/client/coral-sign-in/components/SignUpContent.js
@@ -1,6 +1,5 @@
 import React, {PropTypes} from 'react';
-import Alert from './Alert';
-import {Button, TextField, Spinner, Success} from 'coral-ui';
+import {Button, TextField, Spinner, Success, Alert} from 'coral-ui';
 import styles from './styles.css';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../translations';
diff --git a/client/coral-sign-in/components/styles.css b/client/coral-sign-in/components/styles.css
index 31d4a4fed..d3cd47b87 100644
--- a/client/coral-sign-in/components/styles.css
+++ b/client/coral-sign-in/components/styles.css
@@ -65,23 +65,6 @@ input.error{
     padding: 3px 0 16px;
 }
 
-.alert {
-    padding: 10px;
-    margin-bottom: 20px;
-    border-radius: 2px;
-}
-
-.alert--success {
-    border: solid 1px #1ec00e;
-    background: #cbf1b8;
-    color: #006900;
-}
-
-.alert--error {
-    background: #FFEBEE;
-    color: #B71C1C;
-}
-
 .userBox {
   padding: 10px 0 20px;
   letter-spacing: 0.1px;
diff --git a/client/coral-ui/components/Alert.css b/client/coral-ui/components/Alert.css
new file mode 100644
index 000000000..47b4787a1
--- /dev/null
+++ b/client/coral-ui/components/Alert.css
@@ -0,0 +1,16 @@
+.alert {
+    padding: 10px;
+    margin-bottom: 20px;
+    border-radius: 2px;
+}
+
+.alert--success {
+    border: solid 1px #1ec00e;
+    background: #cbf1b8;
+    color: #006900;
+}
+
+.alert--error {
+    background: #FFEBEE;
+    color: #B71C1C;
+}
diff --git a/client/coral-sign-in/components/Alert.js b/client/coral-ui/components/Alert.js
similarity index 87%
rename from client/coral-sign-in/components/Alert.js
rename to client/coral-ui/components/Alert.js
index 019c3456a..02f0524ff 100644
--- a/client/coral-sign-in/components/Alert.js
+++ b/client/coral-ui/components/Alert.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import styles from './styles.css';
+import styles from './Alert.css';
 
 const Alert = ({cStyle = 'error', children, className, ...props}) => (
   <div
diff --git a/client/coral-ui/index.js b/client/coral-ui/index.js
index 255259c32..b3498c3e0 100644
--- a/client/coral-ui/index.js
+++ b/client/coral-ui/index.js
@@ -1,3 +1,4 @@
+export {default as Alert} from './components/Alert';
 export {default as Dialog} from './components/Dialog';
 export {default as CoralLogo} from './components/CoralLogo';
 export {default as FabButton} from './components/FabButton';

From 7ccf77b1ada0236f35c2bd165c902f26df657254 Mon Sep 17 00:00:00 2001
From: riley <riley.davis@gmail.com>
Date: Tue, 28 Feb 2017 17:10:51 -0700
Subject: [PATCH 077/132] add reset password link

---
 client/coral-admin/src/actions/auth.js        | 11 ++++
 .../coral-admin/src/components/AdminLogin.js  | 63 ++++++++++++++-----
 .../coral-admin/src/components/NotFound.css   |  7 +++
 client/coral-admin/src/constants/auth.js      |  4 ++
 .../src/containers/LayoutContainer.js         | 13 +++-
 client/coral-admin/src/reducers/auth.js       |  7 ++-
 6 files changed, 85 insertions(+), 20 deletions(-)

diff --git a/client/coral-admin/src/actions/auth.js b/client/coral-admin/src/actions/auth.js
index 66c063d00..4fd4f3c63 100644
--- a/client/coral-admin/src/actions/auth.js
+++ b/client/coral-admin/src/actions/auth.js
@@ -14,6 +14,17 @@ export const handleLogin = (email, password) => dispatch => {
     });
 };
 
+const forgotPassowordRequest = () => ({type: actions.FETCH_FORGOT_PASSWORD_REQUEST});
+const forgotPassowordSuccess = () => ({type: actions.FETCH_FORGOT_PASSWORD_SUCCESS});
+const forgotPassowordFailure = () => ({type: actions.FETCH_FORGOT_PASSWORD_FAILURE});
+
+export const requestPasswordReset = email => dispatch => {
+  dispatch(forgotPassowordRequest(email));
+  return coralApi('/account/password/reset', {method: 'POST', body: {email}})
+    .then(() => dispatch(forgotPassowordSuccess()))
+    .catch(error => dispatch(forgotPassowordFailure(error)));
+};
+
 // Check Login
 
 const checkLoginRequest = () => ({type: actions.CHECK_LOGIN_REQUEST});
diff --git a/client/coral-admin/src/components/AdminLogin.js b/client/coral-admin/src/components/AdminLogin.js
index 1475ccce7..cd9bac1d4 100644
--- a/client/coral-admin/src/components/AdminLogin.js
+++ b/client/coral-admin/src/components/AdminLogin.js
@@ -10,7 +10,7 @@ class AdminLogin extends React.Component {
 
   constructor (props) {
     super(props);
-    this.state = {email: '', password: ''};
+    this.state = {email: '', password: '', requestPassword: false};
   }
 
   handleSignIn = e => {
@@ -18,29 +18,57 @@ class AdminLogin extends React.Component {
     this.props.handleLogin(this.state.email, this.state.password);
   }
 
+  handleRequestPassword = e => {
+    e.preventDefault();
+    this.props.requestPasswordReset(this.state.email);
+  }
+
   render () {
     const {errorMessage} = this.props;
+    const signInForm = (
+      <form onSubmit={this.handleSignIn}>
+        {errorMessage && <Alert>{lang.t(`errors.${errorMessage}`)}</Alert>}
+        <TextField
+          label='email'
+          value={this.state.email}
+          onChange={e => this.setState({email: e.target.value})} />
+        <TextField
+          label='password'
+          value={this.state.password}
+          onChange={e => this.setState({password: e.target.value})}
+          type='password' />
+        <Button
+          type='submit'
+          cStyle='black'
+          onClick={this.handleSignIn} full>Sign In</Button>
+        <p>
+          Forgot your password? <a href="#" onClick={e => {
+            e.preventDefault();
+            this.setState({requestPassword: true});
+          }}>Request a new one.</a>
+        </p>
+      </form>
+    );
+    const requestPasswordForm = (
+      this.props.passwordRequestSuccess
+      ? <p className={styles.passwordRequestSuccess}>{this.props.passwordRequestSuccess}</p>
+      : <form onSubmit={this.handleRequestPassword}>
+        <TextField
+          label='email'
+          value={this.state.email}
+          onChange={e => this.setState({email: e.target.value})} />
+        <Button
+          type='submit'
+          cStyle='black'
+          onClick={this.handleRequestPassword}>Reset Password</Button>
+      </form>
+    );
     return (
       <Layout fixedDrawer restricted={true}>
         <div className={styles.layout}>
           <h1>Permission Required</h1>
           <p>Sign in to interact with your community.</p>
-          <form onSubmit={this.handleSignIn}>
-            {errorMessage && <Alert>{lang.t(`errors.${errorMessage}`)}</Alert>}
-            <TextField
-              label='email'
-              value={this.state.email}
-              onChange={e => this.setState({email: e.target.value})} />
-            <TextField
-              label='password'
-              value={this.state.password}
-              onChange={e => this.setState({password: e.target.value})}
-              type='password' />
-            <Button
-              type='submit'
-              cStyle='black'
-              onClick={this.handleSignIn} full>Sign In</Button>
-          </form>
+          { this.state.requestPassword ? requestPasswordForm : signInForm }
         </div>
       </Layout>
     );
@@ -49,6 +77,7 @@ class AdminLogin extends React.Component {
 
 AdminLogin.propTypes = {
   handleLogin: PropTypes.func.isRequired,
+  passwordRequestSuccess: PropTypes.string,
   loginError: PropTypes.string
 };
 
diff --git a/client/coral-admin/src/components/NotFound.css b/client/coral-admin/src/components/NotFound.css
index e0e04e0fd..c45fbcc02 100644
--- a/client/coral-admin/src/components/NotFound.css
+++ b/client/coral-admin/src/components/NotFound.css
@@ -6,3 +6,10 @@
 .layout h1 {
   font-size: 40px;
 }
+
+.passwordRequestSuccess {
+  padding: 8px 14px;
+  background: lightgreen;
+  border: 1px solid darkgreen;
+  border-radius: 4px;
+}
diff --git a/client/coral-admin/src/constants/auth.js b/client/coral-admin/src/constants/auth.js
index 88a9c4a3f..3c47bfc45 100644
--- a/client/coral-admin/src/constants/auth.js
+++ b/client/coral-admin/src/constants/auth.js
@@ -11,3 +11,7 @@ export const LOGOUT_FAILURE = 'LOGOUT_FAILURE';
 export const LOGIN_REQUEST = 'LOGIN_REQUEST';
 export const LOGIN_SUCCESS = 'LOGIN_SUCCESS';
 export const LOGIN_FAILURE = 'LOGIN_FAILURE';
+
+export const FETCH_FORGOT_PASSWORD_REQUEST = 'FETCH_FORGOT_PASSWORD_REQUEST';
+export const FETCH_FORGOT_PASSWORD_SUCCESS = 'FETCH_FORGOT_PASSWORD_SUCCESS';
+export const FETCH_FORGOT_PASSWORD_FAILURE = 'FETCH_FORGOT_PASSWORD_FAILURE';
diff --git a/client/coral-admin/src/containers/LayoutContainer.js b/client/coral-admin/src/containers/LayoutContainer.js
index ca9ff2e7b..d122cd23a 100644
--- a/client/coral-admin/src/containers/LayoutContainer.js
+++ b/client/coral-admin/src/containers/LayoutContainer.js
@@ -1,7 +1,7 @@
 import React, {Component} from 'react';
 import {connect} from 'react-redux';
 import Layout from '../components/ui/Layout';
-import {checkLogin, handleLogin, logout} from '../actions/auth';
+import {checkLogin, handleLogin, logout, requestPasswordReset} from '../actions/auth';
 import {FullLoading} from '../components/FullLoading';
 import AdminLogin from '../components/AdminLogin';
 
@@ -11,12 +11,20 @@ class LayoutContainer extends Component {
     checkLogin();
   }
   render () {
-    const {isAdmin, loggedIn, loadingUser, loginError} = this.props.auth;
+    const {
+      isAdmin,
+      loggedIn,
+      loadingUser,
+      loginError,
+      passwordRequestSuccess
+    } = this.props.auth;
     const {handleLogout} = this.props;
     if (loadingUser) { return <FullLoading />; }
     if (!isAdmin) {
       return <AdminLogin
         handleLogin={this.props.handleLogin}
+        requestPasswordReset={this.props.requestPasswordReset}
+        passwordRequestSuccess={passwordRequestSuccess}
         errorMessage={loginError} />;
     }
     if (isAdmin && loggedIn) { return <Layout handleLogout={handleLogout} {...this.props} />; }
@@ -31,6 +39,7 @@ const mapStateToProps = state => ({
 const mapDispatchToProps = dispatch => ({
   checkLogin: () => dispatch(checkLogin()),
   handleLogin: (username, password) => dispatch(handleLogin(username, password)),
+  requestPasswordReset: email => dispatch(requestPasswordReset(email)),
   handleLogout: () => dispatch(logout())
 });
 
diff --git a/client/coral-admin/src/reducers/auth.js b/client/coral-admin/src/reducers/auth.js
index d2f178773..b52efdb85 100644
--- a/client/coral-admin/src/reducers/auth.js
+++ b/client/coral-admin/src/reducers/auth.js
@@ -5,7 +5,8 @@ const initialState = Map({
   loggedIn: false,
   user: null,
   isAdmin: false,
-  loginError: null
+  loginError: null,
+  passwordRequestSuccess: null
 });
 
 export default function auth (state = initialState, action) {
@@ -30,6 +31,10 @@ export default function auth (state = initialState, action) {
     return state.set('loginError', null);
   case actions.LOGIN_FAILURE:
     return state.set('loginError', action.message);
+  case actions.FETCH_FORGOT_PASSWORD_REQUEST:
+    return state.set('passwordRequestSuccess', null);
+  case actions.FETCH_FORGOT_PASSWORD_SUCCESS:
+    return state.set('passwordRequestSuccess', 'If you have a registered account, a password reset link was sent to that email.');
   default :
     return state;
   }

From 42b380b942ac56066f93101fbfb189e767c91abe Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Tue, 28 Feb 2017 22:35:37 -0300
Subject: [PATCH 078/132] Flag box

---
 .../ModerationQueue/ModerationQueue.js        |  1 +
 .../ModerationQueue/components/Comment.js     | 60 ++++++++++---------
 .../components/CommentType.css                | 33 ++++++++++
 .../ModerationQueue/components/CommentType.js | 30 ++++++++++
 .../ModerationQueue/components/FlagBox.css    | 35 +++++++++++
 .../ModerationQueue/components/FlagBox.js     | 20 ++++---
 .../ModerationQueue/components/styles.css     | 40 +++++++------
 7 files changed, 164 insertions(+), 55 deletions(-)
 create mode 100644 client/coral-admin/src/containers/ModerationQueue/components/CommentType.css
 create mode 100644 client/coral-admin/src/containers/ModerationQueue/components/CommentType.js
 create mode 100644 client/coral-admin/src/containers/ModerationQueue/components/FlagBox.css

diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
index 0d48acc92..23ed45f2e 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
@@ -21,6 +21,7 @@ const ModerationQueue = ({activeTab = 'premod', ...props}) => {
             key={i}
             index={i}
             comment={comment}
+            commentType={activeTab}
             suspectWords={props.suspectWords}
             actions={actionsMap[status]}
             showBanUserDialog={props.showBanUserDialog}
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
index b39eeb2f8..98e24f92a 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
@@ -8,6 +8,7 @@ import styles from './styles.css';
 import {Icon} from 'coral-ui';
 import ActionButton from '../../../components/ActionButton';
 import FlagBox from './FlagBox';
+import CommentType from './CommentType';
 
 const linkify = new Linkify();
 
@@ -21,46 +22,48 @@ const Comment = ({actions = [], ...props}) => {
   return (
     <li tabIndex={props.index}
         className={`mdl-card mdl-shadow--2dp ${styles.Comment} ${styles.listItem} ${props.isActive && !props.hideActive ? styles.activeItem : ''}`}>
-      <div className={styles.itemHeader}>
+      <div className={styles.container}>
+        <div className={styles.itemHeader}>
         <div className={styles.author}>
           <span>{props.comment.user.name}</span>
           <span className={styles.created}>
-            {timeago().format(props.comment.created_at || (Date.now() - props.index * 60 * 1000), lang.getLocale().replace('-', '_'))}
-          </span>
-          {props.comment.action_summaries ? <p className={styles.flagged}>{lang.t('comment.flagged')}</p> : null}
+              {timeago().format(props.comment.created_at || (Date.now() - props.index * 60 * 1000), lang.getLocale().replace('-', '_'))}
+            </span>
+          <CommentType type={props.commentType} />
         </div>
         <div className={styles.sideActions}>
           {links ? <span className={styles.hasLinks}><Icon name='error_outline'/> Contains Link</span> : null}
-           <div className={`actions ${styles.actions}`}>
-             {actions.map((action, i) =>
-               <ActionButton key={i}
-                 type={action}
-                 user={props.comment.user}
-                 acceptComment={() => props.acceptComment({commentId: props.comment.id})}
-                 rejectComment={() => props.rejectComment({commentId: props.comment.id})}
-                 showBanUserDialog={() => props.showBanUserDialog(props.comment.user, props.comment.id)}
-               />
-             )}
-           </div>
+          <div className={`actions ${styles.actions}`}>
+            {actions.map((action, i) =>
+              <ActionButton key={i}
+                            type={action}
+                            user={props.comment.user}
+                            acceptComment={() => props.acceptComment({commentId: props.comment.id})}
+                            rejectComment={() => props.rejectComment({commentId: props.comment.id})}
+                            showBanUserDialog={() => props.showBanUserDialog(props.comment.user, props.comment.id)}
+              />
+            )}
+          </div>
           {props.comment.user.status === 'banned' ?
             <span className={styles.banned}>
-              <Icon name='error_outline'/>
+                <Icon name='error_outline'/>
               {lang.t('comment.banned_user')}
-            </span>
-          : null}
+              </span>
+            : null}
         </div>
       </div>
-      {!props.currentAsset && (
-        <div className={styles.moderateArticle}>
-          Article: {props.comment.asset.title} <Link to={`/admin/moderate/${props.comment.asset.id}`}>Moderate Article</Link>
+        {!props.currentAsset && (
+          <div className={styles.moderateArticle}>
+            Story: {props.comment.asset.title} <Link to={`/admin/moderate/${props.comment.asset.id}`}>Moderate &rarr;</Link>
+          </div>
+        )}
+        <div className={styles.itemBody}>
+          <p className={styles.body}>
+            <Linkify component='span' properties={{style: linkStyles}}>
+              <Highlighter searchWords={props.suspectWords} textToHighlight={props.comment.body}/>
+            </Linkify>
+          </p>
         </div>
-      )}
-      <div className={styles.itemBody}>
-        <p className={styles.body}>
-          <Linkify component='span' properties={{style: linkStyles}}>
-            <Highlighter searchWords={props.suspectWords} textToHighlight={props.comment.body}/>
-          </Linkify>
-        </p>
       </div>
       {actionSummaries && <FlagBox actionSummaries={actionSummaries} />}
     </li>
@@ -72,7 +75,6 @@ Comment.propTypes = {
   rejectComment: PropTypes.func.isRequired,
   suspectWords: PropTypes.arrayOf(PropTypes.string).isRequired,
   currentAsset: PropTypes.object,
-  isActive: PropTypes.bool.isRequired,
   comment: PropTypes.shape({
     body: PropTypes.string.isRequired,
     action_summaries: PropTypes.array,
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/CommentType.css b/client/coral-admin/src/containers/ModerationQueue/components/CommentType.css
new file mode 100644
index 000000000..42c0b75f0
--- /dev/null
+++ b/client/coral-admin/src/containers/ModerationQueue/components/CommentType.css
@@ -0,0 +1,33 @@
+.commentType {
+  position: absolute;
+  right: 5px;
+  top: 5px;
+  color: white;
+  background: grey;
+  padding: 2px 13px;
+  font-size: 14px;
+  height: 32px;
+  box-sizing: border-box;
+  line-height: 29px;
+  padding-left: 26px;
+
+  i {
+    font-size: 14px;
+    position: absolute;
+    left: 6px;
+    top: 8px;
+    margin: 0;
+  }
+
+  &.premod {
+    background: #063B9A;
+  }
+
+  &.flagged {
+    background: #d03235;
+  }
+
+  &.no-type {
+    display: none;
+  }
+}
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/CommentType.js b/client/coral-admin/src/containers/ModerationQueue/components/CommentType.js
new file mode 100644
index 000000000..5ad4138ca
--- /dev/null
+++ b/client/coral-admin/src/containers/ModerationQueue/components/CommentType.js
@@ -0,0 +1,30 @@
+import React, {PropTypes} from 'react';
+import styles from './CommentType.css';
+import {Icon} from 'coral-ui';
+
+const CommentType = props => {
+  const typeData = getTypeData(props.type);
+
+  return (
+    <span className={`${styles.commentType} ${styles[typeData.className]}`}>
+      <Icon name={typeData.icon}/>{typeData.text}
+    </span>
+  );
+};
+
+const getTypeData = type => {
+  switch (type) {
+  case 'premod':
+    return {icon: 'query_builder', text: 'Pre-Mod', className: 'premod'};
+  case 'flagged':
+    return {icon: 'flag', text: 'Flagged', className: 'flagged'};
+  default:
+    return {icon: 'flag', className: 'no-type'};
+  }
+};
+
+CommentType.propTypes = {
+  type: PropTypes.string.isRequired
+};
+
+export default CommentType;
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.css b/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.css
new file mode 100644
index 000000000..0806c30c3
--- /dev/null
+++ b/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.css
@@ -0,0 +1,35 @@
+.flagBox {
+  border-top: 1px solid rgba(66, 66, 66, 0.12);
+
+  .container {
+    padding: 0 14px;
+  }
+
+  .header {
+    position: relative;
+    .moreDetail {
+      float: right;
+    }
+    i {
+      vertical-align: middle;
+      font-size: 12px;
+    }
+    ul {
+      vertical-align: middle;
+      list-style: none;
+      display: inline-block;
+      padding: 0;
+      margin-left: 10px;
+      font-size: 12px;
+    }
+  }
+
+  h3 {
+    vertical-align: middle;
+    margin: 0;
+    font-weight: 500;
+    display: inline-block;
+    margin-left: 7px;
+    font-size: 12px;
+  }
+}
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.js b/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.js
index 6140abd90..f30d32662 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.js
@@ -1,14 +1,20 @@
 import React, {PropTypes} from 'react';
-import styles from './styles.css';
+import {Icon} from 'coral-ui';
+import styles from './FlagBox.css';
 
 const FlagBox = props => (
   <div className={styles.flagBox}>
-    <h3>Flags:</h3>
-    <ul>
-      {props.actionSummaries.map((action, i) =>
-        <li key={i}>{!action.reason ? <i>No reason provided</i> : action.reason} (<strong>{action.count}</strong>)</li>
-      )}
-    </ul>
+    <div className={styles.container}>
+      <div className={styles.header}>
+        <Icon name='flag'/><h3>Flags ({props.actionSummaries.length}):</h3>
+        <ul>
+          {props.actionSummaries.map((action, i) =>
+            <li key={i}>{!action.reason ? <i>No reason provided</i> : action.reason} (<strong>{action.count}</strong>)</li>
+          )}
+        </ul>
+        <span className={styles.moreDetail}></span>
+      </div>
+    </div>
   </div>
 );
 
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/styles.css b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
index 27d5c2533..fdaf01439 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/styles.css
+++ b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
@@ -162,16 +162,20 @@ span {
 
 .listItem {
   border-bottom: 1px solid #e0e0e0;
-  font-size: 16px;
+  font-size: 18px;
   width: 100%;
   max-width: 660px;
   min-width: 400px;
   margin: 0 auto;
-  padding: 16px 14px;
   position: relative;
   transition: box-shadow 200ms;
   margin-top: 0;
+  padding: 20px 0 0;
+  min-height: 187px;
 
+  .container {
+    padding: 0 14px;
+  }
 
   &:hover {
      box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23);
@@ -213,6 +217,8 @@ span {
   .itemBody {
     display: flex;
     justify-content: space-between;
+    margin-top: 15px;
+    font-size: 16px;
   }
 
   .avatar {
@@ -228,7 +234,7 @@ span {
   .created {
     color: #666;
     font-size: 13px;
-    margin-left: 40px;
+    margin-left: 15px;
   }
 
   .actionButton {
@@ -310,20 +316,26 @@ span {
 }
 
 .Comment {
+
   .moderateArticle {
-    font-size: 12px;
+    font-size: 15px;
+    margin-top: 14px;
+    font-weight: 500;
     a {
       display: inline-block;
-      color: #679af3;
+      color: #063b9a;
       text-decoration: none;
-      font-size: 1em;
-      font-weight: 400;
+      font-weight: 500;
       letter-spacing: .5px;
-      font-size: 12px;
       margin-left: 10px;
 
+      font-size: 13px;
+      margin-left: 5px;
+      padding-bottom: 0px;
+      border-bottom: solid 1px;
+      line-height: 16px;
+
       &:hover {
-        text-decoration: underline;
         opacity: .9;
         cursor: pointer;
        }
@@ -331,16 +343,6 @@ span {
   }
 }
 
-.flagBox {
-  max-width: 480px;
-  border-top: 1px solid rgba(66, 66, 66, 0.12);
-  h3 {
-    font-size: 14px;
-    margin: 0;
-    font-weight: 500;
-  }
-}
-
 .selectField {
   position: relative;
   width: 140px;

From 378622f7e8bc5835ac42171497ad34830e80949d Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Wed, 1 Mar 2017 12:46:35 +0800
Subject: [PATCH 079/132] commentTag mutation tests await SettingsService

---
 test/graph/mutations/addCommentTag.js    | 2 +-
 test/graph/mutations/removeCommentTag.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/graph/mutations/addCommentTag.js b/test/graph/mutations/addCommentTag.js
index fcbb0d0e8..14a746705 100644
--- a/test/graph/mutations/addCommentTag.js
+++ b/test/graph/mutations/addCommentTag.js
@@ -10,7 +10,7 @@ const CommentsService = require('../../../services/comments');
 describe('graph.mutations.addCommentTag', () => {
   let comment;
   beforeEach(async () => {
-    SettingsService.init();
+    await SettingsService.init();
     comment = await CommentsService.publicCreate({body: `hello there! ${  String(Math.random()).slice(2)}`});
   });
 
diff --git a/test/graph/mutations/removeCommentTag.js b/test/graph/mutations/removeCommentTag.js
index c10f70172..99def095d 100644
--- a/test/graph/mutations/removeCommentTag.js
+++ b/test/graph/mutations/removeCommentTag.js
@@ -10,7 +10,7 @@ const CommentsService = require('../../../services/comments');
 describe('graph.mutations.removeCommentTag', () => {
   let comment;
   beforeEach(async () => {
-    SettingsService.init();
+    await SettingsService.init();
     comment = await CommentsService.publicCreate({body: `hello there! ${  String(Math.random()).slice(2)}`});
   });
 

From 388c3182ea79ca7b4cd98a8bcc44f28775437aff Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Wed, 1 Mar 2017 13:08:36 +0800
Subject: [PATCH 080/132] Change add,removeTag in CommentsService to use
 simpler query then elemMatch

---
 services/comments.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/comments.js b/services/comments.js
index 4b11f3622..b0594cf8d 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -59,7 +59,7 @@ module.exports = class CommentsService {
 
     const filter = {
       id,
-      tags: {$not: {$elemMatch: {name}}}
+      'tags.name': {$ne: name},
     };
     const update = {
       $push: {tags: {
@@ -101,7 +101,7 @@ module.exports = class CommentsService {
   static removeTag(id, name) {
     const filter = {
       id,
-      tags: {$elemMatch: {name}}
+      'tags.name': name,
     };
     const update = {$pull: {tags: {name}}};
     return CommentModel.update(filter, update)

From 405dac292c1da4a0b6e1cfce81eac501de62eef0 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Wed, 1 Mar 2017 13:43:39 +0800
Subject: [PATCH 081/132] Only transform-async-to-generator for client code.
 Allows async to work with mocha tests (if proper node version)

---
 .babelrc        | 1 -
 client/.babelrc | 6 ++++++
 package.json    | 2 +-
 test/mocha.opts | 1 -
 4 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 client/.babelrc

diff --git a/.babelrc b/.babelrc
index 41d27bf34..6186cefaf 100644
--- a/.babelrc
+++ b/.babelrc
@@ -5,7 +5,6 @@
   ],
   "plugins": [
     "add-module-exports",
-    "transform-async-to-generator",
     "transform-class-properties",
     "transform-decorators-legacy",
     "transform-object-assign",
diff --git a/client/.babelrc b/client/.babelrc
new file mode 100644
index 000000000..27289288c
--- /dev/null
+++ b/client/.babelrc
@@ -0,0 +1,6 @@
+{
+  "extends": "../.babelrc",
+  "plugins": [
+    "transform-async-to-generator",
+  ]
+}
diff --git a/package.json b/package.json
index 7e4c6dfa6..140e9d4e5 100644
--- a/package.json
+++ b/package.json
@@ -165,6 +165,6 @@
     "webpack": "^2.2.1"
   },
   "engines": {
-    "node": ">=7.0.0"
+    "node": ">=7.6.0"
   }
 }
diff --git a/test/mocha.opts b/test/mocha.opts
index 76ca86399..a159ae7aa 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -2,7 +2,6 @@ test/helpers/*.js
 test
 --compilers js:babel-core/register
 --require ignore-styles
---require babel-polyfill
 --recursive
 --colors
 --sort

From 4b2cc72e1aea194e3f0ce498254c08eade311fd0 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Wed, 1 Mar 2017 14:01:12 +0800
Subject: [PATCH 082/132] Remove unnecessary defensive code in CommentsService

---
 services/comments.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/services/comments.js b/services/comments.js
index b0594cf8d..85cc03167 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -86,8 +86,8 @@ module.exports = class CommentsService {
             // tag added
           return;
         default:
-          console.warn('CommentsService#addTag modified multiple comments, but it should only have modified 1. '
-                      + `You may have bad data. Check for multiple comments with id=${id}`);
+
+          // this should never happen because no multi parameter and unique index on id
         }
       });
   }
@@ -122,8 +122,8 @@ module.exports = class CommentsService {
             // tag removed
           return;
         default:
-          console.warn('CommentsService#removeTag modified multiple comments, but it should only have modified 1. '
-                      + `You may have bad data. Check for multiple comments with id=${id}`);
+
+          // this should never happen because no multi parameter and unique index on id
         }
       });
   }

From b0036ef77842247c8bd2f75174547a642c6afcd6 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Wed, 1 Mar 2017 14:09:03 +0800
Subject: [PATCH 083/132] Remove findById in error conditions of
 CommentsService@addTag,removeTag

---
 services/comments.js | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/services/comments.js b/services/comments.js
index 85cc03167..75b53873a 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -73,14 +73,8 @@ module.exports = class CommentsService {
         switch (nModified) {
         case 0:
 
-            // either the tag was already there, or the comment doesn't exist with that id...
-          return this.findById(id)
-              .then(result => {
-                if ( ! result) {
-                  throw new Error(`Can't add tag to comment. There is no comment with id ${id}`);
-                }
-                throw new Error(`Can't add tag ${name} to comment. Comment already has that tag.`);
-              });
+          // either the tag was already there, or the comment doesn't exist with that id...
+          throw new Error('Could not add tag to comment. Either the comment doesn\'t exist or the tag is already present.');
         case 1:
 
             // tag added
@@ -108,15 +102,7 @@ module.exports = class CommentsService {
       .then(({nModified}) => {
         switch (nModified) {
         case 0:
-
-            // either the tag was already there, or the comment doesn't exist with that id...
-          return this.findById(id)
-              .then(result => {
-                if ( ! result) {
-                  throw new Error(`Can't remove tag from comment. There is no comment with id ${id}`);
-                }
-                throw new Error(`Can't remove tag ${name} from comment. Comment doesn't have that tag.`);
-              });
+          throw new Error('Could not remove tag from comment. Either the comment doesn\'t exist or the tag is not present');
         case 1:
 
             // tag removed

From 5e0d01a6493ec68c122242cb0c4db518b2c1e4f2 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Wed, 1 Mar 2017 14:15:31 +0800
Subject: [PATCH 084/132] lift findById out of add,removeCommentTag mutators
 and into root_mutation.js defs

---
 graph/mutators/comment.js        | 6 ++----
 graph/resolvers/root_mutation.js | 5 +++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index c9b3b0ab0..94ffb850c 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -193,8 +193,7 @@ const setCommentStatus = ({loaders: {Comments}}, {id, status}) => {
  * @param {String} tag     name of the tag
  */
 const addCommentTag = ({user, loaders: {Comments}}, {id, tag}) => {
-  return CommentsService.addTag(id, tag, user.id)
-    .then(() => CommentsService.findById( id ));
+  return CommentsService.addTag(id, tag, user.id);
 };
 
 /**
@@ -203,8 +202,7 @@ const addCommentTag = ({user, loaders: {Comments}}, {id, tag}) => {
  * @param {String} tag     name of the tag
  */
 const removeCommentTag = ({user, loaders: {Comments}}, {id, tag}) => {
-  return CommentsService.removeTag(id, tag)
-    .then(() => CommentsService.findById( id ));
+  return CommentsService.removeTag(id, tag);
 };
 
 module.exports = (context) => {
diff --git a/graph/resolvers/root_mutation.js b/graph/resolvers/root_mutation.js
index 61c4367c1..dc540b202 100644
--- a/graph/resolvers/root_mutation.js
+++ b/graph/resolvers/root_mutation.js
@@ -1,5 +1,6 @@
 const {Error: {ValidationError}} = require('mongoose');
 const errors = require('../../errors');
+const CommentsService = require('../../services/comments');
 
 /**
  * Wraps up a promise to return an object with the resolution of the promise
@@ -50,10 +51,10 @@ const RootMutation = {
     return wrapResponse(null)(Comment.setCommentStatus({id, status}));
   },
   addCommentTag(_, {id, tag}, {mutators: {Comment}}) {
-    return wrapResponse('comment')(Comment.addCommentTag({id, tag}));
+    return wrapResponse('comment')(Comment.addCommentTag({id, tag}).then(() => CommentsService.findById(id)));
   },
   removeCommentTag(_, {id, tag}, {mutators: {Comment}}) {
-    return wrapResponse('comment')(Comment.removeCommentTag({id, tag}));
+    return wrapResponse('comment')(Comment.removeCommentTag({id, tag}).then(() => CommentsService.findById(id)));
   },
 };
 

From 90730e52be09e5eeb1186d78026b286accde2a03 Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Wed, 1 Mar 2017 14:56:44 +0800
Subject: [PATCH 085/132] Make all comment action buttons use cursor:pointer
 and nowrap (sam said ok)

---
 client/coral-embed-stream/src/Comment.js    | 71 +++++++++++++--------
 client/coral-embed-stream/style/default.css |  8 ++-
 client/coral-plugin-best/BestButton.js      |  6 +-
 client/coral-plugin-replies/ReplyButton.js  |  2 +-
 4 files changed, 50 insertions(+), 37 deletions(-)

diff --git a/client/coral-embed-stream/src/Comment.js b/client/coral-embed-stream/src/Comment.js
index 3cc13174a..1e4802470 100644
--- a/client/coral-embed-stream/src/Comment.js
+++ b/client/coral-embed-stream/src/Comment.js
@@ -26,6 +26,11 @@ const getActionSummary = (type, comment) => comment.action_summaries
   .filter((a) => a.__typename === type)[0];
 const isStaff = (tags) => !tags.every((t) => t.name !== 'STAFF') ;
 
+// hold actions links (e.g. Like, Reply) along the comment footer
+const ActionButton = ({children}) => {
+  return <span className="comment__action-button comment__action-button--nowrap">{ children }</span>;
+};
+
 class Comment extends React.Component {
 
   constructor(props) {
@@ -135,36 +140,46 @@ class Comment extends React.Component {
         <PubDate created_at={comment.created_at} />
         <Content body={comment.body} />
           <div className="commentActionsLeft comment__action-container">
-              <LikeButton
-                like={like}
-                id={comment.id}
-                postLike={postLike}
-                deleteAction={deleteAction}
-                showSignInDialog={showSignInDialog}
-                currentUser={currentUser} />
-              <ReplyButton
-                onClick={() => setActiveReplyBox(comment.id)}
-                parentCommentId={parentId || comment.id}
-                currentUserId={currentUser && currentUser.id}
-                banned={false} />
-              <IfUserCanModifyBest user={currentUser}>
-                <BestButton
-                  isBest={commentIsBest(comment)}
-                  addBest={addBestTag}
-                  removeBest={removeBestTag} />
-              </IfUserCanModifyBest>
+              <ActionButton>
+                <LikeButton
+                  like={like}
+                  id={comment.id}
+                  postLike={postLike}
+                  deleteAction={deleteAction}
+                  showSignInDialog={showSignInDialog}
+                  currentUser={currentUser} />
+              </ActionButton>
+              <ActionButton>
+                <ReplyButton
+                  onClick={() => setActiveReplyBox(comment.id)}
+                  parentCommentId={parentId || comment.id}
+                  currentUserId={currentUser && currentUser.id}
+                  banned={false} />
+              </ActionButton>
+              <ActionButton>
+                <IfUserCanModifyBest user={currentUser}>
+                  <BestButton
+                    isBest={commentIsBest(comment)}
+                    addBest={addBestTag}
+                    removeBest={removeBestTag} />
+                </IfUserCanModifyBest>
+              </ActionButton>
             </div>
         <div className="commentActionsRight comment__action-container">
-          <PermalinkButton articleURL={asset.url} commentId={comment.id} />
-          <FlagComment
-            flag={flag && flag.current_user ? flag : dontagree}
-            id={comment.id}
-            author_id={comment.user.id}
-            postFlag={postFlag}
-            postDontAgree={postDontAgree}
-            deleteAction={deleteAction}
-            showSignInDialog={showSignInDialog}
-            currentUser={currentUser} />
+          <ActionButton>
+            <PermalinkButton articleURL={asset.url} commentId={comment.id} />
+          </ActionButton>
+          <ActionButton>
+            <FlagComment
+              flag={flag && flag.current_user ? flag : dontagree}
+              id={comment.id}
+              author_id={comment.user.id}
+              postFlag={postFlag}
+              postDontAgree={postDontAgree}
+              deleteAction={deleteAction}
+              showSignInDialog={showSignInDialog}
+              currentUser={currentUser} />
+          </ActionButton>
         </div>
         {
           activeReplyBox === comment.id
diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css
index 6a8c58059..afc690f01 100644
--- a/client/coral-embed-stream/style/default.css
+++ b/client/coral-embed-stream/style/default.css
@@ -214,15 +214,17 @@ hr {
 }
 
 .comment__action-container .material-icons {
-  font-size: 12px !important;
+  font-size: 12px;
   margin-left: 3px;  
 }
 
-.comment__action-button {
+button.comment__action-button,
+.comment__action-button button {
   cursor: pointer;
 }
 
-.comment__action-button[disabled] {
+button.comment__action-button[disabled],
+.comment__action-button[disabled] button {
   cursor: inherit;
 }
 
diff --git a/client/coral-plugin-best/BestButton.js b/client/coral-plugin-best/BestButton.js
index 182bd27c2..ac0e75aaf 100644
--- a/client/coral-plugin-best/BestButton.js
+++ b/client/coral-plugin-best/BestButton.js
@@ -89,17 +89,13 @@ export class BestButton extends Component {
   }
 
   render() {
-
-    // @TODO(bengo) Consider adding the comment__action--cursor-pointer to all buttons to add cursor:pointer and never wrap the icons
     const {isBest, addBest, removeBest} = this.props;
     const {isSaving} = this.state;
     const disabled = isSaving || ! (isBest ? removeBest : addBest);
     return (
       <button onClick={isBest ? this.onClickRemoveBest : this.onClickAddBest}
               disabled={disabled}
-              className={classnames('comment__action-button', `${name}-button`,
-                                    'comment__action-button--nowrap', /* Can I do this to all buttons? 'comment__action-button--cursor-pointer', */
-                                    `e2e__${isBest ? 'unset' : 'set'}-best-comment`)}
+              className={classnames(`${name}-button`, `e2e__${isBest ? 'unset' : 'set'}-best-comment`)}
               aria-label={lang.t(isBest ? 'unsetBest' : 'setBest')}>
         <i className={`${name}-icon material-icons`} aria-hidden={true}>
           { isBest ? 'favorite' : 'favorite_border' }
diff --git a/client/coral-plugin-replies/ReplyButton.js b/client/coral-plugin-replies/ReplyButton.js
index cd1859afc..eb2d3fe9f 100644
--- a/client/coral-plugin-replies/ReplyButton.js
+++ b/client/coral-plugin-replies/ReplyButton.js
@@ -8,7 +8,7 @@ const name = 'coral-plugin-replies';
 const ReplyButton = ({banned, onClick}) => {
   return (
     <button
-      className={classnames(`${name}-reply-button`, 'comment__action-button--nowrap')}
+      className={classnames(`${name}-reply-button`)}
       onClick={onClick}>
       {lang.t('reply')}
       <i className={`${name}-icon material-icons`}

From ab70ac38fdf7974fe316daa76a3fbd077cc5314c Mon Sep 17 00:00:00 2001
From: Benjamin Goering <bengoering@gmail.com>
Date: Wed, 1 Mar 2017 16:07:25 +0800
Subject: [PATCH 086/132] If fail to addremov best comment tag, show user an
 error

---
 client/coral-embed-stream/src/Comment.js | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/client/coral-embed-stream/src/Comment.js b/client/coral-embed-stream/src/Comment.js
index 1e4802470..7f3265f5f 100644
--- a/client/coral-embed-stream/src/Comment.js
+++ b/client/coral-embed-stream/src/Comment.js
@@ -113,14 +113,26 @@ class Comment extends React.Component {
     const flag = getActionSummary('FlagActionSummary', comment);
     const dontagree = getActionSummary('DontAgreeActionSummary', comment);
 
-    const addBestTag = () => addCommentTag({
+    // call a function, and if it errors, call addNotification('error', ...) (e.g. to show user a snackbar)
+    const notifyOnError = (fn, errorToMessage) => async () => {
+      if (typeof errorToMessage !== 'function') {errorToMessage = (error) => error.message;}
+      try {
+        return await fn();
+      } catch (error) {
+        addNotification('error', errorToMessage(error));
+        throw error;
+      }
+    };
+
+    const addBestTag = notifyOnError(() => addCommentTag({
       id: comment.id,
       tag: BEST_TAG,
-    });
-    const removeBestTag = () => removeCommentTag({
+    }), () => 'Failed to tag comment as best');
+
+    const removeBestTag = notifyOnError(() => removeCommentTag({
       id: comment.id,
       tag: BEST_TAG,
-    });
+    }), () => 'Failed to remove best comment tag');
 
     return (
       <div

From ea0602b7a55cf1e2bcaf2caff2fc51a76ebc2855 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 1 Mar 2017 11:42:08 -0300
Subject: [PATCH 087/132] Design Comment Component

---
 .../src/components/ActionButton.js            | 13 +---
 .../src/components/BanUserButton.css          |  5 +-
 .../src/components/BanUserButton.js           |  2 +-
 .../ModerationQueue/ModerationContainer.js    |  4 +-
 .../ModerationQueue/ModerationQueue.js        | 20 +++--
 .../ModerationQueue/components/Comment.js     |  6 +-
 .../components/CommentType.css                |  4 +-
 .../ModerationQueue/components/FlagBox.css    | 20 +++++
 .../ModerationQueue/components/FlagBox.js     | 55 ++++++++++----
 .../ModerationQueue/components/styles.css     |  7 +-
 .../helpers/moderationQueueActionsMap.js      | 15 ++--
 client/coral-ui/components/Button.css         | 76 +++++++++++++++++++
 12 files changed, 174 insertions(+), 53 deletions(-)

diff --git a/client/coral-admin/src/components/ActionButton.js b/client/coral-admin/src/components/ActionButton.js
index 1d1d4d9d0..3bd96abad 100644
--- a/client/coral-admin/src/components/ActionButton.js
+++ b/client/coral-admin/src/components/ActionButton.js
@@ -1,21 +1,16 @@
 import React from 'react';
 import styles from './ModerationList.css';
-import BanUserButton from './BanUserButton';
-import {FabButton} from 'coral-ui';
+import {Button} from 'coral-ui';
 import {menuActionsMap} from '../containers/ModerationQueue/helpers/moderationQueueActionsMap';
 
-const ActionButton = ({type = '', user, ...props}) => {
-  if (type === 'BAN') {
-    return <BanUserButton user={user} onClick={() => props.showBanUserDialog(props.user, props.id)} />;
-  }
-
+const ActionButton = ({type = '', ...props}) => {
   return (
-    <FabButton
+    <Button
       className={`${type.toLowerCase()} ${styles.actionButton}`}
       cStyle={type.toLowerCase()}
       icon={menuActionsMap[type].icon}
       onClick={type === 'APPROVE' ? props.acceptComment : props.rejectComment}
-    />
+    >{menuActionsMap[type].text}</Button>
   );
 };
 
diff --git a/client/coral-admin/src/components/BanUserButton.css b/client/coral-admin/src/components/BanUserButton.css
index 79b805c30..36243348f 100644
--- a/client/coral-admin/src/components/BanUserButton.css
+++ b/client/coral-admin/src/components/BanUserButton.css
@@ -1,6 +1,7 @@
 .banButton {
-  width: 114px;
-  letter-spacing: 1px;
+  -webkit-transform: scale(.8);
+  transform: scale(.8);
+  margin: 0;
 
   i {
     vertical-align: middle;
diff --git a/client/coral-admin/src/components/BanUserButton.js b/client/coral-admin/src/components/BanUserButton.js
index 191164ca5..a54cdd322 100644
--- a/client/coral-admin/src/components/BanUserButton.js
+++ b/client/coral-admin/src/components/BanUserButton.js
@@ -8,7 +8,7 @@ const lang = new I18n(translations);
 
 const BanUserButton = ({user, ...props}) => (
   <div className={styles.ban}>
-    <Button cStyle='darkGrey'
+    <Button cStyle='ban'
       className={`ban ${styles.banButton}`}
       disabled={user.status === 'BANNED' ? 'disabled' : ''}
       onClick={props.onClick}
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
index d3e2f9194..40f19b5a1 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
@@ -65,6 +65,8 @@ class ModerationContainer extends Component {
       }
     }
 
+    const comments = data[activeTab];
+
     return (
       <div>
         <ModerationHeader asset={asset} />
@@ -76,8 +78,8 @@ class ModerationContainer extends Component {
           modQueueResort={modQueueResort}
         />
         <ModerationQueue
-          data={data}
           currentAsset={asset}
+          comments={comments}
           activeTab={activeTab}
           suspectWords={settings.wordlist.suspect}
           showBanUserDialog={props.showBanUserDialog}
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
index 23ed45f2e..cdbc7f28c 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
@@ -7,21 +7,19 @@ import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from 'coral-admin/src/translations';
 
 const lang = new I18n(translations);
-
-const ModerationQueue = ({activeTab = 'premod', ...props}) => {
-  const areComments = props.data[activeTab].length;
+const ModerationQueue = ({comments, ...props}) => {
   return (
     <div id="moderationList">
       <ul style={{paddingLeft: 0}}>
       {
-        areComments
-        ? props.data[activeTab].map((comment, i) => {
+        comments.length
+        ? comments.map((comment, i) => {
           const status = comment.action_summaries ? 'FLAGGED' : comment.status;
           return <Comment
             key={i}
             index={i}
             comment={comment}
-            commentType={activeTab}
+            commentType={props.activeTab}
             suspectWords={props.suspectWords}
             actions={actionsMap[status]}
             showBanUserDialog={props.showBanUserDialog}
@@ -38,12 +36,12 @@ const ModerationQueue = ({activeTab = 'premod', ...props}) => {
 };
 
 ModerationQueue.propTypes = {
-  data: PropTypes.object.isRequired,
-  acceptComment: PropTypes.func.isRequired,
-  rejectComment: PropTypes.func.isRequired,
-  showBanUserDialog: PropTypes.func.isRequired,
+  suspectWords: PropTypes.arrayOf(PropTypes.string).isRequired,
   currentAsset: PropTypes.object,
-  suspectWords: PropTypes.arrayOf(PropTypes.string).isRequired
+  showBanUserDialog: PropTypes.func.isRequired,
+  rejectComment: PropTypes.func.isRequired,
+  acceptComment: PropTypes.func.isRequired,
+  comments: PropTypes.array.isRequired
 };
 
 export default ModerationQueue;
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
index 98e24f92a..ef88a6220 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
@@ -6,9 +6,11 @@ import {Link} from 'react-router';
 
 import styles from './styles.css';
 import {Icon} from 'coral-ui';
-import ActionButton from '../../../components/ActionButton';
+
 import FlagBox from './FlagBox';
 import CommentType from './CommentType';
+import ActionButton from 'coral-admin/src/components/ActionButton';
+import BanUserButton from 'coral-admin/src/components/BanUserButton';
 
 const linkify = new Linkify();
 
@@ -29,6 +31,7 @@ const Comment = ({actions = [], ...props}) => {
           <span className={styles.created}>
               {timeago().format(props.comment.created_at || (Date.now() - props.index * 60 * 1000), lang.getLocale().replace('-', '_'))}
             </span>
+          <BanUserButton user={props.comment.user} onClick={() => props.showBanUserDialog(props.comment.user, props.comment.id)} />
           <CommentType type={props.commentType} />
         </div>
         <div className={styles.sideActions}>
@@ -40,7 +43,6 @@ const Comment = ({actions = [], ...props}) => {
                             user={props.comment.user}
                             acceptComment={() => props.acceptComment({commentId: props.comment.id})}
                             rejectComment={() => props.rejectComment({commentId: props.comment.id})}
-                            showBanUserDialog={() => props.showBanUserDialog(props.comment.user, props.comment.id)}
               />
             )}
           </div>
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/CommentType.css b/client/coral-admin/src/containers/ModerationQueue/components/CommentType.css
index 42c0b75f0..cdfd212ff 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/CommentType.css
+++ b/client/coral-admin/src/containers/ModerationQueue/components/CommentType.css
@@ -1,7 +1,7 @@
 .commentType {
   position: absolute;
-  right: 5px;
-  top: 5px;
+  right: 15px;
+  top: 11px;
   color: white;
   background: grey;
   padding: 2px 13px;
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.css b/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.css
index 0806c30c3..fa7bb0cca 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.css
+++ b/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.css
@@ -5,10 +5,30 @@
     padding: 0 14px;
   }
 
+  .detail {
+    padding: 0 20px 16px;
+    ul {
+      padding: 0;
+      list-style: none;
+      font-size: 12px;
+      font-weight: 500;
+    }
+  }
+
   .header {
     position: relative;
     .moreDetail {
       float: right;
+      font-size: 12px;
+      font-weight: 500;
+      margin-right: 10px;
+      margin-top: 8px;
+      color: black;
+
+      &:hover {
+        opacity: 0.9;
+        cursor: pointer;
+      }
     }
     i {
       vertical-align: middle;
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.js b/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.js
index f30d32662..335004aeb 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.js
@@ -1,22 +1,47 @@
-import React, {PropTypes} from 'react';
+import React, {Component, PropTypes} from 'react';
 import {Icon} from 'coral-ui';
 import styles from './FlagBox.css';
 
-const FlagBox = props => (
-  <div className={styles.flagBox}>
-    <div className={styles.container}>
-      <div className={styles.header}>
-        <Icon name='flag'/><h3>Flags ({props.actionSummaries.length}):</h3>
-        <ul>
-          {props.actionSummaries.map((action, i) =>
-            <li key={i}>{!action.reason ? <i>No reason provided</i> : action.reason} (<strong>{action.count}</strong>)</li>
-          )}
-        </ul>
-        <span className={styles.moreDetail}></span>
+class FlagBox extends Component {
+  constructor () {
+    super();
+    this.state = {
+      showDetail: false
+    };
+  }
+
+  toggleDetail = () => {
+    this.setState((state) => ({
+      showDetail: !state.showDetail
+    }));
+  }
+
+  render() {
+    const {props} = this;
+    return (
+      <div className={styles.flagBox}>
+        <div className={styles.container}>
+          <div className={styles.header}>
+            <Icon name='flag'/><h3>Flags ({props.actionSummaries.length}):</h3>
+            <ul>
+              {props.actionSummaries.map((action, i) =>
+                <li key={i}>{!action.reason ? <i>No reason provided</i> : action.reason} (<strong>{action.count}</strong>)</li>
+              )}
+            </ul>
+            <a onClick={this.toggleDetail} className={styles.moreDetail}>More detail</a>
+          </div>
+          {this.state.showDetail && (<div className={styles.detail}>
+            <ul>
+              {props.actionSummaries.map((action, i) =>
+                <li key={i}>{!action.reason ? <i>No reason provided</i> : action.reason} (<strong>{action.count}</strong>)</li>
+              )}
+            </ul>
+          </div>)}
+        </div>
       </div>
-    </div>
-  </div>
-);
+    );
+  }
+}
 
 FlagBox.propTypes = {
   actionSummaries: PropTypes.array.isRequired
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/styles.css b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
index fdaf01439..65f6e6e45 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/styles.css
+++ b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
@@ -170,11 +170,12 @@ span {
   position: relative;
   transition: box-shadow 200ms;
   margin-top: 0;
-  padding: 20px 0 0;
-  min-height: 187px;
+  padding: 4px 0 0;
+  min-height: 220px;
 
   .container {
     padding: 0 14px;
+    min-height: 180px;
   }
 
   &:hover {
@@ -198,7 +199,7 @@ span {
      right: 0;
      height: 100%;
      top: 0;
-     padding: 40px 18px;
+     padding: 65px 12px;
      box-sizing: border-box;
    }
 
diff --git a/client/coral-admin/src/containers/ModerationQueue/helpers/moderationQueueActionsMap.js b/client/coral-admin/src/containers/ModerationQueue/helpers/moderationQueueActionsMap.js
index d0ac64070..09066831f 100644
--- a/client/coral-admin/src/containers/ModerationQueue/helpers/moderationQueueActionsMap.js
+++ b/client/coral-admin/src/containers/ModerationQueue/helpers/moderationQueueActionsMap.js
@@ -1,13 +1,14 @@
 export const actionsMap = {
-  PREMOD: ['REJECT', 'APPROVE', 'BAN'],
-  FLAGGED: ['REJECT', 'APPROVE', 'BAN'],
-  REJECTED: ['APPROVE']
+  PREMOD: ['APPROVE', 'REJECT'],
+  FLAGGED: ['APPROVE', 'REJECT'],
+  REJECTED: ['APPROVE', 'REJECTED']
 };
 
 export const menuActionsMap = {
-  'REJECT': {status: 'REJECTED', icon: 'close', key: 'r'},
-  'APPROVE': {status: 'ACCEPTED', icon: 'done', key: 't'},
-  'FLAGGED': {status: 'FLAGGED', icon: 'flag', filter: 'Untouched'},
-  'BAN': {status: 'BANNED', icon: 'not interested'},
+  'REJECT': {status: 'REJECTED', text: 'Reject', icon: 'close', key: 'r'},
+  'REJECTED': {status: 'REJECTED', text: 'Rejected', icon: 'close'},
+  'APPROVE': {status: 'ACCEPTED', text: 'Approve', icon: 'done', key: 't'},
+  'FLAGGED': {status: 'FLAGGED', text: 'Flag', icon: 'flag', filter: 'Untouched'},
+  'BAN': {status: 'BANNED', text: 'Ban User', icon: 'not interested'},
   '': {icon: 'done'}
 };
diff --git a/client/coral-ui/components/Button.css b/client/coral-ui/components/Button.css
index 4cdd7ef74..498b03912 100644
--- a/client/coral-ui/components/Button.css
+++ b/client/coral-ui/components/Button.css
@@ -110,6 +110,82 @@
   background: #00a291;
 }
 
+.type--approve {
+  display: block;
+  color: #519954;
+  border: solid 2px rgba(81, 153, 84, 0.75);
+  background: white;
+  padding: 10px 12px;
+  box-sizing: border-box;
+  vertical-align: middle;
+  line-height: 24px;
+  font-size: 17px;
+  height: 47px;
+  border-radius: 3px;
+  text-transform: capitalize;
+  box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.03), 0 3px 1px -2px rgba(0,0,0,.2), 0 1px 5px 0 rgba(0,0,0,.09);
+  width: 128px;
+
+  &:hover {
+   box-shadow: none;
+   color: white;
+   background-color: #519954;
+  }
+}
+
+.type--reject, .type--rejected {
+  display: block;
+  color: #D03235;
+  border: solid 1px #D03235;
+  background: white;
+  padding: 10px 11px;
+  box-sizing: border-box;
+  vertical-align: middle;
+  line-height: 24px;
+  font-size: 17px;
+  height: 47px;
+  border-radius: 3px;
+  text-transform: capitalize;
+  box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.03), 0 3px 1px -2px rgba(0,0,0,.2), 0 1px 5px 0 rgba(0,0,0,.09);
+  width: 128px;
+
+&:hover {
+   color: white;
+   background-color: #D03235;
+   box-shadow: none;
+ }
+}
+
+.type--rejected {
+  color: white;
+  background-color: #D03235;
+  box-shadow: none;
+  cursor: not-allowed;
+}
+
+.type--ban {
+  display: block;
+  color: #616161;
+  border: solid 2px rgba(97, 97, 97, 0.77);
+  background: white;
+  padding: 10px 12px;
+  box-sizing: border-box;
+  vertical-align: middle;
+  line-height: 24px;
+  font-size: 17px;
+  height: 47px;
+  border-radius: 3px;
+  text-transform: capitalize;
+  box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.03), 0 3px 1px -2px rgba(0,0,0,.2), 0 1px 5px 0 rgba(0,0,0,.09);
+  width: 128px;
+
+&:hover {
+   box-shadow: none;
+   color: white;
+   background-color: #616161;
+ }
+}
+
 .full {
   width: 100%;
   margin: 0;

From 545410b27e127e500710b1a9e06d44c94ec57951 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 1 Mar 2017 11:50:05 -0300
Subject: [PATCH 088/132] renaming duplicate statement

---
 .../src/containers/ModerationQueue/components/Comment.js         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
index 1e1d4ac10..3a82af2cd 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
@@ -6,7 +6,6 @@ import {Link} from 'react-router';
 
 import styles from './styles.css';
 import {Icon} from 'coral-ui';
-import ActionButton from '../../../components/ActionButton';
 import FlagBox from './FlagBox';
 import CommentType from './CommentType';
 import ActionButton from 'coral-admin/src/components/ActionButton';

From 6cd0c12ba4605c2d22e38724cc311f408bb3868f Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 1 Mar 2017 12:35:59 -0300
Subject: [PATCH 089/132] tweaks

---
 .../src/containers/ModerationQueue/components/FlagBox.js      | 2 +-
 .../src/containers/ModerationQueue/components/styles.css      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.js b/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.js
index 335004aeb..e578548d8 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.js
@@ -28,7 +28,7 @@ class FlagBox extends Component {
                 <li key={i}>{!action.reason ? <i>No reason provided</i> : action.reason} (<strong>{action.count}</strong>)</li>
               )}
             </ul>
-            <a onClick={this.toggleDetail} className={styles.moreDetail}>More detail</a>
+            {/*<a onClick={this.toggleDetail} className={styles.moreDetail}>More detail</a>*/}
           </div>
           {this.state.showDetail && (<div className={styles.detail}>
             <ul>
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/styles.css b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
index 65f6e6e45..6db537eef 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/styles.css
+++ b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
@@ -175,7 +175,7 @@ span {
 
   .container {
     padding: 0 14px;
-    min-height: 180px;
+    min-height: 220px;
   }
 
   &:hover {
@@ -199,7 +199,7 @@ span {
      right: 0;
      height: 100%;
      top: 0;
-     padding: 65px 12px;
+     padding: 100px 12px 65px;
      box-sizing: border-box;
    }
 

From 674585adebdae92c56f713862796993a5062a48b Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Wed, 1 Mar 2017 10:37:39 -0700
Subject: [PATCH 090/132] design updates

---
 .../src/containers/Dashboard/FlagWidget.js    | 22 +++++----
 .../src/containers/Dashboard/LikeWidget.js    | 18 +++++---
 .../src/containers/Dashboard/Widget.css       | 46 +++++++++++++++++--
 client/coral-admin/src/reducers/settings.js   |  2 +-
 client/coral-admin/src/translations.json      |  2 +
 5 files changed, 68 insertions(+), 22 deletions(-)

diff --git a/client/coral-admin/src/containers/Dashboard/FlagWidget.js b/client/coral-admin/src/containers/Dashboard/FlagWidget.js
index 537b89b8f..5d891b3bb 100644
--- a/client/coral-admin/src/containers/Dashboard/FlagWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/FlagWidget.js
@@ -15,28 +15,32 @@ const FlagWidget = (props) => {
       <table className={styles.widgetTable}>
         <thead className={styles.widgetHead}>
           <tr>
-            <th></th>{/* empty on purpose */}
             <th>{lang.t('streams.article')}</th>
-            <th>{lang.t('modqueue.flagged')}</th>
+            <th>{lang.t('dashboard.flags')}</th>
           </tr>
         </thead>
         <tbody>
           {
             assets.length
-            ? assets.map((asset, index) => {
+            ? assets.map(asset => {
               const flagSummary = asset.action_summaries.find(s => s.type === 'FlagAssetActionSummary');
               return (
-                <tr key={asset.id}>
-                  <td>{index + 1}.</td>
+                <tr className={styles.rowLinkify} key={asset.id}>
                   <td>
-                    <Link to={`/admin/moderate/flagged/${asset.id}`}>{asset.title}</Link>
-                    <p className={styles.lede}>{asset.author} - Published: {new Date(asset.created_at).toLocaleDateString()}</p>
+                    <Link className={styles.linkToAsset} to={`/admin/moderate/flagged/${asset.id}`}>
+                      <p className={styles.assetTitle}>{asset.title}</p>
+                      <p className={styles.lede}>{asset.author} — Published: {new Date(asset.created_at).toLocaleDateString()}</p>
+                    </Link>
+                  </td>
+                  <td>
+                    <Link className={styles.linkToAsset} to={`/admin/moderate/flagged/${asset.id}`}>
+                      <p className={styles.widgetCount}>{flagSummary ? flagSummary.actionCount : 0}</p>
+                    </Link>
                   </td>
-                  <td>{flagSummary ? flagSummary.actionCount : 0}</td>
                 </tr>
               );
             })
-            : <tr><td colSpan="3">{lang.t('dashboard.no_flags')}</td></tr>
+            : <tr><td colSpan="2">{lang.t('dashboard.no_flags')}</td></tr>
           }
         </tbody>
       </table>
diff --git a/client/coral-admin/src/containers/Dashboard/LikeWidget.js b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
index ed6a0c0ae..d628c2e11 100644
--- a/client/coral-admin/src/containers/Dashboard/LikeWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
@@ -16,7 +16,6 @@ const LikeWidget = (props) => {
       <table className={styles.widgetTable}>
         <thead className={styles.widgetHead}>
           <tr>
-            <th></th>{/* empty on purpose */}
             <th>{lang.t('streams.article')}</th>
             <th>{lang.t('modqueue.likes')}</th>
           </tr>
@@ -24,20 +23,25 @@ const LikeWidget = (props) => {
         <tbody>
           {
             assets.length
-            ? assets.map((asset, index) => {
+            ? assets.map(asset => {
               const likeSummary = asset.action_summaries.find(s => s.type === 'LikeAssetActionSummary');
               return (
                 <tr key={asset.id}>
-                  <td>{index + 1}.</td>
                   <td>
-                    <Link to={`/admin/moderate/flagged/${asset.id}`}>{asset.title}</Link>
-                    <p className={styles.lede}>{asset.author} - Published: {new Date(asset.created_at).toLocaleDateString()}</p>
+                    <Link className={styles.linkToAsset} to={`/admin/moderate/flagged/${asset.id}`}>
+                      <p className={styles.assetTitle}>{asset.title}</p>
+                      <p className={styles.lede}>{asset.author} — Published: {new Date(asset.created_at).toLocaleDateString()}</p>
+                    </Link>
+                  </td>
+                  <td>
+                    <Link className={styles.linkToAsset} to={`/admin/moderate/flagged/${asset.id}`}>
+                      <p className={styles.widgetCount}>{likeSummary ? likeSummary.actionCount : 0}</p>
+                    </Link>
                   </td>
-                  <td>{likeSummary ? likeSummary.actionCount : 0}</td>
                 </tr>
               );
             })
-            : <tr><td colSpan="3">{lang.t('dashboard.no_likes')}</td></tr>
+            : <tr><td colSpan="2">{lang.t('dashboard.no_likes')}</td></tr>
           }
         </tbody>
       </table>
diff --git a/client/coral-admin/src/containers/Dashboard/Widget.css b/client/coral-admin/src/containers/Dashboard/Widget.css
index 624b72519..a99c2febd 100644
--- a/client/coral-admin/src/containers/Dashboard/Widget.css
+++ b/client/coral-admin/src/containers/Dashboard/Widget.css
@@ -4,10 +4,12 @@
   box-shadow: 0px 0px 5px 0px rgba(0,0,0,0.2);
   padding: 15px;
   flex: 1;
+  background-color: white;
 }
 
 .heading {
   margin: 0;
+  padding-left: 10px;
   font-size: 1.5rem;
   font-weight: bold;
 }
@@ -15,28 +17,62 @@
 .widgetTable {
   width: 100%;
   border-collapse: collapse;
-  box-shadow: 0px 0px 5px 0px rgba(0,0,0,0.2);
+  user-select: none;
 }
 
 .widgetTable thead th {
-  border-bottom: 1px solid #f47e6b;
+  color: rgb(35, 102, 223);
   padding: 10px;
   text-align: left;
+  text-transform: capitalize;
 }
 
-.widgetTable tbody tr {
+.widgetTable thead th:last-child {
+  width: 10%;
+}
+
+.rowLinkify {
+  cursor: pointer;
   border-bottom: 1px solid lightgrey;
+  color: #555;
 }
 
-.widgetTable tbody tr:last-child {
+.rowLinkify:last-child {
   border-bottom: none;
 }
 
+.rowLinkify:hover {
+  background-color: #f8f8f8;
+}
+
 .widgetTable tbody td {
   padding: 10px;
 }
 
+.linkToAsset {
+  display: block;
+  text-decoration: none;
+}
+
 .lede {
   font-size: 0.9em;
-  color: grey;
+  color: #aaa;
+}
+
+.assetTitle {
+  color: #555;
+  text-decoration: none;
+  font-size: 1.2em;
+  font-weight: normal;
+  margin: 0;
+}
+
+.assetTitle:hover {
+  text-decoration: underline;
+}
+
+.widgetCount {
+  color: #555;
+  font-size: 1.3em;
+  font-weight: 400;
 }
diff --git a/client/coral-admin/src/reducers/settings.js b/client/coral-admin/src/reducers/settings.js
index f74eb659f..4f7d90d59 100644
--- a/client/coral-admin/src/reducers/settings.js
+++ b/client/coral-admin/src/reducers/settings.js
@@ -6,7 +6,7 @@ import * as actions from '../actions/settings';
 // cleaner updates are planned in the future.
 // TODO: if there are more than two fields for the dashboard being created here,
 // please create a new reducer specifically for the Dashboard.
-const DASHBOARD_WINDOW_MINUTES = 5;
+const DASHBOARD_WINDOW_MINUTES = 105;
 let then = new Date();
 then.setMinutes(then.getMinutes() - DASHBOARD_WINDOW_MINUTES);
 
diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json
index dbb3e650e..92e0cbbff 100644
--- a/client/coral-admin/src/translations.json
+++ b/client/coral-admin/src/translations.json
@@ -112,6 +112,7 @@
     "dashboard": {
       "no_flags": "There have been no flags in the last 5 minutes! Hooray!",
       "no_likes": "There have been no likes in the last 5 minutes. All quiet.",
+      "flags": "Flags",
       "comment_count": "comments"
     },
     "streams": {
@@ -222,6 +223,7 @@
     "dashbord": {
       "no_flags": "¡Nadie ha marcado nada en los últimos 5 minutos! ¡Bravo!",
       "no_likes": "A nadie le ha gustado algún comentario en los últimos 5 minutos. Todo tranquilo.",
+      "flags": "Marcados",
       "comment_count": "comentarios"
     },
     "streams": {

From 04ab00d053e441d5c5010b3cdf2d58f72ddf629d Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Wed, 1 Mar 2017 10:40:40 -0700
Subject: [PATCH 091/132] ignore this

---
 client/coral-admin/src/AppRouter.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/client/coral-admin/src/AppRouter.js b/client/coral-admin/src/AppRouter.js
index aacc3d6c7..38d06dcb1 100644
--- a/client/coral-admin/src/AppRouter.js
+++ b/client/coral-admin/src/AppRouter.js
@@ -14,8 +14,6 @@ import Dashboard from 'containers/Dashboard/Dashboard';
 const routes = (
   <div>
     <Route exact path="/admin/install" component={InstallContainer}/>
-    <Route path='/admin/login' component={LayoutContainer} />
-    <Route path='/admin/logon' component={LayoutContainer} />
     <Route path='/admin' component={LayoutContainer}>
       <IndexRoute component={Dashboard} />
       <Route path='community' component={CommunityContainer} />

From 045fa3e2a945988910aa1e066d410c44695ccc2a Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Wed, 1 Mar 2017 10:42:01 -0700
Subject: [PATCH 092/132] also ignore this

---
 client/coral-admin/src/components/AdminLogin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-admin/src/components/AdminLogin.js b/client/coral-admin/src/components/AdminLogin.js
index cd9bac1d4..3d374bcda 100644
--- a/client/coral-admin/src/components/AdminLogin.js
+++ b/client/coral-admin/src/components/AdminLogin.js
@@ -66,7 +66,7 @@ class AdminLogin extends React.Component {
     return (
       <Layout fixedDrawer restricted={true}>
         <div className={styles.layout}>
-          <h1>Permission Required</h1>
+          <h1>Team Sign In</h1>
           <p>Sign in to interact with your community.</p>
           { this.state.requestPassword ? requestPasswordForm : signInForm }
         </div>

From bbf70aedabb0afddb18f40c336a69fd214440a7c Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Wed, 1 Mar 2017 10:47:31 -0700
Subject: [PATCH 093/132] put it back to 5 minutes

---
 client/coral-admin/src/reducers/settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-admin/src/reducers/settings.js b/client/coral-admin/src/reducers/settings.js
index 4f7d90d59..f74eb659f 100644
--- a/client/coral-admin/src/reducers/settings.js
+++ b/client/coral-admin/src/reducers/settings.js
@@ -6,7 +6,7 @@ import * as actions from '../actions/settings';
 // cleaner updates are planned in the future.
 // TODO: if there are more than two fields for the dashboard being created here,
 // please create a new reducer specifically for the Dashboard.
-const DASHBOARD_WINDOW_MINUTES = 105;
+const DASHBOARD_WINDOW_MINUTES = 5;
 let then = new Date();
 then.setMinutes(then.getMinutes() - DASHBOARD_WINDOW_MINUTES);
 

From 45b14d026dec4927addbb33d5918e227d8da68ed Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 1 Mar 2017 10:49:47 -0700
Subject: [PATCH 094/132] Added more conditional checks to exclusion

---
 graph/loaders/metrics.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graph/loaders/metrics.js b/graph/loaders/metrics.js
index 2627d82d9..a6fe5afe4 100644
--- a/graph/loaders/metrics.js
+++ b/graph/loaders/metrics.js
@@ -54,7 +54,7 @@ const getAssetMetrics = ({loaders: {Metrics, Assets, Comments}}, {from, to, sort
 
       .filter((asset) => {
         let contextActionSummary = asset.action_summaries.find((({action_type}) => action_type === sort));
-        if (contextActionSummary === null) {
+        if (contextActionSummary === null || contextActionSummary.actionCount === 0) {
           return false;
         }
 

From 00b2bf37eee9cdd2ff5280a507d03683ee798d6e Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Wed, 1 Mar 2017 11:14:13 -0700
Subject: [PATCH 095/132] fix height of the table

---
 client/coral-admin/src/containers/Dashboard/FlagWidget.js | 6 +++++-
 client/coral-admin/src/containers/Dashboard/LikeWidget.js | 8 ++++++--
 client/coral-admin/src/containers/Dashboard/Widget.css    | 6 ++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/client/coral-admin/src/containers/Dashboard/FlagWidget.js b/client/coral-admin/src/containers/Dashboard/FlagWidget.js
index 5d891b3bb..da71ac04a 100644
--- a/client/coral-admin/src/containers/Dashboard/FlagWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/FlagWidget.js
@@ -40,7 +40,11 @@ const FlagWidget = (props) => {
                 </tr>
               );
             })
-            : <tr><td colSpan="2">{lang.t('dashboard.no_flags')}</td></tr>
+            : <tr className={styles.rowLinkify}><td colSpan="2">{lang.t('dashboard.no_flags')}</td></tr>
+          }
+          { /* rows in a table with a fixed height will expand and ignore height.
+                this extra row will expand to fill the extra space. */
+            assets.length < 10 ? <tr></tr> : null
           }
         </tbody>
       </table>
diff --git a/client/coral-admin/src/containers/Dashboard/LikeWidget.js b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
index d628c2e11..25e851966 100644
--- a/client/coral-admin/src/containers/Dashboard/LikeWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/LikeWidget.js
@@ -26,7 +26,7 @@ const LikeWidget = (props) => {
             ? assets.map(asset => {
               const likeSummary = asset.action_summaries.find(s => s.type === 'LikeAssetActionSummary');
               return (
-                <tr key={asset.id}>
+                <tr className={styles.rowLinkify} key={asset.id}>
                   <td>
                     <Link className={styles.linkToAsset} to={`/admin/moderate/flagged/${asset.id}`}>
                       <p className={styles.assetTitle}>{asset.title}</p>
@@ -41,7 +41,11 @@ const LikeWidget = (props) => {
                 </tr>
               );
             })
-            : <tr><td colSpan="2">{lang.t('dashboard.no_likes')}</td></tr>
+            : <tr className={styles.rowLinkify}><td colSpan="2">{lang.t('dashboard.no_likes')}</td></tr>
+          }
+          { /* rows in a table with a fixed height will expand and ignore height.
+                this extra row will expand to fill the extra space. */
+            assets.length < 10 ? <tr></tr> : null
           }
         </tbody>
       </table>
diff --git a/client/coral-admin/src/containers/Dashboard/Widget.css b/client/coral-admin/src/containers/Dashboard/Widget.css
index a99c2febd..cb764d9cc 100644
--- a/client/coral-admin/src/containers/Dashboard/Widget.css
+++ b/client/coral-admin/src/containers/Dashboard/Widget.css
@@ -1,3 +1,7 @@
+:root {
+  --row-height: 80px;
+}
+
 .widget {
   box-sizing: border-box;
   margin: 10px 5px 5px 5px;
@@ -18,6 +22,7 @@
   width: 100%;
   border-collapse: collapse;
   user-select: none;
+  height: calc(var(--row-height) * 10);
 }
 
 .widgetTable thead th {
@@ -35,6 +40,7 @@
   cursor: pointer;
   border-bottom: 1px solid lightgrey;
   color: #555;
+  height: var(--row-height);
 }
 
 .rowLinkify:last-child {

From af8c9262968afbc30e6d805ae075be5ace14119d Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 1 Mar 2017 11:37:29 -0700
Subject: [PATCH 096/132] Pinning to 7.6 until upstream issues resolved, see
 #357

---
 Dockerfile   | 2 +-
 circle.yml   | 2 +-
 package.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 14d606c0a..dc7e64e31 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:7
+FROM node:7.6
 
 # Install yarn
 RUN npm install -g yarn
diff --git a/circle.yml b/circle.yml
index b29dfcc4c..2357ecf4c 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,6 +1,6 @@
 machine:
   node:
-    version: 7
+    version: 7.6
   services:
     - docker
     - redis
diff --git a/package.json b/package.json
index cbf3a1267..740063dd1 100644
--- a/package.json
+++ b/package.json
@@ -165,6 +165,6 @@
     "webpack": "^2.2.1"
   },
   "engines": {
-    "node": ">=7.0.0"
+    "node": "~7.6.0"
   }
 }

From 4e5bcbc27f61185bbc32e7301af21bb8974683f1 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Wed, 1 Mar 2017 11:42:03 -0700
Subject: [PATCH 097/132] even more design updates

---
 .../coral-admin/src/components/AdminLogin.js  | 30 ++++++++++-------
 .../coral-admin/src/components/NotFound.css   | 32 ++++++++++++++++---
 2 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/client/coral-admin/src/components/AdminLogin.js b/client/coral-admin/src/components/AdminLogin.js
index 3d374bcda..7c7d4b00f 100644
--- a/client/coral-admin/src/components/AdminLogin.js
+++ b/client/coral-admin/src/components/AdminLogin.js
@@ -1,7 +1,7 @@
 import React, {PropTypes} from 'react';
 import Layout from 'coral-admin/src/components/ui/Layout';
 import styles from './NotFound.css';
-import {Button, TextField, Alert} from 'coral-ui';
+import {Button, TextField, Alert, Success} from 'coral-ui';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../translations';
 const lang = new I18n(translations);
@@ -29,20 +29,22 @@ class AdminLogin extends React.Component {
       <form onSubmit={this.handleSignIn}>
         {errorMessage && <Alert>{lang.t(`errors.${errorMessage}`)}</Alert>}
         <TextField
-          label='email'
+          label='Email Address'
           value={this.state.email}
           onChange={e => this.setState({email: e.target.value})} />
         <TextField
-          label='password'
+          label='Password'
           value={this.state.password}
           onChange={e => this.setState({password: e.target.value})}
           type='password' />
+        <div style={{height: 10}}></div>
         <Button
           type='submit'
           cStyle='black'
-          onClick={this.handleSignIn} full>Sign In</Button>
-        <p>
-          Forgot your password? <a href="#" onClick={e => {
+          full
+          onClick={this.handleSignIn}>Sign In</Button>
+        <p className={styles.forgotPasswordCTA}>
+          Forgot your password? <a href="#" className={styles.forgotPasswordLink} onClick={e => {
             e.preventDefault();
             this.setState({requestPassword: true});
           }}>Request a new one.</a>
@@ -51,23 +53,29 @@ class AdminLogin extends React.Component {
     );
     const requestPasswordForm = (
       this.props.passwordRequestSuccess
-      ? <p className={styles.passwordRequestSuccess}>{this.props.passwordRequestSuccess}</p>
+      ? <p className={styles.passwordRequestSuccess} onClick={() => {
+        location.href = location.href;
+      }}>
+          {this.props.passwordRequestSuccess} <a className={styles.signInLink} href="#">Sign in</a>
+          <Success />
+        </p>
       : <form onSubmit={this.handleRequestPassword}>
         <TextField
-          label='email'
+          label='Email Address'
           value={this.state.email}
           onChange={e => this.setState({email: e.target.value})} />
         <Button
           type='submit'
           cStyle='black'
+          full
           onClick={this.handleRequestPassword}>Reset Password</Button>
       </form>
     );
     return (
       <Layout fixedDrawer restricted={true}>
-        <div className={styles.layout}>
-          <h1>Team Sign In</h1>
-          <p>Sign in to interact with your community.</p>
+        <div className={styles.loginLayout}>
+          <h1 className={styles.loginHeader}>Team sign in</h1>
+          <p className={styles.loginCTA}>Sign in to interact with your community.</p>
           { this.state.requestPassword ? requestPasswordForm : signInForm }
         </div>
       </Layout>
diff --git a/client/coral-admin/src/components/NotFound.css b/client/coral-admin/src/components/NotFound.css
index c45fbcc02..9977f858a 100644
--- a/client/coral-admin/src/components/NotFound.css
+++ b/client/coral-admin/src/components/NotFound.css
@@ -1,15 +1,37 @@
 .layout {
+  max-width: 800px;
+  margin: 0 auto;
+}
+
+.loginLayout {
   max-width: 400px;
   margin: 0 auto;
 }
 
+.loginHeader, .loginCTA, .forgotPasswordCTA, .passwordRequestSuccess {
+  text-align: center;
+  font-size: 16px;
+}
+
+.forgotPasswordLink, .signInLink {
+  color: blue;
+  font-weight: normal;
+  text-decoration: none;
+}
+
+.forgotPasswordLink:hover, .signInLink:hover {
+  text-decoration: underline;
+}
+
 .layout h1 {
   font-size: 40px;
 }
 
-.passwordRequestSuccess {
-  padding: 8px 14px;
-  background: lightgreen;
-  border: 1px solid darkgreen;
-  border-radius: 4px;
+.loginHeader {
+  font-size: 30px;
+}
+
+.passwordRequestSuccess {
+  cursor: pointer;
+  padding: 8px 14px;
 }

From 2f05cec380a01986b8d5cdb12f0b78c2109bc6c2 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 1 Mar 2017 11:50:32 -0700
Subject: [PATCH 098/132] Removed yarn install (already has yarn!)

---
 Dockerfile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index dc7e64e31..fc0b3aca2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,5 @@
 FROM node:7.6
 
-# Install yarn
-RUN npm install -g yarn
-
 # Create app directory
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app

From 0085d2bb0473e4c2fd708e832cccc48ae11c65f6 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Wed, 1 Mar 2017 14:21:03 -0500
Subject: [PATCH 099/132] Preventing premod comments from being posted
 optimistically.

---
 client/coral-framework/graphql/mutations/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-framework/graphql/mutations/index.js b/client/coral-framework/graphql/mutations/index.js
index 67af2df4a..4c2920e54 100644
--- a/client/coral-framework/graphql/mutations/index.js
+++ b/client/coral-framework/graphql/mutations/index.js
@@ -40,7 +40,7 @@ export const postComment = graphql(POST_COMMENT, {
         updateQueries: {
           AssetQuery: (oldData, {mutationResult:{data:{createComment:{comment}}}}) => {
 
-            if (oldData.asset.moderation === 'PRE') {
+            if (oldData.asset.settings.moderation === 'PRE') {
               return oldData;
             }
 

From 9cb835b08bc493ed072c00398f26cdb15ac13d74 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Wed, 1 Mar 2017 14:49:42 -0500
Subject: [PATCH 100/132] Setting action user_id to null on suspect words.

---
 graph/mutators/action.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graph/mutators/action.js b/graph/mutators/action.js
index a572a641c..3bc20cba4 100644
--- a/graph/mutators/action.js
+++ b/graph/mutators/action.js
@@ -16,7 +16,7 @@ const createAction = ({user = {}}, {item_id, item_type, action_type, group_id, m
   return ActionsService.insertUserAction({
     item_id,
     item_type,
-    user_id: user.id,
+    user_id: group_id === 'Matched suspect word filter' ? null : user.id,
     group_id,
     action_type,
     metadata

From 49477ead6a3ae3b80bf4689a1dbc69c24ba7b6f9 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 1 Mar 2017 13:47:08 -0700
Subject: [PATCH 101/132] Fixed temp issue

---
 Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index fc0b3aca2..7cd06e673 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,8 @@
 FROM node:7.6
 
+# Add node-gyp for bcrypt build support
+RUN yarn global add node-gyp
+
 # Create app directory
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app

From fb96d432ee4f1fcf237f56a9efda881db8b34bf0 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 1 Mar 2017 13:51:32 -0700
Subject: [PATCH 102/132] Moved action creation upstream

---
 graph/mutators/action.js  | 2 +-
 graph/mutators/comment.js | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/graph/mutators/action.js b/graph/mutators/action.js
index 3bc20cba4..a572a641c 100644
--- a/graph/mutators/action.js
+++ b/graph/mutators/action.js
@@ -16,7 +16,7 @@ const createAction = ({user = {}}, {item_id, item_type, action_type, group_id, m
   return ActionsService.insertUserAction({
     item_id,
     item_type,
-    user_id: group_id === 'Matched suspect word filter' ? null : user.id,
+    user_id: user.id,
     group_id,
     action_type,
     metadata
diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index 5112ba829..d608eee57 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -1,6 +1,7 @@
 const errors = require('../../errors');
 
 const AssetsService = require('../../services/assets');
+const ActionsService = require('../../services/actions');
 const CommentsService = require('../../services/comments');
 
 const Wordlist = require('../../services/wordlist');
@@ -146,10 +147,11 @@ const createPublicComment = (context, commentInput) => {
           // TODO: this is kind of fragile, we should refactor this to resolve
           // all these const's that we're using like 'COMMENTS', 'FLAG' to be
           // defined in a checkable schema.
-          return context.mutators.Action.create({
+          return ActionsService.insertUserAction({
             item_id: comment.id,
             item_type: 'COMMENTS',
             action_type: 'FLAG',
+            user_id: null,
             group_id: 'Matched suspect word filter',
             metadata: {}
           })

From 62793f59472cb8a64fafa9c6b4492038c64649dc Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Wed, 1 Mar 2017 14:40:10 -0700
Subject: [PATCH 103/132] keepin' it DRY

---
 .../src/containers/Configure/Configure.css    |  2 +-
 .../src/containers/Configure/Configure.js     | 85 ++++++++++---------
 .../src/containers/Configure/Domainlist.js    | 24 +++---
 .../src/containers/Configure/EmbedLink.js     | 21 ++---
 .../Configure/ModerationSettings.js           | 56 ++++++++++++
 .../{CommentSettings.js => StreamSettings.js} | 47 +---------
 .../src/containers/Configure/TechSettings.js  | 48 +++++++++++
 client/coral-admin/src/reducers/settings.js   |  4 +-
 8 files changed, 177 insertions(+), 110 deletions(-)
 create mode 100644 client/coral-admin/src/containers/Configure/ModerationSettings.js
 rename client/coral-admin/src/containers/Configure/{CommentSettings.js => StreamSettings.js} (80%)
 create mode 100644 client/coral-admin/src/containers/Configure/TechSettings.js

diff --git a/client/coral-admin/src/containers/Configure/Configure.css b/client/coral-admin/src/containers/Configure/Configure.css
index 1f23af30b..5f4a07c81 100644
--- a/client/coral-admin/src/containers/Configure/Configure.css
+++ b/client/coral-admin/src/containers/Configure/Configure.css
@@ -150,7 +150,7 @@
   margin-top: 38px;
 }
 
-.commentSettingsSection {
+.settingsSection {
   padding-bottom: 200px;
   .action {
     display: inline-block;
diff --git a/client/coral-admin/src/containers/Configure/Configure.js b/client/coral-admin/src/containers/Configure/Configure.js
index 1ec78dcd2..2fbe9daf2 100644
--- a/client/coral-admin/src/containers/Configure/Configure.js
+++ b/client/coral-admin/src/containers/Configure/Configure.js
@@ -8,22 +8,20 @@ import {
   updateDomainlist
 } from '../../actions/settings';
 
-import {Button, List, Item} from 'coral-ui';
+import {Button, List, Item, Card, Spinner} from 'coral-ui';
 import styles from './Configure.css';
 import I18n from 'coral-framework/modules/i18n/i18n';
-import translations from '../../translations.json';
-import EmbedLink from './EmbedLink';
-import CommentSettings from './CommentSettings';
-import Wordlist from './Wordlist';
-import Domainlist from './Domainlist';
-import has from 'lodash/has';
+import translations from 'coral-admin/src/translations.json';
+import StreamSettings from './StreamSettings';
+import ModerationSettings from './ModerationSettings';
+import TechSettings from './TechSettings';
 
 class Configure extends Component {
   constructor (props) {
     super(props);
 
     this.state = {
-      activeSection: 'comments',
+      activeSection: 'stream',
       changed: false,
       errors: {}
     };
@@ -70,40 +68,51 @@ class Configure extends Component {
 
   getSection (section) {
     const pageTitle = this.getPageTitle(section);
+    let sectionComponent;
     switch(section){
-    case 'comments':
-      return <CommentSettings
-        title={pageTitle}
-        fetchingSettings={this.props.fetchingSettings}
+    case 'stream':
+      sectionComponent = <StreamSettings
         settings={this.props.settings}
         updateSettings={this.onSettingUpdate}
         errors={this.state.errors}
         settingsError={this.onSettingError}/>;
-    case 'embed':
-      return has(this, 'props.settings.domains.whitelist')
-        ? <div>
-            <Domainlist
-             domains={this.props.settings.domains.whitelist}
-             onChangeDomainlist={this.onChangeDomainlist}/>
-            <EmbedLink title={pageTitle} />
-          </div>
-        : <EmbedLink title={pageTitle} />;
-    case 'wordlist':
-      return has(this, 'props.settings.wordlist')
-        ? <Wordlist
-          bannedWords={this.props.settings.wordlist.banned}
-          suspectWords={this.props.settings.wordlist.suspect}
-          onChangeWordlist={this.onChangeWordlist} />
-        : <p>loading wordlists</p>;
+      break;
+    case 'moderation':
+      sectionComponent = <ModerationSettings
+        title={pageTitle}
+        onChangeWordlist={this.onChangeWordlist}
+        fetchingSettings={this.props.settings.fetchingSettings}
+        settings={this.props.settings}
+        updateSettings={this.onSettingUpdate} />;
+      break;
+    case 'tech':
+      sectionComponent = <TechSettings
+        title={pageTitle}
+        fetchingSettings={this.props.settings.fetchingSettings}
+        settings={this.props.settings}
+        updateSettings={this.onSettingUpdate} />;
     }
+
+    if (this.props.settings.fetchingSettings) {
+      return <Card shadow="4"><Spinner/>Loading settings...</Card>;
+    }
+
+    return (
+      <div className={styles.settingsSection}>
+        <h3>{pageTitle}</h3>
+        {sectionComponent}
+      </div>
+    );
   }
 
   getPageTitle (section) {
     switch(section) {
-    case 'comments':
-      return lang.t('configure.comment-settings');
-    case 'embed':
-      return lang.t('configure.embed-comment-stream');
+    case 'stream':
+      return lang.t('configure.stream-settings');
+    case 'moderation':
+      return lang.t('configure.moderation-settings');
+    case 'tech':
+      return lang.t('configure.tech-settings');
     default:
       return '';
     }
@@ -120,14 +129,14 @@ class Configure extends Component {
         <div className={styles.container}>
           <div className={styles.leftColumn}>
             <List onChange={this.changeSection} activeItem={activeSection}>
-              <Item itemId='comments' icon="settings">
-                {lang.t('configure.comment-settings')}
+              <Item itemId='stream' icon='speaker_notes'>
+                {lang.t('configure.stream-settings')}
               </Item>
-              <Item itemId='embed' icon='code'>
-                {lang.t('configure.embed-comment-stream')}
+              <Item itemId='moderation' icon='thumbs_up_down'>
+                {lang.t('configure.moderation-settings')}
               </Item>
-              <Item itemId='wordlist' icon='settings'>
-                {lang.t('configure.wordlist')}
+              <Item itemId='tech' icon='code'>
+                {lang.t('configure.tech-settings')}
               </Item>
             </List>
             <div className={styles.saveBox}>
diff --git a/client/coral-admin/src/containers/Configure/Domainlist.js b/client/coral-admin/src/containers/Configure/Domainlist.js
index 6918c0471..bda3ca139 100644
--- a/client/coral-admin/src/containers/Configure/Domainlist.js
+++ b/client/coral-admin/src/containers/Configure/Domainlist.js
@@ -9,19 +9,17 @@ const lang = new I18n(translations);
 
 const Domainlist = ({domains, onChangeDomainlist}) => {
   return (
-    <div>
-      <h3>{lang.t('configure.domain-list-title')}</h3>
-      <Card id={styles.domainlist}>
-        <p className={styles.domainlistDesc}>{lang.t('configure.domain-list-text')}</p>
-        <TagsInput
-          value={domains}
-          inputProps={{placeholder: 'URL'}}
-          addOnPaste={true}
-          pasteSplit={data => data.split(',').map(d => d.trim())}
-          onChange={tags => onChangeDomainlist('whitelist', tags)}
-        />
-      </Card>
-    </div>
+    <Card id={styles.domainlist} className={styles.configSetting}>
+      <h3 style={{margin: 0}}>{lang.t('configure.domain-list-title')}</h3>
+      <p className={styles.domainlistDesc}>{lang.t('configure.domain-list-text')}</p>
+      <TagsInput
+        value={domains}
+        inputProps={{placeholder: 'URL'}}
+        addOnPaste={true}
+        pasteSplit={data => data.split(',').map(d => d.trim())}
+        onChange={tags => onChangeDomainlist('whitelist', tags)}
+      />
+    </Card>
   );
 };
 
diff --git a/client/coral-admin/src/containers/Configure/EmbedLink.js b/client/coral-admin/src/containers/Configure/EmbedLink.js
index 413f421d7..cdbb66c3a 100644
--- a/client/coral-admin/src/containers/Configure/EmbedLink.js
+++ b/client/coral-admin/src/containers/Configure/EmbedLink.js
@@ -44,19 +44,14 @@ class EmbedLink extends Component {
 "></script>
     `.trim();
     return (
-      <div>
-        <h3>{this.props.title}</h3>
-        <div>
-          <Card shadow="2">
-            <p>{lang.t('configure.copy-and-paste')}</p>
-            <textarea rows={5} type='text' className={styles.embedInput} value={embedText} readOnly={true}/>
-            <Button raised className={styles.copyButton} onClick={this.copyToClipBoard} cStyle="black">
-              {lang.t('embedlink.copy')}
-            </Button>
-            <div className={styles.copiedText}>{this.state.copied && 'Copied!'}</div>
-          </Card>
-        </div>
-      </div>
+      <Card shadow="2" className={styles.configSetting}>
+        <p>{lang.t('configure.copy-and-paste')}</p>
+        <textarea rows={5} type='text' className={styles.embedInput} value={embedText} readOnly={true}/>
+        <Button raised className={styles.copyButton} onClick={this.copyToClipBoard} cStyle="black">
+          {lang.t('embedlink.copy')}
+        </Button>
+        <div className={styles.copiedText}>{this.state.copied && 'Copied!'}</div>
+      </Card>
     );
   }
 }
diff --git a/client/coral-admin/src/containers/Configure/ModerationSettings.js b/client/coral-admin/src/containers/Configure/ModerationSettings.js
new file mode 100644
index 000000000..8343f6e04
--- /dev/null
+++ b/client/coral-admin/src/containers/Configure/ModerationSettings.js
@@ -0,0 +1,56 @@
+import React, {PropTypes} from 'react';
+import styles from './Configure.css';
+import {Card} from 'coral-ui';
+import {Checkbox} from 'react-mdl';
+import Wordlist from './Wordlist';
+import I18n from 'coral-framework/modules/i18n/i18n';
+import translations from '../../translations.json';
+const lang = new I18n(translations);
+
+const updateModeration = (updateSettings, mod) => () => {
+  const moderation = mod === 'PRE' ? 'POST' : 'PRE';
+  updateSettings({moderation});
+};
+
+const ModerationSettings = ({settings, updateSettings, onChangeWordlist}) => {
+
+  // just putting this here for shorthand below
+  const on = styles.enabledSetting;
+  const off = styles.disabledSetting;
+
+  return (
+    <div>
+      <Card className={`${styles.configSetting} ${settings.moderation === 'PRE' ? on : off}`}>
+        <div className={styles.action}>
+          <Checkbox
+            onChange={updateModeration(updateSettings, settings.moderation)}
+            checked={settings.moderation === 'PRE'} />
+        </div>
+        <div className={styles.content}>
+          <div className={styles.settingsHeader}>{lang.t('configure.enable-pre-moderation')}</div>
+          <p className={settings.moderation === 'PRE' ? '' : styles.disabledSettingText}>
+            {lang.t('configure.enable-pre-moderation-text')}
+          </p>
+        </div>
+      </Card>
+      <Wordlist
+        bannedWords={settings.wordlist.banned}
+        suspectWords={settings.wordlist.suspect}
+        onChangeWordlist={onChangeWordlist} />
+    </div>
+  );
+};
+
+ModerationSettings.propTypes = {
+  onChangeWordlist: PropTypes.func.isRequired,
+  settings: PropTypes.shape({
+    moderation: PropTypes.string.isRequired,
+    wordlist: PropTypes.shape({
+      banned: PropTypes.array.isRequired,
+      suspect: PropTypes.array.isRequired
+    })
+  }).isRequired,
+  updateSettings: PropTypes.func.isRequired
+};
+
+export default ModerationSettings;
diff --git a/client/coral-admin/src/containers/Configure/CommentSettings.js b/client/coral-admin/src/containers/Configure/StreamSettings.js
similarity index 80%
rename from client/coral-admin/src/containers/Configure/CommentSettings.js
rename to client/coral-admin/src/containers/Configure/StreamSettings.js
index 90057c5fe..0aa846c61 100644
--- a/client/coral-admin/src/containers/Configure/CommentSettings.js
+++ b/client/coral-admin/src/containers/Configure/StreamSettings.js
@@ -4,7 +4,7 @@ import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../../translations.json';
 import styles from './Configure.css';
 import {Textfield, Checkbox} from 'react-mdl';
-import {Card, Icon, Spinner} from 'coral-ui';
+import {Card, Icon} from 'coral-ui';
 
 const TIMESTAMPS = {
   weeks: 60 * 60 * 24 * 7,
@@ -27,11 +27,6 @@ const updateCharCount = (updateSettings, settingsError) => (event) => {
   updateSettings({charCount: charCount});
 };
 
-const updateModeration = (updateSettings, mod) => () => {
-  const moderation = mod === 'PRE' ? 'POST' : 'PRE';
-  updateSettings({moderation});
-};
-
 const updateEmailConfirmation = (updateSettings, verify) => () => {
   updateSettings({requireEmailConfirmation: !verify});
 };
@@ -51,11 +46,6 @@ const updateClosedMessage = (updateSettings) => (event) => {
   updateSettings({closedMessage});
 };
 
-const updateCustomCssUrl = (updateSettings) => (event) => {
-  const customCssUrl = event.target.value;
-  updateSettings({customCssUrl});
-};
-
 // If we are changing the measure we need to recalculate using the old amount
 // Same thing if we are just changing the amount
 const updateClosedTimeout = (updateSettings, ts, isMeasure) => (event) => {
@@ -71,31 +61,14 @@ const updateClosedTimeout = (updateSettings, ts, isMeasure) => (event) => {
   }
 };
 
-const CommentSettings = ({fetchingSettings, title, updateSettings, settingsError, settings, errors}) => {
-  if (fetchingSettings) {
-    return <Card shadow="4"><Spinner/>Loading settings...</Card>;
-  }
+const StreamSettings = ({updateSettings, settingsError, settings, errors}) => {
 
   // just putting this here for shorthand below
   const on = styles.enabledSetting;
   const off = styles.disabledSetting;
 
   return (
-    <div className={styles.commentSettingsSection}>
-      <h3>{title}</h3>
-      <Card className={`${styles.configSetting} ${settings.moderation === 'PRE' ? on : off}`}>
-        <div className={styles.action}>
-          <Checkbox
-            onChange={updateModeration(updateSettings, settings.moderation)}
-            checked={settings.moderation === 'PRE'} />
-        </div>
-        <div className={styles.content}>
-          <div className={styles.settingsHeader}>{lang.t('configure.enable-pre-moderation')}</div>
-          <p className={settings.moderation === 'PRE' ? '' : styles.disabledSettingText}>
-            {lang.t('configure.enable-pre-moderation-text')}
-          </p>
-        </div>
-      </Card>
+    <div>
       <Card className={`${styles.configSetting} ${settings.requireEmailConfirmation ? on : off}`}>
         <div className={styles.action}>
           <Checkbox
@@ -193,23 +166,11 @@ const CommentSettings = ({fetchingSettings, title, updateSettings, settingsError
           </div>
         </div>
       </Card>
-      <Card className={styles.configSettingInfoBox}>
-        <div className={styles.content}>
-          {lang.t('configure.custom-css-url')}
-          <p>{lang.t('configure.custom-css-url-desc')}</p>
-          <br />
-          <Textfield
-            style={{width: '100%'}}
-            label={lang.t('configure.custom-css-url')}
-            value={settings.customCssUrl}
-            onChange={updateCustomCssUrl(updateSettings)} />
-        </div>
-      </Card>
     </div>
   );
 };
 
-export default CommentSettings;
+export default StreamSettings;
 
 // To see if we are talking about weeks, days or hours
 // We talk the remainder of the division and see if it's 0
diff --git a/client/coral-admin/src/containers/Configure/TechSettings.js b/client/coral-admin/src/containers/Configure/TechSettings.js
new file mode 100644
index 000000000..180877472
--- /dev/null
+++ b/client/coral-admin/src/containers/Configure/TechSettings.js
@@ -0,0 +1,48 @@
+import React, {PropTypes} from 'react';
+import {Card} from 'coral-ui';
+import {Textfield} from 'react-mdl';
+import Domainlist from './Domainlist';
+import EmbedLink from './EmbedLink';
+import styles from './Configure.css';
+import I18n from 'coral-framework/modules/i18n/i18n';
+import translations from '../../translations.json';
+const lang = new I18n(translations);
+
+const updateCustomCssUrl = (updateSettings) => (event) => {
+  const customCssUrl = event.target.value;
+  updateSettings({customCssUrl});
+};
+
+const TechSettings = ({settings, onChangeDomainlist, updateSettings}) => {
+  return (
+    <div>
+      <Domainlist
+        domains={settings.domains.whitelist}
+        onChangeDomainlist={onChangeDomainlist} />
+      <EmbedLink />
+      <Card className={styles.configSettingInfoBox}>
+        <div className={styles.content}>
+          {lang.t('configure.custom-css-url')}
+          <p>{lang.t('configure.custom-css-url-desc')}</p>
+          <br />
+          <Textfield
+            style={{width: '100%'}}
+            label={lang.t('configure.custom-css-url')}
+            value={settings.customCssUrl}
+            onChange={updateCustomCssUrl(updateSettings)} />
+        </div>
+      </Card>
+    </div>
+  );
+};
+
+TechSettings.propTypes = {
+  settings: PropTypes.shape({
+    domains: PropTypes.shape({
+      whitelist: PropTypes.array.isRequired
+    })
+  }).isRequired,
+  updateSettings: PropTypes.func.isRequired
+};
+
+export default TechSettings;
diff --git a/client/coral-admin/src/reducers/settings.js b/client/coral-admin/src/reducers/settings.js
index f74eb659f..67907b327 100644
--- a/client/coral-admin/src/reducers/settings.js
+++ b/client/coral-admin/src/reducers/settings.js
@@ -33,7 +33,7 @@ export default function settings (state = initialState, action) {
       .set('fetchSettingsError', null);
   case actions.SETTINGS_RECEIVED:
     return state.merge({
-      fetchingSettings: null,
+      fetchingSettings: false,
       fetchSettingsError: null,
       ...action.settings
     });
@@ -43,7 +43,7 @@ export default function settings (state = initialState, action) {
       .set('fetchSettingsError', action.error);
   case actions.SETTINGS_UPDATED:
     return state.merge({
-      fetchingSettings: null,
+      fetchingSettings: false,
       fetchSettingsError: null,
       ...action.settings
     });

From 0c89dd6d9876f48ace3fa064e1b395c26b442951 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Wed, 1 Mar 2017 15:23:17 -0700
Subject: [PATCH 104/132] sam's feedback

---
 .../src/containers/Configure/Configure.css    | 21 ++++++++++++-------
 .../src/containers/Configure/Configure.js     |  1 +
 .../src/containers/Configure/Domainlist.js    |  2 +-
 .../src/containers/Configure/EmbedLink.js     |  1 +
 .../Configure/ModerationSettings.js           | 17 +++++++++++++++
 .../containers/Configure/StreamSettings.js    | 17 ---------------
 .../src/containers/Configure/TechSettings.js  | 20 +++++++-----------
 .../src/containers/Configure/Wordlist.js      | 10 ++++-----
 client/coral-admin/src/translations.json      |  6 +-----
 9 files changed, 46 insertions(+), 49 deletions(-)

diff --git a/client/coral-admin/src/containers/Configure/Configure.css b/client/coral-admin/src/containers/Configure/Configure.css
index 5f4a07c81..058ff7a64 100644
--- a/client/coral-admin/src/containers/Configure/Configure.css
+++ b/client/coral-admin/src/containers/Configure/Configure.css
@@ -3,7 +3,7 @@
 
   h3 {
     color: black;
-    font-size: 1.76em;
+    font-size: 1.26em;
     font-weight: 500;
   }
 }
@@ -24,6 +24,10 @@
   margin-bottom: 20px;
   align-items: flex-start;
   min-height: 100px;
+
+  h3 {
+    margin: 0;
+  }
 }
 
 .settingsError {
@@ -118,18 +122,19 @@
 }
 
 #bannedWordlist, #suspectWordlist {
-  width: 100%;
-  padding: 10px;
-
+  display: block;
   input {
     width: 100%;
   }
 }
 
-.wordlistHeader {
-  font-weight: bold;
-  font-size:18px;
-  margin-bottom:3px;
+.customCSSInput {
+  width: 100%;
+  font-size: 14px;
+  padding: 14px;
+  letter-spacing: 0.03em;
+  color: #555;
+  box-sizing: border-box;
 }
 
 .enabledSetting {
diff --git a/client/coral-admin/src/containers/Configure/Configure.js b/client/coral-admin/src/containers/Configure/Configure.js
index 2fbe9daf2..140f5786a 100644
--- a/client/coral-admin/src/containers/Configure/Configure.js
+++ b/client/coral-admin/src/containers/Configure/Configure.js
@@ -89,6 +89,7 @@ class Configure extends Component {
       sectionComponent = <TechSettings
         title={pageTitle}
         fetchingSettings={this.props.settings.fetchingSettings}
+        onChangeDomainlist={this.onChangeDomainlist}
         settings={this.props.settings}
         updateSettings={this.onSettingUpdate} />;
     }
diff --git a/client/coral-admin/src/containers/Configure/Domainlist.js b/client/coral-admin/src/containers/Configure/Domainlist.js
index bda3ca139..c8c7cbd6c 100644
--- a/client/coral-admin/src/containers/Configure/Domainlist.js
+++ b/client/coral-admin/src/containers/Configure/Domainlist.js
@@ -10,7 +10,7 @@ const lang = new I18n(translations);
 const Domainlist = ({domains, onChangeDomainlist}) => {
   return (
     <Card id={styles.domainlist} className={styles.configSetting}>
-      <h3 style={{margin: 0}}>{lang.t('configure.domain-list-title')}</h3>
+      <h3>{lang.t('configure.domain-list-title')}</h3>
       <p className={styles.domainlistDesc}>{lang.t('configure.domain-list-text')}</p>
       <TagsInput
         value={domains}
diff --git a/client/coral-admin/src/containers/Configure/EmbedLink.js b/client/coral-admin/src/containers/Configure/EmbedLink.js
index cdbb66c3a..674bafa6e 100644
--- a/client/coral-admin/src/containers/Configure/EmbedLink.js
+++ b/client/coral-admin/src/containers/Configure/EmbedLink.js
@@ -45,6 +45,7 @@ class EmbedLink extends Component {
     `.trim();
     return (
       <Card shadow="2" className={styles.configSetting}>
+        <h3>Embed Comment Stream</h3>
         <p>{lang.t('configure.copy-and-paste')}</p>
         <textarea rows={5} type='text' className={styles.embedInput} value={embedText} readOnly={true}/>
         <Button raised className={styles.copyButton} onClick={this.copyToClipBoard} cStyle="black">
diff --git a/client/coral-admin/src/containers/Configure/ModerationSettings.js b/client/coral-admin/src/containers/Configure/ModerationSettings.js
index 8343f6e04..23f0f39d8 100644
--- a/client/coral-admin/src/containers/Configure/ModerationSettings.js
+++ b/client/coral-admin/src/containers/Configure/ModerationSettings.js
@@ -12,6 +12,10 @@ const updateModeration = (updateSettings, mod) => () => {
   updateSettings({moderation});
 };
 
+const updateEmailConfirmation = (updateSettings, verify) => () => {
+  updateSettings({requireEmailConfirmation: !verify});
+};
+
 const ModerationSettings = ({settings, updateSettings, onChangeWordlist}) => {
 
   // just putting this here for shorthand below
@@ -20,6 +24,19 @@ const ModerationSettings = ({settings, updateSettings, onChangeWordlist}) => {
 
   return (
     <div>
+      <Card className={`${styles.configSetting} ${settings.requireEmailConfirmation ? on : off}`}>
+        <div className={styles.action}>
+          <Checkbox
+            onChange={updateEmailConfirmation(updateSettings, settings.requireEmailConfirmation)}
+            checked={settings.requireEmailConfirmation} />
+        </div>
+        <div className={styles.content}>
+          <div className={styles.settingsHeader}>{lang.t('configure.require-email-verification')}</div>
+          <p className={settings.requireEmailConfirmation ? '' : styles.disabledSettingText}>
+            {lang.t('configure.require-email-verification-text')}
+          </p>
+        </div>
+      </Card>
       <Card className={`${styles.configSetting} ${settings.moderation === 'PRE' ? on : off}`}>
         <div className={styles.action}>
           <Checkbox
diff --git a/client/coral-admin/src/containers/Configure/StreamSettings.js b/client/coral-admin/src/containers/Configure/StreamSettings.js
index 0aa846c61..568e0a075 100644
--- a/client/coral-admin/src/containers/Configure/StreamSettings.js
+++ b/client/coral-admin/src/containers/Configure/StreamSettings.js
@@ -27,10 +27,6 @@ const updateCharCount = (updateSettings, settingsError) => (event) => {
   updateSettings({charCount: charCount});
 };
 
-const updateEmailConfirmation = (updateSettings, verify) => () => {
-  updateSettings({requireEmailConfirmation: !verify});
-};
-
 const updateInfoBoxEnable = (updateSettings, infoBox) => () => {
   const infoBoxEnable = !infoBox;
   updateSettings({infoBoxEnable});
@@ -69,19 +65,6 @@ const StreamSettings = ({updateSettings, settingsError, settings, errors}) => {
 
   return (
     <div>
-      <Card className={`${styles.configSetting} ${settings.requireEmailConfirmation ? on : off}`}>
-        <div className={styles.action}>
-          <Checkbox
-            onChange={updateEmailConfirmation(updateSettings, settings.requireEmailConfirmation)}
-            checked={settings.requireEmailConfirmation} />
-        </div>
-        <div className={styles.content}>
-          <div className={styles.settingsHeader}>{lang.t('configure.require-email-verification')}</div>
-          <p className={settings.requireEmailConfirmation ? '' : styles.disabledSettingText}>
-            {lang.t('configure.require-email-verification-text')}
-          </p>
-        </div>
-      </Card>
       <Card className={`${styles.configSetting} ${settings.charCountEnable ? on : off}`}>
         <div className={styles.action}>
           <Checkbox
diff --git a/client/coral-admin/src/containers/Configure/TechSettings.js b/client/coral-admin/src/containers/Configure/TechSettings.js
index 180877472..c50a7d507 100644
--- a/client/coral-admin/src/containers/Configure/TechSettings.js
+++ b/client/coral-admin/src/containers/Configure/TechSettings.js
@@ -1,6 +1,5 @@
 import React, {PropTypes} from 'react';
 import {Card} from 'coral-ui';
-import {Textfield} from 'react-mdl';
 import Domainlist from './Domainlist';
 import EmbedLink from './EmbedLink';
 import styles from './Configure.css';
@@ -20,17 +19,14 @@ const TechSettings = ({settings, onChangeDomainlist, updateSettings}) => {
         domains={settings.domains.whitelist}
         onChangeDomainlist={onChangeDomainlist} />
       <EmbedLink />
-      <Card className={styles.configSettingInfoBox}>
-        <div className={styles.content}>
-          {lang.t('configure.custom-css-url')}
-          <p>{lang.t('configure.custom-css-url-desc')}</p>
-          <br />
-          <Textfield
-            style={{width: '100%'}}
-            label={lang.t('configure.custom-css-url')}
-            value={settings.customCssUrl}
-            onChange={updateCustomCssUrl(updateSettings)} />
-        </div>
+      <Card className={styles.configSetting}>
+        <h3>{lang.t('configure.custom-css-url')}</h3>
+        <p>{lang.t('configure.custom-css-url-desc')}</p>
+        <br />
+        <input
+          className={styles.customCSSInput}
+          value={settings.customCssUrl}
+          onChange={updateCustomCssUrl(updateSettings)} />
       </Card>
     </div>
   );
diff --git a/client/coral-admin/src/containers/Configure/Wordlist.js b/client/coral-admin/src/containers/Configure/Wordlist.js
index 1a808acc6..aa79cb8ae 100644
--- a/client/coral-admin/src/containers/Configure/Wordlist.js
+++ b/client/coral-admin/src/containers/Configure/Wordlist.js
@@ -7,9 +7,8 @@ import {Card} from 'coral-ui';
 
 const Wordlist = ({suspectWords, bannedWords, onChangeWordlist}) => (
   <div>
-    <h3>{lang.t('configure.banned-words-title')}</h3>
-    <Card id={styles.bannedWordlist}>
-      <p className={styles.wordlistHeader}>{lang.t('configure.banned-word-header')}</p>
+    <Card id={styles.bannedWordlist} className={styles.configSetting}>
+      <h3>{lang.t('configure.banned-words-title')}</h3>
       <p className={styles.wordlistDesc}>{lang.t('configure.banned-word-text')}</p>
       <TagsInput
         value={bannedWords}
@@ -19,9 +18,8 @@ const Wordlist = ({suspectWords, bannedWords, onChangeWordlist}) => (
         onChange={tags => onChangeWordlist('banned', tags)}
       />
     </Card>
-    <h3>{lang.t('configure.suspect-words-title')}</h3>
-    <Card id={styles.suspectWordlist}>
-      <p className={styles.wordlistHeader}>{lang.t('configure.suspect-word-header')}</p>
+    <Card id={styles.suspectWordlist} className={styles.configSetting}>
+      <h3>{lang.t('configure.suspect-words-title')}</h3>
       <p className={styles.wordlistDesc}>{lang.t('configure.suspect-word-text')}</p>
       <TagsInput
         value={suspectWords}
diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json
index 96e727567..8a8ff0a6b 100644
--- a/client/coral-admin/src/translations.json
+++ b/client/coral-admin/src/translations.json
@@ -65,8 +65,6 @@
       "include-text": "Include your text here.",
       "comment-settings": "Settings",
       "embed-comment-stream": "Embed Stream",
-      "banned-word-header": "Write the banned words list",
-      "suspect-word-header": "Write the suspect words list",
       "banned-word-text": "Comments which contain these words or phrases (not case-sensitive) will be automatically removed from the comment stream. Type a word and press Enter or Tab to add. Optionally paste a comma-separated list.",
       "suspect-word-text": "Comments which contain these words or phrases (not case-sensitive) will be highlighted in the comment stream. Type a word and press Enter or Tab to add. Optionally paste a comma-separated list.",
       "wordlist": "Banned Words",
@@ -88,7 +86,7 @@
       "comment-count-text-pre":  "Comments will be limited to ",
       "comment-count-text-post": " characters.",
       "comment-count-error": "Please enter a valid number.",
-      "domain-list-title": "Domain Whitelist",
+      "domain-list-title": "Permitted Domains",
       "domain-list-text": "Enter the domains you would like to permit for Talk, e.g. your local, staging and production environments (ex. localhost:3000, staging.domain.com, domain.com)."
     },
     "bandialog": {
@@ -190,8 +188,6 @@
       "comment-settings": "Configuración de Comentarios",
       "embed-comment-stream": "Colocar Hilo de Comentarios",
       "wordlist": "Palabras Suspendidas y Suspechosas",
-      "banned-word-header": "Escribir las palabras no permitidas",
-      "suspect-word-header": "Write the suspect words list",
       "banned-word-text": "Comentarios que contengan estas palabras o frases, no separadas por comas y en mayusculas o minusuculas, serán automaticamente separadas de los comentarios publicados.",
       "suspect-word-text": "Comments which contain these words or phrases (not case-sensitive) will be highlighted in the comment stream. Type a word and press Enter or Tab to add. Optionally paste a comma-separated list.",
       "banned-words-title": "Banned words list",

From c4edbd4db4f2dc53e3d4fe995ca94fa88f6c3a1f Mon Sep 17 00:00:00 2001
From: riley <riley.davis@gmail.com>
Date: Wed, 1 Mar 2017 15:28:44 -0700
Subject: [PATCH 105/132] removing dead code

---
 client/coral-admin/src/containers/Configure/Configure.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/client/coral-admin/src/containers/Configure/Configure.js b/client/coral-admin/src/containers/Configure/Configure.js
index 140f5786a..b94394c61 100644
--- a/client/coral-admin/src/containers/Configure/Configure.js
+++ b/client/coral-admin/src/containers/Configure/Configure.js
@@ -79,16 +79,12 @@ class Configure extends Component {
       break;
     case 'moderation':
       sectionComponent = <ModerationSettings
-        title={pageTitle}
         onChangeWordlist={this.onChangeWordlist}
-        fetchingSettings={this.props.settings.fetchingSettings}
         settings={this.props.settings}
         updateSettings={this.onSettingUpdate} />;
       break;
     case 'tech':
       sectionComponent = <TechSettings
-        title={pageTitle}
-        fetchingSettings={this.props.settings.fetchingSettings}
         onChangeDomainlist={this.onChangeDomainlist}
         settings={this.props.settings}
         updateSettings={this.onSettingUpdate} />;

From 3d13380fccd3365b516cceb86fca353924aa9731 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 1 Mar 2017 15:49:39 -0700
Subject: [PATCH 106/132] Touched up embed + stream query

---
 client/coral-embed/src/index.js               | 39 ++++++++++++-------
 .../coral-framework/graphql/queries/index.js  | 23 +++++++----
 .../graphql/queries/streamQuery.graphql       |  6 +--
 3 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/client/coral-embed/src/index.js b/client/coral-embed/src/index.js
index a75706c8e..d3715b44d 100644
--- a/client/coral-embed/src/index.js
+++ b/client/coral-embed/src/index.js
@@ -5,24 +5,30 @@ const Coral = {};
 const Talk = Coral.Talk = {};
 
 // build the URL to load in the pym iframe
-function buildStreamIframeUrl(talkBaseUrl, asset, comment) {
+function buildStreamIframeUrl(talkBaseUrl, asset_url, comment, asset_id) {
   let iframeArray = [
     talkBaseUrl,
     (talkBaseUrl.match(/\/$/) ? '' : '/'), // make sure no double-'/' if opts.talk already ends with '/'
     'embed/stream?asset_url=',
-    encodeURIComponent(asset)
+    encodeURIComponent(asset_url)
   ];
 
   if (comment) {
     iframeArray.push('&comment_id=');
     iframeArray.push(encodeURIComponent(comment));
   }
+
+  if (asset_id) {
+    iframeArray.push('&asset_id=');
+    iframeArray.push(encodeURIComponent(asset_id));
+  }
+
   return iframeArray.join('');
 }
 
 // Set up postMessage listeners/handlers on the pymParent
 // e.g. to resize the iframe, and navigate the host page
-function configurePymParent(pymParent, assetUrl) {
+function configurePymParent(pymParent, asset_url) {
   let notificationOffset = 200;
   let ready = false;
 
@@ -52,7 +58,7 @@ function configurePymParent(pymParent, assetUrl) {
         window.clearInterval(interval);
 
         // @todo - It's weird to me that this is sent here in addition to the iframe URL. Could it just be in one place?
-        pymParent.sendMessage('DOMContentLoaded', assetUrl);
+        pymParent.sendMessage('DOMContentLoaded', asset_url);
       }
     }, 100);
   });
@@ -88,11 +94,11 @@ function configurePymParent(pymParent, assetUrl) {
  * @param {Object} opts - Configuration options for talk
  * @param {String} opts.talk - Talk base URL
  * @param {String} [opts.title] - Title of Stream (rendered in iframe)
- * @param {String} [opts.asset] - parent Asset ID or URL. Comments in the
- * stream will replies to this asset
+ * @param {String} [opts.asset_url] - Asset URL
+ * @param {String} [opts.asset_id] - Asset ID
  */
 Talk.render = function (el, opts) {
-  if ( ! el) {
+  if (!el) {
     throw new Error('Please provide Coral.Talk.render() the HTMLElement you want to render Talk in.');
   }
   if (typeof el !== 'object') {
@@ -101,7 +107,7 @@ Talk.render = function (el, opts) {
   opts = opts || {};
 
   // @todo infer this URL without explicit user input (if possible, may have to be added at build/render time of this script)
-  if (! opts.talk) {
+  if (!opts.talk) {
     throw new Error('Coral.Talk.render() expects opts.talk as the Talk Base URL');
   }
 
@@ -110,16 +116,23 @@ Talk.render = function (el, opts) {
     el.id = `_${Math.random()}`;
   }
 
-  let asset = opts.asset || window.location.href.split('#')[0];
+  let asset_url = opts.asset_url || window.location.href.split('#')[0];
   let comment = window.location.hash.slice(1);
-  let pymParent = new pym.Parent(el.id, buildStreamIframeUrl(opts.talk, asset, comment), {
+
+  let query = {
     title: opts.title,
-    asset_url: asset,
+    asset_url: asset_url,
     id: `${el.id}_iframe`,
     name: `${el.id}_iframe`
-  });
+  };
 
-  configurePymParent(pymParent, asset);
+  if (opts.asset_id && opts.asset_id.length > 0) {
+    query.asset_id = opts.asset_id;
+  }
+
+  let pymParent = new pym.Parent(el.id, buildStreamIframeUrl(opts.talk, asset_url, comment), query);
+
+  configurePymParent(pymParent, asset_url);
 };
 
 export default Coral;
diff --git a/client/coral-framework/graphql/queries/index.js b/client/coral-framework/graphql/queries/index.js
index 26a72498d..fa9d0f866 100644
--- a/client/coral-framework/graphql/queries/index.js
+++ b/client/coral-framework/graphql/queries/index.js
@@ -14,8 +14,8 @@ function getQueryVariable(variable) {
     }
   }
 
-  // If no query is included, return a default string for development
-  return 'http://localhost/default/stream';
+  // If not found, return null.
+  return null;
 }
 
 export const getCounts = (data) => ({asset_id, limit, sort}) => {
@@ -85,12 +85,19 @@ export const loadMore = (data) => ({limit, cursor, parent_id, asset_id, sort}, n
 };
 
 export const queryStream = graphql(STREAM_QUERY, {
-  options: () => ({
-    variables: {
-      asset_url: getQueryVariable('asset_url'),
-      comment_id: getQueryVariable('comment_id')
-    }
-  }),
+  options: () => {
+    let comment_id = getQueryVariable('comment_id');
+    let has_comment = comment_id != null;
+
+    return {
+      variables: {
+        asset_id: getQueryVariable('asset_id'),
+        asset_url: getQueryVariable('asset_url'),
+        comment_id: has_comment ? comment_id : 'no-comment',
+        has_comment
+      }
+    };
+  },
   props: ({data}) => ({
     data,
     loadMore: loadMore(data),
diff --git a/client/coral-framework/graphql/queries/streamQuery.graphql b/client/coral-framework/graphql/queries/streamQuery.graphql
index 4f09f628e..e9f4c827c 100644
--- a/client/coral-framework/graphql/queries/streamQuery.graphql
+++ b/client/coral-framework/graphql/queries/streamQuery.graphql
@@ -1,7 +1,7 @@
 #import "../fragments/commentView.graphql"
 
-query AssetQuery($asset_url: String!, $comment_id: ID!) {
-    comment(id: $comment_id) {
+query AssetQuery($asset_id: ID, $asset_url: String!, $comment_id: ID!, $has_comment: Boolean!) {
+    comment(id: $comment_id) @include(if: $has_comment) {
       ...commentView
       parent {
         ...commentView
@@ -10,7 +10,7 @@ query AssetQuery($asset_url: String!, $comment_id: ID!) {
         }
       }
     }
-    asset(url: $asset_url) {
+    asset(id: $asset_id, url: $asset_url) {
         id
         title
         url

From fa5a94c4be1ca01747ae8ac389fe9ab638605344 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Wed, 1 Mar 2017 16:00:42 -0700
Subject: [PATCH 107/132] add some missing translations

---
 client/coral-admin/src/translations.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json
index 8a8ff0a6b..cebc499ca 100644
--- a/client/coral-admin/src/translations.json
+++ b/client/coral-admin/src/translations.json
@@ -53,6 +53,9 @@
       "copy": "Copy to Clipboard"
     },
     "configure": {
+      "stream-settings": "Stream Settings",
+      "moderation-settings": "Moderation Settings",
+      "tech-settings": "Tech Settings",
       "custom-css-url": "Custom CSS URL",
       "custom-css-url-desc": "URL of a CSS stylesheet that will override default Embed Stream styles. Can be internal or external.",
       "dashboard": "Dashboard",
@@ -175,6 +178,9 @@
       "username_flags": ""
     },
     "configure": {
+      "stream-settings": "Configuración de Comentarios",
+      "moderation-settings": "Configuración de Moderación",
+      "tech-settings": "Configuración Technical",
       "custom-css-url": "URL CSS a medida",
       "custom-css-url-desc": "URL de una hoja de estilo que va a sobrescribir los estilos por defecto de Embed Stream. Puede ser interna o externa.",
       "dashboard": "Panel",

From ed0df4b7381ba2b30095da9d7b59e986af440999 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Wed, 1 Mar 2017 16:23:24 -0700
Subject: [PATCH 108/132] make sure reply box works

---
 client/coral-embed-stream/src/Embed.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-embed-stream/src/Embed.js b/client/coral-embed-stream/src/Embed.js
index d016af137..da9fd4b6e 100644
--- a/client/coral-embed-stream/src/Embed.js
+++ b/client/coral-embed-stream/src/Embed.js
@@ -77,8 +77,8 @@ class Embed extends Component {
     }
   }
 
-  setActiveReplyBox (reactKey) {
-    if (!this.props.currentUser) {
+  setActiveReplyBox = (reactKey) => {
+    if (!this.props.auth.user) {
       const offset = document.getElementById(`c_${reactKey}`).getBoundingClientRect().top - 75;
       this.props.showSignInDialog(offset);
     } else {

From cefe872bf00891f7e8011bcef290fe545097c3f9 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 1 Mar 2017 16:38:27 -0700
Subject: [PATCH 109/132] Fixed queries

---
 .../coral-framework/graphql/queries/myCommentHistory.graphql | 5 +++++
 client/coral-plugin-history/Comment.js                       | 5 +++--
 client/coral-plugin-history/CommentHistory.js                | 5 ++---
 client/coral-settings/components/NotLoggedIn.js              | 4 ++--
 client/coral-settings/containers/ProfileContainer.js         | 2 +-
 webpack.config.js                                            | 5 +++--
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/client/coral-framework/graphql/queries/myCommentHistory.graphql b/client/coral-framework/graphql/queries/myCommentHistory.graphql
index 6a4309dac..0b37b192a 100644
--- a/client/coral-framework/graphql/queries/myCommentHistory.graphql
+++ b/client/coral-framework/graphql/queries/myCommentHistory.graphql
@@ -3,6 +3,11 @@ query myCommentHistory {
         comments {
             id
             body
+            asset {
+              id
+              title
+              url
+            }
             created_at
         }
     }
diff --git a/client/coral-plugin-history/Comment.js b/client/coral-plugin-history/Comment.js
index df61b9e7d..00dcc40c7 100644
--- a/client/coral-plugin-history/Comment.js
+++ b/client/coral-plugin-history/Comment.js
@@ -5,7 +5,7 @@ const Comment = props => {
   return (
     <div className={styles.myComment}>
       <p className="myCommentAsset">
-        <a className={`${styles.assetURL} myCommentAnchor`} href='#' onClick={props.link(`${props.asset.url}#${props.comment.id}`)}>{props.asset.url}</a>
+        <a className={`${styles.assetURL} myCommentAnchor`} href='#' onClick={props.link(`${props.asset.url}#${props.comment.id}`)}>{props.asset.title ? props.asset.title : props.asset.url}</a>
       </p>
       <p className={`${styles.commentBody} myCommentBody`}>{props.comment.body}</p>
     </div>
@@ -18,7 +18,8 @@ Comment.propTypes = {
     body: PropTypes.string
   }).isRequired,
   asset: PropTypes.shape({
-    url: PropTypes.string
+    url: PropTypes.string,
+    title: PropTypes.string
   }).isRequired
 };
 
diff --git a/client/coral-plugin-history/CommentHistory.js b/client/coral-plugin-history/CommentHistory.js
index 1940f2695..a53035fb3 100644
--- a/client/coral-plugin-history/CommentHistory.js
+++ b/client/coral-plugin-history/CommentHistory.js
@@ -11,7 +11,7 @@ const CommentHistory = props => {
             key={i}
             comment={comment}
             link={props.link}
-            asset={props.asset} />;
+            asset={comment.asset} />;
         })}
       </div>
     </div>
@@ -19,8 +19,7 @@ const CommentHistory = props => {
 };
 
 CommentHistory.propTypes = {
-  comments: PropTypes.array.isRequired,
-  asset: PropTypes.object.isRequired
+  comments: PropTypes.array.isRequired
 };
 
 export default CommentHistory;
diff --git a/client/coral-settings/components/NotLoggedIn.js b/client/coral-settings/components/NotLoggedIn.js
index acd3ae7e6..c76553c50 100644
--- a/client/coral-settings/components/NotLoggedIn.js
+++ b/client/coral-settings/components/NotLoggedIn.js
@@ -5,9 +5,9 @@ import translations from '../translations';
 import I18n from 'coral-framework/modules/i18n/i18n';
 const lang = new I18n(translations);
 
-export default ({showSignInDialog}) => (
+export default ({showSignInDialog, requireEmailConfirmation}) => (
   <div className={styles.message}>
-    <SignInContainer noButton={true}/>
+    <SignInContainer noButton={true} requireEmailConfirmation={requireEmailConfirmation}/>
     <div>
       <a onClick={() => {
         showSignInDialog();
diff --git a/client/coral-settings/containers/ProfileContainer.js b/client/coral-settings/containers/ProfileContainer.js
index 4a98ed8ff..9a8117e87 100644
--- a/client/coral-settings/containers/ProfileContainer.js
+++ b/client/coral-settings/containers/ProfileContainer.js
@@ -35,7 +35,7 @@ class ProfileContainer extends Component {
     const {me} = this.props.data;
 
     if (!loggedIn || !me) {
-      return <NotLoggedIn showSignInDialog={showSignInDialog}/>;
+      return <NotLoggedIn showSignInDialog={showSignInDialog} requireEmailConfirmation={asset.settings.requireEmailConfirmation}/>;
     }
 
     if (data.loading) {
diff --git a/webpack.config.js b/webpack.config.js
index cd00696d8..432bb6155 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -17,7 +17,7 @@ const buildEmbeds = [
 ];
 
 module.exports = {
-  devtool: 'cheap-source-map',
+  devtool: '#cheap-module-source-map',
   entry: Object.assign({}, {
     'embed': [
       'babel-polyfill',
@@ -58,7 +58,8 @@ module.exports = {
         exclude: /node_modules/,
         test: /\.js$/,
         query: {
-          cacheDirectory: true
+          cacheDirectory: true,
+          sourceMap: true
         }
       },
       {

From 57fc4b8a3fa0e2eba7a90bd63e2e5c3abc9f3f47 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 1 Mar 2017 16:40:47 -0700
Subject: [PATCH 110/132] Fixed test

---
 test/client/coral-plugin-history/CommentHistory.spec.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/client/coral-plugin-history/CommentHistory.spec.js b/test/client/coral-plugin-history/CommentHistory.spec.js
index 945bf45a3..671a50137 100644
--- a/test/client/coral-plugin-history/CommentHistory.spec.js
+++ b/test/client/coral-plugin-history/CommentHistory.spec.js
@@ -20,6 +20,10 @@ describe('coral-plugin-history/CommentHistory', () => {
     'closedAt':null
   };
 
+  comments.forEach((comment) => {
+    comment.asset = asset;
+  });
+
   beforeEach(() => {
     render = shallow(<CommentHistory comments={comments} asset={asset} link={()=>{}}/>);
   });

From 21783edbfe0ee0de5b50244b05ab37e91c9e3f2b Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 2 Mar 2017 10:59:19 -0700
Subject: [PATCH 111/132] Adjusted session details

---
 app.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app.js b/app.js
index c2601ad5a..c3f97f831 100644
--- a/app.js
+++ b/app.js
@@ -45,16 +45,15 @@ const session_opts = {
   secret: process.env.TALK_SESSION_SECRET,
   httpOnly: true,
   rolling: true,
-  saveUninitialized: false,
-  resave: false,
+  saveUninitialized: true,
+  resave: true,
   unset: 'destroy',
   name: 'talk.sid',
   cookie: {
     secure: false,
-    maxAge: 36000000, // 1 hour for expiry.
+    maxAge: 8.64e+7, // 24 hours for session token expiry
   },
   store: new RedisStore({
-    ttl: 1800,
     client: redis.createClient(),
   })
 };

From acda388d4e007b129f291445343008b6570ea7a9 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Thu, 2 Mar 2017 13:00:54 -0500
Subject: [PATCH 112/132] Updating e2e tests.

---
 .../coral-admin/src/components/ui/Header.js   | 11 ++++++--
 client/coral-embed-stream/src/Comment.css     |  4 +++
 client/coral-embed-stream/src/Stream.js       |  2 +-
 test/e2e/pages/adminPage.js                   |  5 ++++
 test/e2e/pages/embedStreamPage.js             | 28 +++++++++----------
 test/e2e/tests/Commenter/FlagUsernameTest.js  |  1 +
 test/e2e/tests/EmbedStreamTests.js            | 15 ++++------
 7 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/client/coral-admin/src/components/ui/Header.js b/client/coral-admin/src/components/ui/Header.js
index 556b33b6c..28db9145d 100644
--- a/client/coral-admin/src/components/ui/Header.js
+++ b/client/coral-admin/src/components/ui/Header.js
@@ -14,28 +14,35 @@ export default ({handleLogout, restricted = false}) => (
       <div>
         <Navigation className={styles.nav}>
           <IndexLink
+            id='dashboardNav'
             className={styles.navLink}
             to="/admin/dashboard"
             activeClassName={styles.active}>
             {lang.t('configure.dashboard')}
           </IndexLink>
           <Link
+            id='moderateNav'
             className={styles.navLink}
             to="/admin/moderate"
             activeClassName={styles.active}>
             {lang.t('configure.moderate')}
           </Link>
-          <Link className={styles.navLink}
+          <Link
+            id='streamsNav'
+            className={styles.navLink}
             to="/admin/streams"
             activeClassName={styles.active}>
             {lang.t('configure.streams')}
           </Link>
-          <Link className={styles.navLink}
+          <Link
+            id='communityNav'
+            className={styles.navLink}
             to="/admin/community"
             activeClassName={styles.active}>
             {lang.t('configure.community')}
           </Link>
           <Link
+            id='configureNav'
             className={styles.navLink}
             to="/admin/configure"
             activeClassName={styles.active}>
diff --git a/client/coral-embed-stream/src/Comment.css b/client/coral-embed-stream/src/Comment.css
index 09a94aa55..7bc1a21f4 100644
--- a/client/coral-embed-stream/src/Comment.css
+++ b/client/coral-embed-stream/src/Comment.css
@@ -1,3 +1,7 @@
 .Reply {
   position: relative;
 }
+
+.Comment {
+  
+}
diff --git a/client/coral-embed-stream/src/Stream.js b/client/coral-embed-stream/src/Stream.js
index 9d24d7f42..bd471338e 100644
--- a/client/coral-embed-stream/src/Stream.js
+++ b/client/coral-embed-stream/src/Stream.js
@@ -56,7 +56,7 @@ class Stream extends React.Component {
     } = this.props;
 
     return (
-      <div>
+      <div id='stream'>
         {
           comments.map(comment =>
             <Comment
diff --git a/test/e2e/pages/adminPage.js b/test/e2e/pages/adminPage.js
index e359715ac..e1568ef51 100644
--- a/test/e2e/pages/adminPage.js
+++ b/test/e2e/pages/adminPage.js
@@ -8,6 +8,8 @@ const embedStreamCommands = {
   },
   approveComment() {
     return this
+      .waitForElementVisible('@moderateNav')
+      .click('@moderateNav')
       .waitForElementVisible('@moderationList')
       .waitForElementVisible('@approveButton')
       .click('@approveButton');
@@ -17,6 +19,9 @@ const embedStreamCommands = {
 module.exports = {
   commands: [embedStreamCommands],
   elements: {
+    moderateNav: {
+      selector: '#moderateNav'
+    },
     moderationList: {
       selector: '#moderationList'
     },
diff --git a/test/e2e/pages/embedStreamPage.js b/test/e2e/pages/embedStreamPage.js
index ca72df1db..6ae158fc7 100644
--- a/test/e2e/pages/embedStreamPage.js
+++ b/test/e2e/pages/embedStreamPage.js
@@ -117,46 +117,46 @@ module.exports = {
       selector: '#commentBox .coral-plugin-commentbox-button'
     },
     likeButton: {
-      selector: '.comment .coral-plugin-likes-container .coral-plugin-likes-button'
+      selector: '#stream .coral-plugin-likes-container .coral-plugin-likes-button'
     },
     likeText: {
-      selector: '.comment .coral-plugin-likes-container .coral-plugin-likes-button .coral-plugin-likes-button-text'
+      selector: '#stream .coral-plugin-likes-container .coral-plugin-likes-button .coral-plugin-likes-button-text'
     },
     likesCount: {
-      selector: '.comment .coral-plugin-likes-container .coral-plugin-likes-button .coral-plugin-likes-like-count'
+      selector: '#stream .coral-plugin-likes-container .coral-plugin-likes-button .coral-plugin-likes-like-count'
     },
     flagButton: {
-      selector: '.comment .coral-plugin-flags-container .coral-plugin-flags-button'
+      selector: '#stream .coral-plugin-flags-container .coral-plugin-flags-button'
     },
     flagPopUp: {
-      selector: '.comment .coral-plugin-flags-popup'
+      selector: '#stream .coral-plugin-flags-popup'
     },
     flagCommentOption: {
-      selector: '.comment .coral-plugin-flags-popup .coral-plugin-flags-popup-radio-label[for="COMMENTS"]'
+      selector: '#stream .coral-plugin-flags-popup .coral-plugin-flags-popup-radio-label[for="COMMENTS"]'
     },
     flagUsernameOption: {
-      selector: '.comment .coral-plugin-flags-popup .coral-plugin-flags-popup-radio-label[for="USERS"]'
+      selector: '#stream .coral-plugin-flags-popup .coral-plugin-flags-popup-radio-label[for="USERS"]'
     },
     flagOtherOption: {
-      selector: '.comment .coral-plugin-flags-popup .coral-plugin-flags-popup-radio-label[for="other"]'
+      selector: '#stream .coral-plugin-flags-popup .coral-plugin-flags-popup-radio-label[for="other"]'
     },
     flagHeaderMessage: {
-      selector: '.comment .coral-plugin-flags-popup .coral-plugin-flags-popup-header'
+      selector: '#stream .coral-plugin-flags-popup .coral-plugin-flags-popup-header'
     },
     flagButtonText: {
-      selector: '.comment .coral-plugin-flags-button-text'
+      selector: '#stream .coral-plugin-flags-button-text'
     },
     flagDoneButton: {
-      selector: '.comment .coral-plugin-flags-popup .coral-plugin-flags-popup-button'
+      selector: '#stream .coral-plugin-flags-popup .coral-plugin-flags-popup-button'
     },
     permalinkButton: {
-      selector: '.comment .coral-plugin-permalinks-button'
+      selector: '#stream .coral-plugin-permalinks-button'
     },
     permalinkPopUp: {
-      selector: '.comment .coral-plugin-permalinks-popover.active'
+      selector: '#stream .coral-plugin-permalinks-popover.active'
     },
     permalinkInput: {
-      selector: '.comment .coral-plugin-permalinks-popover.active input'
+      selector: '#stream .coral-plugin-permalinks-popover.active input'
     },
     registerButton: {
       selector: '#signInDialog #coralRegister'
diff --git a/test/e2e/tests/Commenter/FlagUsernameTest.js b/test/e2e/tests/Commenter/FlagUsernameTest.js
index 7d9ab5a90..d72be5386 100644
--- a/test/e2e/tests/Commenter/FlagUsernameTest.js
+++ b/test/e2e/tests/Commenter/FlagUsernameTest.js
@@ -16,6 +16,7 @@ module.exports = {
 
     embedStreamPage
       .flagUsername()
+      .click('@flagButton')
       .waitForElementVisible('@flagPopUp')
       .waitForElementVisible('@flagUsernameOption')
       .click('@flagUsernameOption')
diff --git a/test/e2e/tests/EmbedStreamTests.js b/test/e2e/tests/EmbedStreamTests.js
index 09d07c6c5..f1ef0f5e0 100644
--- a/test/e2e/tests/EmbedStreamTests.js
+++ b/test/e2e/tests/EmbedStreamTests.js
@@ -41,7 +41,6 @@ module.exports = {
           .setValue('#password', mockUser.pw)
           .setValue('#confirmPassword', mockUser.pw)
           .click('#coralSignUpButton')
-          .pause(5000)
           .waitForElementVisible('#coralLogInButton', 10000)
           .click('#coralLogInButton')
           .waitForElementVisible('.coral-plugin-commentbox-button', 4000)
@@ -49,10 +48,10 @@ module.exports = {
           // Post a comment
           .setValue('.coral-plugin-commentbox-textarea', mockComment)
           .click('.coral-plugin-commentbox-button')
-          .waitForElementVisible('.coral-plugin-content-text', 1000)
+          .waitForElementVisible('#stream .coral-plugin-commentcontent-text')
 
           // Verify that it appears
-          .assert.containsText('.coral-plugin-content-text', mockComment);
+          .assert.containsText('#stream .coral-plugin-commentcontent-text', mockComment);
         done();
       })
       .catch((err) => {
@@ -73,11 +72,7 @@ module.exports = {
           // Post a comment
         client.waitForElementVisible('.coral-plugin-commentbox-button', 2000)
           .setValue('.coral-plugin-commentbox-textarea', mockComment)
-          .click('.coral-plugin-commentbox-button')
-          .waitForElementVisible('#coral-notif', 1000)
-
-          // Verify that it appears
-          .assert.containsText('#coral-notif', 'moderation team');
+          .click('.coral-plugin-commentbox-button');
         done();
       })
       .catch((err) => {
@@ -102,8 +97,8 @@ module.exports = {
           .click('.coral-plugin-commentbox-button')
 
           // Post a reply
-          .waitForElementVisible('.coral-plugin-replies-reply-button', 5000)
-          .click('.coral-plugin-replies-reply-button')
+          .waitForElementVisible('#stream .coral-plugin-replies-reply-button', 5000)
+          .click('#stream .coral-plugin-replies-reply-button')
           .waitForElementVisible('#replyText')
           .setValue('#replyText', mockReply)
           .click('.coral-plugin-replies-textarea .coral-plugin-commentbox-button')

From 06f9c12f5e7665104fdae3ba3a9ea78bacd68c14 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Thu, 2 Mar 2017 13:11:16 -0500
Subject: [PATCH 113/132] Updating comment count.

---
 test/e2e/tests/EmbedStreamTests.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/e2e/tests/EmbedStreamTests.js b/test/e2e/tests/EmbedStreamTests.js
index f1ef0f5e0..27072254b 100644
--- a/test/e2e/tests/EmbedStreamTests.js
+++ b/test/e2e/tests/EmbedStreamTests.js
@@ -166,7 +166,7 @@ module.exports = {
 
         // Verify that comment count is correct
       client.waitForElementVisible('.coral-plugin-comment-count-text', 2000)
-        .assert.containsText('.coral-plugin-comment-count-text', '4 Comments');
+        .assert.containsText('.coral-plugin-comment-count-text', '5 Comments');
       done();
     });
   },

From daf0d38c2608807d997e72720bb1f2d38f9a5981 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 2 Mar 2017 12:07:42 -0700
Subject: [PATCH 114/132] fixes #362

---
 Dockerfile   |  3 ---
 package.json |  2 +-
 yarn.lock    | 17 +++++++++++------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7cd06e673..fc0b3aca2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,5 @@
 FROM node:7.6
 
-# Add node-gyp for bcrypt build support
-RUN yarn global add node-gyp
-
 # Create app directory
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
diff --git a/package.json b/package.json
index 740063dd1..eaa15303a 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
   },
   "homepage": "https://github.com/coralproject/talk#readme",
   "dependencies": {
-    "bcrypt": "^0.8.7",
+    "bcrypt": "^1.0.2",
     "body-parser": "^1.15.2",
     "cli-table": "^0.3.1",
     "commander": "^2.9.0",
diff --git a/yarn.lock b/yarn.lock
index 0331202ef..f8a49205a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1089,12 +1089,13 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-bcrypt@^0.8.7:
-  version "0.8.7"
-  resolved "https://registry.yarnpkg.com/bcrypt/-/bcrypt-0.8.7.tgz#bc3875a9afd0a7b2cd231a6a7f218a5ce156b093"
+bcrypt@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt/-/bcrypt-1.0.2.tgz#d05fc5d223173e0e28ec381c0f00cc25ffaf2736"
   dependencies:
     bindings "1.2.1"
-    nan "2.3.5"
+    nan "2.5.0"
+    node-pre-gyp "0.6.32"
 
 big.js@^3.1.3:
   version "3.1.3"
@@ -5006,7 +5007,11 @@ mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
-nan@2.3.5, nan@^2.3.0:
+nan@2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.0.tgz#aa8f1e34531d807e9e27755b234b4a6ec0c152a8"
+
+nan@^2.3.0:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.3.5.tgz#822a0dc266290ce4cd3a12282ca3e7e364668a08"
 
@@ -5111,7 +5116,7 @@ node-libs-browser@^2.0.0:
     util "^0.10.3"
     vm-browserify "0.0.4"
 
-node-pre-gyp@^0.6.29:
+node-pre-gyp@0.6.32, node-pre-gyp@^0.6.29:
   version "0.6.32"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz#fc452b376e7319b3d255f5f34853ef6fd8fe1fd5"
   dependencies:

From 2246728c80b36cc6b59630c52e082ae810c12cb9 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Thu, 2 Mar 2017 12:27:31 -0700
Subject: [PATCH 115/132] only trigger a re-flow when the height actually
 changes

---
 client/coral-embed/src/index.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/client/coral-embed/src/index.js b/client/coral-embed/src/index.js
index d3715b44d..d3a6a4ee5 100644
--- a/client/coral-embed/src/index.js
+++ b/client/coral-embed/src/index.js
@@ -31,13 +31,14 @@ function buildStreamIframeUrl(talkBaseUrl, asset_url, comment, asset_id) {
 function configurePymParent(pymParent, asset_url) {
   let notificationOffset = 200;
   let ready = false;
+  let cachedHeight;
 
   // Resize parent iframe height when child height changes
   pymParent.onMessage('height', function(height) {
-
-    // TODO: In local testing, this is firing nonstop. Maybe there's a bug on the inside?
-    // Or it's by design of pym... but that's very wasteful of CPU and DOM reflows (jank)
-    pymParent.el.querySelector('iframe').height = `${height  }px`;
+    if (height !== cachedHeight) {
+      pymParent.el.querySelector('iframe').height = `${height  }px`;
+      cachedHeight = height;
+    }
   });
 
   // Helps child show notifications at the right scrollTop

From a6c7fe85b91977eda145981f1786a1d5a1c3bb6d Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Thu, 2 Mar 2017 12:34:10 -0700
Subject: [PATCH 116/132] remove querySelector call

---
 client/coral-embed/src/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-embed/src/index.js b/client/coral-embed/src/index.js
index d3a6a4ee5..8d8855aa7 100644
--- a/client/coral-embed/src/index.js
+++ b/client/coral-embed/src/index.js
@@ -36,7 +36,7 @@ function configurePymParent(pymParent, asset_url) {
   // Resize parent iframe height when child height changes
   pymParent.onMessage('height', function(height) {
     if (height !== cachedHeight) {
-      pymParent.el.querySelector('iframe').height = `${height  }px`;
+      pymParent.el.firstChild.style.height = `${height}px`;
       cachedHeight = height;
     }
   });

From 7be3b05f226176e6e1a280f552648e0f9ca30fed Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Thu, 2 Mar 2017 14:51:51 -0500
Subject: [PATCH 117/132] Re-enabling keyboard shortcut menu.

---
 .../src/containers/ModerationQueue/ModerationContainer.js  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
index 40f19b5a1..48741c2ad 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
@@ -17,13 +17,13 @@ import ModerationQueue from './ModerationQueue';
 import ModerationMenu from './components/ModerationMenu';
 import ModerationHeader from './components/ModerationHeader';
 import NotFoundAsset from './components/NotFoundAsset';
+import ModerationKeysModal from '../../components/ModerationKeysModal';
 
 class ModerationContainer extends Component {
   componentWillMount() {
     const {toggleModal, singleView} = this.props;
 
     this.props.fetchSettings();
-
     key('s', () => singleView());
     key('shift+/', () => toggleModal(true));
     key('esc', () => toggleModal(false));
@@ -43,7 +43,7 @@ class ModerationContainer extends Component {
   }
 
   render () {
-    const {data, moderation, settings, assets, modQueueResort, ...props} = this.props;
+    const {data, moderation, settings, assets, modQueueResort, onClose, ...props} = this.props;
     const providedAssetId = this.props.params.id;
     const activeTab = this.props.route.path === ':id' ? 'premod' : this.props.route.path;
 
@@ -92,6 +92,9 @@ class ModerationContainer extends Component {
           handleClose={props.hideBanUserDialog}
           handleBanUser={props.banUser}
         />
+      <ModerationKeysModal
+          open={moderation.modalOpen}
+          onClose={onClose}/>
       </div>
     );
   }

From 78be17ec6d5ac51106608c6c41d021cc7ce57861 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Thu, 2 Mar 2017 15:19:33 -0500
Subject: [PATCH 118/132] Adding keyboard selection of comments.

---
 client/coral-admin/src/components/Comment.js  | 71 -------------------
 .../src/components/ModerationList.css         |  4 ++
 .../ModerationQueue/ModerationContainer.js    |  8 +++
 .../ModerationQueue/ModerationQueue.js        |  3 +-
 .../ModerationQueue/components/Comment.js     |  2 +-
 .../ModerationQueue/components/styles.css     |  4 ++
 6 files changed, 19 insertions(+), 73 deletions(-)
 delete mode 100644 client/coral-admin/src/components/Comment.js

diff --git a/client/coral-admin/src/components/Comment.js b/client/coral-admin/src/components/Comment.js
deleted file mode 100644
index db5cfe5bf..000000000
--- a/client/coral-admin/src/components/Comment.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import React from 'react';
-import timeago from 'timeago.js';
-import Linkify from 'react-linkify';
-
-import styles from './ModerationList.css';
-
-import I18n from 'coral-framework/modules/i18n/i18n';
-import translations from '../translations.json';
-
-import Highlighter from 'react-highlight-words';
-import {Icon} from 'coral-ui';
-import ActionButton from './ActionButton';
-
-const linkify = new Linkify();
-
-// Render a single comment for the list
-const Comment = props => {
-  const {comment, author} = props;
-  let authorStatus = author.status;
-  const links = linkify.getMatches(comment.body);
-
-  return (
-    <li tabIndex={props.index} className={`mdl-card mdl-shadow--2dp ${styles.listItem} ${props.isActive && !props.hideActive ? styles.activeItem : ''}`}>
-      <div className={styles.itemHeader}>
-        <div className={styles.author}>
-          <span>{author.username || lang.t('comment.anon')}</span>
-          <span className={styles.created}>{timeago().format(comment.createdAt || (Date.now() - props.index * 60 * 1000), lang.getLocale().replace('-', '_'))}</span>
-          {comment.flagged ? <p className={styles.flagged}>{lang.t('comment.flagged')}</p> : null}
-        </div>
-        <div className={styles.sideActions}>
-          {links ?
-          <span className={styles.hasLinks}><Icon name='error_outline'/> Contains Link</span> : null}
-          <div className={`actions ${styles.actions}`}>
-            {props.modActions.map(
-              (action, i) =>
-              <ActionButton
-                option={action}
-                key={i}
-                type='COMMENTS'
-                comment={comment}
-                user={author}
-                menuOptionsMap={props.menuOptionsMap}
-                onClickAction={props.onClickAction}
-                onClickShowBanDialog={props.onClickShowBanDialog}/>
-            )}
-          </div>
-          {authorStatus === 'banned' ?
-          <span className={styles.banned}><Icon name='error_outline'/> {lang.t('comment.banned_user')}</span> : null}
-        </div>
-      </div>
-      <div className={styles.itemBody}>
-        <span className={styles.body}>
-          <Linkify  component='span' properties={{style: linkStyles}}>
-            <Highlighter
-              searchWords={props.suspectWords}
-              textToHighlight={comment.body} />
-          </Linkify>
-        </span>
-      </div>
-    </li>
-  );
-};
-
-export default Comment;
-
-const linkStyles = {
-  backgroundColor: 'rgb(255, 219, 135)',
-  padding: '1px 2px'
-};
-
-const lang = new I18n(translations);
diff --git a/client/coral-admin/src/components/ModerationList.css b/client/coral-admin/src/components/ModerationList.css
index 140f4bc8f..7036998d1 100644
--- a/client/coral-admin/src/components/ModerationList.css
+++ b/client/coral-admin/src/components/ModerationList.css
@@ -178,6 +178,10 @@
   }
 }
 
+.selected {
+  border-radius: 10px;
+}
+
 
 .actionButton {
   transform: scale(.8);
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
index 48741c2ad..1505316cd 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
@@ -20,13 +20,20 @@ import NotFoundAsset from './components/NotFoundAsset';
 import ModerationKeysModal from '../../components/ModerationKeysModal';
 
 class ModerationContainer extends Component {
+  state = {
+    selectedIndex: 0
+  }
+
   componentWillMount() {
     const {toggleModal, singleView} = this.props;
+    const {selectedIndex} = this.state;
 
     this.props.fetchSettings();
     key('s', () => singleView());
     key('shift+/', () => toggleModal(true));
     key('esc', () => toggleModal(false));
+    key('j', () => this.setState({selectedIndex: selectedIndex + 1}));
+    key('k', () => this.setState({selectedIndex: selectedIndex > 0 ? selectedIndex + 1 : selectedIndex}));
   }
 
   componentWillUnmount() {
@@ -81,6 +88,7 @@ class ModerationContainer extends Component {
           currentAsset={asset}
           comments={comments}
           activeTab={activeTab}
+          selectedIndex={this.state.selectedIndex}
           suspectWords={settings.wordlist.suspect}
           showBanUserDialog={props.showBanUserDialog}
           acceptComment={props.acceptComment}
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
index cdbc7f28c..e3ba12b09 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
@@ -7,7 +7,7 @@ import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from 'coral-admin/src/translations';
 
 const lang = new I18n(translations);
-const ModerationQueue = ({comments, ...props}) => {
+const ModerationQueue = ({comments, selectedIndex, ...props}) => {
   return (
     <div id="moderationList">
       <ul style={{paddingLeft: 0}}>
@@ -20,6 +20,7 @@ const ModerationQueue = ({comments, ...props}) => {
             index={i}
             comment={comment}
             commentType={props.activeTab}
+            selected={i === selectedIndex}
             suspectWords={props.suspectWords}
             actions={actionsMap[status]}
             showBanUserDialog={props.showBanUserDialog}
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
index 3a82af2cd..683a7abd4 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
@@ -22,7 +22,7 @@ const Comment = ({actions = [], ...props}) => {
   const actionSummaries = props.comment.action_summaries;
   return (
     <li tabIndex={props.index}
-        className={`mdl-card mdl-shadow--2dp ${styles.Comment} ${styles.listItem} ${props.isActive && !props.hideActive ? styles.activeItem : ''}`}>
+        className={`mdl-card mdl-shadow--2dp ${styles.Comment} ${styles.listItem} ${props.selected ? styles.selected : ''} ${props.isActive && !props.hideActive ? styles.activeItem : ''}`}>
       <div className={styles.container}>
         <div className={styles.itemHeader}>
         <div className={styles.author}>
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/styles.css b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
index 6db537eef..b2d59cb1a 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/styles.css
+++ b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
@@ -186,6 +186,10 @@ span {
     border-bottom: none;
   }
 
+  &.selected {
+    box-shadow: 0px 0px 15px 5px rgb(255, 255, 111);
+  }
+
   .context {
     a {
       color: #f36451;

From 1146f22613d9a9a427ddbd4aa8ece95e0e84b0ff Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Thu, 2 Mar 2017 15:41:51 -0500
Subject: [PATCH 119/132] Accepting and rejecting comments w/ keystrokes.

---
 .../ModerationQueue/ModerationContainer.js    | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
index 1505316cd..32a7d0200 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
@@ -34,12 +34,33 @@ class ModerationContainer extends Component {
     key('esc', () => toggleModal(false));
     key('j', () => this.setState({selectedIndex: selectedIndex + 1}));
     key('k', () => this.setState({selectedIndex: selectedIndex > 0 ? selectedIndex + 1 : selectedIndex}));
+    key('r', () => this.moderate(false));
+    key('t', () => this.moderate(true));
+  }
+
+  moderate = (accept) => {
+    const {data, route, acceptComment, rejectComment} = this.props;
+    const {selectedIndex} = this.state;
+    const activeTab = route.path === ':id' ? 'premod' : route.path;
+    const comments = data[activeTab];
+    const commentId = {commentId: comments[selectedIndex].id};
+
+    if (accept) {
+      acceptComment(commentId);
+    } else {
+      rejectComment(commentId);
+    }
+
   }
 
   componentWillUnmount() {
     key.unbind('s');
     key.unbind('shift+/');
     key.unbind('esc');
+    key.unbind('j');
+    key.unbind('k');
+    key.unbind('r');
+    key.unbind('t');
   }
 
   componentWillReceiveProps(nextProps) {

From d554bf5211690856226558779ba5e082a28143cb Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Thu, 2 Mar 2017 16:03:18 -0500
Subject: [PATCH 120/132] Adding single view and restyling selected comment.

---
 .../src/containers/ModerationQueue/ModerationContainer.js    | 1 +
 .../src/containers/ModerationQueue/ModerationQueue.js        | 5 +++--
 .../src/containers/ModerationQueue/components/Comment.js     | 2 +-
 .../src/containers/ModerationQueue/components/styles.css     | 5 +++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
index 32a7d0200..25a7a9511 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
@@ -109,6 +109,7 @@ class ModerationContainer extends Component {
           currentAsset={asset}
           comments={comments}
           activeTab={activeTab}
+          singleView={moderation.singleView}
           selectedIndex={this.state.selectedIndex}
           suspectWords={settings.wordlist.suspect}
           showBanUserDialog={props.showBanUserDialog}
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
index e3ba12b09..58fdd1398 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
@@ -1,15 +1,16 @@
 import React, {PropTypes} from 'react';
 
 import Comment from './components/Comment';
+import styles from './components/styles.css';
 import EmptyCard from '../../components/EmptyCard';
 import {actionsMap} from './helpers/moderationQueueActionsMap';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from 'coral-admin/src/translations';
 
 const lang = new I18n(translations);
-const ModerationQueue = ({comments, selectedIndex, ...props}) => {
+const ModerationQueue = ({comments, selectedIndex, singleView, ...props}) => {
   return (
-    <div id="moderationList">
+    <div id="moderationList" className={`${styles.list} ${singleView ? styles.singleView : ''}`}>
       <ul style={{paddingLeft: 0}}>
       {
         comments.length
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
index 683a7abd4..54eac691b 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
@@ -22,7 +22,7 @@ const Comment = ({actions = [], ...props}) => {
   const actionSummaries = props.comment.action_summaries;
   return (
     <li tabIndex={props.index}
-        className={`mdl-card mdl-shadow--2dp ${styles.Comment} ${styles.listItem} ${props.selected ? styles.selected : ''} ${props.isActive && !props.hideActive ? styles.activeItem : ''}`}>
+        className={`mdl-card ${props.selected ? 'mdl-shadow--8dp' : 'mdl-shadow--2dp'} ${styles.Comment} ${styles.listItem} ${props.selected ? styles.selected : ''}`}>
       <div className={styles.container}>
         <div className={styles.itemHeader}>
         <div className={styles.author}>
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/styles.css b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
index b2d59cb1a..5a4a42cca 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/styles.css
+++ b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
@@ -136,7 +136,7 @@ span {
     display: none;
   }
 
-  &.singleView .listItem.activeItem {
+  &.singleView .listItem.selected {
     display: block;
     height: 100%;
     font-size: 1.5em;
@@ -187,7 +187,8 @@ span {
   }
 
   &.selected {
-    box-shadow: 0px 0px 15px 5px rgb(255, 255, 111);
+    max-width: 670px;
+    max-height: 410px;
   }
 
   .context {

From 57a7000e5901a9c23b7c1c3ed06ebcac631557f2 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Thu, 2 Mar 2017 16:08:24 -0500
Subject: [PATCH 121/132] Animating transition in mod queue.

---
 .../src/containers/ModerationQueue/components/styles.css        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-admin/src/containers/ModerationQueue/components/styles.css b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
index 5a4a42cca..cdd03bca8 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/styles.css
+++ b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
@@ -168,7 +168,7 @@ span {
   min-width: 400px;
   margin: 0 auto;
   position: relative;
-  transition: box-shadow 200ms;
+  transition: all 200ms;
   margin-top: 0;
   padding: 4px 0 0;
   min-height: 220px;

From edd694cfa524e0ccc4a657af949b75223c3a1d12 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Fri, 3 Mar 2017 06:55:55 -0500
Subject: [PATCH 122/132] Bump version for 1.0.1 release

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index eaa15303a..f86558a59 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "talk",
-  "version": "0.0.1",
+  "version": "1.0.1",
   "description": "A commenting platform from The Coral Project. https://coralproject.net",
   "main": "app.js",
   "scripts": {

From d65fb64b7e159594afb429ddbcc25070a506d886 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Fri, 3 Mar 2017 11:28:22 -0500
Subject: [PATCH 123/132] Update for major release to include Best Comments

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e29cbf955..f67a36908 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "talk",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "A commenting platform from The Coral Project. https://coralproject.net",
   "main": "app.js",
   "scripts": {

From d218979ee6fd3254de3c73fe8a9ea4bab8fdca70 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 3 Mar 2017 11:46:09 -0500
Subject: [PATCH 124/132] Show Story, show and hide Moderate

---
 .../src/containers/ModerationQueue/components/Comment.js   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
index 54eac691b..1c46d7ecd 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
@@ -53,11 +53,12 @@ const Comment = ({actions = [], ...props}) => {
             : null}
         </div>
       </div>
-        {!props.currentAsset && (
           <div className={styles.moderateArticle}>
-            Story: {props.comment.asset.title} <Link to={`/admin/moderate/${props.comment.asset.id}`}>Moderate &rarr;</Link>
+            Story: {props.comment.asset.title}
+            {!props.currentAsset && (
+              <Link to={`/admin/moderate/${props.comment.asset.id}`}>Moderate &rarr;</Link>
+            )}
           </div>
-        )}
         <div className={styles.itemBody}>
           <p className={styles.body}>
             <Linkify component='span' properties={{style: linkStyles}}>

From 5da1af83873cad98f9533c285c5c76b6e07dbaf1 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 3 Mar 2017 13:00:22 -0500
Subject: [PATCH 125/132] Styles ready!

---
 .../src/components/BanUserButton.css          |  2 +-
 .../ModerationQueue/components/Comment.js     | 55 ++++++++++---------
 .../components/CommentType.css                |  6 +-
 .../ModerationQueue/components/styles.css     | 25 +++++----
 client/coral-plugin-best/BestButton.js        |  8 +--
 client/coral-ui/components/Button.css         | 10 ++--
 6 files changed, 54 insertions(+), 52 deletions(-)

diff --git a/client/coral-admin/src/components/BanUserButton.css b/client/coral-admin/src/components/BanUserButton.css
index 36243348f..6e8e50f71 100644
--- a/client/coral-admin/src/components/BanUserButton.css
+++ b/client/coral-admin/src/components/BanUserButton.css
@@ -5,7 +5,7 @@
 
   i {
     vertical-align: middle;
-    margin-right: 10px;
+    margin-right: 5px;
     font-size: 14px;
   }
 }
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
index 1c46d7ecd..8be1262f5 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
@@ -21,50 +21,51 @@ const Comment = ({actions = [], ...props}) => {
   const links = linkify.getMatches(props.comment.body);
   const actionSummaries = props.comment.action_summaries;
   return (
-    <li tabIndex={props.index}
-        className={`mdl-card ${props.selected ? 'mdl-shadow--8dp' : 'mdl-shadow--2dp'} ${styles.Comment} ${styles.listItem} ${props.selected ? styles.selected : ''}`}>
+    <li tabIndex={props.index} className={`mdl-card ${props.selected ? 'mdl-shadow--8dp' : 'mdl-shadow--2dp'} ${styles.Comment} ${styles.listItem} ${props.selected ? styles.selected : ''}`}>
       <div className={styles.container}>
         <div className={styles.itemHeader}>
-        <div className={styles.author}>
-          <span>{props.comment.user.name}</span>
+          <div className={styles.author}>
+          <span>
+            {props.comment.user.name}
+          </span>
           <span className={styles.created}>
-              {timeago().format(props.comment.created_at || (Date.now() - props.index * 60 * 1000), lang.getLocale().replace('-', '_'))}
-            </span>
+            {timeago().format(props.comment.created_at || (Date.now() - props.index * 60 * 1000), lang.getLocale().replace('-', '_'))}
+          </span>
           <BanUserButton user={props.comment.user} onClick={() => props.showBanUserDialog(props.comment.user, props.comment.id)} />
           <CommentType type={props.commentType} />
         </div>
-        <div className={styles.sideActions}>
-          {links ? <span className={styles.hasLinks}><Icon name='error_outline'/> Contains Link</span> : null}
-          <div className={`actions ${styles.actions}`}>
-            {actions.map((action, i) =>
-              <ActionButton key={i}
-                            type={action}
-                            user={props.comment.user}
-                            acceptComment={() => props.acceptComment({commentId: props.comment.id})}
-                            rejectComment={() => props.rejectComment({commentId: props.comment.id})}
-              />
-            )}
-          </div>
           {props.comment.user.status === 'banned' ?
             <span className={styles.banned}>
-                <Icon name='error_outline'/>
+              <Icon name='error_outline'/>
               {lang.t('comment.banned_user')}
-              </span>
+            </span>
             : null}
         </div>
-      </div>
-          <div className={styles.moderateArticle}>
-            Story: {props.comment.asset.title}
-            {!props.currentAsset && (
-              <Link to={`/admin/moderate/${props.comment.asset.id}`}>Moderate &rarr;</Link>
-            )}
-          </div>
+        <div className={styles.moderateArticle}>
+          Story: {props.comment.asset.title}
+          {!props.currentAsset && (
+            <Link to={`/admin/moderate/${props.comment.asset.id}`}>Moderate &rarr;</Link>
+          )}
+        </div>
         <div className={styles.itemBody}>
           <p className={styles.body}>
             <Linkify component='span' properties={{style: linkStyles}}>
               <Highlighter searchWords={props.suspectWords} textToHighlight={props.comment.body}/>
             </Linkify>
           </p>
+          <div className={styles.sideActions}>
+            {links ? <span className={styles.hasLinks}><Icon name='error_outline'/> Contains Link</span> : null}
+            <div className={`actions ${styles.actions}`}>
+              {actions.map((action, i) =>
+                <ActionButton key={i}
+                              type={action}
+                              user={props.comment.user}
+                              acceptComment={() => props.acceptComment({commentId: props.comment.id})}
+                              rejectComment={() => props.rejectComment({commentId: props.comment.id})}
+                />
+              )}
+            </div>
+          </div>
         </div>
       </div>
       {actionSummaries && <FlagBox actionSummaries={actionSummaries} />}
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/CommentType.css b/client/coral-admin/src/containers/ModerationQueue/components/CommentType.css
index cdfd212ff..3144a5bd7 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/CommentType.css
+++ b/client/coral-admin/src/containers/ModerationQueue/components/CommentType.css
@@ -4,12 +4,12 @@
   top: 11px;
   color: white;
   background: grey;
-  padding: 2px 13px;
-  font-size: 14px;
   height: 32px;
   box-sizing: border-box;
   line-height: 29px;
-  padding-left: 26px;
+  padding: 2px 8px 2px 26px;
+  border-radius: 2px;
+  font-size: 12px;
 
   i {
     font-size: 14px;
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/styles.css b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
index cdd03bca8..59f47faad 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/styles.css
+++ b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
@@ -147,7 +147,6 @@ span {
       position: fixed;
       bottom: 60px;
       left: 25%;
-      margin: 0 auto;
       display: flex;
       justify-content: space-around;
       width: 50%;
@@ -169,13 +168,12 @@ span {
   margin: 0 auto;
   position: relative;
   transition: all 200ms;
-  margin-top: 0;
-  padding: 4px 0 0;
+  padding: 10px 0 0;
   min-height: 220px;
 
   .container {
     padding: 0 14px;
-    min-height: 220px;
+    min-height: 180px;
   }
 
   &:hover {
@@ -200,11 +198,8 @@ span {
   }
 
    .sideActions {
-     position: absolute;
-     right: 0;
      height: 100%;
      top: 0;
-     padding: 100px 12px 65px;
      box-sizing: border-box;
    }
 
@@ -214,6 +209,7 @@ span {
     justify-content: space-between;
 
     .author {
+      font-weight: 600;
       min-width: 230px;
       display: flex;
       align-items: center;
@@ -223,8 +219,9 @@ span {
   .itemBody {
     display: flex;
     justify-content: space-between;
-    margin-top: 15px;
-    font-size: 16px;
+    font-size: 14px;
+    line-height: 1.5;
+    font-weight: 300;
   }
 
   .avatar {
@@ -241,6 +238,7 @@ span {
     color: #666;
     font-size: 13px;
     margin-left: 15px;
+    line-height: 1px;
   }
 
   .actionButton {
@@ -251,10 +249,10 @@ span {
   .body {
     margin-top: 0px;
     flex: 1;
-    font-size: 0.88em;
     color: black;
     max-width: 500px;
     word-wrap: break-word;
+    font-weight: 300;
   }
 
   .flagged {
@@ -324,9 +322,12 @@ span {
 .Comment {
 
   .moderateArticle {
-    font-size: 15px;
-    margin-top: 14px;
+    font-size: 14px;
+    margin: 10px 0;
     font-weight: 500;
+    line-height: 1.2;
+    max-width: 500px;
+
     a {
       display: inline-block;
       color: #063b9a;
diff --git a/client/coral-plugin-best/BestButton.js b/client/coral-plugin-best/BestButton.js
index ac0e75aaf..8130c2530 100644
--- a/client/coral-plugin-best/BestButton.js
+++ b/client/coral-plugin-best/BestButton.js
@@ -17,9 +17,9 @@ const lang = new I18n(translations);
 const canModifyBestTag = ({roles = []} = {}) => roles && ['ADMIN', 'MODERATOR'].some(role => roles.includes(role));
 
 // Put this on a comment to show that it is best
-export const BestIndicator = ({children = <i className={'material-icons'} aria-hidden={true}>favorite</i>}) => (
+export const BestIndicator = ({children = <i className={'material-icons'} aria-hidden={true}>star</i>}) => (
   <span aria-label={lang.t('commentIsBest')}>
-    { children } 
+    { children }
   </span>
 );
 
@@ -69,7 +69,7 @@ export class BestButton extends Component {
     try {
       await addBest();
     } finally {
-      this.setState({isSaving: false});      
+      this.setState({isSaving: false});
     }
   }
 
@@ -84,7 +84,7 @@ export class BestButton extends Component {
     try {
       await removeBest();
     } finally {
-      this.setState({isSaving: false});      
+      this.setState({isSaving: false});
     }
   }
 
diff --git a/client/coral-ui/components/Button.css b/client/coral-ui/components/Button.css
index 498b03912..9a2611630 100644
--- a/client/coral-ui/components/Button.css
+++ b/client/coral-ui/components/Button.css
@@ -166,18 +166,18 @@
 .type--ban {
   display: block;
   color: #616161;
-  border: solid 2px rgba(97, 97, 97, 0.77);
+  border: solid 1px rgba(97, 97, 97, 0.77);
   background: white;
-  padding: 10px 12px;
   box-sizing: border-box;
   vertical-align: middle;
   line-height: 24px;
-  font-size: 17px;
-  height: 47px;
   border-radius: 3px;
   text-transform: capitalize;
   box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.03), 0 3px 1px -2px rgba(0,0,0,.2), 0 1px 5px 0 rgba(0,0,0,.09);
-  width: 128px;
+  padding: 0 8px;
+  height: 34px;
+  font-size: 14px;
+  width: auto;
 
 &:hover {
    box-shadow: none;

From 646d1aa5851758c04b1153ad05eb15737d55aa32 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 3 Mar 2017 11:03:11 -0700
Subject: [PATCH 126/132] Added version endpoint

---
 routes/index.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/routes/index.js b/routes/index.js
index b1e61659a..766de7d7a 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -1,7 +1,14 @@
 const express = require('express');
 const path = require('path');
+const _ = require('lodash');
+const pkg = require('../package.json');
+
 const router = express.Router();
 
+router.use('/', (req, res) => {
+  res.json(_.pick(pkg, ['version']));
+});
+
 router.use('/api/v1', require('./api'));
 router.use('/admin', require('./admin'));
 router.use('/embed', require('./embed'));

From 840bfad06f7fbe06594a5acd17fdc7f1c8e6ddd2 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 3 Mar 2017 11:04:46 -0700
Subject: [PATCH 127/132] Simplfied endpoint

---
 routes/index.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/routes/index.js b/routes/index.js
index 766de7d7a..218b00740 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -1,12 +1,11 @@
 const express = require('express');
 const path = require('path');
-const _ = require('lodash');
 const pkg = require('../package.json');
 
 const router = express.Router();
 
 router.use('/', (req, res) => {
-  res.json(_.pick(pkg, ['version']));
+  res.json({version: pkg.version});
 });
 
 router.use('/api/v1', require('./api'));

From 3fc349dbe4d37f293183d6228790c50eca0d7b7a Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 3 Mar 2017 11:08:59 -0700
Subject: [PATCH 128/132] Fixed endpoint...

---
 routes/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routes/index.js b/routes/index.js
index 218b00740..057199382 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -4,7 +4,7 @@ const pkg = require('../package.json');
 
 const router = express.Router();
 
-router.use('/', (req, res) => {
+router.get('/', (req, res) => {
   res.json({version: pkg.version});
 });
 

From 79102de9d2acd7287583d68104109ed47fcaab27 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 3 Mar 2017 13:21:42 -0500
Subject: [PATCH 129/132] Star and Coral UI added :D

---
 client/coral-plugin-best/BestButton.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/client/coral-plugin-best/BestButton.js b/client/coral-plugin-best/BestButton.js
index ac0e75aaf..d1bceca37 100644
--- a/client/coral-plugin-best/BestButton.js
+++ b/client/coral-plugin-best/BestButton.js
@@ -1,6 +1,7 @@
 import React, {Component, PropTypes} from 'react';
 import {I18n} from '../coral-framework';
 import translations from './translations.json';
+import {Icon} from 'coral-ui';
 import classnames from 'classnames';
 
 // tag string for best comments
@@ -17,9 +18,9 @@ const lang = new I18n(translations);
 const canModifyBestTag = ({roles = []} = {}) => roles && ['ADMIN', 'MODERATOR'].some(role => roles.includes(role));
 
 // Put this on a comment to show that it is best
-export const BestIndicator = ({children = <i className={'material-icons'} aria-hidden={true}>favorite</i>}) => (
+export const BestIndicator = ({children = <Icon name='star'/>}) => (
   <span aria-label={lang.t('commentIsBest')}>
-    { children } 
+    { children }
   </span>
 );
 
@@ -69,7 +70,7 @@ export class BestButton extends Component {
     try {
       await addBest();
     } finally {
-      this.setState({isSaving: false});      
+      this.setState({isSaving: false});
     }
   }
 
@@ -84,7 +85,7 @@ export class BestButton extends Component {
     try {
       await removeBest();
     } finally {
-      this.setState({isSaving: false});      
+      this.setState({isSaving: false});
     }
   }
 
@@ -97,9 +98,7 @@ export class BestButton extends Component {
               disabled={disabled}
               className={classnames(`${name}-button`, `e2e__${isBest ? 'unset' : 'set'}-best-comment`)}
               aria-label={lang.t(isBest ? 'unsetBest' : 'setBest')}>
-        <i className={`${name}-icon material-icons`} aria-hidden={true}>
-          { isBest ? 'favorite' : 'favorite_border' }
-        </i>
+        <Icon name={ isBest ? 'star' : 'star_border' } />
       </button>
     );
   }

From bb05fa5325efbd7ea567d329cff97a9a302ae1ed Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 3 Mar 2017 13:37:10 -0500
Subject: [PATCH 130/132] Reverse chronos

---
 graph/resolvers/user.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graph/resolvers/user.js b/graph/resolvers/user.js
index 13efe29e9..d8ed7ee15 100644
--- a/graph/resolvers/user.js
+++ b/graph/resolvers/user.js
@@ -15,7 +15,7 @@ const User = {
     // If the user is not an admin, only return comment list for the owner of
     // the comments.
     if (user && (user.hasRoles('ADMIN') || user.id === id)) {
-      return Comments.getByQuery({author_id: id});
+      return Comments.getByQuery({author_id: id, sort: 'REVERSE_CHRONOLOGICAL'});
     }
 
     return null;

From 56350ffe1a15ad2c51af6feb8fd7fef1518321ad Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Mon, 6 Mar 2017 09:58:21 -0700
Subject: [PATCH 131/132] Moved to correct route

---
 routes/api/index.js | 6 +++++-
 routes/index.js     | 5 -----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/routes/api/index.js b/routes/api/index.js
index 56846acde..764612f78 100644
--- a/routes/api/index.js
+++ b/routes/api/index.js
@@ -1,11 +1,15 @@
 const express = require('express');
 const authorization = require('../../middleware/authorization');
+const pkg = require('../../package.json');
 
 const router = express.Router();
 
+router.get('/', (req, res) => {
+  res.json({version: pkg.version});
+});
+
 router.use('/assets', authorization.needed('ADMIN'), require('./assets'));
 router.use('/settings', authorization.needed('ADMIN'), require('./settings'));
-
 router.use('/auth', require('./auth'));
 router.use('/users', require('./users'));
 router.use('/account', require('./account'));
diff --git a/routes/index.js b/routes/index.js
index 057199382..58c8f13d7 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -1,13 +1,8 @@
 const express = require('express');
 const path = require('path');
-const pkg = require('../package.json');
 
 const router = express.Router();
 
-router.get('/', (req, res) => {
-  res.json({version: pkg.version});
-});
-
 router.use('/api/v1', require('./api'));
 router.use('/admin', require('./admin'));
 router.use('/embed', require('./embed'));

From 1c81d0a04fa15c93ad5bd09d26a428783de528a4 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Mon, 6 Mar 2017 13:00:22 -0700
Subject: [PATCH 132/132] Update index.js

---
 routes/admin/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routes/admin/index.js b/routes/admin/index.js
index e2473bca9..cb256327a 100644
--- a/routes/admin/index.js
+++ b/routes/admin/index.js
@@ -12,7 +12,7 @@ router.get('/password-reset', (req, res) => {
 
   // TODO: store the redirect uri in the token or something fancy.
   // admins and regular users should probably be redirected to different places.
-  res.render('password-reset', {redirectUri: process.env.TALK_ROOT_URL});
+  res.render('admin/password-reset', {redirectUri: process.env.TALK_ROOT_URL});
 });
 
 router.get('*', (req, res) => {