From 7955b28a75f59b48e13609395c7df3e62e196a74 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Wed, 4 Apr 2018 07:59:13 -0300
Subject: [PATCH 001/144] Adding rejectUsername

---
 client/coral-admin/src/components/UserDetail.js | 9 ++++++++-
 client/coral-admin/src/containers/UserDetail.js | 6 +++++-
 client/coral-framework/utils/user.js            | 9 +++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index 31ad999dc..b917d81eb 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -110,6 +110,7 @@ class UserDetail extends React.Component {
       unbanUser,
       unsuspendUser,
       modal,
+      rejectUsername,
     } = this.props;
 
     // if totalComments is 0, you're dividing by zero
@@ -122,6 +123,8 @@ class UserDetail extends React.Component {
     const banned = isBanned(user);
     const suspended = isSuspended(user);
 
+    console.log(user);
+
     const slotPassthrough = {
       root,
       user,
@@ -155,6 +158,10 @@ class UserDetail extends React.Component {
               )}
               label={this.getActionMenuLabel()}
             >
+              <ActionsMenuItem onClick={() => rejectUsername({ id: user.id })}>
+                Reject Username
+              </ActionsMenuItem>
+
               {suspended ? (
                 <ActionsMenuItem onClick={() => unsuspendUser({ id: user.id })}>
                   {t('user_detail.remove_suspension')}
@@ -167,7 +174,6 @@ class UserDetail extends React.Component {
                   {t('user_detail.suspend')}
                 </ActionsMenuItem>
               )}
-
               {banned ? (
                 <ActionsMenuItem onClick={() => unbanUser({ id: user.id })}>
                   {t('user_detail.remove_ban')}
@@ -376,6 +382,7 @@ UserDetail.propTypes = {
   unbanUser: PropTypes.func.isRequired,
   unsuspendUser: PropTypes.func.isRequired,
   modal: PropTypes.bool,
+  rejectUsername: PropTypes.func.isRequired,
 };
 
 export default UserDetail;
diff --git a/client/coral-admin/src/containers/UserDetail.js b/client/coral-admin/src/containers/UserDetail.js
index fb1508a2f..2046f9c74 100644
--- a/client/coral-admin/src/containers/UserDetail.js
+++ b/client/coral-admin/src/containers/UserDetail.js
@@ -26,6 +26,7 @@ import UserDetailComment from './UserDetailComment';
 import update from 'immutability-helper';
 import { showBanUserDialog } from 'actions/banUserDialog';
 import { showSuspendUserDialog } from 'actions/suspendUserDialog';
+import { withRejectUsername } from '../../../coral-framework/graphql/mutations';
 
 const commentConnectionFragment = gql`
   fragment CoralAdmin_UserDetail_CommentConnection on CommentConnection {
@@ -131,6 +132,7 @@ class UserDetailContainer extends React.Component {
         loading={loading}
         error={this.props.data && this.props.data.error}
         loadMore={this.loadMore}
+        rejectUsername={this.props.rejectUsername}
         {...this.props}
       />
     );
@@ -148,6 +150,7 @@ UserDetailContainer.propTypes = {
   selectedCommentIds: PropTypes.array,
   unbanUser: PropTypes.func.isRequired,
   unsuspendUser: PropTypes.func.isRequired,
+  rejectUsername: PropTypes.func.isRequired,
 };
 
 const LOAD_MORE_QUERY = gql`
@@ -281,5 +284,6 @@ export default compose(
   withUserDetailQuery,
   withSetCommentStatus,
   withUnbanUser,
-  withUnsuspendUser
+  withUnsuspendUser,
+  withRejectUsername
 )(UserDetailContainer);
diff --git a/client/coral-framework/utils/user.js b/client/coral-framework/utils/user.js
index f50fca335..63a552110 100644
--- a/client/coral-framework/utils/user.js
+++ b/client/coral-framework/utils/user.js
@@ -33,3 +33,12 @@ export const isSuspended = user => {
 export const isBanned = user => {
   return get(user, 'state.status.banned.status');
 };
+
+/**
+ * isUsernameRejected
+ * retrieves boolean based on the username status
+ */
+
+export const isUsernameRejected = user => {
+  return get(user, 'state.status.username.status');
+};

From 8563ddffd35fa91085742260654f0846a5a2f9a4 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Wed, 11 Apr 2018 23:55:50 -0300
Subject: [PATCH 002/144] Adding functionality and design functionality

---
 .../coral-admin/src/components/ActionsMenu.js |  2 +-
 .../coral-admin/src/components/UserDetail.js  | 75 +++++++++++++++----
 .../coral-admin/src/containers/UserDetail.js  |  6 +-
 client/coral-framework/utils/user.js          | 30 +++++++-
 4 files changed, 94 insertions(+), 19 deletions(-)

diff --git a/client/coral-admin/src/components/ActionsMenu.js b/client/coral-admin/src/components/ActionsMenu.js
index 81b857a13..52370f9a7 100644
--- a/client/coral-admin/src/components/ActionsMenu.js
+++ b/client/coral-admin/src/components/ActionsMenu.js
@@ -76,7 +76,7 @@ ActionsMenu.propTypes = {
   icon: PropTypes.string,
   children: PropTypes.node,
   className: PropTypes.string,
-  label: PropTypes.string,
+  label: PropTypes.oneOfType([PropTypes.node, PropTypes.string]),
   buttonClassNames: PropTypes.string,
 };
 
diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index b917d81eb..a6684a04d 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -10,6 +10,9 @@ import {
   getReliability,
   isSuspended,
   isBanned,
+  isUsernameRejected,
+  isUsernameChanged,
+  getActiveStatuses,
 } from 'coral-framework/utils/user';
 import ButtonCopyToClipboard from './ButtonCopyToClipboard';
 import ClickOutside from 'coral-framework/components/ClickOutside';
@@ -26,6 +29,7 @@ import ActionsMenu from 'coral-admin/src/components/ActionsMenu';
 import ActionsMenuItem from 'coral-admin/src/components/ActionsMenuItem';
 import UserInfoTooltip from './UserInfoTooltip';
 import t from 'coral-framework/services/i18n';
+import flatten from 'lodash/flatten';
 
 class UserDetail extends React.Component {
   rejectThenReload = async info => {
@@ -84,18 +88,43 @@ class UserDetail extends React.Component {
     );
   }
 
-  getActionMenuLabel() {
-    const { root: { user } } = this.props;
+  getActionMenuLabel(user) {
+    const activeStatuses = getActiveStatuses(user);
+    const count = activeStatuses.length;
 
-    if (isBanned(user)) {
-      return 'Banned';
-    } else if (isSuspended(user)) {
-      return 'Suspended';
+    if (count > 1) {
+      return `Status(${count})`;
+    } else {
+      const activeStatus = flatten(activeStatuses)[0];
+
+      switch (activeStatus) {
+        case 'suspended':
+          return <span>Suspended</span>;
+        case 'banned':
+          return <span>Banned</span>;
+        case 'usernameRejected':
+          return (
+            <span>
+              Username <Icon name="cancel" />
+            </span>
+          );
+        case 'usernameChanged':
+          return (
+            <span>
+              Username <Icon name="access_time" />
+            </span>
+          );
+        default:
+          return activeStatus;
+      }
     }
-
-    return '';
   }
 
+  goToReportedUsernames = () => {
+    const { router } = this.props;
+    router.push('/admin/community/flagged');
+  };
+
   renderLoaded() {
     const {
       root,
@@ -122,8 +151,8 @@ class UserDetail extends React.Component {
 
     const banned = isBanned(user);
     const suspended = isSuspended(user);
-
-    console.log(user);
+    const usernameRejected = isUsernameRejected(user);
+    const usernameChanged = isUsernameChanged(user);
 
     const slotPassthrough = {
       root,
@@ -156,12 +185,8 @@ class UserDetail extends React.Component {
                 },
                 'talk-admin-user-detail-actions-button'
               )}
-              label={this.getActionMenuLabel()}
+              label={this.getActionMenuLabel(user)}
             >
-              <ActionsMenuItem onClick={() => rejectUsername({ id: user.id })}>
-                Reject Username
-              </ActionsMenuItem>
-
               {suspended ? (
                 <ActionsMenuItem onClick={() => unsuspendUser({ id: user.id })}>
                   {t('user_detail.remove_suspension')}
@@ -174,6 +199,7 @@ class UserDetail extends React.Component {
                   {t('user_detail.suspend')}
                 </ActionsMenuItem>
               )}
+
               {banned ? (
                 <ActionsMenuItem onClick={() => unbanUser({ id: user.id })}>
                   {t('user_detail.remove_ban')}
@@ -186,6 +212,24 @@ class UserDetail extends React.Component {
                   {t('user_detail.ban')}
                 </ActionsMenuItem>
               )}
+
+              {usernameChanged && (
+                <ActionsMenuItem onClick={this.goToReportedUsernames}>
+                  Username needs approval
+                </ActionsMenuItem>
+              )}
+
+              {usernameRejected && !usernameChanged ? (
+                <ActionsMenuItem disabled={me.id === user.id}>
+                  Username Rejected
+                </ActionsMenuItem>
+              ) : (
+                <ActionsMenuItem
+                  onClick={() => rejectUsername({ id: user.id })}
+                >
+                  Reject Username
+                </ActionsMenuItem>
+              )}
             </ActionsMenu>
           )}
 
@@ -361,6 +405,7 @@ class UserDetail extends React.Component {
 }
 
 UserDetail.propTypes = {
+  router: PropTypes.object.isRequired,
   userId: PropTypes.string.isRequired,
   hideUserDetail: PropTypes.func.isRequired,
   root: PropTypes.object.isRequired,
diff --git a/client/coral-admin/src/containers/UserDetail.js b/client/coral-admin/src/containers/UserDetail.js
index 2046f9c74..38a610880 100644
--- a/client/coral-admin/src/containers/UserDetail.js
+++ b/client/coral-admin/src/containers/UserDetail.js
@@ -5,6 +5,7 @@ import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import UserDetail from '../components/UserDetail';
 import withQuery from 'coral-framework/hocs/withQuery';
+import { withRouter } from 'react-router';
 import {
   getDefinitionName,
   getSlotFragmentSpreads,
@@ -21,12 +22,12 @@ import {
   withSetCommentStatus,
   withUnbanUser,
   withUnsuspendUser,
+  withRejectUsername,
 } from 'coral-framework/graphql/mutations';
 import UserDetailComment from './UserDetailComment';
 import update from 'immutability-helper';
 import { showBanUserDialog } from 'actions/banUserDialog';
 import { showSuspendUserDialog } from 'actions/suspendUserDialog';
-import { withRejectUsername } from '../../../coral-framework/graphql/mutations';
 
 const commentConnectionFragment = gql`
   fragment CoralAdmin_UserDetail_CommentConnection on CommentConnection {
@@ -285,5 +286,6 @@ export default compose(
   withSetCommentStatus,
   withUnbanUser,
   withUnsuspendUser,
-  withRejectUsername
+  withRejectUsername,
+  withRouter
 )(UserDetailContainer);
diff --git a/client/coral-framework/utils/user.js b/client/coral-framework/utils/user.js
index 63a552110..c6b2ba83d 100644
--- a/client/coral-framework/utils/user.js
+++ b/client/coral-framework/utils/user.js
@@ -1,4 +1,6 @@
 import get from 'lodash/get';
+import mapValues from 'lodash/mapValues';
+import toPairs from 'lodash/toPairs';
 
 /**
  * getReliability
@@ -40,5 +42,31 @@ export const isBanned = user => {
  */
 
 export const isUsernameRejected = user => {
-  return get(user, 'state.status.username.status');
+  return get(user, 'state.status.username.status') === 'REJECTED';
+};
+
+/**
+ * isUsernameChanged
+ * retrieves boolean based on the username status
+ */
+
+export const isUsernameChanged = user => {
+  return get(user, 'state.status.username.status') === 'CHANGED';
+};
+
+/**
+ * getActiveStatuses
+ * returns an array of active status(es)
+ * i.e if suspension is active, it returns suspension
+ */
+
+export const getActiveStatuses = user => {
+  const statusMap = {
+    suspended: isSuspended,
+    banned: isBanned,
+    usernameRejected: isUsernameRejected,
+    usernameChanged: isUsernameChanged,
+  };
+
+  return toPairs(mapValues(statusMap, fn => fn(user))).filter(x => x[1]);
 };

From 3d3a46070c43a737b898792ee375cf7ea6ea6969 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Thu, 12 Apr 2018 00:09:33 -0300
Subject: [PATCH 003/144] Adding translations

---
 .../coral-admin/src/components/UserDetail.js  | 18 +++++++------
 locales/en.yml                                |  6 +++++
 locales/es.yml                                | 25 +++++++++++--------
 3 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index a6684a04d..2476898a5 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -99,19 +99,23 @@ class UserDetail extends React.Component {
 
       switch (activeStatus) {
         case 'suspended':
-          return <span>Suspended</span>;
+          return t('user_detail.suspended');
         case 'banned':
-          return <span>Banned</span>;
+          return t('user_detail.banned');
         case 'usernameRejected':
           return (
             <span>
-              Username <Icon name="cancel" />
+              {t('user_detail.username')}
+              {` `}
+              <Icon name="cancel" />
             </span>
           );
         case 'usernameChanged':
           return (
             <span>
-              Username <Icon name="access_time" />
+              {t('user_detail.username')}
+              {` `}
+              <Icon name="access_time" />
             </span>
           );
         default:
@@ -215,19 +219,19 @@ class UserDetail extends React.Component {
 
               {usernameChanged && (
                 <ActionsMenuItem onClick={this.goToReportedUsernames}>
-                  Username needs approval
+                  {t('user_detail.username_needs_approval')}
                 </ActionsMenuItem>
               )}
 
               {usernameRejected && !usernameChanged ? (
                 <ActionsMenuItem disabled={me.id === user.id}>
-                  Username Rejected
+                  {t('user_detail.username_rejected')}
                 </ActionsMenuItem>
               ) : (
                 <ActionsMenuItem
                   onClick={() => rejectUsername({ id: user.id })}
                 >
-                  Reject Username
+                  {t('user_detail.reject_username')}
                 </ActionsMenuItem>
               )}
             </ActionsMenu>
diff --git a/locales/en.yml b/locales/en.yml
index 08d64ddc8..b63142e63 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -428,6 +428,12 @@ en:
     user_bio: "User Bio"
     username_flags: "flags for this username"
   user_detail:
+    suspended: 'Suspended'
+    banned: 'Banned'
+    username: 'Username'
+    username_needs_approval: 'Username needs approval'
+    username_rejected: 'Username rejected'
+    reject_username: 'Reject Username'
     remove_suspension: "Remove Suspension"
     suspend: "Suspend User"
     remove_ban: "Remove Ban"
diff --git a/locales/es.yml b/locales/es.yml
index ba6cb8ad3..b6b01e2b6 100644
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -421,17 +421,22 @@ es:
     user_bio: "Bio de Usuario"
     username_flags: "reportes para este nombre de usuario"
   user_detail:
-    remove_suspension: "Remove Suspension"
-    suspend: "Suspend User"
-    remove_ban: "Remove Ban"
-    ban: "Ban User"
-    member_since: "Member Since"
+    suspended: 'Suspendido'
+    banned: 'Baneado'
+    username: 'Usuario'
+    username_needs_approval: 'El usuario necesita aprovación'
+    username_rejected: 'Usuario rechazado'
+    remove_suspension: "Quitar suspensión"
+    suspend: "Suspender usuario"
+    remove_ban: "Quitar ban"
+    ban: "Banear usuario"
+    member_since: "Miembro desde"
     email: "Email"
-    total_comments: "Total Comments"
-    reject_rate: "Reject Rate"
-    reports: "Reports"
-    all: "All"
-    rejected: "Rejected"
+    total_comments: "Comentarios totales"
+    reject_rate: "Promedio de rechazo"
+    reports: "Reportes"
+    all: "Todos"
+    rejected: "Rechazado"
     account_history: "Account History"
   account_history:
     user_banned: "User banned"

From c2b14fca1097292ff3594bcfc04d7f4e8341b8b1 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 13 Apr 2018 14:34:39 -0600
Subject: [PATCH 004/144] fixed mutation

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

diff --git a/client/coral-framework/graphql/mutations.js b/client/coral-framework/graphql/mutations.js
index 1b3b4c6fc..aea85c40f 100644
--- a/client/coral-framework/graphql/mutations.js
+++ b/client/coral-framework/graphql/mutations.js
@@ -271,7 +271,7 @@ export const withRejectUsername = withMutation(
   `,
   {
     props: ({ mutate }) => ({
-      rejectUsername: id => {
+      rejectUsername: ({ id }) => {
         return mutate({
           variables: {
             id,

From 42ca5743aac3694497522c87c92fcb02ad860d9f Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Mon, 16 Apr 2018 16:07:00 -0300
Subject: [PATCH 005/144] flow checks

---
 client/coral-admin/src/components/ActionsMenuItem.js | 2 +-
 client/coral-admin/src/components/UserDetail.js      | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/components/ActionsMenuItem.js b/client/coral-admin/src/components/ActionsMenuItem.js
index 7370ba466..54816147a 100644
--- a/client/coral-admin/src/components/ActionsMenuItem.js
+++ b/client/coral-admin/src/components/ActionsMenuItem.js
@@ -15,7 +15,7 @@ const ActionsMenuItem = props => (
 
 ActionsMenuItem.propTypes = {
   className: PropTypes.string,
-  children: PropTypes.string,
+  children: PropTypes.oneOfType([PropTypes.node, PropTypes.string]),
 };
 
 export default ActionsMenuItem;
diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index 2476898a5..aed200f18 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -220,16 +220,19 @@ class UserDetail extends React.Component {
               {usernameChanged && (
                 <ActionsMenuItem onClick={this.goToReportedUsernames}>
                   {t('user_detail.username_needs_approval')}
+                  {` `}
+                  <Icon name="launch" />
                 </ActionsMenuItem>
               )}
 
               {usernameRejected && !usernameChanged ? (
-                <ActionsMenuItem disabled={me.id === user.id}>
+                <ActionsMenuItem disabled>
                   {t('user_detail.username_rejected')}
                 </ActionsMenuItem>
               ) : (
                 <ActionsMenuItem
                   onClick={() => rejectUsername({ id: user.id })}
+                  disabled={me.id === user.id}
                 >
                   {t('user_detail.reject_username')}
                 </ActionsMenuItem>

From 33be00a5404cded4b4b5b8b9d1f0ba37533a96f8 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 10 May 2018 16:44:19 -0600
Subject: [PATCH 006/144] Added support for external signins on Admin

---
 .../coral-admin/src/components/External.css   | 16 ++++
 client/coral-admin/src/components/External.js | 24 +++++
 client/coral-admin/src/components/SignIn.js   | 90 ++++++++++---------
 client/coral-admin/src/containers/SignIn.js   |  4 +-
 .../coral-framework/services/postMessage.js   |  6 +-
 client/coral-framework/utils/index.js         | 20 +++++
 plugin-api/beta/client/utils/index.js         |  1 +
 .../client/actions.js                         |  4 +-
 .../talk-plugin-google-auth/client/actions.js |  4 +-
 9 files changed, 121 insertions(+), 48 deletions(-)
 create mode 100644 client/coral-admin/src/components/External.css
 create mode 100644 client/coral-admin/src/components/External.js

diff --git a/client/coral-admin/src/components/External.css b/client/coral-admin/src/components/External.css
new file mode 100644
index 000000000..ff23c53cc
--- /dev/null
+++ b/client/coral-admin/src/components/External.css
@@ -0,0 +1,16 @@
+.external {
+  margin-bottom: 20px;
+}
+
+.separator h5 {
+  text-align: center;
+  font-size: 1.2em;
+}
+
+.slot > * {
+margin-bottom: 8px;
+
+&:last-child {
+  margin-bottom: 0px;
+}
+}
diff --git a/client/coral-admin/src/components/External.js b/client/coral-admin/src/components/External.js
new file mode 100644
index 000000000..0f133d3b9
--- /dev/null
+++ b/client/coral-admin/src/components/External.js
@@ -0,0 +1,24 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import styles from './External.css';
+import Slot from 'coral-framework/components/Slot';
+import IfSlotIsNotEmpty from 'coral-framework/components/IfSlotIsNotEmpty';
+
+const External = ({ slot }) => (
+  <IfSlotIsNotEmpty slot={slot}>
+    <div>
+      <div className={styles.external}>
+        <Slot fill={slot} className={styles.slot} />
+      </div>
+      <div className={styles.separator}>
+        <h5>Or</h5>
+      </div>
+    </div>
+  </IfSlotIsNotEmpty>
+);
+
+External.propTypes = {
+  slot: PropTypes.string.isRequired,
+};
+
+export default External;
diff --git a/client/coral-admin/src/components/SignIn.js b/client/coral-admin/src/components/SignIn.js
index 5e1de2033..ddd69d3ac 100644
--- a/client/coral-admin/src/components/SignIn.js
+++ b/client/coral-admin/src/components/SignIn.js
@@ -4,6 +4,7 @@ import styles from './SignIn.css';
 import { Button, TextField, Alert } from 'coral-ui';
 import cn from 'classnames';
 import Recaptcha from 'coral-framework/components/Recaptcha';
+import External from './External';
 
 class SignIn extends React.Component {
   recaptcha = null;
@@ -33,48 +34,55 @@ class SignIn extends React.Component {
   render() {
     const { email, password, errorMessage, requireRecaptcha } = this.props;
     return (
-      <form className="talk-admin-login-sign-in" onSubmit={this.handleSubmit}>
-        {errorMessage && <Alert>{errorMessage}</Alert>}
-        <TextField
-          id="email"
-          label="Email Address"
-          value={email}
-          onChange={this.handleEmailChange}
-        />
-        <TextField
-          id="password"
-          label="Password"
-          value={password}
-          onChange={this.handlePasswordChange}
-          type="password"
-        />
-        {requireRecaptcha && (
-          <div className={styles.recaptcha}>
-            <Recaptcha
-              ref={this.handleRecaptchaRef}
-              onVerify={this.props.onRecaptchaVerify}
-            />
-          </div>
-        )}
-        <Button
-          className={cn(styles.signInButton, 'talk-admin-login-sign-in-button')}
-          type="submit"
-          cStyle="black"
-          full
-        >
-          Sign In
-        </Button>
-        <p className={styles.forgotPasswordCTA}>
-          Forgot your password?{' '}
-          <a
-            href="#"
-            className={styles.forgotPasswordLink}
-            onClick={this.handleForgotPasswordLink}
+      <div className="talk-admin-login-sign-in">
+        <External slot="authExternalSignIn" />
+        <form onSubmit={this.handleSubmit}>
+          {errorMessage && <Alert>{errorMessage}</Alert>}
+          <TextField
+            id="email"
+            label="Email Address"
+            value={email}
+            onChange={this.handleEmailChange}
+          />
+          <TextField
+            id="password"
+            label="Password"
+            value={password}
+            onChange={this.handlePasswordChange}
+            type="password"
+          />
+          {requireRecaptcha && (
+            <div className={styles.recaptcha}>
+              <Recaptcha
+                ref={this.handleRecaptchaRef}
+                onVerify={this.props.onRecaptchaVerify}
+              />
+            </div>
+          )}
+          <Button
+            className={cn(
+              styles.signInButton,
+              'talk-admin-login-sign-in-button'
+            )}
+            type="submit"
+            cStyle="black"
+            full
           >
-            Request a new one.
-          </a>
-        </p>
-      </form>
+            Sign In
+          </Button>
+          <p className={styles.forgotPasswordCTA}>
+            {/* TODO: translate */}
+            Forgot your password?{' '}
+            <a
+              href="#"
+              className={styles.forgotPasswordLink}
+              onClick={this.handleForgotPasswordLink}
+            >
+              Request a new one.
+            </a>
+          </p>
+        </form>
+      </div>
     );
   }
 }
diff --git a/client/coral-admin/src/containers/SignIn.js b/client/coral-admin/src/containers/SignIn.js
index 523d81091..1af857294 100644
--- a/client/coral-admin/src/containers/SignIn.js
+++ b/client/coral-admin/src/containers/SignIn.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { withSignIn } from 'coral-framework/hocs';
+import { withSignIn, withPopupAuthHandler } from 'coral-framework/hocs';
 import { compose } from 'recompose';
 import SignIn from '../components/SignIn';
 
@@ -55,4 +55,4 @@ SignInContainer.propTypes = {
   requireRecaptcha: PropTypes.bool.isRequired,
 };
 
-export default compose(withSignIn)(SignInContainer);
+export default compose(withSignIn, withPopupAuthHandler)(SignInContainer);
diff --git a/client/coral-framework/services/postMessage.js b/client/coral-framework/services/postMessage.js
index ef9311e64..6bc18eccf 100644
--- a/client/coral-framework/services/postMessage.js
+++ b/client/coral-framework/services/postMessage.js
@@ -56,10 +56,10 @@ export function createPostMessage(origin, scope = 'client') {
       // Send the message.
       target.postMessage(msg, origin);
     },
-    subscribe: (handler, target = window) => {
+    subscribe(handler, target = window) {
       // If this handler is already attached to the target, detach it.
       if (has(listeners, [target, handler])) {
-        this.unsubscribeFromMessages(handler, target);
+        this.unsubscribe(handler, target);
       }
 
       // Wrap the listener with a origin check.
@@ -71,7 +71,7 @@ export function createPostMessage(origin, scope = 'client') {
       // Attach the listener to the target.
       target.addEventListener('message', listener);
     },
-    unsubscribe: (handler, target = window) => {
+    unsubscribe(handler, target = window) {
       if (!has(listeners, [target, handler])) {
         return;
       }
diff --git a/client/coral-framework/utils/index.js b/client/coral-framework/utils/index.js
index e30c12e06..6351c4484 100644
--- a/client/coral-framework/utils/index.js
+++ b/client/coral-framework/utils/index.js
@@ -273,3 +273,23 @@ export function translateError(error) {
   }
   return error.toString();
 }
+
+/**
+ * handlePopupAuth will optionally open a popup with the requested uri if the
+ * window is not already a popup.
+ *
+ * @param {String} uri the url to open the window? to
+ * @param {String} title the title of the new window? to open
+ * @param {String} features the features to use when opening a window?
+ */
+export function handlePopupAuth(
+  uri,
+  title = 'Login', // TODO: translate
+  features = 'menubar=0,resizable=0,width=500,height=550,top=200,left=500'
+) {
+  if (window.opener) {
+    window.location = uri;
+  } else {
+    window.open(uri, title, features);
+  }
+}
diff --git a/plugin-api/beta/client/utils/index.js b/plugin-api/beta/client/utils/index.js
index aeb9841f9..0d1893066 100644
--- a/plugin-api/beta/client/utils/index.js
+++ b/plugin-api/beta/client/utils/index.js
@@ -9,4 +9,5 @@ export {
   getDefinitionName,
   getShallowChanges,
   createDefaultResponseFragments,
+  handlePopupAuth,
 } from 'coral-framework/utils';
diff --git a/plugins/talk-plugin-facebook-auth/client/actions.js b/plugins/talk-plugin-facebook-auth/client/actions.js
index 79f2d2a6a..2f92ecfb6 100644
--- a/plugins/talk-plugin-facebook-auth/client/actions.js
+++ b/plugins/talk-plugin-facebook-auth/client/actions.js
@@ -1,3 +1,5 @@
+import { handlePopupAuth } from 'plugin-api/beta/client/utils';
+
 export const loginWithFacebook = () => (dispatch, _, { rest }) => {
-  window.location = `${rest.uri}/auth/facebook`;
+  handlePopupAuth(`${rest.uri}/auth/facebook`);
 };
diff --git a/plugins/talk-plugin-google-auth/client/actions.js b/plugins/talk-plugin-google-auth/client/actions.js
index 8b49bf39e..1856ddb54 100644
--- a/plugins/talk-plugin-google-auth/client/actions.js
+++ b/plugins/talk-plugin-google-auth/client/actions.js
@@ -1,3 +1,5 @@
+import { handlePopupAuth } from 'plugin-api/beta/client/utils';
+
 export const loginWithGoogle = () => (dispatch, _, { rest }) => {
-  window.location = `${rest.uri}/auth/google`;
+  handlePopupAuth(`${rest.uri}/auth/google`);
 };

From b73620bcb0de6ef33f10b8491e486fe9be6cfe73 Mon Sep 17 00:00:00 2001
From: Fabian Neumann <neumann@ferret-go.com>
Date: Fri, 20 Apr 2018 10:00:52 +0200
Subject: [PATCH 007/144] WIP

---
 .gitignore                                    |  1 +
 .../plugin/talk-plugin-global-switchoff.md    | 25 ++++++++
 .../client/.eslintrc.json                     | 23 ++++++++
 .../client/components/GlobalSwitchoff.js      | 59 +++++++++++++++++++
 .../client/components/styles.css              |  0
 .../client/index.js                           |  9 +++
 .../client/translations.yml                   |  8 +++
 plugins/talk-plugin-global-switchoff/index.js | 11 ++++
 .../server/index.js                           |  1 +
 .../server/resolvers.js                       | 10 ++++
 .../server/typeDefs.graphql                   | 10 ++++
 11 files changed, 157 insertions(+)
 create mode 100644 docs/source/plugin/talk-plugin-global-switchoff.md
 create mode 100644 plugins/talk-plugin-global-switchoff/client/.eslintrc.json
 create mode 100644 plugins/talk-plugin-global-switchoff/client/components/GlobalSwitchoff.js
 create mode 100644 plugins/talk-plugin-global-switchoff/client/components/styles.css
 create mode 100644 plugins/talk-plugin-global-switchoff/client/index.js
 create mode 100644 plugins/talk-plugin-global-switchoff/client/translations.yml
 create mode 100644 plugins/talk-plugin-global-switchoff/index.js
 create mode 100644 plugins/talk-plugin-global-switchoff/server/index.js
 create mode 100644 plugins/talk-plugin-global-switchoff/server/resolvers.js
 create mode 100644 plugins/talk-plugin-global-switchoff/server/typeDefs.graphql

diff --git a/.gitignore b/.gitignore
index 24022b9d7..ce5146929 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,7 @@ plugins/*
 !plugins/talk-plugin-facebook-auth
 !plugins/talk-plugin-featured-comments
 !plugins/talk-plugin-flag-details
+!plugins/talk-plugin-global-switchoff
 !plugins/talk-plugin-google-auth
 !plugins/talk-plugin-ignore-user
 !plugins/talk-plugin-like
diff --git a/docs/source/plugin/talk-plugin-global-switchoff.md b/docs/source/plugin/talk-plugin-global-switchoff.md
new file mode 100644
index 000000000..317fb4b3b
--- /dev/null
+++ b/docs/source/plugin/talk-plugin-global-switchoff.md
@@ -0,0 +1,25 @@
+---
+title: talk-plugin-global-switchoff
+permalink: /plugin/talk-plugin-global-switchoff/
+layout: plugin
+plugin:
+    name: talk-plugin-global-switchoff
+    provides:
+        - Client
+        - Server
+---
+
+Add a switch to the settings page that disables commenting globally.
+
+## Installation
+
+TBD
+
+Add `"talk-plugin-global-switchoff"` to the `plugins.json` in your Talk installation.
+This plugin provides a server and a client side implementation.
+
+## Server implementation
+
+### How does this work?
+
+TODO
diff --git a/plugins/talk-plugin-global-switchoff/client/.eslintrc.json b/plugins/talk-plugin-global-switchoff/client/.eslintrc.json
new file mode 100644
index 000000000..9fe56bd14
--- /dev/null
+++ b/plugins/talk-plugin-global-switchoff/client/.eslintrc.json
@@ -0,0 +1,23 @@
+{
+  "env": {
+    "browser": true,
+    "es6": true,
+    "mocha": true
+  },
+  "parserOptions": {
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "experimentalObjectRestSpread": true,
+      "jsx": true
+    }
+  },
+  "parser": "babel-eslint",
+  "plugins": [
+    "react"
+  ],
+  "rules": {
+    "react/jsx-uses-react": "error",
+    "react/jsx-uses-vars": "error",
+    "no-console": ["warn", { "allow": ["warn", "error"] }]
+  }
+}
diff --git a/plugins/talk-plugin-global-switchoff/client/components/GlobalSwitchoff.js b/plugins/talk-plugin-global-switchoff/client/components/GlobalSwitchoff.js
new file mode 100644
index 000000000..a5150ed10
--- /dev/null
+++ b/plugins/talk-plugin-global-switchoff/client/components/GlobalSwitchoff.js
@@ -0,0 +1,59 @@
+import React from 'react';
+import { gql } from 'react-apollo';
+import ConfigureCard from 'coral-framework/components/ConfigureCard';
+import MarkdownEditor from 'coral-framework/components/MarkdownEditor';
+import t from 'coral-framework/services/i18n';
+import { withFragments } from 'plugin-api/beta/client/hocs';
+import cn from 'classnames';
+import styles from './styles.css';
+
+const plugin = 'talk-plugin-global-switchoff';
+
+class GlobalSwitchoff extends React.Component {
+  updateGlobalSwitchoffEnable = () => {
+    const updater = {
+      globalSwitchoffEnable: {
+        $set: !this.props.settings.globalSwitchoffEnable,
+      },
+    };
+    this.props.updatePending({ updater });
+  };
+
+  updateGlobalSwitchoffMessage = () => {};
+
+  render() {
+    const { settings } = this.props;
+    return (
+      <ConfigureCard
+        checked={settings.globalSwitchoffEnable}
+        onCheckbox={this.updateGlobalSwitchoffEnable}
+        title={t(plugin + '.setting_title')}
+      >
+        <p>{t(plugin + '.setting_desc')}</p>
+        <div
+          className={cn(
+            styles.configSettingGlobalSwitchoff,
+            settings.globalSwitchoffEnable ? null : styles.hidden
+          )}
+        >
+          <MarkdownEditor
+            className={styles.descriptionBox}
+            onChange={this.updateGlobalSwitchoffMessage}
+            value={settings.globalSwitchoffMessage}
+          />
+        </div>
+      </ConfigureCard>
+    );
+  }
+}
+
+// export default GlobalSwitchoff;
+
+export default withFragments({
+  settings: gql`
+    fragment TalkPlugin_GlobalSwitchoff_settings on Settings {
+      globalSwitchoffEnable
+      globalSwitchoffMessage
+    }
+  `,
+})(GlobalSwitchoff);
diff --git a/plugins/talk-plugin-global-switchoff/client/components/styles.css b/plugins/talk-plugin-global-switchoff/client/components/styles.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/plugins/talk-plugin-global-switchoff/client/index.js b/plugins/talk-plugin-global-switchoff/client/index.js
new file mode 100644
index 000000000..de8b516e7
--- /dev/null
+++ b/plugins/talk-plugin-global-switchoff/client/index.js
@@ -0,0 +1,9 @@
+import GlobalSwitchoff from './components/GlobalSwitchoff';
+import translations from './translations.yml';
+
+export default {
+  translations,
+  slots: {
+    adminStreamSettings: [GlobalSwitchoff],
+  },
+};
diff --git a/plugins/talk-plugin-global-switchoff/client/translations.yml b/plugins/talk-plugin-global-switchoff/client/translations.yml
new file mode 100644
index 000000000..c135337f4
--- /dev/null
+++ b/plugins/talk-plugin-global-switchoff/client/translations.yml
@@ -0,0 +1,8 @@
+en:
+  talk-plugin-global-switchoff:
+    setting_title: 'Deactivate commenting globally'
+    setting_desc: 'Write a message that will be displayed while commenting is deactivated.'
+de:
+  talk-plugin-global-switchoff:
+    setting_title: 'Kommentieren global deaktivieren'
+    setting_desc: 'Verfassen Sie eine Nachricht, die angezeigt wird, solange das Kommentieren deaktiviert ist.'
diff --git a/plugins/talk-plugin-global-switchoff/index.js b/plugins/talk-plugin-global-switchoff/index.js
new file mode 100644
index 000000000..dfd1f0d04
--- /dev/null
+++ b/plugins/talk-plugin-global-switchoff/index.js
@@ -0,0 +1,11 @@
+const { readFileSync } = require('fs');
+const path = require('path');
+const resolvers = require('./server/resolvers');
+
+module.exports = {
+  typeDefs: readFileSync(
+    path.join(__dirname, 'server/typeDefs.graphql'),
+    'utf8'
+  ),
+  resolvers,
+};
diff --git a/plugins/talk-plugin-global-switchoff/server/index.js b/plugins/talk-plugin-global-switchoff/server/index.js
new file mode 100644
index 000000000..f053ebf79
--- /dev/null
+++ b/plugins/talk-plugin-global-switchoff/server/index.js
@@ -0,0 +1 @@
+module.exports = {};
diff --git a/plugins/talk-plugin-global-switchoff/server/resolvers.js b/plugins/talk-plugin-global-switchoff/server/resolvers.js
new file mode 100644
index 000000000..4e249ff3a
--- /dev/null
+++ b/plugins/talk-plugin-global-switchoff/server/resolvers.js
@@ -0,0 +1,10 @@
+const { get } = require('lodash');
+
+module.exports = {
+  Settings: {
+    globalSwitchoffEnable: settings =>
+      get(settings, 'globalSwitchoffEnable', false),
+    globalSwitchoffMessage: settings =>
+      get(settings, 'globalSwitchoffMessage', ''),
+  },
+};
diff --git a/plugins/talk-plugin-global-switchoff/server/typeDefs.graphql b/plugins/talk-plugin-global-switchoff/server/typeDefs.graphql
new file mode 100644
index 000000000..efb4b80f6
--- /dev/null
+++ b/plugins/talk-plugin-global-switchoff/server/typeDefs.graphql
@@ -0,0 +1,10 @@
+
+type Settings {
+    globalSwitchoffEnable: Boolean
+    globalSwitchoffMessage: String
+}
+
+input UpdateSettingsInput {
+    globalSwitchoffEnable: Boolean
+    globalSwitchoffMessage: String
+}

From bbd3050b95d24228a6bf50898b126b99a7a49e11 Mon Sep 17 00:00:00 2001
From: Fabian Neumann <neumann@ferret-go.com>
Date: Mon, 23 Apr 2018 12:04:53 +0200
Subject: [PATCH 008/144] Small refactoring

---
 .../client/components/GlobalSwitchoff.js            | 13 +------------
 .../client/containers/GlobalSwitchoff.js            | 12 ++++++++++++
 .../talk-plugin-global-switchoff/client/index.js    |  2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)
 create mode 100644 plugins/talk-plugin-global-switchoff/client/containers/GlobalSwitchoff.js

diff --git a/plugins/talk-plugin-global-switchoff/client/components/GlobalSwitchoff.js b/plugins/talk-plugin-global-switchoff/client/components/GlobalSwitchoff.js
index a5150ed10..d676e7531 100644
--- a/plugins/talk-plugin-global-switchoff/client/components/GlobalSwitchoff.js
+++ b/plugins/talk-plugin-global-switchoff/client/components/GlobalSwitchoff.js
@@ -1,9 +1,7 @@
 import React from 'react';
-import { gql } from 'react-apollo';
 import ConfigureCard from 'coral-framework/components/ConfigureCard';
 import MarkdownEditor from 'coral-framework/components/MarkdownEditor';
 import t from 'coral-framework/services/i18n';
-import { withFragments } from 'plugin-api/beta/client/hocs';
 import cn from 'classnames';
 import styles from './styles.css';
 
@@ -47,13 +45,4 @@ class GlobalSwitchoff extends React.Component {
   }
 }
 
-// export default GlobalSwitchoff;
-
-export default withFragments({
-  settings: gql`
-    fragment TalkPlugin_GlobalSwitchoff_settings on Settings {
-      globalSwitchoffEnable
-      globalSwitchoffMessage
-    }
-  `,
-})(GlobalSwitchoff);
+export default GlobalSwitchoff;
diff --git a/plugins/talk-plugin-global-switchoff/client/containers/GlobalSwitchoff.js b/plugins/talk-plugin-global-switchoff/client/containers/GlobalSwitchoff.js
new file mode 100644
index 000000000..b935bcb5a
--- /dev/null
+++ b/plugins/talk-plugin-global-switchoff/client/containers/GlobalSwitchoff.js
@@ -0,0 +1,12 @@
+import { gql } from 'react-apollo';
+import GlobalSwitchoff from '../components/GlobalSwitchoff';
+import { withFragments } from 'plugin-api/beta/client/hocs';
+
+export default withFragments({
+  settings: gql`
+    fragment TalkPlugin_GlobalSwitchoff_settings on Settings {
+      globalSwitchoffEnable
+      globalSwitchoffMessage
+    }
+  `,
+})(GlobalSwitchoff);
diff --git a/plugins/talk-plugin-global-switchoff/client/index.js b/plugins/talk-plugin-global-switchoff/client/index.js
index de8b516e7..c9994ce5e 100644
--- a/plugins/talk-plugin-global-switchoff/client/index.js
+++ b/plugins/talk-plugin-global-switchoff/client/index.js
@@ -1,4 +1,4 @@
-import GlobalSwitchoff from './components/GlobalSwitchoff';
+import GlobalSwitchoff from './containers/GlobalSwitchoff';
 import translations from './translations.yml';
 
 export default {

From 499030028c152969430e76039e297d01899f2eb5 Mon Sep 17 00:00:00 2001
From: Fabian Neumann <neumann@ferret-go.com>
Date: Mon, 23 Apr 2018 15:35:02 +0200
Subject: [PATCH 009/144] Add hooks to RootMutation to save our setting in the
 database.

---
 .../{client => }/.eslintrc.json                     |  0
 plugins/talk-plugin-global-switchoff/index.js       |  2 ++
 .../talk-plugin-global-switchoff/server/hooks.js    | 13 +++++++++++++
 3 files changed, 15 insertions(+)
 rename plugins/talk-plugin-global-switchoff/{client => }/.eslintrc.json (100%)
 create mode 100644 plugins/talk-plugin-global-switchoff/server/hooks.js

diff --git a/plugins/talk-plugin-global-switchoff/client/.eslintrc.json b/plugins/talk-plugin-global-switchoff/.eslintrc.json
similarity index 100%
rename from plugins/talk-plugin-global-switchoff/client/.eslintrc.json
rename to plugins/talk-plugin-global-switchoff/.eslintrc.json
diff --git a/plugins/talk-plugin-global-switchoff/index.js b/plugins/talk-plugin-global-switchoff/index.js
index dfd1f0d04..a318f8a11 100644
--- a/plugins/talk-plugin-global-switchoff/index.js
+++ b/plugins/talk-plugin-global-switchoff/index.js
@@ -1,5 +1,6 @@
 const { readFileSync } = require('fs');
 const path = require('path');
+const hooks = require('./server/hooks');
 const resolvers = require('./server/resolvers');
 
 module.exports = {
@@ -7,5 +8,6 @@ module.exports = {
     path.join(__dirname, 'server/typeDefs.graphql'),
     'utf8'
   ),
+  hooks,
   resolvers,
 };
diff --git a/plugins/talk-plugin-global-switchoff/server/hooks.js b/plugins/talk-plugin-global-switchoff/server/hooks.js
new file mode 100644
index 000000000..be0498fb6
--- /dev/null
+++ b/plugins/talk-plugin-global-switchoff/server/hooks.js
@@ -0,0 +1,13 @@
+module.exports = {
+  RootMutation: {
+    updateSettings: {
+      async pre(_, { input }) {
+        input.metadata = {
+          ...input.metadata,
+          globalSwitchoffEnable: input.globalSwitchoffEnable,
+        };
+        delete input.globalSwitchoffEnable;
+      },
+    },
+  },
+};

From fab15daacd008c2d3275e26040683b66b2a76be8 Mon Sep 17 00:00:00 2001
From: Fabian Neumann <neumann@ferret-go.com>
Date: Mon, 23 Apr 2018 17:06:46 +0200
Subject: [PATCH 010/144] Fix: use the correct keys to get the settings

---
 plugins/talk-plugin-global-switchoff/server/resolvers.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/talk-plugin-global-switchoff/server/resolvers.js b/plugins/talk-plugin-global-switchoff/server/resolvers.js
index 4e249ff3a..f28e765fc 100644
--- a/plugins/talk-plugin-global-switchoff/server/resolvers.js
+++ b/plugins/talk-plugin-global-switchoff/server/resolvers.js
@@ -3,8 +3,8 @@ const { get } = require('lodash');
 module.exports = {
   Settings: {
     globalSwitchoffEnable: settings =>
-      get(settings, 'globalSwitchoffEnable', false),
+      get(settings, 'metadata.globalSwitchoffEnable', false),
     globalSwitchoffMessage: settings =>
-      get(settings, 'globalSwitchoffMessage', ''),
+      get(settings, 'metadata.globalSwitchoffMessage', ''),
   },
 };

From 48fc3ab5db24e2a05d6faf06ef09edbdbb3baf48 Mon Sep 17 00:00:00 2001
From: Fabian Neumann <neumann@ferret-go.com>
Date: Thu, 26 Apr 2018 13:12:27 +0200
Subject: [PATCH 011/144] Move "global switchoff" code from plugin to core

---
 .gitignore                                    |  1 -
 .../Configure/components/StreamSettings.js    | 33 +++++++++++++
 .../Configure/containers/StreamSettings.js    |  2 +
 .../src/tabs/stream/components/Stream.js      | 11 ++++-
 .../src/tabs/stream/containers/Stream.js      |  2 +
 errors.js                                     | 19 ++++++++
 graph/typeDefs.graphql                        | 14 ++++++
 locales/de.yml                                |  3 ++
 locales/en.yml                                |  3 ++
 models/schema/setting.js                      |  8 ++++
 .../.eslintrc.json                            | 23 ---------
 .../client/components/GlobalSwitchoff.js      | 48 -------------------
 .../client/components/styles.css              |  0
 .../client/containers/GlobalSwitchoff.js      | 12 -----
 .../client/index.js                           |  9 ----
 .../client/translations.yml                   |  8 ----
 plugins/talk-plugin-global-switchoff/index.js | 13 -----
 .../server/hooks.js                           | 13 -----
 .../server/index.js                           |  1 -
 .../server/resolvers.js                       | 10 ----
 .../server/typeDefs.graphql                   | 10 ----
 services/moderation/index.js                  |  2 +
 .../moderation/phases/commentingDisabled.js   |  9 ++++
 services/moderation/phases/index.js           |  1 +
 24 files changed, 105 insertions(+), 150 deletions(-)
 delete mode 100644 plugins/talk-plugin-global-switchoff/.eslintrc.json
 delete mode 100644 plugins/talk-plugin-global-switchoff/client/components/GlobalSwitchoff.js
 delete mode 100644 plugins/talk-plugin-global-switchoff/client/components/styles.css
 delete mode 100644 plugins/talk-plugin-global-switchoff/client/containers/GlobalSwitchoff.js
 delete mode 100644 plugins/talk-plugin-global-switchoff/client/index.js
 delete mode 100644 plugins/talk-plugin-global-switchoff/client/translations.yml
 delete mode 100644 plugins/talk-plugin-global-switchoff/index.js
 delete mode 100644 plugins/talk-plugin-global-switchoff/server/hooks.js
 delete mode 100644 plugins/talk-plugin-global-switchoff/server/index.js
 delete mode 100644 plugins/talk-plugin-global-switchoff/server/resolvers.js
 delete mode 100644 plugins/talk-plugin-global-switchoff/server/typeDefs.graphql
 create mode 100644 services/moderation/phases/commentingDisabled.js

diff --git a/.gitignore b/.gitignore
index ce5146929..24022b9d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,7 +35,6 @@ plugins/*
 !plugins/talk-plugin-facebook-auth
 !plugins/talk-plugin-featured-comments
 !plugins/talk-plugin-flag-details
-!plugins/talk-plugin-global-switchoff
 !plugins/talk-plugin-google-auth
 !plugins/talk-plugin-ignore-user
 !plugins/talk-plugin-like
diff --git a/client/coral-admin/src/routes/Configure/components/StreamSettings.js b/client/coral-admin/src/routes/Configure/components/StreamSettings.js
index e6424848f..ce69da129 100644
--- a/client/coral-admin/src/routes/Configure/components/StreamSettings.js
+++ b/client/coral-admin/src/routes/Configure/components/StreamSettings.js
@@ -82,6 +82,20 @@ class StreamSettings extends React.Component {
     this.props.updatePending({ updater });
   };
 
+  updateGlobalSwitchoffEnable = () => {
+    const updater = {
+      globalSwitchoffEnable: {
+        $set: !this.props.settings.globalSwitchoffEnable,
+      },
+    };
+    this.props.updatePending({ updater });
+  };
+
+  updateGlobalSwitchoffMessage = value => {
+    const updater = { globalSwitchoffMessage: { $set: value } };
+    this.props.updatePending({ updater });
+  };
+
   updateAutoClose = () => {
     const updater = {
       autoCloseStream: { $set: !this.props.settings.autoCloseStream },
@@ -192,6 +206,25 @@ class StreamSettings extends React.Component {
           &nbsp;
           {t('configure.edit_comment_timeframe_text_post')}
         </ConfigureCard>
+        <ConfigureCard
+          checked={settings.globalSwitchoffEnable}
+          onCheckbox={this.updateGlobalSwitchoffEnable}
+          title={t('configure.global_switchoff_title')}
+        >
+          <p>{t('configure.global_switchoff_desc')}</p>
+          <div
+            className={cn(
+              styles.configSettingGlobalSwitchoff,
+              settings.globalSwitchoffEnable ? null : styles.hidden
+            )}
+          >
+            <MarkdownEditor
+              className={styles.descriptionBox}
+              onChange={this.updateGlobalSwitchoffMessage}
+              value={settings.globalSwitchoffMessage}
+            />
+          </div>
+        </ConfigureCard>
         <ConfigureCard
           checked={settings.autoCloseStream}
           onCheckbox={this.updateAutoClose}
diff --git a/client/coral-admin/src/routes/Configure/containers/StreamSettings.js b/client/coral-admin/src/routes/Configure/containers/StreamSettings.js
index 5bc8e69a9..6eaff0d9a 100644
--- a/client/coral-admin/src/routes/Configure/containers/StreamSettings.js
+++ b/client/coral-admin/src/routes/Configure/containers/StreamSettings.js
@@ -39,6 +39,8 @@ export default compose(
         autoCloseStream
         closedTimeout
         closedMessage
+        globalSwitchoffEnable
+        globalSwitchoffMessage
         ${getSlotFragmentSpreads(slots, 'settings')}
       }
     `,
diff --git a/client/coral-embed-stream/src/tabs/stream/components/Stream.js b/client/coral-embed-stream/src/tabs/stream/components/Stream.js
index cc4e8e939..fbe49a069 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/Stream.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/Stream.js
@@ -4,6 +4,7 @@ import StreamError from './StreamError';
 import Comment from '../containers/Comment';
 import BannedAccount from '../../../components/BannedAccount';
 import ChangeUsername from '../containers/ChangeUsername';
+import Markdown from 'coral-framework/components/Markdown';
 import Slot from 'coral-framework/components/Slot';
 import InfoBox from './InfoBox';
 import { can } from 'coral-framework/services/perms';
@@ -215,7 +216,7 @@ class Stream extends React.Component {
       currentUser,
     } = this.props;
     const { keepCommentBox } = this.state;
-    const open = !asset.isClosed;
+    const open = !(asset.isClosed || asset.settings.globalSwitchoffEnable);
 
     const banned = get(currentUser, 'status.banned.status');
     const suspensionUntil = get(currentUser, 'status.suspension.until');
@@ -293,7 +294,13 @@ class Stream extends React.Component {
             )}
           </div>
         ) : (
-          <p>{asset.settings.closedMessage}</p>
+          <div>
+            {asset.isClosed ? (
+              <p>{asset.settings.closedMessage}</p>
+            ) : (
+              <Markdown content={asset.settings.globalSwitchoffMessage} />
+            )}
+          </div>
         )}
 
         <Slot fill="stream" passthrough={slotPassthrough} />
diff --git a/client/coral-embed-stream/src/tabs/stream/containers/Stream.js b/client/coral-embed-stream/src/tabs/stream/containers/Stream.js
index f1a973f03..99878a9b9 100644
--- a/client/coral-embed-stream/src/tabs/stream/containers/Stream.js
+++ b/client/coral-embed-stream/src/tabs/stream/containers/Stream.js
@@ -434,6 +434,8 @@ const fragments = {
         questionBoxIcon
         closedTimeout
         closedMessage
+        globalSwitchoffEnable
+        globalSwitchoffMessage
         charCountEnable
         charCount
         requireEmailConfirmation
diff --git a/errors.js b/errors.js
index da1287dd3..39cb6b8ff 100644
--- a/errors.js
+++ b/errors.js
@@ -161,6 +161,24 @@ class ErrAssetCommentingClosed extends TalkError {
   }
 }
 
+// ErrCommentingDisabled is returned when a comment or action is attempted while
+// commenting has been disabled site-wide.
+class ErrCommentingDisabled extends TalkError {
+  constructor(message = null) {
+    super(
+      'asset commenting is closed',
+      {
+        status: 400,
+        translation_key: 'COMMENTING_DISABLED',
+      },
+      {
+        // Include the closedMessage in the metadata piece of the error.
+        message,
+      }
+    );
+  }
+}
+
 /**
  * ErrAuthentication is returned when there is an error authenticating and the
  * message is provided.
@@ -387,6 +405,7 @@ module.exports = {
   ErrAuthentication,
   ErrCannotIgnoreStaff,
   ErrCommentTooShort,
+  ErrCommentingDisabled,
   ErrContainsProfanity,
   ErrEditWindowHasEnded,
   ErrEmailAlreadyVerified,
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 03c97ce58..dda86291f 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -837,6 +837,13 @@ type Settings {
   # closed.
   closedMessage: String
 
+  # globalSwitchoffEnable will disable commenting site-wide.
+  globalSwitchoffEnable: Boolean
+
+  # globalSwitchoffMessage will be shown above the comment stream while
+  # commenting is disabled site-wide.
+  globalSwitchoffMessage: String
+
   # editCommentWindowLength is the length of time (in milliseconds) after a
   # comment is posted that it can still be edited by the author.
   editCommentWindowLength: Int
@@ -1300,6 +1307,13 @@ input UpdateSettingsInput {
   # closed.
   closedMessage: String
 
+  # globalSwitchoffEnable will disable commenting site-wide.
+  globalSwitchoffEnable: Boolean
+
+  # globalSwitchoffMessage will be shown above the comment stream while
+  # commenting is disabled site-wide.
+  globalSwitchoffMessage: String
+
   # charCountEnable is true when the character count restriction is enabled.
   charCountEnable: Boolean
 
diff --git a/locales/de.yml b/locales/de.yml
index d2b247fbc..00cbb007c 100644
--- a/locales/de.yml
+++ b/locales/de.yml
@@ -136,6 +136,8 @@ de:
     enable_premod_links_description: "Moderatoren müssen jeden Kommentar, der einen Link enthält, freigeben, bevor er veröffentlicht wird."
     enable_questionbox: "Stellen Sie den Lesern eine Frage"
     enable_questionbox_description: "Diese Frage erscheint am Anfang des Kommentarbereichs. Regen Sie eine Diskussion an."
+    global_switchoff_title: "Kommentieren global deaktivieren"
+    global_switchoff_desc: "Verfassen Sie eine Nachricht, die angezeigt wird, solange das Kommentieren deaktiviert ist."
     hours: Stunden
     include_comment_stream: "Einleitung zum Kommentarbereich"
     include_comment_stream_desc: "Verfassen Sie eine Einleitung, die über jedem Kommentarbereich erscheint. Nützlich z.B. für Community-Richtlinien."
@@ -223,6 +225,7 @@ de:
     LOGIN_MAXIMUM_EXCEEDED: "Sie haben zu häufig erfolglos versucht, sich anzumelden. Bitte warten Sie."
     PASSWORD_REQUIRED: "Passwort ist erforderlich"
     COMMENTING_CLOSED: "Kommentarbereich ist bereits geschlossen"
+    COMMENTING_DISABLED: "Die Kommentarfunktion ist derzeit abgeschaltet"
     NOT_FOUND: "Ressource nicht gefunden"
     ALREADY_EXISTS: "Ressource existiert bereits"
     INVALID_ASSET_URL: "Asset-URL ist ungültig"
diff --git a/locales/en.yml b/locales/en.yml
index e293fb40b..eae0e43c9 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -140,6 +140,8 @@ en:
     enable_premod_links_description: "Moderators must approve any comment containing a link before it is published."
     enable_questionbox: "Ask Readers a Question"
     enable_questionbox_description: "This question will appear at the top of this comment stream. Ask readers about a certain issue in the article or pose discussion questions etc."
+    global_switchoff_title: "Deactivate commenting site-wide"
+    global_switchoff_desc: "Write a message that will be displayed while commenting is deactivated."
     hours: Hours
     include_comment_stream: "Include Comment Stream Description for Readers"
     include_comment_stream_desc: "Write a message to be added to the top of your comment stream. Pose a topic include community guidelines etc."
@@ -247,6 +249,7 @@ en:
     LOGIN_MAXIMUM_EXCEEDED: "You have made too many unsuccessful password attempts. Please wait."
     PASSWORD_REQUIRED: "Must input a password"
     COMMENTING_CLOSED: "Commenting is already closed"
+    COMMENTING_DISABLED: "Commenting is currently disabled on this site"
     NOT_FOUND: "Resource not found"
     ALREADY_EXISTS: "Resource already exists"
     INVALID_ASSET_URL: "Assert URL is invalid"
diff --git a/models/schema/setting.js b/models/schema/setting.js
index eb9dc76d1..a896c797e 100644
--- a/models/schema/setting.js
+++ b/models/schema/setting.js
@@ -66,6 +66,14 @@ const Setting = new Schema(
       type: String,
       default: 'Expired',
     },
+    globalSwitchoffEnable: {
+      type: Boolean,
+      default: false,
+    },
+    globalSwitchoffMessage: {
+      type: String,
+      default: '',
+    },
     wordlist: {
       banned: {
         type: Array,
diff --git a/plugins/talk-plugin-global-switchoff/.eslintrc.json b/plugins/talk-plugin-global-switchoff/.eslintrc.json
deleted file mode 100644
index 9fe56bd14..000000000
--- a/plugins/talk-plugin-global-switchoff/.eslintrc.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "env": {
-    "browser": true,
-    "es6": true,
-    "mocha": true
-  },
-  "parserOptions": {
-    "sourceType": "module",
-    "ecmaFeatures": {
-      "experimentalObjectRestSpread": true,
-      "jsx": true
-    }
-  },
-  "parser": "babel-eslint",
-  "plugins": [
-    "react"
-  ],
-  "rules": {
-    "react/jsx-uses-react": "error",
-    "react/jsx-uses-vars": "error",
-    "no-console": ["warn", { "allow": ["warn", "error"] }]
-  }
-}
diff --git a/plugins/talk-plugin-global-switchoff/client/components/GlobalSwitchoff.js b/plugins/talk-plugin-global-switchoff/client/components/GlobalSwitchoff.js
deleted file mode 100644
index d676e7531..000000000
--- a/plugins/talk-plugin-global-switchoff/client/components/GlobalSwitchoff.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import React from 'react';
-import ConfigureCard from 'coral-framework/components/ConfigureCard';
-import MarkdownEditor from 'coral-framework/components/MarkdownEditor';
-import t from 'coral-framework/services/i18n';
-import cn from 'classnames';
-import styles from './styles.css';
-
-const plugin = 'talk-plugin-global-switchoff';
-
-class GlobalSwitchoff extends React.Component {
-  updateGlobalSwitchoffEnable = () => {
-    const updater = {
-      globalSwitchoffEnable: {
-        $set: !this.props.settings.globalSwitchoffEnable,
-      },
-    };
-    this.props.updatePending({ updater });
-  };
-
-  updateGlobalSwitchoffMessage = () => {};
-
-  render() {
-    const { settings } = this.props;
-    return (
-      <ConfigureCard
-        checked={settings.globalSwitchoffEnable}
-        onCheckbox={this.updateGlobalSwitchoffEnable}
-        title={t(plugin + '.setting_title')}
-      >
-        <p>{t(plugin + '.setting_desc')}</p>
-        <div
-          className={cn(
-            styles.configSettingGlobalSwitchoff,
-            settings.globalSwitchoffEnable ? null : styles.hidden
-          )}
-        >
-          <MarkdownEditor
-            className={styles.descriptionBox}
-            onChange={this.updateGlobalSwitchoffMessage}
-            value={settings.globalSwitchoffMessage}
-          />
-        </div>
-      </ConfigureCard>
-    );
-  }
-}
-
-export default GlobalSwitchoff;
diff --git a/plugins/talk-plugin-global-switchoff/client/components/styles.css b/plugins/talk-plugin-global-switchoff/client/components/styles.css
deleted file mode 100644
index e69de29bb..000000000
diff --git a/plugins/talk-plugin-global-switchoff/client/containers/GlobalSwitchoff.js b/plugins/talk-plugin-global-switchoff/client/containers/GlobalSwitchoff.js
deleted file mode 100644
index b935bcb5a..000000000
--- a/plugins/talk-plugin-global-switchoff/client/containers/GlobalSwitchoff.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { gql } from 'react-apollo';
-import GlobalSwitchoff from '../components/GlobalSwitchoff';
-import { withFragments } from 'plugin-api/beta/client/hocs';
-
-export default withFragments({
-  settings: gql`
-    fragment TalkPlugin_GlobalSwitchoff_settings on Settings {
-      globalSwitchoffEnable
-      globalSwitchoffMessage
-    }
-  `,
-})(GlobalSwitchoff);
diff --git a/plugins/talk-plugin-global-switchoff/client/index.js b/plugins/talk-plugin-global-switchoff/client/index.js
deleted file mode 100644
index c9994ce5e..000000000
--- a/plugins/talk-plugin-global-switchoff/client/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import GlobalSwitchoff from './containers/GlobalSwitchoff';
-import translations from './translations.yml';
-
-export default {
-  translations,
-  slots: {
-    adminStreamSettings: [GlobalSwitchoff],
-  },
-};
diff --git a/plugins/talk-plugin-global-switchoff/client/translations.yml b/plugins/talk-plugin-global-switchoff/client/translations.yml
deleted file mode 100644
index c135337f4..000000000
--- a/plugins/talk-plugin-global-switchoff/client/translations.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-en:
-  talk-plugin-global-switchoff:
-    setting_title: 'Deactivate commenting globally'
-    setting_desc: 'Write a message that will be displayed while commenting is deactivated.'
-de:
-  talk-plugin-global-switchoff:
-    setting_title: 'Kommentieren global deaktivieren'
-    setting_desc: 'Verfassen Sie eine Nachricht, die angezeigt wird, solange das Kommentieren deaktiviert ist.'
diff --git a/plugins/talk-plugin-global-switchoff/index.js b/plugins/talk-plugin-global-switchoff/index.js
deleted file mode 100644
index a318f8a11..000000000
--- a/plugins/talk-plugin-global-switchoff/index.js
+++ /dev/null
@@ -1,13 +0,0 @@
-const { readFileSync } = require('fs');
-const path = require('path');
-const hooks = require('./server/hooks');
-const resolvers = require('./server/resolvers');
-
-module.exports = {
-  typeDefs: readFileSync(
-    path.join(__dirname, 'server/typeDefs.graphql'),
-    'utf8'
-  ),
-  hooks,
-  resolvers,
-};
diff --git a/plugins/talk-plugin-global-switchoff/server/hooks.js b/plugins/talk-plugin-global-switchoff/server/hooks.js
deleted file mode 100644
index be0498fb6..000000000
--- a/plugins/talk-plugin-global-switchoff/server/hooks.js
+++ /dev/null
@@ -1,13 +0,0 @@
-module.exports = {
-  RootMutation: {
-    updateSettings: {
-      async pre(_, { input }) {
-        input.metadata = {
-          ...input.metadata,
-          globalSwitchoffEnable: input.globalSwitchoffEnable,
-        };
-        delete input.globalSwitchoffEnable;
-      },
-    },
-  },
-};
diff --git a/plugins/talk-plugin-global-switchoff/server/index.js b/plugins/talk-plugin-global-switchoff/server/index.js
deleted file mode 100644
index f053ebf79..000000000
--- a/plugins/talk-plugin-global-switchoff/server/index.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = {};
diff --git a/plugins/talk-plugin-global-switchoff/server/resolvers.js b/plugins/talk-plugin-global-switchoff/server/resolvers.js
deleted file mode 100644
index f28e765fc..000000000
--- a/plugins/talk-plugin-global-switchoff/server/resolvers.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const { get } = require('lodash');
-
-module.exports = {
-  Settings: {
-    globalSwitchoffEnable: settings =>
-      get(settings, 'metadata.globalSwitchoffEnable', false),
-    globalSwitchoffMessage: settings =>
-      get(settings, 'metadata.globalSwitchoffMessage', ''),
-  },
-};
diff --git a/plugins/talk-plugin-global-switchoff/server/typeDefs.graphql b/plugins/talk-plugin-global-switchoff/server/typeDefs.graphql
deleted file mode 100644
index efb4b80f6..000000000
--- a/plugins/talk-plugin-global-switchoff/server/typeDefs.graphql
+++ /dev/null
@@ -1,10 +0,0 @@
-
-type Settings {
-    globalSwitchoffEnable: Boolean
-    globalSwitchoffMessage: String
-}
-
-input UpdateSettingsInput {
-    globalSwitchoffEnable: Boolean
-    globalSwitchoffMessage: String
-}
diff --git a/services/moderation/index.js b/services/moderation/index.js
index 27346e620..cc3a74a73 100644
--- a/services/moderation/index.js
+++ b/services/moderation/index.js
@@ -6,6 +6,7 @@ const {
   wordlist,
   commentLength,
   assetClosed,
+  commentingDisabled,
   karma,
   staff,
   links,
@@ -36,6 +37,7 @@ const applyStatus = status => () => ({ status });
 const phases = [
   commentLength,
   assetClosed,
+  commentingDisabled,
   wordlist,
   staff,
   links,
diff --git a/services/moderation/phases/commentingDisabled.js b/services/moderation/phases/commentingDisabled.js
new file mode 100644
index 000000000..8c62d5d98
--- /dev/null
+++ b/services/moderation/phases/commentingDisabled.js
@@ -0,0 +1,9 @@
+const { ErrCommentingDisabled } = require('../../../errors');
+
+// This phase checks to see if commenting is site-wide disabled.
+module.exports = (ctx, comment, { asset }) => {
+  // Check to see if the asset has closed commenting...
+  if (asset.settings.globalSwitchoffEnable) {
+    throw new ErrCommentingDisabled(asset.settings.globalSwitchoffMessage);
+  }
+};
diff --git a/services/moderation/phases/index.js b/services/moderation/phases/index.js
index a1c2e7bf5..425c57197 100644
--- a/services/moderation/phases/index.js
+++ b/services/moderation/phases/index.js
@@ -1,6 +1,7 @@
 module.exports.wordlist = require('./wordlist');
 module.exports.commentLength = require('./commentLength');
 module.exports.assetClosed = require('./assetClosed');
+module.exports.commentingDisabled = require('./commentingDisabled');
 module.exports.karma = require('./karma');
 module.exports.staff = require('./staff');
 module.exports.links = require('./links');

From f28a3f2f4e99012171b969d9ad3cfe5ec90fdfef Mon Sep 17 00:00:00 2001
From: Fabian Neumann <neumann@ferret-go.com>
Date: Thu, 26 Apr 2018 13:49:38 +0200
Subject: [PATCH 012/144] Add test case: err if trying to comment while it's
 disabled

---
 test/server/graph/mutations/createComment.js | 48 ++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/test/server/graph/mutations/createComment.js b/test/server/graph/mutations/createComment.js
index fbbbf4d38..373045efc 100644
--- a/test/server/graph/mutations/createComment.js
+++ b/test/server/graph/mutations/createComment.js
@@ -179,6 +179,54 @@ describe('graph.mutations.createComment', () => {
     });
   });
 
+  describe('assets while commenting is disabled', () => {
+    [
+      {
+        disabled: false,
+        error: null,
+      },
+      {
+        disabled: true,
+        error: 'COMMENTING_DISABLED',
+      },
+    ].forEach(({ disabled, error }) => {
+      describe(`commentingDisabled=${disabled}`, () => {
+        beforeEach(() =>
+          AssetModel.create({
+            id: '123',
+            settings: { globalSwitchoffEnable: disabled },
+          })
+        );
+
+        it(
+          error ? 'does not create the comment' : 'creates the comment',
+          () => {
+            const context = new Context({ user: new UserModel({}) });
+
+            return graphql(schema, query, {}, context).then(
+              ({ data, errors }) => {
+                expect(errors).to.be.undefined;
+                if (error) {
+                  expect(data.createComment).to.have.property('comment').null;
+                  expect(data.createComment).to.have.property('errors').not
+                    .null;
+                  expect(data.createComment.errors[0]).to.have.property(
+                    'translation_key',
+                    error
+                  );
+                } else {
+                  expect(data.createComment).to.have.property('comment').not
+                    .null;
+                  expect(data.createComment).to.have.property('errors').null;
+                }
+              }
+            );
+          }
+        );
+      });
+    });
+  });
+
   describe('comments made with different asset moderation settings', () => {
     [
       { moderation: 'PRE', status: 'PREMOD' },

From d7313570019385e2922ddfdbfcac74ad9cf54447 Mon Sep 17 00:00:00 2001
From: Fabian Neumann <neumann@ferret-go.com>
Date: Fri, 11 May 2018 12:20:26 +0200
Subject: [PATCH 013/144] Remove plugin docs for global-switchoff. Not a plugin
 anymore.

---
 .../plugin/talk-plugin-global-switchoff.md    | 25 -------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 docs/source/plugin/talk-plugin-global-switchoff.md

diff --git a/docs/source/plugin/talk-plugin-global-switchoff.md b/docs/source/plugin/talk-plugin-global-switchoff.md
deleted file mode 100644
index 317fb4b3b..000000000
--- a/docs/source/plugin/talk-plugin-global-switchoff.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-title: talk-plugin-global-switchoff
-permalink: /plugin/talk-plugin-global-switchoff/
-layout: plugin
-plugin:
-    name: talk-plugin-global-switchoff
-    provides:
-        - Client
-        - Server
----
-
-Add a switch to the settings page that disables commenting globally.
-
-## Installation
-
-TBD
-
-Add `"talk-plugin-global-switchoff"` to the `plugins.json` in your Talk installation.
-This plugin provides a server and a client side implementation.
-
-## Server implementation
-
-### How does this work?
-
-TODO

From bae20c38ec9fcc27d3d90144d06081ceea9049d9 Mon Sep 17 00:00:00 2001
From: Fabian Neumann <neumann@ferret-go.com>
Date: Fri, 11 May 2018 12:21:13 +0200
Subject: [PATCH 014/144] Rename globalSwitchoff to disableCommenting.

---
 .../Configure/components/StreamSettings.js    | 26 +++++++++----------
 .../Configure/containers/StreamSettings.js    |  4 +--
 .../src/tabs/stream/components/Stream.js      |  4 +--
 .../src/tabs/stream/containers/Stream.js      |  4 +--
 graph/typeDefs.graphql                        | 16 ++++++------
 locales/de.yml                                |  4 +--
 locales/en.yml                                |  4 +--
 models/schema/setting.js                      |  4 +--
 .../moderation/phases/commentingDisabled.js   |  4 +--
 test/server/graph/mutations/createComment.js  |  2 +-
 10 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/client/coral-admin/src/routes/Configure/components/StreamSettings.js b/client/coral-admin/src/routes/Configure/components/StreamSettings.js
index ce69da129..1f661fd72 100644
--- a/client/coral-admin/src/routes/Configure/components/StreamSettings.js
+++ b/client/coral-admin/src/routes/Configure/components/StreamSettings.js
@@ -82,17 +82,17 @@ class StreamSettings extends React.Component {
     this.props.updatePending({ updater });
   };
 
-  updateGlobalSwitchoffEnable = () => {
+  updateDisableCommenting = () => {
     const updater = {
-      globalSwitchoffEnable: {
-        $set: !this.props.settings.globalSwitchoffEnable,
+      disableCommenting: {
+        $set: !this.props.settings.disableCommenting,
       },
     };
     this.props.updatePending({ updater });
   };
 
-  updateGlobalSwitchoffMessage = value => {
-    const updater = { globalSwitchoffMessage: { $set: value } };
+  updateDisableCommentingMessage = value => {
+    const updater = { disableCommentingMessage: { $set: value } };
     this.props.updatePending({ updater });
   };
 
@@ -207,21 +207,21 @@ class StreamSettings extends React.Component {
           {t('configure.edit_comment_timeframe_text_post')}
         </ConfigureCard>
         <ConfigureCard
-          checked={settings.globalSwitchoffEnable}
-          onCheckbox={this.updateGlobalSwitchoffEnable}
-          title={t('configure.global_switchoff_title')}
+          checked={settings.disableCommenting}
+          onCheckbox={this.updateDisableCommenting}
+          title={t('configure.disable_commenting_title')}
         >
-          <p>{t('configure.global_switchoff_desc')}</p>
+          <p>{t('configure.disable_commenting_desc')}</p>
           <div
             className={cn(
-              styles.configSettingGlobalSwitchoff,
-              settings.globalSwitchoffEnable ? null : styles.hidden
+              styles.configSettingDisableCommenting,
+              settings.disableCommenting ? null : styles.hidden
             )}
           >
             <MarkdownEditor
               className={styles.descriptionBox}
-              onChange={this.updateGlobalSwitchoffMessage}
-              value={settings.globalSwitchoffMessage}
+              onChange={this.updateDisableCommentingMessage}
+              value={settings.disableCommentingMessage}
             />
           </div>
         </ConfigureCard>
diff --git a/client/coral-admin/src/routes/Configure/containers/StreamSettings.js b/client/coral-admin/src/routes/Configure/containers/StreamSettings.js
index 6eaff0d9a..faffb1aec 100644
--- a/client/coral-admin/src/routes/Configure/containers/StreamSettings.js
+++ b/client/coral-admin/src/routes/Configure/containers/StreamSettings.js
@@ -39,8 +39,8 @@ export default compose(
         autoCloseStream
         closedTimeout
         closedMessage
-        globalSwitchoffEnable
-        globalSwitchoffMessage
+        disableCommenting
+        disableCommentingMessage
         ${getSlotFragmentSpreads(slots, 'settings')}
       }
     `,
diff --git a/client/coral-embed-stream/src/tabs/stream/components/Stream.js b/client/coral-embed-stream/src/tabs/stream/components/Stream.js
index fbe49a069..2b7396720 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/Stream.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/Stream.js
@@ -216,7 +216,7 @@ class Stream extends React.Component {
       currentUser,
     } = this.props;
     const { keepCommentBox } = this.state;
-    const open = !(asset.isClosed || asset.settings.globalSwitchoffEnable);
+    const open = !(asset.isClosed || asset.settings.disableCommenting);
 
     const banned = get(currentUser, 'status.banned.status');
     const suspensionUntil = get(currentUser, 'status.suspension.until');
@@ -298,7 +298,7 @@ class Stream extends React.Component {
             {asset.isClosed ? (
               <p>{asset.settings.closedMessage}</p>
             ) : (
-              <Markdown content={asset.settings.globalSwitchoffMessage} />
+              <Markdown content={asset.settings.disableCommentingMessage} />
             )}
           </div>
         )}
diff --git a/client/coral-embed-stream/src/tabs/stream/containers/Stream.js b/client/coral-embed-stream/src/tabs/stream/containers/Stream.js
index 99878a9b9..d6ca27558 100644
--- a/client/coral-embed-stream/src/tabs/stream/containers/Stream.js
+++ b/client/coral-embed-stream/src/tabs/stream/containers/Stream.js
@@ -434,8 +434,8 @@ const fragments = {
         questionBoxIcon
         closedTimeout
         closedMessage
-        globalSwitchoffEnable
-        globalSwitchoffMessage
+        disableCommenting
+        disableCommentingMessage
         charCountEnable
         charCount
         requireEmailConfirmation
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index dda86291f..07947af6e 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -837,12 +837,12 @@ type Settings {
   # closed.
   closedMessage: String
 
-  # globalSwitchoffEnable will disable commenting site-wide.
-  globalSwitchoffEnable: Boolean
+  # disableCommenting will disable commenting site-wide.
+  disableCommenting: Boolean
 
-  # globalSwitchoffMessage will be shown above the comment stream while
+  # disableCommentingMessage will be shown above the comment stream while
   # commenting is disabled site-wide.
-  globalSwitchoffMessage: String
+  disableCommentingMessage: String
 
   # editCommentWindowLength is the length of time (in milliseconds) after a
   # comment is posted that it can still be edited by the author.
@@ -1307,12 +1307,12 @@ input UpdateSettingsInput {
   # closed.
   closedMessage: String
 
-  # globalSwitchoffEnable will disable commenting site-wide.
-  globalSwitchoffEnable: Boolean
+  # disableCommenting will disable commenting site-wide.
+  disableCommenting: Boolean
 
-  # globalSwitchoffMessage will be shown above the comment stream while
+  # disableCommentingMessage will be shown above the comment stream while
   # commenting is disabled site-wide.
-  globalSwitchoffMessage: String
+  disableCommentingMessage: String
 
   # charCountEnable is true when the character count restriction is enabled.
   charCountEnable: Boolean
diff --git a/locales/de.yml b/locales/de.yml
index 00cbb007c..15404856c 100644
--- a/locales/de.yml
+++ b/locales/de.yml
@@ -121,6 +121,8 @@ de:
     custom_css_url_desc: "URL eines CSS-Stylesheets zum Überschreiben des Standard-Designs"
     days: Tage
     description: "Als Administrator können Sie die Einstellungen für den Kommentarbereich dieses Artikels anpassen:"
+    disable_commenting_title: "Kommentieren global deaktivieren"
+    disable_commenting_desc: "Verfassen Sie eine Nachricht, die angezeigt wird, solange das Kommentieren deaktiviert ist."
     domain_list_text: "Geben Sie Domains an, für die diese Talk-Instanz freigegeben werden soll, z.B. für lokale Test- oder Produktionsumgebungen (Bsp.: localhost:3000 staging.domain.com domain.com)."
     domain_list_title: "Zugelassene Domains"
     edit_comment_timeframe_heading: "Zeitlimit zur Bearbeitung von Kommentaren"
@@ -136,8 +138,6 @@ de:
     enable_premod_links_description: "Moderatoren müssen jeden Kommentar, der einen Link enthält, freigeben, bevor er veröffentlicht wird."
     enable_questionbox: "Stellen Sie den Lesern eine Frage"
     enable_questionbox_description: "Diese Frage erscheint am Anfang des Kommentarbereichs. Regen Sie eine Diskussion an."
-    global_switchoff_title: "Kommentieren global deaktivieren"
-    global_switchoff_desc: "Verfassen Sie eine Nachricht, die angezeigt wird, solange das Kommentieren deaktiviert ist."
     hours: Stunden
     include_comment_stream: "Einleitung zum Kommentarbereich"
     include_comment_stream_desc: "Verfassen Sie eine Einleitung, die über jedem Kommentarbereich erscheint. Nützlich z.B. für Community-Richtlinien."
diff --git a/locales/en.yml b/locales/en.yml
index eae0e43c9..283ec4301 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -124,6 +124,8 @@ en:
     custom_css_url_desc: "URL of a CSS stylesheet that will override default Embed Stream styles. Can be internal or external."
     days: Days
     description: "Change the comment settings on this story."
+    disable_commenting_title: "Deactivate commenting site-wide"
+    disable_commenting_desc: "Write a message that will be displayed while commenting is deactivated."
     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)."
     domain_list_title: "Permitted Domains"
     edit_info: "Edit Info"
@@ -140,8 +142,6 @@ en:
     enable_premod_links_description: "Moderators must approve any comment containing a link before it is published."
     enable_questionbox: "Ask Readers a Question"
     enable_questionbox_description: "This question will appear at the top of this comment stream. Ask readers about a certain issue in the article or pose discussion questions etc."
-    global_switchoff_title: "Deactivate commenting site-wide"
-    global_switchoff_desc: "Write a message that will be displayed while commenting is deactivated."
     hours: Hours
     include_comment_stream: "Include Comment Stream Description for Readers"
     include_comment_stream_desc: "Write a message to be added to the top of your comment stream. Pose a topic include community guidelines etc."
diff --git a/models/schema/setting.js b/models/schema/setting.js
index a896c797e..d75bed29e 100644
--- a/models/schema/setting.js
+++ b/models/schema/setting.js
@@ -66,11 +66,11 @@ const Setting = new Schema(
       type: String,
       default: 'Expired',
     },
-    globalSwitchoffEnable: {
+    disableCommenting: {
       type: Boolean,
       default: false,
     },
-    globalSwitchoffMessage: {
+    disableCommentingMessage: {
       type: String,
       default: '',
     },
diff --git a/services/moderation/phases/commentingDisabled.js b/services/moderation/phases/commentingDisabled.js
index 8c62d5d98..060da473c 100644
--- a/services/moderation/phases/commentingDisabled.js
+++ b/services/moderation/phases/commentingDisabled.js
@@ -3,7 +3,7 @@ const { ErrCommentingDisabled } = require('../../../errors');
 // This phase checks to see if commenting is site-wide disabled.
 module.exports = (ctx, comment, { asset }) => {
   // Check to see if the asset has closed commenting...
-  if (asset.settings.globalSwitchoffEnable) {
-    throw new ErrCommentingDisabled(asset.settings.globalSwitchoffMessage);
+  if (asset.settings.disableCommenting) {
+    throw new ErrCommentingDisabled(asset.settings.disableCommentingMessage);
   }
 };
diff --git a/test/server/graph/mutations/createComment.js b/test/server/graph/mutations/createComment.js
index 373045efc..662404bf2 100644
--- a/test/server/graph/mutations/createComment.js
+++ b/test/server/graph/mutations/createComment.js
@@ -194,7 +194,7 @@ describe('graph.mutations.createComment', () => {
         beforeEach(() =>
           AssetModel.create({
             id: '123',
-            settings: { globalSwitchoffEnable: disabled },
+            settings: { disableCommenting: disabled },
           })
         );
 

From 1236e7a5048385f1c9dc7e8ddd42713fb53fc9ed Mon Sep 17 00:00:00 2001
From: Fabian Neumann <neumann@ferret-go.com>
Date: Fri, 11 May 2018 12:52:44 +0200
Subject: [PATCH 015/144] Disable/hide the reply buttons when commenting is
 disabled.

---
 .../coral-embed-stream/src/tabs/stream/components/Stream.js   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/coral-embed-stream/src/tabs/stream/components/Stream.js b/client/coral-embed-stream/src/tabs/stream/components/Stream.js
index 2b7396720..a07f8ff8b 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/Stream.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/Stream.js
@@ -182,7 +182,9 @@ class Stream extends React.Component {
                 setActiveReplyBox={setActiveReplyBox}
                 activeReplyBox={activeReplyBox}
                 notify={notify}
-                disableReply={asset.isClosed}
+                disableReply={
+                  asset.isClosed || asset.settings.disableCommenting
+                }
                 postComment={postComment}
                 currentUser={currentUser}
                 postFlag={postFlag}

From bde1dff33b4868de902891e07c45c54635574f39 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 11 May 2018 14:45:03 -0600
Subject: [PATCH 016/144] changed to seperate slot

---
 client/coral-admin/src/components/SignIn.js       | 2 +-
 plugins/talk-plugin-facebook-auth/client/index.js | 1 +
 plugins/talk-plugin-google-auth/client/index.js   | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/coral-admin/src/components/SignIn.js b/client/coral-admin/src/components/SignIn.js
index ddd69d3ac..a067ace1d 100644
--- a/client/coral-admin/src/components/SignIn.js
+++ b/client/coral-admin/src/components/SignIn.js
@@ -35,7 +35,7 @@ class SignIn extends React.Component {
     const { email, password, errorMessage, requireRecaptcha } = this.props;
     return (
       <div className="talk-admin-login-sign-in">
-        <External slot="authExternalSignIn" />
+        <External slot="authExternalAdminSignIn" />
         <form onSubmit={this.handleSubmit}>
           {errorMessage && <Alert>{errorMessage}</Alert>}
           <TextField
diff --git a/plugins/talk-plugin-facebook-auth/client/index.js b/plugins/talk-plugin-facebook-auth/client/index.js
index cb8a8f059..cf2ac32ce 100644
--- a/plugins/talk-plugin-facebook-auth/client/index.js
+++ b/plugins/talk-plugin-facebook-auth/client/index.js
@@ -5,6 +5,7 @@ import translations from './translations.yml';
 export default {
   translations,
   slots: {
+    authExternalAdminSignIn: [SignIn],
     authExternalSignIn: [SignIn],
     authExternalSignUp: [SignUp],
   },
diff --git a/plugins/talk-plugin-google-auth/client/index.js b/plugins/talk-plugin-google-auth/client/index.js
index cb8a8f059..cf2ac32ce 100644
--- a/plugins/talk-plugin-google-auth/client/index.js
+++ b/plugins/talk-plugin-google-auth/client/index.js
@@ -5,6 +5,7 @@ import translations from './translations.yml';
 export default {
   translations,
   slots: {
+    authExternalAdminSignIn: [SignIn],
     authExternalSignIn: [SignIn],
     authExternalSignUp: [SignUp],
   },

From 36063b459e8719c7396be1f3f77c3310c66effae Mon Sep 17 00:00:00 2001
From: Fabian Neumann <neumann@ferret-go.com>
Date: Mon, 14 May 2018 13:57:46 +0200
Subject: [PATCH 017/144] Add new slot 'commentTombstone'.

With this slot plugins can override the default tombstone for deleted
comments.
---
 .../src/tabs/stream/components/Comment.js          | 14 +++++++++++++-
 .../src/tabs/stream/components/CommentTombstone.js |  1 +
 .../src/tabs/stream/containers/Comment.js          |  1 +
 docs/source/api/slots.md                           |  1 +
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/client/coral-embed-stream/src/tabs/stream/components/Comment.js b/client/coral-embed-stream/src/tabs/stream/components/Comment.js
index 32778f7ea..3c840734e 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/Comment.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/Comment.js
@@ -745,10 +745,22 @@ export default class Comment extends React.Component {
 
     const id = `c_${comment.id}`;
 
+    // props that are passed down the slots.
+    const slotPassthrough = {
+      action: 'deleted',
+      comment,
+    };
+
     return (
       <div className={rootClassName} id={id}>
         {isCommentDeleted(comment) ? (
-          <CommentTombstone action="deleted" />
+          <Slot
+            fill="commentTombstone"
+            className="talk-stream-comment-tombstone"
+            defaultComponent={CommentTombstone}
+            size={1}
+            passthrough={slotPassthrough}
+          />
         ) : (
           <div>
             {this.renderComment()}
diff --git a/client/coral-embed-stream/src/tabs/stream/components/CommentTombstone.js b/client/coral-embed-stream/src/tabs/stream/components/CommentTombstone.js
index 95184dffd..e08f45d95 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/CommentTombstone.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/CommentTombstone.js
@@ -39,6 +39,7 @@ class CommentTombstone extends React.Component {
 
 CommentTombstone.propTypes = {
   action: PropTypes.string,
+  comment: PropTypes.object,
   onUndo: PropTypes.func,
 };
 
diff --git a/client/coral-embed-stream/src/tabs/stream/containers/Comment.js b/client/coral-embed-stream/src/tabs/stream/containers/Comment.js
index dca7fadaa..028d6a478 100644
--- a/client/coral-embed-stream/src/tabs/stream/containers/Comment.js
+++ b/client/coral-embed-stream/src/tabs/stream/containers/Comment.js
@@ -24,6 +24,7 @@ const slots = [
   'commentAuthorName',
   'commentAuthorTags',
   'commentTimestamp',
+  'commentTombstone',
   'commentContent',
 ];
 
diff --git a/docs/source/api/slots.md b/docs/source/api/slots.md
index a2e7cc04d..662a025e0 100644
--- a/docs/source/api/slots.md
+++ b/docs/source/api/slots.md
@@ -99,6 +99,7 @@ You won't have to use this to build plugins, but it's helpful to find where to e
 * `commentReactions`
 * `commentActions`
 * `commentInputArea`
+* `commentTombstone`
 
 * `draftArea`
 * `streamSettings`

From 8e392ef32d454c4aadafb9598010a69da3253235 Mon Sep 17 00:00:00 2001
From: Fabian Neumann <neumann@ferret-go.com>
Date: Mon, 14 May 2018 15:01:51 +0200
Subject: [PATCH 018/144] Remove superfluous className

---
 client/coral-embed-stream/src/tabs/stream/components/Comment.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/coral-embed-stream/src/tabs/stream/components/Comment.js b/client/coral-embed-stream/src/tabs/stream/components/Comment.js
index 3c840734e..63740764f 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/Comment.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/Comment.js
@@ -756,7 +756,6 @@ export default class Comment extends React.Component {
         {isCommentDeleted(comment) ? (
           <Slot
             fill="commentTombstone"
-            className="talk-stream-comment-tombstone"
             defaultComponent={CommentTombstone}
             size={1}
             passthrough={slotPassthrough}

From 0b407d516b30efbb2937814aca879645c167394b Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Tue, 15 May 2018 15:51:14 -0600
Subject: [PATCH 019/144] copy updates

---
 .../client/components/Profile.js               | 18 ++++++++++++++----
 .../talk-plugin-local-auth/translations.yml    |  6 ++++--
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/plugins/talk-plugin-local-auth/client/components/Profile.js b/plugins/talk-plugin-local-auth/client/components/Profile.js
index 8484fa2b8..caa09543b 100644
--- a/plugins/talk-plugin-local-auth/client/components/Profile.js
+++ b/plugins/talk-plugin-local-auth/client/components/Profile.js
@@ -223,11 +223,21 @@ class Profile extends React.Component {
                   disabled={!usernameCanBeUpdated}
                   columnDisplay
                 >
-                  <span className={styles.bottomText}>
-                    {t(
-                      'talk-plugin-local-auth.change_username.change_username_note'
+                  <div className={styles.bottomText}>
+                    <span>
+                      {t(
+                        'talk-plugin-local-auth.change_username.change_username_note'
+                      )}
+                    </span>
+                    {!usernameCanBeUpdated && (
+                      <b>
+                        {' '}
+                        {t(
+                          'talk-plugin-local-auth.change_username.is_not_eligible'
+                        )}
+                      </b>
                     )}
-                  </span>
+                  </div>
                 </InputField>
                 <InputField
                   icon="email"
diff --git a/plugins/talk-plugin-local-auth/translations.yml b/plugins/talk-plugin-local-auth/translations.yml
index 7f67e33bd..ae89039c3 100644
--- a/plugins/talk-plugin-local-auth/translations.yml
+++ b/plugins/talk-plugin-local-auth/translations.yml
@@ -19,7 +19,8 @@ en:
       changed_password_msg: "Changed Password - Your password has been successfully changed"
       forgot_password_sent: "Forgot Password - We sent you an email to recover your password"
     change_username:
-      change_username_note: "Usernames can only be changed once every 14 days. Your username is not currently eligible to be updated."
+      change_username_note: "Usernames can only be changed once every 14 days."
+      is_not_eligible: "You cannot currently change your username."
       save: "Save"
       edit_profile: "Edit Profile"
       cancel: "Cancel"
@@ -81,7 +82,8 @@ es:
       changed_password_msg: "Contraseña Actualizada - Tu contraseña ha sido exitosamente actualizada"
       forgot_password_sent: "Contraseña Olvidada - Te enviamos un email para recuperar tu contraseña"
     change_username:
-      change_username_note: "El usuario puede ser cambiado cada 14 días"
+      change_username_note: "El usuario puede ser cambiado cada 14 días."
+      is_not_eligible: "Ahora mismo no se puede cambiar su nombre de usuario."
       save: "Guardar"
       edit_profile: "Editar Perfil"
       cancel: "Cancelar"

From 91060537bbbbdaf8888d0109b475c55dd6b7ad73 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Wed, 16 May 2018 11:51:28 -0300
Subject: [PATCH 020/144] displaying multiple provider ids

---
 .../coral-admin/src/components/UserDetail.js  | 19 ++++++++++++++++---
 .../coral-admin/src/containers/UserDetail.js  |  1 +
 .../src/routes/Community/components/People.js |  9 ++++++++-
 locales/en.yml                                |  1 +
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index 5dabc5b6f..de69f8a93 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -185,11 +185,24 @@ class UserDetail extends React.Component {
                 {new Date(user.created_at).toLocaleString()}
               </li>
 
-              {user.profiles.map(({ id }) => (
+              <li>
+                <Icon name="email" />
+                <span className={styles.userDetailItem}>
+                  {t('user_detail.email')}:
+                </span>
+                {user.email}{' '}
+                <ButtonCopyToClipboard
+                  className={styles.copyButton}
+                  icon="content_copy"
+                  copyText={user.email}
+                />
+              </li>
+
+              {user.profiles.map(({ provider, id }) => (
                 <li key={id}>
-                  <Icon name="email" />
+                  <Icon name="device_hub" />
                   <span className={styles.userDetailItem}>
-                    {t('user_detail.email')}:
+                    {capitalize(provider)} {t('user_detail.id')}:
                   </span>
                   {id}{' '}
                   <ButtonCopyToClipboard
diff --git a/client/coral-admin/src/containers/UserDetail.js b/client/coral-admin/src/containers/UserDetail.js
index 360819dd6..484d3dd84 100644
--- a/client/coral-admin/src/containers/UserDetail.js
+++ b/client/coral-admin/src/containers/UserDetail.js
@@ -179,6 +179,7 @@ export const withUserDetailQuery = withQuery(
       id
       username
       created_at
+      email
       profiles {
         id
         provider
diff --git a/client/coral-admin/src/routes/Community/components/People.js b/client/coral-admin/src/routes/Community/components/People.js
index 5645f88f1..6d1457cb8 100644
--- a/client/coral-admin/src/routes/Community/components/People.js
+++ b/client/coral-admin/src/routes/Community/components/People.js
@@ -130,7 +130,14 @@ class People extends React.Component {
                             {user.username}
                           </button>
                           <span className={styles.email}>
-                            {user.profiles.map(({ id }) => id)}
+                            {user.email
+                              ? user.email
+                              : user.profiles.map(({ id }, i) => {
+                                  if (i === user.profiles.length - 1) {
+                                    return id;
+                                  }
+                                  return `${id}, `;
+                                })}
                           </span>
                         </td>
                         <td className="mdl-data-table__cell--non-numeric">
diff --git a/locales/en.yml b/locales/en.yml
index 36cf956b4..0c25c2c94 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -467,6 +467,7 @@ en:
     all: "All"
     rejected: "Rejected"
     user_history: "User History"
+    id: "ID"
   user_history:
     user_banned: "User banned"
     ban_removed: "Ban removed"

From 2524004e2a5e50cf7eeb6a5ab90d5c6482ea3926 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Wed, 16 May 2018 11:55:05 -0300
Subject: [PATCH 021/144] Styling

---
 client/coral-admin/src/components/UserDetail.css | 4 ++++
 client/coral-admin/src/components/UserDetail.js  | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/client/coral-admin/src/components/UserDetail.css b/client/coral-admin/src/components/UserDetail.css
index 58faee5c4..389971b32 100644
--- a/client/coral-admin/src/components/UserDetail.css
+++ b/client/coral-admin/src/components/UserDetail.css
@@ -143,3 +143,7 @@
   border-color: #E45241;
   color: white;
 }
+
+.userDetailItem {
+  padding: 2px 0;
+}
diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index de69f8a93..a61ee81ec 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -177,7 +177,7 @@ class UserDetail extends React.Component {
 
           <div>
             <ul className={styles.userDetailList}>
-              <li>
+              <li className={styles.userDetailItem}>
                 <Icon name="assignment_ind" />
                 <span className={styles.userDetailItem}>
                   {t('user_detail.member_since')}:
@@ -185,7 +185,7 @@ class UserDetail extends React.Component {
                 {new Date(user.created_at).toLocaleString()}
               </li>
 
-              <li>
+              <li className={styles.userDetailItem}>
                 <Icon name="email" />
                 <span className={styles.userDetailItem}>
                   {t('user_detail.email')}:
@@ -199,7 +199,7 @@ class UserDetail extends React.Component {
               </li>
 
               {user.profiles.map(({ provider, id }) => (
-                <li key={id}>
+                <li key={id} className={styles.userDetailItem}>
                   <Icon name="device_hub" />
                   <span className={styles.userDetailItem}>
                     {capitalize(provider)} {t('user_detail.id')}:

From 2eac8f48d623d717c4e5331ef79fe1b8d9061dfd Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Wed, 16 May 2018 21:37:35 +0200
Subject: [PATCH 022/144] Workaround IOS focus bug when clicking on buttons

---
 .../client/components/rte/components/Button.js       | 11 ++---------
 .../client/components/rte/factories/createToggle.js  | 12 ++++++++++++
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/plugins/talk-plugin-rich-text/client/components/rte/components/Button.js b/plugins/talk-plugin-rich-text/client/components/rte/components/Button.js
index f99648cb7..fd5d451a1 100644
--- a/plugins/talk-plugin-rich-text/client/components/rte/components/Button.js
+++ b/plugins/talk-plugin-rich-text/client/components/rte/components/Button.js
@@ -7,21 +7,17 @@ class Button extends React.Component {
   render() {
     const {
       className,
-      title,
-      onClick,
       children,
       active,
       activeClassName,
-      disabled,
+      ...rest
     } = this.props;
     return (
       <button
         className={cn(className, styles.button, {
           [cn(styles.active, activeClassName)]: active,
         })}
-        title={title}
-        onClick={onClick}
-        disabled={disabled}
+        {...rest}
       >
         {children}
       </button>
@@ -32,11 +28,8 @@ class Button extends React.Component {
 Button.propTypes = {
   className: PropTypes.string,
   activeClassName: PropTypes.string,
-  title: PropTypes.string,
-  onClick: PropTypes.func,
   children: PropTypes.node,
   active: PropTypes.bool,
-  disabled: PropTypes.bool,
 };
 
 export default Button;
diff --git a/plugins/talk-plugin-rich-text/client/components/rte/factories/createToggle.js b/plugins/talk-plugin-rich-text/client/components/rte/factories/createToggle.js
index 028757222..59b75fdf2 100644
--- a/plugins/talk-plugin-rich-text/client/components/rte/factories/createToggle.js
+++ b/plugins/talk-plugin-rich-text/client/components/rte/factories/createToggle.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import Button from '../components/Button';
+import bowser from 'bowser';
 
 /**
  *  createToggle creates a button that can be active, inactive or disabled
@@ -32,7 +33,17 @@ const createToggle = (
       this.execCommand();
     };
 
+    // Detect whether there was focus on the RTE before the click.
+    hadFocusBeforeClick = false;
+    handleMouseDown = () => (this.hadFocusBeforeClick = this.props.api.focused);
+
     handleClick = () => {
+      // Skip IOS when the focus was not there before.
+      // IOS fails to focus to the RTE correctly and scrolls to nirvana.
+      // See https://www.pivotaltracker.com/story/show/157607216
+      if (!this.hadFocusBeforeClick && bowser.ios) {
+        return;
+      }
       this.props.api.focus();
       this.formatToggle();
       this.props.api.focus();
@@ -62,6 +73,7 @@ const createToggle = (
         <Button
           className={className}
           title={title}
+          onMouseDown={this.handleMouseDown}
           onClick={this.handleClick}
           active={this.state.active}
           disabled={disabled || this.state.disabled}

From d07c54918d0eefce3da8aff2b53bc69c8c1c3429 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Wed, 16 May 2018 21:37:48 +0200
Subject: [PATCH 023/144] Indent, outdent fixes

---
 .../client/components/rte/lib/dom.js               | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/plugins/talk-plugin-rich-text/client/components/rte/lib/dom.js b/plugins/talk-plugin-rich-text/client/components/rte/lib/dom.js
index a5fbec19e..c82b13d59 100644
--- a/plugins/talk-plugin-rich-text/client/components/rte/lib/dom.js
+++ b/plugins/talk-plugin-rich-text/client/components/rte/lib/dom.js
@@ -381,9 +381,13 @@ export function isBogusBR(node) {
 }
 
 /**
- * Returns an array of all nodes after `node`.
+ * Returns an array of all nodes after `node` in a _line_.
  */
 export function getRightOfNode(node) {
+  if (node.tagName === 'BR') {
+    return [];
+  }
+
   let result = [];
   let cur = node;
   while (
@@ -515,10 +519,10 @@ export function outdentBlock(node, changeSelection) {
 
   // A new lines to substitute the missing block element.
   const needLineAfter =
-    node.nextSibling &&
-    !isBlockElement(node.nextSibling) &&
-    node.lastChild &&
-    !isBlockElement(node.lastChild);
+    !node.lastChild ||
+    (node.nextSibling &&
+      !isBlockElement(node.nextSibling) &&
+      !isBlockElement(node.lastChild));
   const needLineBefore =
     node.previousSibling &&
     !isBlockElement(node.previousSibling) &&

From 663caa10017bdf99d1cb803aeb65e5785cdf2b33 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Wed, 16 May 2018 18:18:36 -0400
Subject: [PATCH 024/144] Update lint-staged to fix dependency issue

---
 package.json |   4 +-
 yarn.lock    | 134 +++++++++++++++++++++++----------------------------
 2 files changed, 61 insertions(+), 77 deletions(-)

diff --git a/package.json b/package.json
index 97f4e373d..c387d6145 100644
--- a/package.json
+++ b/package.json
@@ -149,7 +149,7 @@
     "metascraper-title": "^3.9.2",
     "minimist": "^1.2.0",
     "moment": "^2.18.1",
-    "mongoose": "^4.12.3",
+    "mongoose": "^5.1.1",
     "ms": "^2.0.0",
     "murmurhash-js": "^1.0.0",
     "name-all-modules-plugin": "^1.0.1",
@@ -231,7 +231,7 @@
     "husky": "^0.14.3",
     "identity-obj-proxy": "^3.0.0",
     "jest-junit": "^3.6.0",
-    "lint-staged": "^7.0.0",
+    "lint-staged": "^7.1.0",
     "mocha": "^3.1.2",
     "mocha-junit-reporter": "^1.12.1",
     "nightwatch": "^0.9.16",
diff --git a/yarn.lock b/yarn.lock
index f0da6d006..13da4b2f7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1644,6 +1644,10 @@ bson@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/bson/-/bson-1.0.4.tgz#93c10d39eaa5b58415cbc4052f3e53e562b0b72c"
 
+bson@~1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/bson/-/bson-1.0.6.tgz#444db59ddd4c24f0cb063aabdc5c8c7b0ceca912"
+
 buffer-crc32@^0.2.1, buffer-crc32@~0.2.3:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
@@ -1652,10 +1656,6 @@ buffer-equal-constant-time@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
 
-buffer-shims@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
-
 buffer-xor@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
@@ -3353,10 +3353,6 @@ es6-map@^0.1.3:
     es6-symbol "~3.1.1"
     event-emitter "~0.3.5"
 
-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@^4.0.5:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.1.1.tgz#8811e90915d9a0dba36274f0b242dbda78f9c92a"
@@ -4890,10 +4886,6 @@ home-or-tmp@^2.0.0:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.1"
 
-hooks-fixed@2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/hooks-fixed/-/hooks-fixed-2.0.2.tgz#20076daa07e77d8a6106883ce3f1722e051140b0"
-
 hosted-git-info@^2.1.4:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c"
@@ -6399,9 +6391,9 @@ jxLoader@*:
     promised-io "*"
     walker "1.x"
 
-kareem@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/kareem/-/kareem-1.5.0.tgz#e3e4101d9dcfde299769daf4b4db64d895d17448"
+kareem@2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/kareem/-/kareem-2.0.7.tgz#8d260366a4df4236ceccec318fcf10c17c5beb22"
 
 keymaster@^1.6.2:
   version "1.6.2"
@@ -6528,9 +6520,9 @@ linkifyjs@^2.1.5:
     react ">=0.14.0"
     react-dom ">=0.14.0"
 
-lint-staged@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-7.0.0.tgz#57926c63201e7bd38ca0576d74391efa699b4a9d"
+lint-staged@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-7.1.0.tgz#1514a5b71b8d9492ca0c3d2a44769cbcbc8bcc79"
   dependencies:
     app-root-path "^2.0.1"
     chalk "^2.3.1"
@@ -6541,6 +6533,7 @@ lint-staged@^7.0.0:
     execa "^0.9.0"
     find-parent-dir "^0.3.0"
     is-glob "^4.0.0"
+    is-windows "^1.0.2"
     jest-validate "^22.4.0"
     listr "^0.13.0"
     lodash "^4.17.5"
@@ -6550,8 +6543,9 @@ lint-staged@^7.0.0:
     p-map "^1.1.1"
     path-is-inside "^1.0.2"
     pify "^3.0.0"
-    please-upgrade-node "^3.0.1"
-    staged-git-files "1.1.0"
+    please-upgrade-node "^3.0.2"
+    staged-git-files "1.1.1"
+    string-argv "^0.0.2"
     stringify-object "^3.2.2"
 
 listr-silent-renderer@^1.1.1:
@@ -7451,36 +7445,36 @@ moment@^2.15.2:
   version "2.22.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.1.tgz#529a2e9bf973f259c9643d237fda84de3a26e8ad"
 
-mongodb-core@2.1.17:
-  version "2.1.17"
-  resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-2.1.17.tgz#a418b337a14a14990fb510b923dee6a813173df8"
+mongodb-core@3.0.8:
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-3.0.8.tgz#8d401f4eab6056c0d874a3d5844a4844f761d4d7"
   dependencies:
     bson "~1.0.4"
-    require_optional "~1.0.0"
+    require_optional "^1.0.1"
 
-mongodb@2.2.33:
-  version "2.2.33"
-  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-2.2.33.tgz#b537c471d34a6651b48f36fdbf29750340e08b50"
+mongodb@3.0.8:
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.0.8.tgz#2c1daecac9a0ec2de2f2aea4dc97d76ae70f8951"
   dependencies:
-    es6-promise "3.2.1"
-    mongodb-core "2.1.17"
-    readable-stream "2.2.7"
+    mongodb-core "3.0.8"
 
-mongoose@^4.12.3:
-  version "4.13.7"
-  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-4.13.7.tgz#f760c770e6c8cdf34a6fe8b7443882b5fced1032"
+mongoose-legacy-pluralize@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz#3ba9f91fa507b5186d399fb40854bff18fb563e4"
+
+mongoose@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.1.1.tgz#a7e925607e76032e5ef20b3035a357bc8581b45e"
   dependencies:
     async "2.1.4"
-    bson "~1.0.4"
-    hooks-fixed "2.0.2"
-    kareem "1.5.0"
+    bson "~1.0.5"
+    kareem "2.0.7"
     lodash.get "4.4.2"
-    mongodb "2.2.33"
-    mpath "0.3.0"
-    mpromise "0.5.5"
-    mquery "2.3.3"
+    mongodb "3.0.8"
+    mongoose-legacy-pluralize "1.0.2"
+    mpath "0.4.1"
+    mquery "3.0.0"
     ms "2.0.0"
-    muri "1.3.0"
     regexp-clone "0.0.1"
     sliced "1.0.1"
 
@@ -7509,17 +7503,13 @@ move-concurrently@^1.0.1:
     rimraf "^2.5.4"
     run-queue "^1.0.3"
 
-mpath@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/mpath/-/mpath-0.3.0.tgz#7a58f789e9b5fd3c94520634157960f26bd5ef44"
+mpath@0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/mpath/-/mpath-0.4.1.tgz#ed10388430380bf7bbb5be1391e5d6969cb08e89"
 
-mpromise@0.5.5:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/mpromise/-/mpromise-0.5.5.tgz#f5b24259d763acc2257b0a0c8c6d866fd51732e6"
-
-mquery@2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/mquery/-/mquery-2.3.3.tgz#221412e5d4e7290ca5582dd16ea8f190a506b518"
+mquery@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mquery/-/mquery-3.0.0.tgz#e5f387dbabc0b9b69859e550e810faabe0ceabb0"
   dependencies:
     bluebird "3.5.0"
     debug "2.6.9"
@@ -7538,10 +7528,6 @@ ms@^2.0.0, ms@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
 
-muri@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/muri/-/muri-1.3.0.tgz#aeccf3db64c56aa7c5b34e00f95b7878527a4721"
-
 murmurhash-js@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/murmurhash-js/-/murmurhash-js-1.0.0.tgz#b06278e21fc6c37fa5313732b0412bcb6ae15f51"
@@ -8556,9 +8542,11 @@ platform@1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.4.tgz#6f0fb17edaaa48f21442b3a975c063130f1c3ebd"
 
-please-upgrade-node@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.0.1.tgz#0a681f2c18915e5433a5ca2cd94e0b8206a782db"
+please-upgrade-node@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.0.2.tgz#7b9eaeca35aa4a43d6ebdfd10616c042f9a83acc"
+  dependencies:
+    semver-compare "^1.0.0"
 
 pluralize@^1.2.1:
   version "1.2.1"
@@ -9717,18 +9705,6 @@ readable-stream@2, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stre
     string_decoder "~1.0.3"
     util-deprecate "~1.0.1"
 
-readable-stream@2.2.7:
-  version "2.2.7"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.7.tgz#07057acbe2467b22042d36f98c5ad507054e95b1"
-  dependencies:
-    buffer-shims "~1.0.0"
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    string_decoder "~1.0.0"
-    util-deprecate "~1.0.1"
-
 readdirp@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
@@ -10034,7 +10010,7 @@ require-uncached@^1.0.3:
     caller-path "^0.1.0"
     resolve-from "^1.0.0"
 
-require_optional@~1.0.0:
+require_optional@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require_optional/-/require_optional-1.0.1.tgz#4cf35a4247f64ca3df8c2ef208cc494b1ca8fc2e"
   dependencies:
@@ -10285,6 +10261,10 @@ selenium-standalone@^6.11.0:
     which "^1.2.12"
     yauzl "^2.5.0"
 
+semver-compare@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
+
 semver-diff@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
@@ -10762,9 +10742,9 @@ stack-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.1.tgz#d4f33ab54e8e38778b0ca5cfd3b3afb12db68620"
 
-staged-git-files@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/staged-git-files/-/staged-git-files-1.1.0.tgz#1a9bb131c1885601023c7aaddd3d54c22142c526"
+staged-git-files@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/staged-git-files/-/staged-git-files-1.1.1.tgz#37c2218ef0d6d26178b1310719309a16a59f8f7b"
 
 static-extend@^0.1.1:
   version "0.1.2"
@@ -10841,6 +10821,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-argv@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.0.2.tgz#dac30408690c21f3c3630a3ff3a05877bdcbd736"
+
 string-hash@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/string-hash/-/string-hash-1.1.3.tgz#e8aafc0ac1855b4666929ed7dd1275df5d6c811b"
@@ -10875,7 +10859,7 @@ string.prototype.padend@^3.0.0:
     es-abstract "^1.4.3"
     function-bind "^1.0.2"
 
-string_decoder@^1.0.0, string_decoder@~1.0.0, string_decoder@~1.0.3:
+string_decoder@^1.0.0, string_decoder@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
   dependencies:

From 5241206b038a51ee3172dc43754cf64e7666e730 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Wed, 16 May 2018 18:24:34 -0400
Subject: [PATCH 025/144] Remove deprecated useMongoClient

---
 services/mongoose.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/services/mongoose.js b/services/mongoose.js
index 167b0d45b..f6615ad39 100644
--- a/services/mongoose.js
+++ b/services/mongoose.js
@@ -45,7 +45,6 @@ if (WEBPACK) {
   // Connect to the Mongo instance.
   mongoose
     .connect(MONGO_URL, {
-      useMongoClient: true,
       config: {
         autoIndex: CREATE_MONGO_INDEXES,
       },

From 0339e97b377aa83a35b3662670213d8078e5cc1f Mon Sep 17 00:00:00 2001
From: Leandro <leeeandroo@gmail.com>
Date: Thu, 17 May 2018 16:39:04 +0200
Subject: [PATCH 026/144] fix optimisticResponse typo

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

diff --git a/client/coral-framework/graphql/mutations.js b/client/coral-framework/graphql/mutations.js
index 995ca1720..722d8ea98 100644
--- a/client/coral-framework/graphql/mutations.js
+++ b/client/coral-framework/graphql/mutations.js
@@ -116,7 +116,7 @@ export const withRemoveTag = withMutation(
             asset_id: assetId,
             item_type: itemType,
           },
-          o3timisticResponse: {
+          optimisticResponse: {
             removeTag: {
               __typename: 'ModifyTagResponse',
               errors: null,

From 6444e8c2ab3a374434941c406ad7dfea8ebbe2be Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Thu, 17 May 2018 13:48:30 -0300
Subject: [PATCH 027/144] Karma

---
 .../src/components/KarmaTooltip.css           | 76 +++++++++++++++++++
 .../src/components/KarmaTooltip.js            | 52 +++++++++++++
 .../coral-admin/src/components/UserDetail.css | 17 ++---
 .../coral-admin/src/components/UserDetail.js  | 39 +++++++---
 client/coral-framework/utils/user.js          | 15 ++++
 locales/en.yml                                |  4 +
 6 files changed, 185 insertions(+), 18 deletions(-)
 create mode 100644 client/coral-admin/src/components/KarmaTooltip.css
 create mode 100644 client/coral-admin/src/components/KarmaTooltip.js

diff --git a/client/coral-admin/src/components/KarmaTooltip.css b/client/coral-admin/src/components/KarmaTooltip.css
new file mode 100644
index 000000000..1f7e1b732
--- /dev/null
+++ b/client/coral-admin/src/components/KarmaTooltip.css
@@ -0,0 +1,76 @@
+.karmaTooltip {
+  position: relative;
+  display: inline-block;
+  margin: 0 4px;
+}
+
+.icon {
+  font-size: 16px;
+  color: #0D5B8F;
+  -ms-user-select:none;
+  -moz-user-select: none;
+  -webkit-user-select: none;
+  -webkit-touch-callout:none;
+  user-select: none;
+  -webkit-tap-highlight-color:rgba(0,0,0,0);
+}
+
+.icon:hover {
+  cursor: pointer;
+}
+
+.menu {
+  background-color: white;
+  border: solid 1px #999;
+  border-radius: 3px;
+  padding: 10px;
+  position: absolute;
+  -webkit-box-shadow: 0 2px 2px 0 rgba(0,0,0,0.14), 0 1px 5px 0 rgba(0,0,0,0.12), 0 3px 1px -2px rgba(0,0,0,0.2);
+  box-shadow: 0 2px 2px 0 rgba(0,0,0,0.14), 0 1px 5px 0 rgba(0,0,0,0.12), 0 3px 1px -2px rgba(0,0,0,0.2);
+  z-index: 10;
+  top: 32px;
+  left: -100px;
+  width: 150px;
+  text-align: left;
+  color: #616161;
+}
+
+.menu::before{
+  content: '';
+  border: 10px solid transparent;
+  border-top-color: #999;
+  position: absolute;
+  left: 96px;
+  top: -20px;
+  transform: rotate(180deg);
+}
+
+.menu::after{
+  content: '';
+  border: 10px solid transparent;
+  border-top-color: white;
+  position: absolute;
+  left: 96px;
+  top: -19px;
+  transform: rotate(180deg);
+}
+
+.descriptionList {
+  padding: 0;
+  margin: 0;
+  list-style: none;
+}
+
+.strongItem {
+  margin-right: 3px;
+}
+
+.descriptionItem {
+  font-size: 0.9em;
+}
+
+.link {
+  color: #2B7EB5;
+  text-decoration: underline;
+  display: block;
+}
\ No newline at end of file
diff --git a/client/coral-admin/src/components/KarmaTooltip.js b/client/coral-admin/src/components/KarmaTooltip.js
new file mode 100644
index 000000000..370856f1f
--- /dev/null
+++ b/client/coral-admin/src/components/KarmaTooltip.js
@@ -0,0 +1,52 @@
+import React from 'react';
+import cn from 'classnames';
+import { Icon } from 'coral-ui';
+import styles from './KarmaTooltip.css';
+import ClickOutside from 'coral-framework/components/ClickOutside';
+import t from 'coral-framework/services/i18n';
+
+const initialState = { menuVisible: false };
+
+class KarmaTooltip extends React.Component {
+  state = initialState;
+
+  toogleMenu = () => {
+    this.setState({ menuVisible: !this.state.menuVisible });
+  };
+
+  hideMenu = () => {
+    this.setState({ menuVisible: false });
+  };
+
+  render() {
+    const { menuVisible } = this.state;
+
+    return (
+      <ClickOutside onClickOutside={this.hideMenu}>
+        <div className={cn(styles.karmaTooltip, 'talk-admin-karma-tooltip')}>
+          <span
+            onClick={this.toogleMenu}
+            className={cn(styles.icon, 'talk-admin-karma-tooltip-icon')}
+          >
+            <Icon name="info" />
+          </span>
+
+          {menuVisible && (
+            <div className={cn(styles.menu, 'talk-admin-karma-tooltip-menu')}>
+              <strong>{t('user_detail.user_karma_score')}</strong>
+              <a
+                className={styles.link}
+                href={t('user_detail.karma_docs_link')}
+                target="_blank"
+              >
+                {t('user_detail.learn_more')}
+              </a>
+            </div>
+          )}
+        </div>
+      </ClickOutside>
+    );
+  }
+}
+
+export default KarmaTooltip;
diff --git a/client/coral-admin/src/components/UserDetail.css b/client/coral-admin/src/components/UserDetail.css
index 58faee5c4..0f034d419 100644
--- a/client/coral-admin/src/components/UserDetail.css
+++ b/client/coral-admin/src/components/UserDetail.css
@@ -39,17 +39,16 @@
   margin-right: 0px;
 }
 
-.statItem,
-.statReportResult {
+.statItem, .statReportResult, .statKarmaResult {
   padding: 3px 5px;
   background-color: #D8D8D8;
   border-radius: 3px;
   font-weight: 500;
-  display: block;
   font-size: 0.9em;
   line-height: normal;
   letter-spacing: 0.4px;
-  min-width: 60px;
+  min-width: 35px;
+  display: inline-block;
 }
 
 .statResult {
@@ -58,21 +57,21 @@
   display: inline-block;
 }
 
-.statReportResult {
+.statReportResult, .statKarmaResult {
   color: white;
   margin: 5px 0;
   font-weight: 400;
 }
 
-.statReportResult.reliable {
-  background-color: #749C48;
+.statReportResult.reliable, .statKarmaResult.good {
+  background-color: #03AB61;
 }
 
-.statReportResult.neutral {
+.statReportResult.neutral, .statKarmaResult.neutral {
   background-color: #616161;
 }
 
-.statReportResult.unreliable {
+.statReportResult.unreliable, .statKarmaResult.bad {
   background-color: #F44336;
 }
 
diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index 5dabc5b6f..723a71eef 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -10,6 +10,7 @@ import {
   getReliability,
   isSuspended,
   isBanned,
+  getKarma,
 } from 'coral-framework/utils/user';
 import ButtonCopyToClipboard from './ButtonCopyToClipboard';
 import ClickOutside from 'coral-framework/components/ClickOutside';
@@ -25,6 +26,7 @@ import {
 import ActionsMenu from 'coral-admin/src/components/ActionsMenu';
 import ActionsMenuItem from 'coral-admin/src/components/ActionsMenuItem';
 import UserInfoTooltip from './UserInfoTooltip';
+import KarmaTooltip from './KarmaTooltip';
 import t from 'coral-framework/services/i18n';
 
 class UserDetail extends React.Component {
@@ -203,23 +205,29 @@ class UserDetail extends React.Component {
 
             <ul className={styles.stats}>
               <li className={styles.stat}>
-                <span className={styles.statItem}>
-                  {t('user_detail.total_comments')}
-                </span>
+                <div>
+                  <span className={styles.statItem}>
+                    {t('user_detail.total_comments')}
+                  </span>
+                </div>
                 <span className={styles.statResult}>{totalComments}</span>
               </li>
               <li className={styles.stat}>
-                <span className={styles.statItem}>
-                  {t('user_detail.reject_rate')}
-                </span>
+                <div>
+                  <span className={styles.statItem}>
+                    {t('user_detail.reject_rate')}
+                  </span>
+                </div>
                 <span className={styles.statResult}>
                   {rejectedPercent.toFixed(1)}%
                 </span>
               </li>
               <li className={styles.stat}>
-                <span className={styles.statItem}>
-                  {t('user_detail.reports')}
-                </span>
+                <div>
+                  <span className={styles.statItem}>
+                    {t('user_detail.reports')}
+                  </span>
+                </div>
                 <span
                   className={cn(
                     styles.statReportResult,
@@ -229,6 +237,19 @@ class UserDetail extends React.Component {
                   {capitalize(getReliability(user.reliable.flagger))}
                 </span>
               </li>
+              <li className={styles.stat}>
+                <div>
+                  <span className={styles.statItem}>
+                    {t('user_detail.karma')}
+                  </span>
+                  <KarmaTooltip />
+                </div>
+                <span
+                  className={cn(styles.statKarmaResult, styles[getKarma(100)])}
+                >
+                  {100}
+                </span>
+              </li>
             </ul>
           </div>
 
diff --git a/client/coral-framework/utils/user.js b/client/coral-framework/utils/user.js
index 610557542..693652994 100644
--- a/client/coral-framework/utils/user.js
+++ b/client/coral-framework/utils/user.js
@@ -49,3 +49,18 @@ export const canUsernameBeUpdated = status => {
     moment(created_at).isAfter(oldestEditTime)
   );
 };
+
+/**
+ * getKarma
+ * retrieves karma value as string
+ */
+
+export const getKarma = score => {
+  if (score === 0) {
+    return 'neutral';
+  } else if (score) {
+    return 'good';
+  } else {
+    return 'bad';
+  }
+};
diff --git a/locales/en.yml b/locales/en.yml
index f60219472..ab7be8e9d 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -470,6 +470,10 @@ en:
     all: "All"
     rejected: "Rejected"
     user_history: "User History"
+    karma: "Karma"
+    learn_more: "Learn More"
+    user_karma_score: "User Karma Score"
+    karma_docs_link: "https://docs.coralproject.net/talk/trust/#user-karma-score"
   user_history:
     user_banned: "User banned"
     ban_removed: "Ban removed"

From 887f7e17f49304a0e6445c07abaa55a53c1ed7c8 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 17 May 2018 11:38:00 -0600
Subject: [PATCH 028/144] server side

---
 client/coral-admin/src/components/UserDetail.js | 7 +++++--
 client/coral-admin/src/containers/UserDetail.js | 2 ++
 client/coral-framework/utils/user.js            | 6 +++---
 graph/typeDefs.graphql                          | 8 ++++++++
 services/karma.js                               | 9 +++++++++
 5 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index 723a71eef..070f22ba4 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -245,9 +245,12 @@ class UserDetail extends React.Component {
                   <KarmaTooltip />
                 </div>
                 <span
-                  className={cn(styles.statKarmaResult, styles[getKarma(100)])}
+                  className={cn(
+                    styles.statKarmaResult,
+                    styles[getKarma(user.reliable.commenter)]
+                  )}
                 >
-                  {100}
+                  {user.reliable.commenterScore}
                 </span>
               </li>
             </ul>
diff --git a/client/coral-admin/src/containers/UserDetail.js b/client/coral-admin/src/containers/UserDetail.js
index 360819dd6..810a336c8 100644
--- a/client/coral-admin/src/containers/UserDetail.js
+++ b/client/coral-admin/src/containers/UserDetail.js
@@ -185,6 +185,8 @@ export const withUserDetailQuery = withQuery(
       }
       reliable {
         flagger
+        commenter
+        commenterScore
       }
       state {
         status {
diff --git a/client/coral-framework/utils/user.js b/client/coral-framework/utils/user.js
index 693652994..e591fa558 100644
--- a/client/coral-framework/utils/user.js
+++ b/client/coral-framework/utils/user.js
@@ -55,10 +55,10 @@ export const canUsernameBeUpdated = status => {
  * retrieves karma value as string
  */
 
-export const getKarma = score => {
-  if (score === 0) {
+export const getKarma = reliability => {
+  if (reliability === null) {
     return 'neutral';
-  } else if (score) {
+  } else if (reliability) {
     return 'good';
   } else {
     return 'bad';
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 07947af6e..1c323e6f4 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -20,9 +20,17 @@ type Reliability {
   # `null` if the reliability cannot be determined.
   flagger: Boolean
 
+  # flaggerScore will contains the number of agreed flags vs disagred flag
+  # count.
+  flaggerScore: Int!
+
   # Commenter will be `true` when the commenter is reliable, `false` if not, or
   # `null` if the reliability cannot be determined.
   commenter: Boolean
+
+  # commenterScore the number of approved comments (not untouched) subtracted by
+  # the number of rejected comments.
+  commenterScore: Int!
 }
 
 ################################################################################
diff --git a/services/karma.js b/services/karma.js
index 58d9da3a0..c39c93a32 100644
--- a/services/karma.js
+++ b/services/karma.js
@@ -1,6 +1,7 @@
 const debug = require('debug')('talk:services:karma');
 const UserModel = require('../models/user');
 const { TRUST_THRESHOLDS } = require('../config');
+const { get } = require('lodash');
 
 /**
  * This will create an object with the property name of the action type as the
@@ -83,9 +84,17 @@ class KarmaModel {
     return KarmaService.isReliable('flag', this.model);
   }
 
+  get flaggerScore() {
+    return get(this.model, 'flag.karma', 0);
+  }
+
   get commenter() {
     return KarmaService.isReliable('comment', this.model);
   }
+
+  get commenterScore() {
+    return get(this.model, 'comment.karma', 0);
+  }
 }
 
 /**

From 086c43a0034a039e58ae95dada8c03c822188ec3 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 17 May 2018 13:18:57 -0600
Subject: [PATCH 029/144] Update .nsprc

---
 .nsprc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.nsprc b/.nsprc
index 530a17a9f..8962db719 100644
--- a/.nsprc
+++ b/.nsprc
@@ -7,6 +7,7 @@
     "https://nodesecurity.io/advisories/594",
     "https://nodesecurity.io/advisories/603",
     "https://nodesecurity.io/advisories/611",
-    "https://nodesecurity.io/advisories/612"
+    "https://nodesecurity.io/advisories/612",
+    "https://nodesecurity.io/advisories/654"
   ]
 }

From 417befd52a6172094fa00815e4096fdd99220f85 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Thu, 17 May 2018 21:34:37 +0200
Subject: [PATCH 030/144] Don't close popup when there is an error

---
 client/coral-auth-callback/src/index.js | 50 +++++++++++++------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/client/coral-auth-callback/src/index.js b/client/coral-auth-callback/src/index.js
index 41a83dcd2..7bf75e825 100644
--- a/client/coral-auth-callback/src/index.js
+++ b/client/coral-auth-callback/src/index.js
@@ -3,32 +3,36 @@ import { getStaticConfiguration } from 'coral-framework/services/staticConfigura
 import { createPostMessage } from 'coral-framework/services/postMessage';
 
 document.addEventListener('DOMContentLoaded', () => {
-  try {
-    const staticConfig = getStaticConfiguration();
-    const { STATIC_ORIGIN: origin } = staticConfig;
-    const postMessage = createPostMessage(origin);
+  const staticConfig = getStaticConfiguration();
+  const { STATIC_ORIGIN: origin } = staticConfig;
+  const postMessage = createPostMessage(origin);
 
-    // Get the auth element and parse it as JSON by decoding it.
-    const auth = document.getElementById('auth');
-    const doc = document.implementation.createHTMLDocument('');
-    doc.body.innerHTML = auth.innerText;
+  // Get the auth element and parse it as JSON by decoding it.
+  const auth = document.getElementById('auth');
+  const doc = document.implementation.createHTMLDocument('');
+  doc.body.innerHTML = auth.innerText;
 
-    // Auth state is contained within the node.
-    const { err, data } = JSON.parse(doc.body.textContent);
-    if (err) {
-      // TODO: send back the error message.
-      console.error(err);
+  // Auth state is contained within the node.
+  const { err, data } = JSON.parse(doc.body.textContent);
+  if (err) {
+    const errDiv = document.createElement('div');
+    if (err.message) {
+      errDiv.innerText = `${err.name}: ${err.message}`;
     } else {
-      // The data will contain a user and a token.
-      const { user, token } = data;
-
-      // Send the state back.
-      postMessage.post(HANDLE_SUCCESSFUL_LOGIN, { user, token });
+      errDiv.innerText = JSON.stringify(err);
     }
-  } finally {
-    // Always close the window.
-    setTimeout(() => {
-      window.close();
-    }, 50);
+    document.body.appendChild(errDiv);
+    throw err;
   }
+
+  // The data will contain a user and a token.
+  const { user, token } = data;
+
+  // Send the state back.
+  postMessage.post(HANDLE_SUCCESSFUL_LOGIN, { user, token });
+
+  // Close the window when all went well.
+  setTimeout(() => {
+    window.close();
+  }, 50);
 });

From 95072be97e27945e071e62c9658b1d81520ef204 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 17 May 2018 15:59:49 -0600
Subject: [PATCH 031/144] switched ejs for nunjucks

---
 app.js                                        |  23 +++-
 package.json                                  |   1 +
 .../server/router.js                          |   2 +-
 .../views/unsubscribe-notifications.ejs       |  64 ---------
 .../views/unsubscribe-notifications.njk       |  61 +++++++++
 .../talk-plugin-profile-data/server/router.js |   2 +-
 .../server/views/download.ejs                 |  56 --------
 .../server/views/download.njk                 |  56 ++++++++
 routes/account/index.js                       |   4 +-
 routes/admin/index.js                         |   2 +-
 routes/api/v1/graph.js                        |   2 +-
 routes/dev/assets.js                          |   6 +-
 routes/dev/index.js                           |   2 +-
 routes/embed/index.js                         |   2 +-
 routes/login/index.js                         |   2 +-
 services/passport.js                          |   6 +-
 views/account/email/confirm.ejs               |  63 ---------
 views/account/email/confirm.njk               |  63 +++++++++
 views/account/password/reset.ejs              |  85 ------------
 views/account/password/reset.njk              |  85 ++++++++++++
 views/admin.ejs                               |  17 ---
 views/admin.njk                               |  14 ++
 views/api/graphiql.ejs                        | 125 -----------------
 views/api/graphiql.njk                        | 126 ++++++++++++++++++
 views/auth-callback.ejs                       |  10 --
 views/auth-callback.njk                       |  10 ++
 views/dev/article.ejs                         |  52 --------
 views/dev/article.njk                         |  55 ++++++++
 views/dev/articles.ejs                        |  40 ------
 views/dev/articles.njk                        |  37 +++++
 views/embed/stream.ejs                        |  14 --
 views/embed/stream.njk                        |  16 +++
 views/login.ejs                               |  16 ---
 views/login.njk                               |  16 +++
 views/partials/account.ejs                    |   4 -
 views/partials/custom-css.ejs                 |   1 -
 views/partials/custom-css.njk                 |   3 +
 views/partials/data.ejs                       |   3 -
 views/partials/data.njk                       |   3 +
 views/partials/dev-nav.ejs                    |   8 --
 views/partials/favicon.njk                    |  14 ++
 views/partials/head.ejs                       |  23 ----
 views/partials/nav.njk                        |   8 ++
 views/templates/account.njk                   |   6 +
 views/templates/base.njk                      |  39 ++++++
 .../dev.ejs => templates/development.njk}     |  16 ++-
 yarn.lock                                     |   6 +
 47 files changed, 670 insertions(+), 599 deletions(-)
 delete mode 100644 plugins/talk-plugin-notifications/server/views/unsubscribe-notifications.ejs
 create mode 100644 plugins/talk-plugin-notifications/server/views/unsubscribe-notifications.njk
 delete mode 100644 plugins/talk-plugin-profile-data/server/views/download.ejs
 create mode 100644 plugins/talk-plugin-profile-data/server/views/download.njk
 delete mode 100644 views/account/email/confirm.ejs
 create mode 100644 views/account/email/confirm.njk
 delete mode 100644 views/account/password/reset.ejs
 create mode 100644 views/account/password/reset.njk
 delete mode 100644 views/admin.ejs
 create mode 100644 views/admin.njk
 delete mode 100644 views/api/graphiql.ejs
 create mode 100644 views/api/graphiql.njk
 delete mode 100644 views/auth-callback.ejs
 create mode 100644 views/auth-callback.njk
 delete mode 100644 views/dev/article.ejs
 create mode 100644 views/dev/article.njk
 delete mode 100644 views/dev/articles.ejs
 create mode 100644 views/dev/articles.njk
 delete mode 100644 views/embed/stream.ejs
 create mode 100644 views/embed/stream.njk
 delete mode 100644 views/login.ejs
 create mode 100644 views/login.njk
 delete mode 100644 views/partials/account.ejs
 delete mode 100644 views/partials/custom-css.ejs
 create mode 100644 views/partials/custom-css.njk
 delete mode 100644 views/partials/data.ejs
 create mode 100644 views/partials/data.njk
 delete mode 100644 views/partials/dev-nav.ejs
 create mode 100644 views/partials/favicon.njk
 delete mode 100644 views/partials/head.ejs
 create mode 100644 views/partials/nav.njk
 create mode 100644 views/templates/account.njk
 create mode 100644 views/templates/base.njk
 rename views/{partials/dev.ejs => templates/development.njk} (54%)

diff --git a/app.js b/app.js
index c5507da2e..b3400b939 100644
--- a/app.js
+++ b/app.js
@@ -1,4 +1,6 @@
 const express = require('express');
+const nunjucks = require('nunjucks');
+const cons = require('consolidate');
 const trace = require('./middleware/trace');
 const logging = require('./middleware/logging');
 const path = require('path');
@@ -72,7 +74,26 @@ app.use(
 // VIEW CONFIGURATION
 //==============================================================================
 
-app.set('views', path.join(__dirname, 'views'));
+// configure the default views directory.
+const views = path.join(__dirname, 'views');
+app.set('views', views);
+
+// reconfigure nunjucks.
+cons.requires.nunjucks = nunjucks.configure(views, {
+  autoescape: true,
+  trimBlocks: true,
+  lstripBlocks: true,
+  watch: process.env.NODE_ENV === 'development',
+});
+
+// assign the nunjucks engine to .njk files.
+app.engine('njk', cons.nunjucks);
+
+// assign the ejs engine to .ejs and .html files.
+app.engine('ejs', cons.ejs);
+app.engine('html', cons.ejs);
+
+// set .ejs as the default extension.
 app.set('view engine', 'ejs');
 
 //==============================================================================
diff --git a/package.json b/package.json
index 97f4e373d..e8ff0182d 100644
--- a/package.json
+++ b/package.json
@@ -91,6 +91,7 @@
     "common-tags": "^1.4.0",
     "compression": "1.7.1",
     "compression-webpack-plugin": "^1.0.0",
+    "consolidate": "0.14.0",
     "cookie-parser": "^1.4.3",
     "copy-webpack-plugin": "^4.0.0",
     "cross-spawn": "^5.1.0",
diff --git a/plugins/talk-plugin-notifications/server/router.js b/plugins/talk-plugin-notifications/server/router.js
index 68919a936..9185c5aba 100644
--- a/plugins/talk-plugin-notifications/server/router.js
+++ b/plugins/talk-plugin-notifications/server/router.js
@@ -4,7 +4,7 @@ const { get, isEmpty, reduce } = require('lodash');
 
 module.exports = router => {
   router.get('/account/unsubscribe-notifications', (req, res) => {
-    res.render(path.join(__dirname, 'views/unsubscribe-notifications'));
+    res.render(path.join(__dirname, 'views/unsubscribe-notifications.njk'));
   });
 
   /**
diff --git a/plugins/talk-plugin-notifications/server/views/unsubscribe-notifications.ejs b/plugins/talk-plugin-notifications/server/views/unsubscribe-notifications.ejs
deleted file mode 100644
index 129c3115c..000000000
--- a/plugins/talk-plugin-notifications/server/views/unsubscribe-notifications.ejs
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta name="viewport" content="initial-scale=1, maximum-scale=1">
-    <title><%= t('talk-plugin-notifications.unsubscribe_page.unsubscribe') %></title>
-    <%- include(root + '/partials/head') %>
-    <link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.indigo-pink.min.css">
-    <link rel="stylesheet" href="<%= BASE_PATH %>public/css/admin.css">
-  </head>
-  <body class="confirm-email-page">
-    <div id="root">
-      <div class="error-console container"><%= t('talk-plugin-notifications.unsubscribe_page.token_invalid') %></div>
-      <div id="success" style="display:none;" class="legend container"><%= t('talk-plugin-notifications.unsubscribe_page.are_unsubscribed') %></div>
-      <form id="unsubscribe-form" class="container">
-        <legend class="legend"><%= t('talk-plugin-notifications.unsubscribe_page.click_to_confirm') %></legend>
-        <button type="submit"><%= t('talk-plugin-notifications.unsubscribe_page.confirm') %></button>
-      </form>
-    </div>
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
-    <script type="text/javascript">
-      $(function() {
-        var submitting = false;
-        var payload = JSON.stringify({token: location.hash.replace('#', '')});
-        function handleSubmit(e) {
-          e.preventDefault();
-
-          if (submitting) {
-              return;
-          }
-
-          submitting = true;
-          $('.error-console').removeClass('active');
-
-          $.ajax({
-            url: '<%= BASE_PATH %>api/v1/account/unsubscribe-notifications',
-            contentType: 'application/json',
-            method: 'POST',
-            data: payload,
-          }).then(function (success) {
-            $('#unsubscribe-form').fadeOut(function () {
-                $('#success').fadeIn();
-            });
-          }).catch(function () {
-            submitting = false;
-            $('.error-console').addClass('active');
-          });
-        }
-
-        $.ajax({
-          url: '<%= BASE_PATH %>api/v1/account/unsubscribe-notifications/verify',
-          contentType: 'application/json',
-          method: 'POST',
-          data: payload,
-        })
-        .then(function () {
-          $('#unsubscribe-form').fadeIn().on('submit', handleSubmit);
-        })
-        .catch(function () {
-          $('.error-console').addClass('active');
-        });
-      });
-    </script>
-  </body>
-</html>
\ No newline at end of file
diff --git a/plugins/talk-plugin-notifications/server/views/unsubscribe-notifications.njk b/plugins/talk-plugin-notifications/server/views/unsubscribe-notifications.njk
new file mode 100644
index 000000000..f8191d525
--- /dev/null
+++ b/plugins/talk-plugin-notifications/server/views/unsubscribe-notifications.njk
@@ -0,0 +1,61 @@
+{% extends "templates/account.njk" %}
+
+{% block title %}{{ t('talk-plugin-notifications.unsubscribe_page.unsubscribe') }}{% endblock %}
+
+{% block html %}
+<div id="root">
+  <div class="error-console container">{{ t('talk-plugin-notifications.unsubscribe_page.token_invalid') }}</div>
+  <div id="success" style="display:none;" class="legend container">{{ t('talk-plugin-notifications.unsubscribe_page.are_unsubscribed') }}</div>
+  <form id="unsubscribe-form" class="container">
+    <legend class="legend">{{ t('talk-plugin-notifications.unsubscribe_page.click_to_confirm') }}</legend>
+    <button type="submit">{{ t('talk-plugin-notifications.unsubscribe_page.confirm') }}</button>
+  </form>
+</div>
+{% endblock %}
+
+{% block js %}
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+<script type="text/javascript">
+  $(function() {
+    var submitting = false;
+    var payload = JSON.stringify({token: location.hash.replace('#', '')});
+    function handleSubmit(e) {
+      e.preventDefault();
+
+      if (submitting) {
+          return;
+      }
+
+      submitting = true;
+      $('.error-console').removeClass('active');
+
+      $.ajax({
+        url: '{{ BASE_PATH }}api/v1/account/unsubscribe-notifications',
+        contentType: 'application/json',
+        method: 'POST',
+        data: payload,
+      }).then(function (success) {
+        $('#unsubscribe-form').fadeOut(function () {
+            $('#success').fadeIn();
+        });
+      }).catch(function () {
+        submitting = false;
+        $('.error-console').addClass('active');
+      });
+    }
+
+    $.ajax({
+      url: '{{ BASE_PATH }}api/v1/account/unsubscribe-notifications/verify',
+      contentType: 'application/json',
+      method: 'POST',
+      data: payload,
+    })
+    .then(function () {
+      $('#unsubscribe-form').fadeIn().on('submit', handleSubmit);
+    })
+    .catch(function () {
+      $('.error-console').addClass('active');
+    });
+  });
+</script>
+{% endblock %}
diff --git a/plugins/talk-plugin-profile-data/server/router.js b/plugins/talk-plugin-profile-data/server/router.js
index 6d8f47d03..6bd165e64 100644
--- a/plugins/talk-plugin-profile-data/server/router.js
+++ b/plugins/talk-plugin-profile-data/server/router.js
@@ -102,7 +102,7 @@ async function loadComments(ctx, userID, archive, latestContentDate) {
 module.exports = router => {
   // /account/download will render the download page.
   router.get('/account/download', (req, res) => {
-    res.render(path.join(__dirname, 'views', 'download'));
+    res.render(path.join(__dirname, 'views', 'download.njk'));
   });
 
   // /api/v1/account/download will send back a zipped archive of the users
diff --git a/plugins/talk-plugin-profile-data/server/views/download.ejs b/plugins/talk-plugin-profile-data/server/views/download.ejs
deleted file mode 100644
index 260badf3a..000000000
--- a/plugins/talk-plugin-profile-data/server/views/download.ejs
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title><%= t('download_landing.download_your_account') %></title>
-    <%- include(root + '/partials/account') %>
-  </head>
-  <body>
-    <div id="root">
-      <section class="container">
-        <h1><%= t('download_landing.download_your_account') %></h1>
-        <p><%= t('download_landing.download_details') %></p>
-        <p><%= t('download_landing.all_information_included') %></p>
-        <ul class="check_list">
-          <li><%= t('download_landing.information_included.date') %></li>
-          <li><%= t('download_landing.information_included.url') %></li>
-          <li><%= t('download_landing.information_included.body') %></li>
-          <li><%= t('download_landing.information_included.asset_url') %></li>
-        </ul>
-        <div class="error-console"><span></span></div>
-        <form id="download-form" method="post" action="<%= BASE_PATH %>api/v1/account/download">
-          <button type="submit"><%= t('download_landing.confirm') %></button>
-        </form>
-      </section>
-    </div>
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
-    <script type="text/javascript">
-      $(function() {
-        function showError(error) {
-          try {
-            let err = JSON.parse(error);
-            $('.error-console span').text(err.message);
-            $('.error-console').fadeIn();
-          } catch (err) {
-            $('.error-console span').text(error);
-            $('.error-console').fadeIn();
-          }
-        }
-
-        var token = location.hash.replace('#', '');
-
-        $.ajax({
-          url: '<%= BASE_PATH %>api/v1/account/download',
-          contentType: 'application/json',
-          method: 'POST',
-          data: JSON.stringify({token: token, check: true})
-        })
-        .then(function () {
-          $('#download-form').append('<input name="token" type="hidden" value="' + token + '"/>').fadeIn();
-        })
-        .catch(function (error) {
-          showError(error.responseText);
-        });
-      });
-    </script>
-  </body>
-</html>
diff --git a/plugins/talk-plugin-profile-data/server/views/download.njk b/plugins/talk-plugin-profile-data/server/views/download.njk
new file mode 100644
index 000000000..5527473bc
--- /dev/null
+++ b/plugins/talk-plugin-profile-data/server/views/download.njk
@@ -0,0 +1,56 @@
+{% extends "templates/account.njk" %}
+
+{% block title %}{{ t('download_landing.download_your_account') }}{% endblock %}
+
+{% block html %}
+<div id="root">
+  <section class="container">
+    <h1>{{ t('download_landing.download_your_account') }}</h1>
+    <p>{{ t('download_landing.download_details') }}</p>
+    <p>{{ t('download_landing.all_information_included') }}</p>
+    <ul class="check_list">
+      <li>{{ t('download_landing.information_included.date') }}</li>
+      <li>{{ t('download_landing.information_included.url') }}</li>
+      <li>{{ t('download_landing.information_included.body') }}</li>
+      <li>{{ t('download_landing.information_included.asset_url') }}</li>
+    </ul>
+    <div class="error-console"><span></span></div>
+    <form id="download-form" method="post" action="{{ BASE_PATH }}api/v1/account/download">
+      <button type="submit">{{ t('download_landing.confirm') }}</button>
+    </form>
+  </section>
+</div>
+{% endblock %}
+
+{% block js %}
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+<script type="text/javascript">
+  $(function() {
+    function showError(error) {
+      try {
+        let err = JSON.parse(error);
+        $('.error-console span').text(err.message);
+        $('.error-console').fadeIn();
+      } catch (err) {
+        $('.error-console span').text(error);
+        $('.error-console').fadeIn();
+      }
+    }
+
+    var token = location.hash.replace('#', '');
+
+    $.ajax({
+      url: '{{ BASE_PATH }}api/v1/account/download',
+      contentType: 'application/json',
+      method: 'POST',
+      data: JSON.stringify({token: token, check: true})
+    })
+    .then(function () {
+      $('#download-form').append('<input name="token" type="hidden" value="' + token + '"/>').fadeIn();
+    })
+    .catch(function (error) {
+      showError(error.responseText);
+    });
+  });
+</script>
+{% endblock %}
diff --git a/routes/account/index.js b/routes/account/index.js
index 70e62accc..37b26e344 100644
--- a/routes/account/index.js
+++ b/routes/account/index.js
@@ -2,11 +2,11 @@ const express = require('express');
 const router = express.Router();
 
 router.get('/email/confirm', (req, res) => {
-  res.render('account/email/confirm');
+  res.render('account/email/confirm.njk');
 });
 
 router.get('/password/reset', (req, res) => {
-  res.render('account/password/reset');
+  res.render('account/password/reset.njk');
 });
 
 module.exports = router;
diff --git a/routes/admin/index.js b/routes/admin/index.js
index d00ef8642..1a9993cfd 100644
--- a/routes/admin/index.js
+++ b/routes/admin/index.js
@@ -2,7 +2,7 @@ const express = require('express');
 const router = express.Router();
 
 router.get('*', (req, res) => {
-  res.render('admin');
+  res.render('admin.njk');
 });
 
 module.exports = router;
diff --git a/routes/api/v1/graph.js b/routes/api/v1/graph.js
index 40e87415b..0660755ea 100644
--- a/routes/api/v1/graph.js
+++ b/routes/api/v1/graph.js
@@ -10,7 +10,7 @@ router.use('/ql', apollo.graphqlExpress(createGraphOptions));
 if (process.env.NODE_ENV !== 'production') {
   // Interactive graphiql interface.
   router.use('/iql', staticTemplate, (req, res) => {
-    res.render('api/graphiql', {
+    res.render('api/graphiql.njk', {
       endpointURL: 'api/v1/graph/ql',
     });
   });
diff --git a/routes/dev/assets.js b/routes/dev/assets.js
index aea0628e3..df59f21a0 100644
--- a/routes/dev/assets.js
+++ b/routes/dev/assets.js
@@ -11,7 +11,7 @@ router.get('/id/:asset_id', async (req, res, next) => {
       throw new ErrNotFound();
     }
 
-    res.render('dev/article', {
+    res.render('dev/article.njk', {
       title: asset.title,
       asset_id: asset.id,
       asset_url: asset.url,
@@ -28,7 +28,7 @@ router.get('/random', (req, res) => {
 });
 
 router.get('/title/:asset_title', (req, res) => {
-  res.render('dev/article', {
+  res.render('dev/article.njk', {
     title: req.params.asset_title.split('-').join(' '),
     asset_url: '',
     asset_id: null,
@@ -48,7 +48,7 @@ router.get('/', async (req, res, next) => {
       Asset.count(),
     ]);
 
-    res.render('dev/articles', {
+    res.render('dev/articles.njk', {
       skip,
       limit,
       count,
diff --git a/routes/dev/index.js b/routes/dev/index.js
index 58daca583..580e702fd 100644
--- a/routes/dev/index.js
+++ b/routes/dev/index.js
@@ -12,7 +12,7 @@ router.get('/', staticTemplate, async (req, res) => {
     await SetupService.isAvailable();
     return res.redirect(url.resolve(MOUNT_PATH, 'admin/install'));
   } catch (e) {
-    return res.render('dev/article', {
+    return res.render('dev/article.njk', {
       title: 'Coral Talk',
       asset_url: '',
       asset_id: '',
diff --git a/routes/embed/index.js b/routes/embed/index.js
index 695ffe609..7456a5b71 100644
--- a/routes/embed/index.js
+++ b/routes/embed/index.js
@@ -2,7 +2,7 @@ const express = require('express');
 const router = express.Router();
 
 router.use('/stream', (req, res) => {
-  res.render('embed/stream');
+  res.render('embed/stream.njk');
 });
 
 module.exports = router;
diff --git a/routes/login/index.js b/routes/login/index.js
index b69cb7f5c..e03690dd0 100644
--- a/routes/login/index.js
+++ b/routes/login/index.js
@@ -2,7 +2,7 @@ const express = require('express');
 const router = express.Router();
 
 router.get('*', (req, res) => {
-  res.render('login');
+  res.render('login.njk');
 });
 
 module.exports = router;
diff --git a/services/passport.js b/services/passport.js
index e4813e419..4b96d2352 100644
--- a/services/passport.js
+++ b/services/passport.js
@@ -115,13 +115,13 @@ const HandleAuthPopupCallback = (req, res, next) => (err, user) => {
   res.locals.encodeJSONForHTML = encodeJSONForHTML;
 
   if (err) {
-    return res.render('auth-callback', {
+    return res.render('auth-callback.njk', {
       auth: { err, data: null },
     });
   }
 
   if (!user) {
-    return res.render('auth-callback', {
+    return res.render('auth-callback.njk', {
       auth: { err: new ErrNotAuthorized(), data: null },
     });
   }
@@ -132,7 +132,7 @@ const HandleAuthPopupCallback = (req, res, next) => (err, user) => {
   SetTokenForSafari(req, res, token);
 
   // We logged in the user! Let's send back the user data.
-  res.render('auth-callback', {
+  res.render('auth-callback.njk', {
     auth: { err: null, data: { user, token } },
   });
 };
diff --git a/views/account/email/confirm.ejs b/views/account/email/confirm.ejs
deleted file mode 100644
index 47bc7773b..000000000
--- a/views/account/email/confirm.ejs
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title><%= t('confirm_email.email_confirmation') %></title>
-    <%- include ../../partials/account %>
-  </head>
-  <body class="confirm-email-page">
-    <div id="root">
-      <section class="container">
-        <h1><%= t('confirm_email.email_confirmation') %></h1>
-        <p><%= t('confirm_email.click_to_confirm') %></p>
-        <div class="error-console"><span></span></div>
-        <form id="verify-email-form">
-          <button type="submit"><%= t('confirm_email.confirm') %></button>
-        </form>
-      </section>
-    </div>
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
-    <script type="text/javascript">
-      $(function() {
-        function showError(error) {
-          try {
-            let err = JSON.parse(error);
-            $('.error-console span').text(err.message);
-            $('.error-console').fadeIn();
-          } catch (err) {
-            $('.error-console span').text(error);
-            $('.error-console').fadeIn();
-          }
-        }
-
-        function handleSubmit(e) {
-          e.preventDefault();
-          $('.error-console').removeClass('active');
-
-          $.ajax({
-            url: '<%= BASE_PATH %>api/v1/account/email/verify',
-            contentType: 'application/json',
-            method: 'POST',
-            data: JSON.stringify({token: location.hash.replace('#', '')})
-          }).then(function (success) {
-            location.href = success.redirectUri;
-          }).catch(function (error) {
-            showError(error.responseText);
-          });
-        }
-
-        $.ajax({
-          url: '<%= BASE_PATH %>api/v1/account/email/verify',
-          contentType: 'application/json',
-          method: 'POST',
-          data: JSON.stringify({token: location.hash.replace('#', ''), check: true})
-        })
-        .then(function () {
-          $('#verify-email-form').fadeIn().on('submit', handleSubmit);
-        })
-        .catch(function (error) {
-          showError(error.responseText);
-        });
-      });
-    </script>
-  </body>
-</html>
diff --git a/views/account/email/confirm.njk b/views/account/email/confirm.njk
new file mode 100644
index 000000000..6111cb21e
--- /dev/null
+++ b/views/account/email/confirm.njk
@@ -0,0 +1,63 @@
+{% extends "templates/account.njk" %}
+
+{% block title %}{{ t('confirm_email.email_confirmation') }}{% endblock %}
+
+{% block html %}
+<div id="root">
+  <section class="container">
+    <h1>{{ t('confirm_email.email_confirmation') }}</h1>
+    <p>{{ t('confirm_email.click_to_confirm') }}</p>
+    <div class="error-console"><span></span></div>
+    <form id="verify-email-form">
+      <button type="submit">{{ t('confirm_email.confirm') }}</button>
+    </form>
+  </section>
+</div>
+{% endblock %}
+
+{% block js %}
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+<script type="text/javascript">
+  $(function() {
+    function showError(error) {
+      try {
+        let err = JSON.parse(error);
+        $('.error-console span').text(err.message);
+        $('.error-console').fadeIn();
+      } catch (err) {
+        $('.error-console span').text(error);
+        $('.error-console').fadeIn();
+      }
+    }
+
+    function handleSubmit(e) {
+      e.preventDefault();
+      $('.error-console').removeClass('active');
+
+      $.ajax({
+        url: '{{ BASE_PATH }}api/v1/account/email/verify',
+        contentType: 'application/json',
+        method: 'POST',
+        data: JSON.stringify({token: location.hash.replace('#', '')})
+      }).then(function (success) {
+        location.href = success.redirectUri;
+      }).catch(function (error) {
+        showError(error.responseText);
+      });
+    }
+
+    $.ajax({
+      url: '{{ BASE_PATH }}api/v1/account/email/verify',
+      contentType: 'application/json',
+      method: 'POST',
+      data: JSON.stringify({token: location.hash.replace('#', ''), check: true})
+    })
+    .then(function () {
+      $('#verify-email-form').fadeIn().on('submit', handleSubmit);
+    })
+    .catch(function (error) {
+      showError(error.responseText);
+    });
+  });
+</script>
+{% endblock %}
diff --git a/views/account/password/reset.ejs b/views/account/password/reset.ejs
deleted file mode 100644
index c8b106139..000000000
--- a/views/account/password/reset.ejs
+++ /dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title><%= t('password_reset.set_new_password') %></title>
-    <%- include ../../partials/account %>
-  </head>
-  <body>
-    <div id="root">
-      <section class="container">
-        <h1><%= t('password_reset.set_new_password') %></h1>
-        <p><%= t('password_reset.change_password_help') %></p>
-        <div class="error-console"><span></span></div>
-        <form id="reset-password-form">
-          <label for="password">
-            <%= t('password_reset.new_password') %>
-            <input type="password" name="password" placeholder="<%= t('password_reset.new_password') %>" />
-            <small><%= t('password_reset.new_password_help') %></small>
-          </label>
-          <label for="confirm-password">
-            <%= t('password_reset.confirm_new_password') %>
-            <input type="password" name="confirm-password" placeholder="<%= t('password_reset.confirm_new_password') %>" />
-          </label>
-          <button type="submit"><%= t('password_reset.change_password') %></button>
-        </form>
-      </section>
-    </div>
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
-    <script>
-      $(function() {
-        function showError(error) {
-          try {
-            let err = JSON.parse(error);
-            $('.error-console span').text(err.message);
-            $('.error-console').fadeIn();
-          } catch (err) {
-            $('.error-console span').text(error);
-            $('.error-console').fadeIn();
-          }
-        }
-
-        function handleSubmit (e) {
-          e.preventDefault();
-          $('.error-console').removeClass('active');
-
-          var password = $('[name="password"]').val();
-          var confirm = $('[name="confirm-password"]').val();
-
-          if (password === '' || password.length < 8) {
-            showError('Passwords must be at least 8 characters.');
-            return false;
-          }
-
-          if (password !== confirm) {
-            showError('New password and confirm password must match');
-            return false;
-          }
-
-          $.ajax({
-            url: '<%= BASE_PATH %>api/v1/account/password/reset',
-            contentType: 'application/json',
-            method: 'PUT',
-            data: JSON.stringify({password: password, token: location.hash.replace('#', '')})
-          }).then(function (success) {
-            location.href = success.redirect;
-          }).catch(function (error) {
-            showError(error.responseText);
-          });
-        }
-
-        $.ajax({
-          url: '<%= BASE_PATH %>api/v1/account/password/reset',
-          contentType: 'application/json',
-          method: 'PUT',
-          data: JSON.stringify({token: location.hash.replace('#', ''), check: true})
-        })
-        .then(function () {
-          $('#reset-password-form').fadeIn().on('submit', handleSubmit);
-        })
-        .catch(function (error) {
-          showError(error.responseText);
-        });
-      });
-    </script>
-  </body>
-</html>
diff --git a/views/account/password/reset.njk b/views/account/password/reset.njk
new file mode 100644
index 000000000..b6f227dea
--- /dev/null
+++ b/views/account/password/reset.njk
@@ -0,0 +1,85 @@
+{% extends "templates/account.njk" %}
+
+{% block title %}{{ t('password_reset.set_new_password') }}{% endblock %}
+
+{% block html %}
+<div id="root">
+  <section class="container">
+    <h1>{{ t('password_reset.set_new_password') }}</h1>
+    <p>{{ t('password_reset.change_password_help') }}</p>
+    <div class="error-console"><span></span></div>
+    <form id="reset-password-form">
+      <label for="password">
+        {{ t('password_reset.new_password') }}
+        <input type="password" name="password" placeholder="{{ t('password_reset.new_password') }}" />
+        <small>{{ t('password_reset.new_password_help') }}</small>
+      </label>
+      <label for="confirm-password">
+        {{ t('password_reset.confirm_new_password') }}
+        <input type="password" name="confirm-password" placeholder="{{ t('password_reset.confirm_new_password') }}" />
+      </label>
+      <button type="submit">{{ t('password_reset.change_password') }}</button>
+    </form>
+  </section>
+</div>
+{% endblock %}
+
+{% block js %}
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+<script>
+  $(function() {
+    function showError(error) {
+      try {
+        let err = JSON.parse(error);
+        $('.error-console span').text(err.message);
+        $('.error-console').fadeIn();
+      } catch (err) {
+        $('.error-console span').text(error);
+        $('.error-console').fadeIn();
+      }
+    }
+
+    function handleSubmit (e) {
+      e.preventDefault();
+      $('.error-console').removeClass('active');
+
+      var password = $('[name="password"]').val();
+      var confirm = $('[name="confirm-password"]').val();
+
+      if (password === '' || password.length < 8) {
+        showError('Passwords must be at least 8 characters.');
+        return false;
+      }
+
+      if (password !== confirm) {
+        showError('New password and confirm password must match');
+        return false;
+      }
+
+      $.ajax({
+        url: '{{ BASE_PATH }}api/v1/account/password/reset',
+        contentType: 'application/json',
+        method: 'PUT',
+        data: JSON.stringify({password: password, token: location.hash.replace('#', '')})
+      }).then(function (success) {
+        location.href = success.redirect;
+      }).catch(function (error) {
+        showError(error.responseText);
+      });
+    }
+
+    $.ajax({
+      url: '{{ BASE_PATH }}api/v1/account/password/reset',
+      contentType: 'application/json',
+      method: 'PUT',
+      data: JSON.stringify({token: location.hash.replace('#', ''), check: true})
+    })
+    .then(function () {
+      $('#reset-password-form').fadeIn().on('submit', handleSubmit);
+    })
+    .catch(function (error) {
+      showError(error.responseText);
+    });
+  });
+</script>
+{% endblock %}
diff --git a/views/admin.ejs b/views/admin.ejs
deleted file mode 100644
index 89cc150f7..000000000
--- a/views/admin.ejs
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta name="viewport" content="initial-scale=1, maximum-scale=1">
-    <title>Talk - Coral Admin</title>
-    <%- include partials/head %>
-    <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet">
-    <link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.min.css">
-    <link rel="stylesheet" type="text/css" href="<%= resolve('coral-admin/bundle.css') %>">
-    <%- include partials/custom-css %>
-  </head>
-  <body class="admin-page">
-    <div id="root"></div>
-    <script src='https://www.google.com/recaptcha/api.js?render=explicit' async defer></script>
-    <script src="<%= resolve('coral-admin/bundle.js') %>" charset="utf-8"></script>
-  </body>
-</html>
diff --git a/views/admin.njk b/views/admin.njk
new file mode 100644
index 000000000..4b5236424
--- /dev/null
+++ b/views/admin.njk
@@ -0,0 +1,14 @@
+{% extends "templates/base.njk" %}
+
+{% block title %}Talk Admin{% endblock %}
+
+{% block css %}
+<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet">
+<link href="https://code.getmdl.io/1.2.1/material.min.css" rel="stylesheet">
+<link href="{{ resolve('coral-admin/bundle.css') }}" rel="stylesheet">
+{% endblock %}
+
+{% block js %}
+<script src='https://www.google.com/recaptcha/api.js?render=explicit' async defer></script>
+<script src="{{ resolve('coral-admin/bundle.js') }}"></script>
+{% endblock %}
diff --git a/views/api/graphiql.ejs b/views/api/graphiql.ejs
deleted file mode 100644
index 8007569b3..000000000
--- a/views/api/graphiql.ejs
+++ /dev/null
@@ -1,125 +0,0 @@
-
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8" />
-  <title>GraphiQL</title>
-  <meta name="robots" content="noindex" />
-  <%- include ../partials/dev %>
-  <style>
-    html, body, #graphiql {
-      height: 100%;
-      margin: 0;
-      overflow: hidden;
-      width: 100%;
-    }
-    *, ::after, ::before {
-      box-sizing: inherit;
-    }
-  </style>
-  <link href="//cdn.jsdelivr.net/graphiql/0.9.1/graphiql.css" rel="stylesheet" />
-  <script src="//cdn.jsdelivr.net/fetch/0.9.0/fetch.min.js"></script>
-  <script src="//cdn.jsdelivr.net/react/15.0.0/react.min.js"></script>
-  <script src="//cdn.jsdelivr.net/react/15.0.0/react-dom.min.js"></script>
-  <script src="//cdn.jsdelivr.net/graphiql/0.9.1/graphiql.min.js"></script>
-</head>
-<body>
-  <%- include ../partials/dev-nav %>
-  <main id="graphiql"></main>
-  <script>
-    // Collect the URL parameters
-    var parameters = {};
-    window.location.search.substr(1).split('&').forEach(function (entry) {
-      var eq = entry.indexOf('=');
-      if (eq >= 0) {
-        parameters[decodeURIComponent(entry.slice(0, eq))] =
-          decodeURIComponent(entry.slice(eq + 1));
-      }
-    });
-    // Produce a Location query string from a parameter object.
-    function locationQuery(params, location) {
-      return (location ? location: '') + '?' + Object.keys(params).map(function (key) {
-        return encodeURIComponent(key) + '=' +
-          encodeURIComponent(params[key]);
-      }).join('&');
-    }
-    // Derive a fetch URL from the current URL, sans the GraphQL parameters.
-    var graphqlParamNames = {
-      query: true,
-      variables: true,
-      operationName: true
-    };
-    var otherParams = {};
-    for (var k in parameters) {
-      if (parameters.hasOwnProperty(k) && graphqlParamNames[k] !== true) {
-        otherParams[k] = parameters[k];
-      }
-    }
-    // We don't use safe-serialize for location, because it's not client input.
-    var fetchURL = locationQuery(otherParams, '<%= BASE_URL %><%= endpointURL %>');
-
-    // Defines a GraphQL fetcher using the fetch API.
-    function graphQLFetcher(graphQLParams) {
-      var headers = {
-        'Accept': 'application/json',
-        'Content-Type': 'application/json'
-      };
-
-      try {
-        let token = localStorage.getItem('token');
-        if (token) {
-          headers['Authorization'] = 'Bearer ' + token;
-        }
-      } catch (e) {
-        console.error(e);
-      }
-
-      return fetch(fetchURL, {
-        method: 'post',
-        headers: headers,
-        body: JSON.stringify(graphQLParams),
-        credentials: 'include',
-      }).then(function (response) {
-        return response.text();
-      }).then(function (responseBody) {
-        try {
-          return JSON.parse(responseBody);
-        } catch (error) {
-          return responseBody;
-        }
-      });
-    }
-    // When the query and variables string is edited, update the URL bar so
-    // that it can be easily shared.
-    function onEditQuery(newQuery) {
-      parameters.query = newQuery;
-      updateURL();
-    }
-    function onEditVariables(newVariables) {
-      parameters.variables = newVariables;
-      updateURL();
-    }
-    function onEditOperationName(newOperationName) {
-      parameters.operationName = newOperationName;
-      updateURL();
-    }
-    function updateURL() {
-      history.replaceState(null, null, locationQuery(parameters));
-    }
-    // Render <GraphiQL /> into the body.
-    ReactDOM.render(
-      React.createElement(GraphiQL, {
-        fetcher: graphQLFetcher,
-        onEditQuery: onEditQuery,
-        onEditVariables: onEditVariables,
-        onEditOperationName: onEditOperationName,
-        query: null,
-        response: null,
-        variables: null,
-        operationName: null,
-      }),
-      document.querySelector("#graphiql")
-    );
-  </script>
-</body>
-</html>
diff --git a/views/api/graphiql.njk b/views/api/graphiql.njk
new file mode 100644
index 000000000..b726918f3
--- /dev/null
+++ b/views/api/graphiql.njk
@@ -0,0 +1,126 @@
+{% extends "templates/development.njk" %}
+
+{% block title %}GraphiQL{% endblock %}
+
+{% block css %}
+{# Include the base development pieces #}
+{{ super() }}
+<style type="text/css">
+  html, body, #graphiql {
+    height: 100%;
+    margin: 0;
+    overflow: hidden;
+    width: 100%;
+  }
+  *, ::after, ::before {
+    box-sizing: inherit;
+  }
+</style>
+<link href="//cdn.jsdelivr.net/graphiql/0.9.1/graphiql.css" rel="stylesheet" />
+{% endblock %}
+
+{% block js %}
+<script src="//cdn.jsdelivr.net/fetch/0.9.0/fetch.min.js"></script>
+<script src="//cdn.jsdelivr.net/react/15.0.0/react.min.js"></script>
+<script src="//cdn.jsdelivr.net/react/15.0.0/react-dom.min.js"></script>
+<script src="//cdn.jsdelivr.net/graphiql/0.9.1/graphiql.min.js"></script>
+<script type="text/javascript">
+  // Collect the URL parameters
+  var parameters = {};
+  window.location.search.substr(1).split('&').forEach(function (entry) {
+    var eq = entry.indexOf('=');
+    if (eq >= 0) {
+      parameters[decodeURIComponent(entry.slice(0, eq))] =
+        decodeURIComponent(entry.slice(eq + 1));
+    }
+  });
+  // Produce a Location query string from a parameter object.
+  function locationQuery(params, location) {
+    return (location ? location: '') + '?' + Object.keys(params).map(function (key) {
+      return encodeURIComponent(key) + '=' +
+        encodeURIComponent(params[key]);
+    }).join('&');
+  }
+  // Derive a fetch URL from the current URL, sans the GraphQL parameters.
+  var graphqlParamNames = {
+    query: true,
+    variables: true,
+    operationName: true
+  };
+  var otherParams = {};
+  for (var k in parameters) {
+    if (parameters.hasOwnProperty(k) && graphqlParamNames[k] !== true) {
+      otherParams[k] = parameters[k];
+    }
+  }
+  // We don't use safe-serialize for location, because it's not client input.
+  var fetchURL = locationQuery(otherParams, '{{ BASE_URL }}{{ endpointURL }}');
+
+  // Defines a GraphQL fetcher using the fetch API.
+  function graphQLFetcher(graphQLParams) {
+    var headers = {
+      'Accept': 'application/json',
+      'Content-Type': 'application/json'
+    };
+
+    try {
+      let token = localStorage.getItem('token');
+      if (token) {
+        headers['Authorization'] = 'Bearer ' + token;
+      }
+    } catch (e) {
+      console.error(e);
+    }
+
+    return fetch(fetchURL, {
+      method: 'post',
+      headers: headers,
+      body: JSON.stringify(graphQLParams),
+      credentials: 'include',
+    }).then(function (response) {
+      return response.text();
+    }).then(function (responseBody) {
+      try {
+        return JSON.parse(responseBody);
+      } catch (error) {
+        return responseBody;
+      }
+    });
+  }
+  // When the query and variables string is edited, update the URL bar so
+  // that it can be easily shared.
+  function onEditQuery(newQuery) {
+    parameters.query = newQuery;
+    updateURL();
+  }
+  function onEditVariables(newVariables) {
+    parameters.variables = newVariables;
+    updateURL();
+  }
+  function onEditOperationName(newOperationName) {
+    parameters.operationName = newOperationName;
+    updateURL();
+  }
+  function updateURL() {
+    history.replaceState(null, null, locationQuery(parameters));
+  }
+  // Render <GraphiQL /> into the body.
+  ReactDOM.render(
+    React.createElement(GraphiQL, {
+      fetcher: graphQLFetcher,
+      onEditQuery: onEditQuery,
+      onEditVariables: onEditVariables,
+      onEditOperationName: onEditOperationName,
+      query: null,
+      response: null,
+      variables: null,
+      operationName: null,
+    }),
+    document.querySelector("#graphiql")
+  );
+</script>
+{% endblock %}
+
+{% block html %}
+<main id="graphiql"></main>
+{% endblock %}
diff --git a/views/auth-callback.ejs b/views/auth-callback.ejs
deleted file mode 100644
index e4d2387b7..000000000
--- a/views/auth-callback.ejs
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <%- include partials/data %>
-  </head>
-  <body>
-    <script type="application/json" id="auth"><%- encodeJSONForHTML(auth) %></script>
-    <script type="text/javascript" src="<%= resolve('coral-auth-callback/bundle.js') %>"></script>
-  </body>
-</html>
diff --git a/views/auth-callback.njk b/views/auth-callback.njk
new file mode 100644
index 000000000..7119a6255
--- /dev/null
+++ b/views/auth-callback.njk
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    {% include "partials/data.njk" %}
+  </head>
+  <body>
+    <script type="application/json" id="auth">{{ encodeJSONForHTML(auth) }}</script>
+    <script type="text/javascript" src="{{ resolve('coral-auth-callback/bundle.js') }}"></script>
+  </body>
+</html>
diff --git a/views/dev/article.ejs b/views/dev/article.ejs
deleted file mode 100644
index 008d3989e..000000000
--- a/views/dev/article.ejs
+++ /dev/null
@@ -1,52 +0,0 @@
-<html>
-  <head>
-    <meta property="og:title" content="<%= title %>" />
-    <meta property="og:description" content="A description of this article." />
-    <meta property="article:author" content="A. J. Ournalist" />
-    <meta property="og:type" content="article">
-    <meta property="og:image" content="https://coralproject.net/images/splash-md.jpg">
-    <meta property="article:published" itemprop="datePublished" content="2016-11-16T11:46:06-05:00" />
-    <meta property="article:modified" itemprop="dateModified" content="2016-11-16T12:09:44-05:00" />
-    <meta property="article:section" itemprop="articleSection" content="The Section!" />
-    <title><%= title %></title>
-    <%- include ../partials/dev %>
-  </head>
-  <body>
-    <%- include ../partials/dev-nav %>
-    <div class="container">
-      <h1 class="mt-3"><%= title %></h1>
-      <div id='coralStreamEmbed'></div>
-      <script src="<%= resolve('embed.js') %>"></script>
-      <script>
-        window.TalkEmbed = Coral.Talk.render(document.getElementById('coralStreamEmbed'), {
-          talk: '<%= BASE_URL %>',
-          asset_url: '<%= asset_url ? asset_url : '' %>',
-          asset_id: '<%= asset_id ? asset_id : '' %>',
-          auth_token: '',
-          /**
-          *  You can listen to events using the example below.
-          *  The argument passed is the event emitter from
-          *  https://github.com/asyncly/EventEmitter2
-          *
-          *  events: function(events) {
-          *    events.onAny(function(eventName, data) {
-          *      console.log(eventName, data);
-          *    });
-          *  },
-          */
-          plugins_config: {
-            /**
-            *  You can disable rendering slot components of a plugin by doing:
-            *
-            *  'talk-plugin-love': {
-            *    disable_components: true,
-            *  },
-            */
-            test: 'data',
-            debug: false
-          }
-        })
-      </script>
-    </div>
-  </body>
-</html>
diff --git a/views/dev/article.njk b/views/dev/article.njk
new file mode 100644
index 000000000..2fb8b3724
--- /dev/null
+++ b/views/dev/article.njk
@@ -0,0 +1,55 @@
+{% extends "templates/development.njk" %}
+
+{% block title %}{{ title }}{% endblock %}
+
+{% block meta %}
+<meta property="og:title" content="{{ title }}" />
+<meta property="og:description" content="A description of this article." />
+<meta property="article:author" content="A. J. Ournalist" />
+<meta property="og:type" content="article">
+<meta property="og:image" content="https://coralproject.net/images/splash-md.jpg">
+<meta property="article:published" itemprop="datePublished" content="2016-11-16T11:46:06-05:00" />
+<meta property="article:modified" itemprop="dateModified" content="2016-11-16T12:09:44-05:00" />
+<meta property="article:section" itemprop="articleSection" content="The Section!" />
+{% endblock %}
+
+{% block html %}
+<div class="container">
+  <h1 class="mt-3">{{ title }}</h1>
+  <div id='coralStreamEmbed'></div>
+</div>
+{% endblock %}
+
+{% block js %}
+<script src="{{ resolve('embed.js') }}"></script>
+<script>
+  window.TalkEmbed = Coral.Talk.render(document.getElementById('coralStreamEmbed'), {
+    talk: '{{ BASE_URL }}',
+    asset_url: '{{ asset_url }}',
+    asset_id: '{{ asset_id }}',
+    auth_token: '',
+    /**
+    *  You can listen to events using the example below.
+    *  The argument passed is the event emitter from
+    *  https://github.com/asyncly/EventEmitter2
+    *
+    *  events: function(events) {
+    *    events.onAny(function(eventName, data) {
+    *      console.log(eventName, data);
+    *    });
+    *  },
+    */
+    plugins_config: {
+      /**
+      *  You can disable rendering slot components of a plugin by doing:
+      *
+      *  'talk-plugin-love': {
+      *    disable_components: true,
+      *  },
+      */
+      test: 'data',
+      debug: false
+    }
+  })
+</script>
+{% endblock %}
diff --git a/views/dev/articles.ejs b/views/dev/articles.ejs
deleted file mode 100644
index 1b07ed116..000000000
--- a/views/dev/articles.ejs
+++ /dev/null
@@ -1,40 +0,0 @@
-<html>
-  <head>
-    <title>All Assets</title>
-    <%- include ../partials/dev %>
-  </head>
-  <body>
-    <%- include ../partials/dev-nav %>
-    <div class="container">
-      <div class="d-flex w-100 justify-content-between mt-3 mb-2">
-        <h1 class="mb-0">All Assets</h1>
-        <span class="text-muted"><%= skip + 1 %> - <%= skip + assets.length %> of <%= count %> Assets</span>
-      </div>
-      <div class="list-group">
-        <% if (skip === 0) { %><a href="<%= BASE_PATH %>dev/assets/random" class="list-group-item list-group-item-action list-group-item-primary"><i class="fa fa-plus" aria-hidden="true"></i> Create a random article</a><% } %>
-        <% assets.forEach(function (asset) { %>
-          <a href="<%= BASE_PATH %>dev/assets/id/<%= asset.id %>" class="list-group-item list-group-item-action flex-column align-items-start">
-            <div class="d-flex w-100 justify-content-between">
-              <h5 class="mb-1"><%= asset.title %></h5>
-              <small>Created <%= asset.created_at.toLocaleString('en-US') %></small>
-            </div>
-            <small><%= asset.url %></small>
-          </a>
-        <% }) %>
-      </div>
-      <% if (count !== assets.length) { %>
-        <nav aria-label="Page navigation example" class="mt-2">
-          <ul class="pagination justify-content-center">
-            <% let page = 1; for (let i = 0; i < count; i += limit) { %>
-              <% if (i === skip) { %>
-                <li class="page-item disabled"><a class="page-link" href="#"><%= page %></a></li>
-              <% } else { %>
-                <li class="page-item"><a class="page-link" href="?skip=<%= i %>&amp;limit=<%= limit %>"><%= page %></a></li>
-              <% } %>
-            <% page++; } %>
-          </ul>
-        </nav>
-      <% } %>
-    </div>
-  </body>
-</html>
diff --git a/views/dev/articles.njk b/views/dev/articles.njk
new file mode 100644
index 000000000..e204c39fc
--- /dev/null
+++ b/views/dev/articles.njk
@@ -0,0 +1,37 @@
+{% extends "templates/development.njk" %}
+
+{% block title %}All Assets{% endblock %}
+
+{% block html %}
+<div class="container">
+  <div class="d-flex w-100 justify-content-between mt-3 mb-2">
+    <h1 class="mb-0">All Assets</h1>
+    <span class="text-muted">{{ skip + 1 }} - {{ skip + assets.length }} of {{ count }} Assets</span>
+  </div>
+  <div class="list-group">
+    {% if skip === 0 %}<a href="{{ BASE_PATH }}dev/assets/random" class="list-group-item list-group-item-action list-group-item-primary"><i class="fa fa-plus" aria-hidden="true"></i> Create a random article</a>{% endif %}
+    {% for asset in assets %}
+      <a href="{{ BASE_PATH }}dev/assets/id/{{ asset.id }}" class="list-group-item list-group-item-action flex-column align-items-start">
+        <div class="d-flex w-100 justify-content-between">
+          <h5 class="mb-1">{{ asset.title }}</h5>
+          <small>Created {{ asset.created_at.toLocaleString('en-US') }}</small>
+        </div>
+        <small>{{ asset.url }}</small>
+      </a>
+    {% endfor %}
+  </div>
+  {% if count !== assets.length %}
+    <nav aria-label="Page navigation example" class="mt-2">
+      <ul class="pagination justify-content-center">
+        {% for i in range(0, count, limit) %}
+          {% if i === skip %}
+            <li class="page-item disabled"><a class="page-link" href="#">{{ i / limit + 1 | round }}</a></li>
+          {% else %}
+            <li class="page-item"><a class="page-link" href="{{ BASE_PATH }}dev/assets?skip={{ i }}&amp;limit={{ limit }}">{{ i / limit + 1 | round }}</a></li>
+          {% endif  %}
+        {% endfor %}
+      </ul>
+    </nav>
+  {% endif %}
+</div>
+{% endblock %}
diff --git a/views/embed/stream.ejs b/views/embed/stream.ejs
deleted file mode 100644
index a1c708b55..000000000
--- a/views/embed/stream.ejs
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, user-scalable=no">
-    <%- include ../partials/head %>
-    <link rel="stylesheet" type="text/css" href="<%= resolve('embed/stream/default.css') %>">
-    <link rel="stylesheet" type="text/css" href="<%= resolve('embed/stream/bundle.css') %>">
-    <%- include ../partials/custom-css %>
-  </head>
-  <body class="embed-stream-page">
-    <div id="talk-embed-stream-container"></div>
-    <script src="<%= resolve('embed/stream/bundle.js') %>"></script>
-  </body>
-</html>
diff --git a/views/embed/stream.njk b/views/embed/stream.njk
new file mode 100644
index 000000000..ddc620f8e
--- /dev/null
+++ b/views/embed/stream.njk
@@ -0,0 +1,16 @@
+{% extends "templates/base.njk" %}
+
+{% block title %}Talk{% endblock %}
+
+{% block css %}
+<link href="{{ resolve('embed/stream/default.css')}}" rel="stylesheet">
+<link href="{{ resolve('embed/stream/bundle.css')}}" rel="stylesheet">
+{% endblock %}
+
+{% block html %}
+<div id="talk-embed-stream-container"></div>
+{% endblock %}
+
+{% block js %}
+<script src="{{ resolve('embed/stream/bundle.js')}}"></script>
+{% endblock %}
diff --git a/views/login.ejs b/views/login.ejs
deleted file mode 100644
index 671b25c83..000000000
--- a/views/login.ejs
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, user-scalable=no">
-    <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
-    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
-    <%- include partials/head %>
-    <link rel="stylesheet" type="text/css" href="<%= resolve('coral-login/bundle.css') %>">
-    <%- include partials/custom-css %>
-  </head>
-  <body>
-    <div id="talk-login-container"></div>
-    <script src='https://www.google.com/recaptcha/api.js?render=explicit' async defer></script>
-    <script src="<%= resolve('coral-login/bundle.js') %>"></script>
-  </body>
-</html>
diff --git a/views/login.njk b/views/login.njk
new file mode 100644
index 000000000..2288898c7
--- /dev/null
+++ b/views/login.njk
@@ -0,0 +1,16 @@
+{% extends "templates/base.njk" %}
+
+{% block title %}Talk - Login{% endblock %}
+
+{% block css %}
+<link href="{{ resolve('coral-login/bundle.css')}}" rel="stylesheet">
+{% endblock %}
+
+{% block html %}
+<div id="talk-login-container"></div>
+{% endblock %}
+
+{% block js %}
+<script src='https://www.google.com/recaptcha/api.js?render=explicit' async defer></script>
+<script src="{{ resolve('coral-login/bundle.js')}}"></script>
+{% endblock %}
diff --git a/views/partials/account.ejs b/views/partials/account.ejs
deleted file mode 100644
index ff2166816..000000000
--- a/views/partials/account.ejs
+++ /dev/null
@@ -1,4 +0,0 @@
-<%- include head %>
-<link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.indigo-pink.min.css">
-<link rel="stylesheet" href="<%= BASE_PATH %>public/css/admin.css">
-<%- include custom-css %>
diff --git a/views/partials/custom-css.ejs b/views/partials/custom-css.ejs
deleted file mode 100644
index d453c37e1..000000000
--- a/views/partials/custom-css.ejs
+++ /dev/null
@@ -1 +0,0 @@
-<% if (locals.customCssUrl) { %><link href="<%= customCssUrl %>" rel="stylesheet" type="text/css"><% } %>
diff --git a/views/partials/custom-css.njk b/views/partials/custom-css.njk
new file mode 100644
index 000000000..6d725e31e
--- /dev/null
+++ b/views/partials/custom-css.njk
@@ -0,0 +1,3 @@
+{% if customCssUrl %}
+<link href="{{ customCssUrl }}" rel="stylesheet">
+{% endif %}
diff --git a/views/partials/data.ejs b/views/partials/data.ejs
deleted file mode 100644
index f0bbf5925..000000000
--- a/views/partials/data.ejs
+++ /dev/null
@@ -1,3 +0,0 @@
-<%_ if (data != null) { _%>
-<script id="data" type="application/json"><%- JSON.stringify(data) %></script>
-<%_ } _%>
\ No newline at end of file
diff --git a/views/partials/data.njk b/views/partials/data.njk
new file mode 100644
index 000000000..4edaf2e2e
--- /dev/null
+++ b/views/partials/data.njk
@@ -0,0 +1,3 @@
+{% if data %}
+<script id="data" type="application/json">{{ data | dump | safe }}</script>
+{% endif %}
diff --git a/views/partials/dev-nav.ejs b/views/partials/dev-nav.ejs
deleted file mode 100644
index 088c52c20..000000000
--- a/views/partials/dev-nav.ejs
+++ /dev/null
@@ -1,8 +0,0 @@
-<nav class="navbar navbar-dark bg-dark">
-  <a class="navbar-brand" href="<%= BASE_PATH %>dev"><%= organizationName %> <span class="text-muted">Organization</span></a>
-  <form class="form-inline mb-0">
-    <a href="<%= BASE_PATH %>admin" class="btn btn-outline-primary mr-2"><i class="fa fa-lock" aria-hidden="true"></i> Admin</a>
-    <a href="<%= BASE_PATH %>api/v1/graph/iql" class="btn btn-outline-secondary mr-2 graphiql"><i class="fa fa-terminal" aria-hidden="true"></i> Graph<em>i</em>QL</a>
-    <a href="<%= BASE_PATH %>dev/assets" class="btn btn-outline-secondary"><i class="fa fa-list" aria-hidden="true"></i> All Assets</a>
-  </form>
-</nav>
diff --git a/views/partials/favicon.njk b/views/partials/favicon.njk
new file mode 100644
index 000000000..5ec2aad8a
--- /dev/null
+++ b/views/partials/favicon.njk
@@ -0,0 +1,14 @@
+<link rel="apple-touch-icon" sizes="57x57" href="{{ STATIC_URL }}public/img/apple-icon-57x57.png">
+<link rel="apple-touch-icon" sizes="60x60" href="{{ STATIC_URL }}public/img/apple-icon-60x60.png">
+<link rel="apple-touch-icon" sizes="72x72" href="{{ STATIC_URL }}public/img/apple-icon-72x72.png">
+<link rel="apple-touch-icon" sizes="76x76" href="{{ STATIC_URL }}public/img/apple-icon-76x76.png">
+<link rel="apple-touch-icon" sizes="114x114" href="{{ STATIC_URL }}public/img/apple-icon-114x114.png">
+<link rel="apple-touch-icon" sizes="120x120" href="{{ STATIC_URL }}public/img/apple-icon-120x120.png">
+<link rel="apple-touch-icon" sizes="144x144" href="{{ STATIC_URL }}public/img/apple-icon-144x144.png">
+<link rel="apple-touch-icon" sizes="152x152" href="{{ STATIC_URL }}public/img/apple-icon-152x152.png">
+<link rel="apple-touch-icon" sizes="180x180" href="{{ STATIC_URL }}public/img/apple-icon-180x180.png">
+<link rel="icon" type="image/png" sizes="32x32" href="{{ STATIC_URL }}public/img/favicon-32x32.png">
+<link rel="icon" type="image/png" sizes="96x96" href="{{ STATIC_URL }}public/img/favicon-96x96.png">
+<link rel="icon" type="image/png" sizes="16x16" href="{{ STATIC_URL }}public/img/favicon-16x16.png">
+<link rel="manifest" href="{{ STATIC_URL }}public/manifest.json">
+<meta name="msapplication-TileColor" content="#ffffff">
diff --git a/views/partials/head.ejs b/views/partials/head.ejs
deleted file mode 100644
index dc3df7103..000000000
--- a/views/partials/head.ejs
+++ /dev/null
@@ -1,23 +0,0 @@
-<meta charset="utf-8">
-<link rel="apple-touch-icon" sizes="57x57" href="<%= STATIC_URL %>public/img/apple-icon-57x57.png">
-<link rel="apple-touch-icon" sizes="60x60" href="<%= STATIC_URL %>public/img/apple-icon-60x60.png">
-<link rel="apple-touch-icon" sizes="72x72" href="<%= STATIC_URL %>public/img/apple-icon-72x72.png">
-<link rel="apple-touch-icon" sizes="76x76" href="<%= STATIC_URL %>public/img/apple-icon-76x76.png">
-<link rel="apple-touch-icon" sizes="114x114" href="<%= STATIC_URL %>public/img/apple-icon-114x114.png">
-<link rel="apple-touch-icon" sizes="120x120" href="<%= STATIC_URL %>public/img/apple-icon-120x120.png">
-<link rel="apple-touch-icon" sizes="144x144" href="<%= STATIC_URL %>public/img/apple-icon-144x144.png">
-<link rel="apple-touch-icon" sizes="152x152" href="<%= STATIC_URL %>public/img/apple-icon-152x152.png">
-<link rel="apple-touch-icon" sizes="180x180" href="<%= STATIC_URL %>public/img/apple-icon-180x180.png">
-<link rel="icon" type="image/png" sizes="32x32" href="<%= STATIC_URL %>public/img/favicon-32x32.png">
-<link rel="icon" type="image/png" sizes="96x96" href="<%= STATIC_URL %>public/img/favicon-96x96.png">
-<link rel="icon" type="image/png" sizes="16x16" href="<%= STATIC_URL %>public/img/favicon-16x16.png">
-<link rel="manifest" href="<%= STATIC_URL %>public/manifest.json">
-<meta name="msapplication-TileColor" content="#ffffff">
-
-<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
-<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600" rel="stylesheet">
-
-<%- include data %>
-
-<base href="<%= BASE_URL %>"/>
diff --git a/views/partials/nav.njk b/views/partials/nav.njk
new file mode 100644
index 000000000..ecea9018d
--- /dev/null
+++ b/views/partials/nav.njk
@@ -0,0 +1,8 @@
+<nav class="navbar navbar-dark bg-dark">
+  <a class="navbar-brand" href="{{ BASE_PATH }}dev">{{ organizationName }} <span class="text-muted">Organization</span></a>
+  <form class="form-inline mb-0">
+    <a href="{{ BASE_PATH }}admin" class="btn btn-outline-primary mr-2"><i class="fa fa-lock" aria-hidden="true"></i> Admin</a>
+    <a href="{{ BASE_PATH }}api/v1/graph/iql" class="btn btn-outline-secondary mr-2 graphiql"><i class="fa fa-terminal" aria-hidden="true"></i> Graph<em>i</em>QL</a>
+    <a href="{{ BASE_PATH }}dev/assets" class="btn btn-outline-secondary"><i class="fa fa-list" aria-hidden="true"></i> All Assets</a>
+  </form>
+</nav>
diff --git a/views/templates/account.njk b/views/templates/account.njk
new file mode 100644
index 000000000..7e1b6e6c9
--- /dev/null
+++ b/views/templates/account.njk
@@ -0,0 +1,6 @@
+{% extends "templates/base.njk" %}
+
+{% block css %}
+<link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.indigo-pink.min.css">
+<link rel="stylesheet" href="{{ BASE_PATH }}public/css/admin.css">
+{% endblock %}
diff --git a/views/templates/base.njk b/views/templates/base.njk
new file mode 100644
index 000000000..23048151e
--- /dev/null
+++ b/views/templates/base.njk
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    {# Meta tags #}
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, user-scalable=no">
+    {% block meta %}{% endblock %}
+
+    {# Favicon Configuration #}
+    {% include "partials/favicon.njk" %}
+
+    {# CSP and security headers #}
+    {% block security %}{% endblock %}
+
+    {# Title #}
+    <title>{% block title %}{% endblock %}</title>
+
+    {# CSS #}
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600" rel="stylesheet">
+    {% include "partials/custom-css.njk" %}
+    {% block css %}{% endblock %}
+
+    {# Static data injection #}
+    {% include "partials/data.njk" %}
+
+    {# Configuration #}
+    <base href="{{ BASE_URL }}"/>
+  </head>
+  <body>
+    {% block body %}
+    {% block html %}
+    <div id="root"></div>
+    {% endblock %}
+    {% endblock %}
+    {% block js %}{% endblock %}
+  </body>
+</html>
diff --git a/views/partials/dev.ejs b/views/templates/development.njk
similarity index 54%
rename from views/partials/dev.ejs
rename to views/templates/development.njk
index 691b548e5..f7fab6682 100644
--- a/views/partials/dev.ejs
+++ b/views/templates/development.njk
@@ -1,5 +1,17 @@
-<meta name="viewport" content="width=device-width, initial-scale=1">
+{% extends "templates/base.njk" %}
+
+{# Null out the security block, we don't want/need that in development #}
+{% block security %}{% endblock %}
+
+{% block css %}
 <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
 <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600" rel="stylesheet">
 <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" integrity="sha384-WskhaSGFgHYWDcbwN70/dfYBj47jz9qbsMId/iRN3ewGhXQFZCSftd1LZCfmhktB" crossorigin="anonymous" rel="stylesheet">
-<link href="<%= BASE_PATH %>public/css/dev.css" rel="stylesheet" >
+<link href="{{ BASE_PATH }}public/css/dev.css" rel="stylesheet" >
+{% endblock %}
+
+{% block body %}
+  {% include "partials/nav.njk" %}
+
+  {% block html %}{% endblock %}
+{% endblock %}
diff --git a/yarn.lock b/yarn.lock
index f0da6d006..770dcc7ec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2392,6 +2392,12 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
 
+consolidate@0.14.0:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.14.0.tgz#b03acd566a2565ca96e99f44fd1417486b4df88d"
+  dependencies:
+    bluebird "^3.1.1"
+
 constantinople@^3.0.1:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-3.1.0.tgz#7569caa8aa3f8d5935d62e1fa96f9f702cd81c79"

From d83c2fd566e53d00350bac570c5a8177628d4b4c Mon Sep 17 00:00:00 2001
From: Mendel Konikov <mkonikov@gmail.com>
Date: Thu, 17 May 2018 20:03:12 -0400
Subject: [PATCH 032/144] Only display paragraph if delete requested

---
 .../client/components/DeleteMyAccount.js            | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js b/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js
index 179fa0193..6eae91043 100644
--- a/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js
+++ b/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js
@@ -63,14 +63,13 @@ class DeleteMyAccount extends React.Component {
         <p className="talk-plugin-auth--delete-my-account-description">
           {t('delete_request.delete_my_account_description')}
         </p>
-        <p className="talk-plugin-auth--delete-my-account-description">
-          {scheduledDeletionDate &&
-            t(
-              'delete_request.already_submitted_request_description',
-              moment(scheduledDeletionDate).format('MMM Do YYYY, h:mm:ss a')
-            )}
-        </p>
         {scheduledDeletionDate ? (
+          <p className="talk-plugin-auth--delete-my-account-description">
+            {t(
+                'delete_request.already_submitted_request_description',
+                moment(scheduledDeletionDate).format('MMM Do YYYY, h:mm:ss a')
+              )}
+          </p>
           <Button onClick={this.cancelAccountDeletion}>
             {t('delete_request.cancel_account_deletion_request')}
           </Button>

From c84a9716a11ccdcc2942f92a0e00b66aa7c4747b Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 17 May 2018 18:37:50 -0600
Subject: [PATCH 033/144] added support for csp

---
 middleware/contentSecurityPolicy.js           | 49 +++++++++++++++++++
 middleware/nonce.js                           |  9 ++++
 .../views/unsubscribe-notifications.njk       | 11 ++++-
 .../server/views/download.njk                 |  2 +-
 routes/api/v1/csp.js                          | 33 +++++++++++++
 routes/api/v1/index.js                        |  1 +
 routes/index.js                               | 16 +++---
 routes/plugins.js                             | 10 ++--
 views/account/email/confirm.njk               |  2 +-
 views/account/password/reset.njk              |  2 +-
 views/admin.njk                               |  2 +-
 views/login.njk                               |  2 +-
 12 files changed, 120 insertions(+), 19 deletions(-)
 create mode 100644 middleware/contentSecurityPolicy.js
 create mode 100644 middleware/nonce.js
 create mode 100644 routes/api/v1/csp.js

diff --git a/middleware/contentSecurityPolicy.js b/middleware/contentSecurityPolicy.js
new file mode 100644
index 000000000..992e41e36
--- /dev/null
+++ b/middleware/contentSecurityPolicy.js
@@ -0,0 +1,49 @@
+const helmet = require('helmet');
+const { WEBSOCKET_LIVE_URI } = require('../config');
+const { BASE_PATH, BASE_URL, STATIC_URL } = require('../url');
+const { URL } = require('url');
+
+// websocketSrc represents the host where we can connect for websocket requests.
+const websocketSrc = new URL(WEBSOCKET_LIVE_URI || BASE_URL).host;
+
+// staticSrc represents any static asset hosted on the static host.
+const staticSrc = new URL(STATIC_URL).host;
+
+// nonceSrc represents the nonce source that is used to indicate a safe resource
+// to load.
+const nonceSrc = (req, res) => `'nonce-${res.locals.nonce}'`;
+
+module.exports = helmet.contentSecurityPolicy({
+  directives: {
+    reportUri: `${BASE_PATH}api/v1/csp`, // report all policy violations to our reporting uri
+    defaultSrc: ["'none'"], // by default, do not allow anything at all
+    scriptSrc: [
+      "'self'",
+      'https://ajax.googleapis.com', // for jquery
+      staticSrc, // for any static files loaded from a cdn
+      nonceSrc,
+    ],
+    styleSrc: [
+      "'self'",
+      'https://maxcdn.bootstrapcdn.com', // for bootstrap css
+      'https://fonts.googleapis.com', // for google fonts
+      'https://code.getmdl.io', // for mdl css
+      staticSrc, // for any static files loaded from a cdn
+      nonceSrc,
+    ],
+    connectSrc: ["'self'", websocketSrc],
+    fontSrc: [
+      "'self'",
+      'https://maxcdn.bootstrapcdn.com', // for font-awesome
+      'https://fonts.gstatic.com', // for google fonts
+      staticSrc, // for any static files loaded from a cdn
+      nonceSrc,
+    ],
+    imgSrc: [
+      "'self'",
+      staticSrc, // for any static files loaded from a cdn
+      nonceSrc,
+    ],
+  },
+  browserSniff: false,
+});
diff --git a/middleware/nonce.js b/middleware/nonce.js
new file mode 100644
index 000000000..1181fac85
--- /dev/null
+++ b/middleware/nonce.js
@@ -0,0 +1,9 @@
+const uuid = require('uuid/v4');
+
+// nonce is designed to create a random value that can be used in conjunction
+// with the csp middleware.
+module.exports = (req, res, next) => {
+  res.locals.nonce = uuid();
+
+  next();
+};
diff --git a/plugins/talk-plugin-notifications/server/views/unsubscribe-notifications.njk b/plugins/talk-plugin-notifications/server/views/unsubscribe-notifications.njk
index f8191d525..5080277f0 100644
--- a/plugins/talk-plugin-notifications/server/views/unsubscribe-notifications.njk
+++ b/plugins/talk-plugin-notifications/server/views/unsubscribe-notifications.njk
@@ -2,10 +2,17 @@
 
 {% block title %}{{ t('talk-plugin-notifications.unsubscribe_page.unsubscribe') }}{% endblock %}
 
+{% block css %}
+{{ super() }}
+<style nonce="{{ nonce }}" type="text/css">
+#success { display:none; }
+</style>
+{% endblock %}
+
 {% block html %}
 <div id="root">
   <div class="error-console container">{{ t('talk-plugin-notifications.unsubscribe_page.token_invalid') }}</div>
-  <div id="success" style="display:none;" class="legend container">{{ t('talk-plugin-notifications.unsubscribe_page.are_unsubscribed') }}</div>
+  <div id="success" class="legend container">{{ t('talk-plugin-notifications.unsubscribe_page.are_unsubscribed') }}</div>
   <form id="unsubscribe-form" class="container">
     <legend class="legend">{{ t('talk-plugin-notifications.unsubscribe_page.click_to_confirm') }}</legend>
     <button type="submit">{{ t('talk-plugin-notifications.unsubscribe_page.confirm') }}</button>
@@ -15,7 +22,7 @@
 
 {% block js %}
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
-<script type="text/javascript">
+<script nonce="{{ nonce }}" type="text/javascript">
   $(function() {
     var submitting = false;
     var payload = JSON.stringify({token: location.hash.replace('#', '')});
diff --git a/plugins/talk-plugin-profile-data/server/views/download.njk b/plugins/talk-plugin-profile-data/server/views/download.njk
index 5527473bc..ee9c94272 100644
--- a/plugins/talk-plugin-profile-data/server/views/download.njk
+++ b/plugins/talk-plugin-profile-data/server/views/download.njk
@@ -24,7 +24,7 @@
 
 {% block js %}
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
-<script type="text/javascript">
+<script nonce="{{ nonce }}" type="text/javascript">
   $(function() {
     function showError(error) {
       try {
diff --git a/routes/api/v1/csp.js b/routes/api/v1/csp.js
new file mode 100644
index 000000000..ad1101987
--- /dev/null
+++ b/routes/api/v1/csp.js
@@ -0,0 +1,33 @@
+const express = require('express');
+const Joi = require('joi');
+const { logger } = require('../../../services/logging');
+const router = express.Router();
+
+const schema = Joi.object().keys({
+  'csp-report': Joi.object().keys({
+    'document-uri': Joi.string(),
+    referrer: Joi.string(),
+    'blocked-uri': Joi.string(),
+    'violated-directive': Joi.string(),
+    'original-policy': Joi.string(),
+  }),
+});
+
+const json = express.json({ type: 'application/csp-report' });
+
+router.post('/', json, async (req, res, next) => {
+  const { value, error: err } = Joi.validate(req.body, schema, {
+    stripUnknown: true,
+    presence: 'required',
+  });
+  if (err) {
+    res.status(400).end();
+    return;
+  }
+
+  logger.error({ report: value }, 'csp violation reported');
+
+  res.status(202).end();
+});
+
+module.exports = router;
diff --git a/routes/api/v1/index.js b/routes/api/v1/index.js
index 46d5c0278..7f715c854 100644
--- a/routes/api/v1/index.js
+++ b/routes/api/v1/index.js
@@ -9,6 +9,7 @@ router.get('/', (req, res) => {
 });
 
 router.use('/account', require('./account'));
+router.use('/csp', require('./csp'));
 router.use('/assets', require('./assets'));
 router.use('/auth', require('./auth'));
 router.use('/graph', require('./graph'));
diff --git a/routes/index.js b/routes/index.js
index 2dbfd51ff..5183e2881 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -9,7 +9,9 @@ const path = require('path');
 const compression = require('compression');
 const plugins = require('../services/plugins');
 const staticTemplate = require('../middleware/staticTemplate');
-const staticMiddleware = require('express-static-gzip');
+const contentSecurityPolicy = require('../middleware/contentSecurityPolicy');
+const nonce = require('../middleware/nonce');
+const staticServer = require('express-static-gzip');
 const { DISABLE_STATIC_SERVER } = require('../config');
 const { passport } = require('../services/passport');
 const { MOUNT_PATH } = require('../url');
@@ -48,7 +50,7 @@ if (!DISABLE_STATIC_SERVER) {
   if (process.env.NODE_ENV === 'production') {
     router.use(
       '/static',
-      staticMiddleware(dist, {
+      staticServer(dist, {
         indexFromEmptyFile: false,
         enableBrotli: true,
         customCompressions: [
@@ -74,10 +76,12 @@ router.use(compression());
 // STATIC ROUTES
 //==============================================================================
 
-router.use('/admin', staticTemplate, require('./admin'));
-router.use('/account', staticTemplate, require('./account'));
-router.use('/login', staticTemplate, require('./login'));
-router.use('/embed', staticTemplate, require('./embed'));
+const staticMiddleware = [staticTemplate, nonce, contentSecurityPolicy];
+
+router.use('/admin', ...staticMiddleware, require('./admin'));
+router.use('/account', ...staticMiddleware, require('./account'));
+router.use('/login', ...staticMiddleware, require('./login'));
+router.use('/embed', ...staticMiddleware, require('./embed'));
 
 //==============================================================================
 // PASSPORT MIDDLEWARE
diff --git a/routes/plugins.js b/routes/plugins.js
index 647acdb75..fcc1125b9 100644
--- a/routes/plugins.js
+++ b/routes/plugins.js
@@ -2,15 +2,13 @@ const express = require('express');
 const debug = require('debug')('talk:routes:plugins');
 const plugins = require('../services/plugins');
 const staticTemplate = require('../middleware/staticTemplate');
+const contentSecurityPolicy = require('../middleware/contentSecurityPolicy');
+const nonce = require('../middleware/nonce');
 
 const router = express.Router();
 
-// Routes mounted from plugins won't have access to our internal partials
-// directory, so we should make that available.
-router.use(staticTemplate, (req, res, next) => {
-  res.locals.root = res.app.get('views');
-  next();
-});
+// Apply the middleware.
+router.use(staticTemplate, nonce, contentSecurityPolicy);
 
 // Inject server route plugins.
 plugins.get('server', 'router').forEach(plugin => {
diff --git a/views/account/email/confirm.njk b/views/account/email/confirm.njk
index 6111cb21e..8e2c9ff05 100644
--- a/views/account/email/confirm.njk
+++ b/views/account/email/confirm.njk
@@ -17,7 +17,7 @@
 
 {% block js %}
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
-<script type="text/javascript">
+<script nonce="{{ nonce }}" type="text/javascript">
   $(function() {
     function showError(error) {
       try {
diff --git a/views/account/password/reset.njk b/views/account/password/reset.njk
index b6f227dea..6eee12dd0 100644
--- a/views/account/password/reset.njk
+++ b/views/account/password/reset.njk
@@ -26,7 +26,7 @@
 
 {% block js %}
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
-<script>
+<script nonce="{{ nonce }}" type="text/javascript">
   $(function() {
     function showError(error) {
       try {
diff --git a/views/admin.njk b/views/admin.njk
index 4b5236424..1b60f6e76 100644
--- a/views/admin.njk
+++ b/views/admin.njk
@@ -9,6 +9,6 @@
 {% endblock %}
 
 {% block js %}
-<script src='https://www.google.com/recaptcha/api.js?render=explicit' async defer></script>
+<script nonce="{{ nonce }}" src='https://www.google.com/recaptcha/api.js?render=explicit' async defer></script>
 <script src="{{ resolve('coral-admin/bundle.js') }}"></script>
 {% endblock %}
diff --git a/views/login.njk b/views/login.njk
index 2288898c7..6a3c1112f 100644
--- a/views/login.njk
+++ b/views/login.njk
@@ -11,6 +11,6 @@
 {% endblock %}
 
 {% block js %}
-<script src='https://www.google.com/recaptcha/api.js?render=explicit' async defer></script>
+<script nonce="{{ nonce }}" src='https://www.google.com/recaptcha/api.js?render=explicit' async defer></script>
 <script src="{{ resolve('coral-login/bundle.js')}}"></script>
 {% endblock %}

From 5f410276c6ace553e5821b1edf1579445ab60ef9 Mon Sep 17 00:00:00 2001
From: Mendel Konikov <mkonikov@gmail.com>
Date: Thu, 17 May 2018 20:41:59 -0400
Subject: [PATCH 034/144] Show overflow text on download comments button when
 disabled

---
 .../client/components/DownloadCommentHistory.css           | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/talk-plugin-profile-data/client/components/DownloadCommentHistory.css b/plugins/talk-plugin-profile-data/client/components/DownloadCommentHistory.css
index 55ea39969..cd523a0cd 100644
--- a/plugins/talk-plugin-profile-data/client/components/DownloadCommentHistory.css
+++ b/plugins/talk-plugin-profile-data/client/components/DownloadCommentHistory.css
@@ -1,6 +1,9 @@
 .button {
   margin: 0;
-
+  &:disabled {
+    overflow: visible;
+    height: auto;
+  }
   i {
     font-size: inherit;
     vertical-align: sub;
@@ -9,4 +12,4 @@
 
 .most_recent {
   color: #808080;
-}
+}
\ No newline at end of file

From ebcff4d95e378f46fc0b1b693e9bb8250a86a490 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 17 May 2018 18:58:01 -0600
Subject: [PATCH 035/144] patched migration bugs

---
 models/schema/user.js | 10 +++++++++
 services/actions.js   | 49 +++++++++++++++++++------------------------
 2 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/models/schema/user.js b/models/schema/user.js
index a4ccfd185..a27b8dc39 100644
--- a/models/schema/user.js
+++ b/models/schema/user.js
@@ -339,6 +339,11 @@ User.virtual('banned')
   })
   .set(function(status) {
     this.status.banned.status = status;
+
+    if (!this.status.banned.history) {
+      this.status.banned.history = [];
+    }
+
     this.status.banned.history.push({
       status,
       created_at: new Date(),
@@ -357,6 +362,11 @@ User.virtual('suspended')
   })
   .set(function(until) {
     this.status.suspension.until = until;
+
+    if (!this.status.suspension.history) {
+      this.status.suspension.history = [];
+    }
+
     this.status.suspension.history.push({
       until,
       created_at: new Date(),
diff --git a/services/actions.js b/services/actions.js
index 1c95e5128..790adc6a0 100644
--- a/services/actions.js
+++ b/services/actions.js
@@ -2,7 +2,7 @@ const ActionModel = require('../models/action');
 const CommentModel = require('../models/comment');
 const UserModel = require('../models/user');
 const _ = require('lodash');
-const errors = require('../errors');
+const { ErrAlreadyExists } = require('../errors');
 
 const incrActionCounts = async (action, value) => {
   const ACTION_TYPE = action.action_type.toLowerCase();
@@ -41,35 +41,30 @@ const incrActionCounts = async (action, value) => {
  * @param {object} update the update operation for the mongo findOneAndUpdate op
  * @param {object} options the options operation for the mongo findOneAndUpdate op
  */
-const findOnlyOneAndUpdate = async (query, update, options = {}) =>
-  new Promise((resolve, reject) => {
-    ActionModel.findOneAndUpdate(
-      query,
-      update,
-      Object.assign({}, options, {
-        // Use raw result to get `updatedExisting`.
-        passRawResult: true,
+const findOnlyOneAndUpdate = async (query, update, options = {}) => {
+  const raw = await ActionModel.findOneAndUpdate(
+    query,
+    update,
+    Object.assign({}, options, {
+      // Use raw result to get `updatedExisting`.
+      rawResult: true,
 
-        // Ensure that if it's new, we return the new object created.
-        new: true,
+      // Ensure that if it's new, we return the new object created.
+      new: true,
 
-        // Perform an upsert in the event that this doesn't exist.
-        upsert: true,
+      // Perform an upsert in the event that this doesn't exist.
+      upsert: true,
 
-        // Set the default values if not provided based on the mongoose models.
-        setDefaultsOnInsert: true,
-      }),
-      (err, doc, raw) => {
-        if (err) {
-          return reject(err);
-        }
-        if (raw.lastErrorObject.updatedExisting) {
-          return reject(new errors.ErrAlreadyExists(raw.value));
-        }
-        return resolve(raw.value);
-      }
-    );
-  });
+      // Set the default values if not provided based on the mongoose models.
+      setDefaultsOnInsert: true,
+    })
+  );
+  if (raw.lastErrorObject.updatedExisting) {
+    throw new ErrAlreadyExists(raw.value);
+  }
+
+  return raw.value;
+};
 
 module.exports = class ActionsService {
   /**

From 8ee90387f689b5eba29cc1ed24a2304a8c100e8e Mon Sep 17 00:00:00 2001
From: Fabian Neumann <neumann@ferret-go.com>
Date: Mon, 7 May 2018 12:33:47 +0200
Subject: [PATCH 036/144] German translations for v4.4.1

---
 locales/de.yml                                | 60 ++++++++++++----
 .../talk-plugin-local-auth/translations.yml   | 70 +++++++++++++++++++
 .../client/translations.yml                   | 51 ++++++++++++++
 .../talk-plugin-profile-data/translations.yml | 37 ++++++++++
 4 files changed, 206 insertions(+), 12 deletions(-)

diff --git a/locales/de.yml b/locales/de.yml
index d2b247fbc..94ecfc1f3 100644
--- a/locales/de.yml
+++ b/locales/de.yml
@@ -20,10 +20,13 @@ de:
   bio_offensive: "Diese Biographie ist unangemessen"
   cancel: "Abbrechen"
   confirm_email:
+    email_confirmation: "E-Mail-Bestätigung"
     click_to_confirm: "Unten klicken, um E-Mail-Adresse zu bestätigen"
     confirm: "Bestätigen"
   password_reset:
+    mail_sent: 'Falls Sie eine registriertes Konto haben, wurde Ihnen ein Zurücksetzen-Link an diese E-Mail-Adresse geschickt'
     set_new_password: "Passwort ändern"
+    change_password_help: "Bitte geben Sie ein neues Passwort ein. Benutzen Sie ein sicheres!"
     new_password: "Neues Passwort"
     new_password_help: "Das Passwort benötigt mindestens 8 Zeichen"
     confirm_new_password: "Neues Passwort bestätigen"
@@ -120,9 +123,10 @@ de:
     custom_css_url: "Benutzerdefinierte CSS-URL"
     custom_css_url_desc: "URL eines CSS-Stylesheets zum Überschreiben des Standard-Designs"
     days: Tage
-    description: "Als Administrator können Sie die Einstellungen für den Kommentarbereich dieses Artikels anpassen:"
+    description: "Ändern Sie die Einstellungen für den Kommentarbereich dieses Artikels."
     domain_list_text: "Geben Sie Domains an, für die diese Talk-Instanz freigegeben werden soll, z.B. für lokale Test- oder Produktionsumgebungen (Bsp.: localhost:3000 staging.domain.com domain.com)."
     domain_list_title: "Zugelassene Domains"
+    edit_info: "Information bearbeiten"
     edit_comment_timeframe_heading: "Zeitlimit zur Bearbeitung von Kommentaren"
     edit_comment_timeframe_text_pre: "Kommentatoren haben"
     edit_comment_timeframe_text_post: "Sekunden Zeit, um ihre Kommentare zu bearbeiten."
@@ -148,17 +152,31 @@ de:
     open_stream_configuration: "Dieser Kommentarbereich ist momentan geöffnet. Nach dem Schließen dieses Kommentarbereich wird es nicht mehr möglich sein, zu kommentieren. Bestehende Kommentare bleiben sichtbar."
     require_email_verification: "E-Mail-Bestätigung erforderlich"
     require_email_verification_text: "Neue Nutzer müssen ihre E-Mail-Adresse bestätigen."
+    save: "Speichern"
     save_changes: "Änderungen speichern"
     shortcuts: Tastaturkürzel
     sign_out: "Abmelden"
     stories: Artikel
     stream_settings: "Einstellungen Kommentarbereich"
+    access_message: "Sie müssen Administrator sein, um auf die Einstellungen zuzugreifen. Fragen Sie ggf. einen Administrator, der Ihnen mehr Recht zuweisen kann!"
     suspect_word_title: "Liste verdächtiger Wörter"
     suspect_word_text: "Kommentare, die diese Wörter oder Phrasen enthalten (unabhängig von Groß-/Kleinschreibung), werden im Kommentarbereich markiert. Geben Sie ein Wort ein und bestätigen Sie mit Eingabetaste oder Tab. Es ist auch möglich, einen komma-separierten Text einzufügen."
     tech_settings: "Technische Einstellungen"
+    organization_information: "Über die Organisation"
+    organization_info_copy: "Wir verwenden diese Informationen in automatisierten E-Mail-Benachrichtigungen, die Talk versendet. Damit können Nutzer Ihre Organisation identifizieren und sie haben die Möglichkeit bei Problemen in Kontakt mit Ihnen zu treten."
+    organization_info_copy_2: "Wir empfehlen, einee generische E-Mail-Adresse (z.B. community@yournewsroom.com) für diesen Zweck einzurichten. Die kann über die Zeit gleich bleiben, und gibt nach außen keine Namen preis, die von Nutzern im Fall von Konflikten für persönliche Angriffe missbraucht werden könnten."
+    organization_details: "Details zur Organisation"
+    organization_name: "Name der Organisation"
+    organization_contact_email: "E-Mail-Adresse der Organisation"
     title: "Kommentarbereich konfigurieren"
     weeks: Wochen
     wordlist: "Gesperrte Wörter"
+    save_changes_dialog:
+      unsaved_changes: "Ungespeicherte Änderungen"
+      copy: "Sie haben einen oder mehrere Änderungen vorgenommen, ohne zu speichern. Möchten Sie jetzt speichern oder die Änderungen verwerfen?"
+      save_settings: "Einstellungen speichern"
+      discard: "Verwerfen"
+      cancel: "Abbrechen"
   continue: "Fortfahren"
   createdisplay:
     check_the_form: "Ungültige Eingabe. Bitte prüfen Sie die Felder."
@@ -200,11 +218,17 @@ de:
       we_received_a_request: "Wir haben eine Anfrage erhalten, Ihr Passwort zurückzusetzen. Sollten Sie dies nicht angefordert haben, können Sie diese Nachricht ignorieren."
       if_you_did: "Falls doch,"
       please_click: "klicken Sie bitte hier zum Zurücksetzen"
+      subject: "Passwort zurücksetzen"
+    password_change:
+      subject: "{0} Passwort-Änderung"
+      body: "Das Passwort Ihres Benutzerkontos wurde geändert.\n\nFalls Sie diese Änderung nicht angefordert haben, kontaktieren Sie uns bitte unter {0}."
   embedlink:
     copy: "In die Zwischenablage kopieren"
   error:
+    PASSWORD_INCORRECT: "Ihr bestehendes Passwort wurde falsch eingegeben"
     COMMENT_PARENT_NOT_VISIBLE: "Der Kommentar, auf den Sie antworten möchten, wurde entfernt oder existiert nicht."
     EMAIL_VERIFICATION_TOKEN_INVALID: "Code zur E-Mail-Bestätigung ist ungültig."
+    EMAIL_ALREADY_VERIFIED: "E-Mail-Adresse ist bereits bestätigt."
     PASSWORD_RESET_TOKEN_INVALID: "Ihr Link zum Passwort zurücksetzen ist ungültig."
     COMMENT_TOO_SHORT: "Kommentare sollten mehr als ein Zeichen enthalten, bitte überprüfen Sie Ihren Kommentar und probieren Sie es erneut."
     NOT_AUTHORIZED: "Sie sind nicht berechtigt, diese Aktion auszuführen."
@@ -227,15 +251,20 @@ de:
     ALREADY_EXISTS: "Ressource existiert bereits"
     INVALID_ASSET_URL: "Asset-URL ist ungültig"
     CANNOT_IGNORE_STAFF: "Mitarbeiter können nicht ignoriert werden."
-    email: "E-Mail-Adresse ungültig"
+    INCORRECT_PASSWORD: "Falsches Passwort"
+    email: "Bitte geben Sie eine gültige E-Mail-Adresse ein."
+    DELETION_NOT_SCHEDULED: "Löschvorgang wurde nicht geplant"
     confirm_password: "Passwörter nicht identisch. Bitte erneut überprüfen"
     network_error: "Server-Verbindung fehlgeschlagen. Bitte überprüfen Sie ihre Internetverbindung und versuchen Sie es erneut."
     email_not_verified: "E-Mail-Adresse {0} nicht bestätigt."
     email_password: "E-Mail und/oder Passwort inkorrekt."
     organization_name: "Namen von Organisationen dürfen nur Buchstaben und Zahlen enthalten."
+    organization_contact_email: "E-Mail-Adresse der Organisation ist ungültig."
     password: "Passwort muss mindestens 8 Zeichen enthalten"
     username: "Nutzernamen dürfen nur Buchstaben, Zahlen und _ enthalten"
     unexpected: "Unerwarteter Fehler aufgetreten. Es tut uns leid!"
+    required_field: "Dieses Feld ist erforderlich"
+    temporarily_suspended: "Ihr Konto ist vorübergehend gesperrt. Es wird wieder aktiviert am {0}. Bei Fragen setzen Sie sich mit uns in Kontakt."
   flag_comment: "Kommentar melden"
   flag_reason: "Grund der Meldung (optional)"
   flag_username: "Nutzername melden"
@@ -245,6 +274,7 @@ de:
     comment: Kommentar
     comment_is_ignored: "Dieser Kommentar ist nicht sichtbar, da Sie den Nutzer ignorieren."
     comment_is_rejected: "Sie haben diesen Kommentar abgelehnt."
+    comment_is_deleted: "Der Kommentar wurde vom Nutzer gelöscht."
     comment_is_hidden: "Dieser Kommentar ist nicht verfügbar."
     comments: Kommentare
     configure_stream: "Konfigurieren"
@@ -333,6 +363,7 @@ de:
     sort: "Sortieren"
     show_shortcuts: "Tastaturkürzel anzeigen"
     singleview: "Zen-Modus"
+    system_withheld: "System Withheld"
     thismenu: "Dieses Menü öffnen"
     jump_to_queue: "Zu bestimmter Liste springen"
     thousand: T
@@ -355,6 +386,9 @@ de:
   report_notif: "Vielen Dank für Ihre Meldung. Unsere Moderatoren wurden informiert und werden sich in Kürze darum kümmern."
   report_notif_remove: "Ihre Meldung wurde entfernt."
   reported: Gemeldet
+  comment_history_blank:
+    title: Sie haben noch keine Kommentare verfasst
+    info: Hier wird ein Verlauf Ihrer verfassten Kommentare erscheinen
   settings:
     from_settings_page: "Sie können auf Ihrer Profilseite Ihren Kommentarverlauf einsehen."
     my_comment_history: "Mein Kommentarverlauf"
@@ -366,7 +400,7 @@ de:
   stream:
     all_comments: "Alle Kommentare"
     temporarily_suspended: "Entsprechend der Community-Regeln von {0} wurde Ihr Konto vorübergehend gesperrt. Nehmen Sie {1} wieder an der Diskussion teil."
-    comment_not_found: "Kommentar nicht gefunden"
+    comment_not_found: "Dieser Kommentar wurde entfernt oder existiert nicht."
     no_comments: "Es gibt noch keine Kommentare. Schreiben Sie doch einen..."
     no_comments_and_closed: "Es gab zu diesem Artikel keine Kommentare."
   step_1_header: "Ein Problem melden"
@@ -393,6 +427,8 @@ de:
     one_hour: "1 Stunde"
     hours: "{0} Stunden"
     days: "{0} Tage"
+    hour: "{0} hours"
+    day: "{0} days"
     cancel: "Abbrechen"
     suspend_user: "Nutzer vorübergehend sperren"
     email_message_suspend: "Sehr geehrte/r {0}, entsprechend der Community-Richtlinien von {1} wurde Ihr Konto vorübergehend gesperrt. Während der Sperrung können Sie weder kommentieren noch andere Aktionen ausführen. Nehmen Sie {2} wieder an der Diskussion teil."
@@ -432,15 +468,15 @@ de:
     rejected: "Abgelehnte"
     user_history: "Konto-Verlauf"
   user_history:
-    user_banned: "User banned"
-    ban_removed: "Ban removed"
-    username_status: "Username {0}"
-    suspended: "Suspended, {0}"
-    suspension_removed: "Suspension removed"
+    user_banned: "Nutzer gesperrt"
+    ban_removed: "Sperrung aufgehoben"
+    username_status: "Nutzername {0}"
+    suspended: "Vorübergehend gesperrt, {0}"
+    suspension_removed: "Vorübergehende Sperrung aufgehoben"
     system: "System"
-    date: "Date"
-    action: "Action"
-    taken_by: "Taken By"
+    date: "Datum"
+    action: "Aktion"
+    taken_by: "Durch"
   user_impersonating: "Gibt sich für jemand anderen aus"
   user_no_comment: "Sie haben noch keinen Kommentar abgegeben. Teilen Sie Ihre Meinung mit uns!"
   username_offensive: "Dieser Nutzername ist unangemessen"
@@ -458,7 +494,7 @@ de:
       username: "Nutzername"
       password: "Passwort"
       confirm_password: "Passwort bestätigen"
-      organization_contact_email: "Organization Contact Email"
+      organization_contact_email: "Kontakt-Adresse der Organisation"
       save: "Speichern"
     permitted_domains:
       title: "Zugelassene Domains"
diff --git a/plugins/talk-plugin-local-auth/translations.yml b/plugins/talk-plugin-local-auth/translations.yml
index 7f67e33bd..4e6486c08 100644
--- a/plugins/talk-plugin-local-auth/translations.yml
+++ b/plugins/talk-plugin-local-auth/translations.yml
@@ -68,6 +68,76 @@ en:
         description_2: "You can change your account settings by visiting"
         path: "My Profile > Settings"
         alert: "Email Added!"
+de:
+  email:
+    email_change_original:
+      subject: Änderung Ihrer E-Mail-Adresse
+      body: Ihre E-Mail-Adresse wurde von {0} zu {1} geändert. Falls Sie diese Änderung nicht selbst vorgenommen haben, kontaktieren Sie bitte zur Sicherheit {2}.
+  error:
+    NO_LOCAL_PROFILE: Mit diesem Benutzerkonto ist keine E-Mail-Adresse verbunden.
+    LOCAL_PROFILE: Es ist bereits eine bestätigte E-Mail-Adresse mit diesem Benutzerkonto verbunden.
+    INCORRECT_PASSWORD: Das Passwort war nicht korrekt.
+  talk-plugin-local-auth:
+    change_password:
+      change_password: "Passwort ändern"
+      passwords_dont_match: "Die Passwörter stimmen nicht überein"
+      required_field: "Diese Angabe ist erforderlich"
+      forgot_password: "Passwort vergessen?"
+      save: "Speichern"
+      cancel: "Abbrechen"
+      edit: "Ändern"
+      changed_password_msg: "Passwort geändert - Ihr Passwort wurde erfolgreich geändert"
+      forgot_password_sent: "Passwort vergessen - Wir haben Ihnen eine E-Mail zum Zurücksetzen des Passwortes geschickt"
+    change_username:
+      change_username_note: "Nutzernamen können nur alle 14 Tage geändert werden. Ihr Nutzername ist zur Zeit nicht editierbar."
+      save: "Speichern"
+      edit_profile: "Profil ändern"
+      cancel: "Abbrechen"
+      confirm_username_change: "Änderung des Nutzernamens bestätigen"
+      description: "Sie möchten Ihren Nutzernamen ändern: der neue Nutzername wird an allen alten und neuen Kommentaren erscheinen."
+      old_username: "Alter Nutzername"
+      new_username: "Neuer Nutzername"
+      bottom_note: "Achtung: die nächste Änderung des Nutzernamens ist erst nach 14 Tagen möglich"
+      confirm_changes: "Änderung bestätigen"
+      username_does_not_match: "Die Nutzernamen stimmen nicht überein"
+      cant_be_equal: "Der neue Nutzername {0} muss sich vom alten unterscheiden."
+      changed_username_success_msg: "Nutzername geändert - Ihr Nutzername wurde erfolgreich aktualisiert. Die nächste Änderung des Nutzernamens ist erst nach 14 Tagen möglich."
+      change_username_attempt: "Der Nutzername kann zur Zeit nicht aktualisiert werden. Änderungen sind nur nach jeweils 14 Tagen möglich."
+    change_email:
+      confirm_email_change: "Änderung der E-Mail-Adresse bestätigen"
+      description: "Sie versuchen, Ihre E-Mail-Adresse ändern: die neue E-Mail-Adresse wird zum Login sowie für Benachrichtigungen bzgl. Ihres Benutzerkontos verwendet."
+      old_email: "Alte E-Mail-Adresse"
+      new_email: "Neue E-Mail-Adresse"
+      enter_password: "Passwort"
+      incorrect_password: "Passwort nicht korrekt"
+      confirm_change: "Änderung bestätigen"
+      cancel: "Abbrechen"
+      change_email_msg: "E-Mail-Adresse erfolgreich aktualisiert - die neue E-Mail-Adresse ab sofort zum Anmelden und für Benachrichtigungen verwendet."
+    add_email:
+      add_email_address: "E-Mail-Adresse hinzufügen"
+      enter_email_address: "E-Mail-Adresse:"
+      invalid_email_address: "Ungültige E-Mail-Adresse"
+      confirm_email_address: "Bestätigung der E-Mail-Adresse:"
+      email_does_not_match: "Die E-Mail-Adressen stimmen nicht überein"
+      insert_password: "Passwort auswählen:"
+      required_field: "Dieses Feld ist erforderlich"
+      done: "Fertig"
+      content:
+        title: "E-Mail-Adresse hinzufügen"
+        description: "Aus Sicherheitsgründen benötigen wir eine E-Mail-Adresse zu jedem Benutzerkonto. Ihre E-Mail-Adresse wird für folgendes verwendet:"
+        item_1: "Benachrichtigungen über Änderungen am Benutzerkonto (Nutzername, E-Mail-Adresse, Passwort)"
+        item_2: "Ermöglicht den Download des eigenen Kommentar-Archivs"
+        item_3: "Kommentar-Benachrichtigungen erhalten, die Sie explizit angefordert haben"
+      verify:
+        title: "E-Mail-Adresse bestätigen"
+        description:  "Wir haben einen E-Mail an {0} geschickt. Bitte bestätigen Sie Ihre E-Mail-Adresse, um damit Benachrichtigungen über Änderungen am Benutzerkonto zu erhalten."
+      added:
+        title: "E-Mail-Adresse hinzugefügt"
+        description: "Ihre E-Mail-Adresse wurde dem Benutzerkonto hinzugefügt."
+        subtitle: "Sie möchten Ihre E-Mail-Adresse ändern?"
+        description_2: "Sie können Ihre Konto-Einstellugen ändern unter"
+        path: "Mein Profil > Profil-Einstellungen"
+        alert: "E-Mail-Adresse hinzugefügt!"
 es:
   talk-plugin-local-auth:
     change_password:
diff --git a/plugins/talk-plugin-profile-data/client/translations.yml b/plugins/talk-plugin-profile-data/client/translations.yml
index d1fdccb73..046c3c3b3 100644
--- a/plugins/talk-plugin-profile-data/client/translations.yml
+++ b/plugins/talk-plugin-profile-data/client/translations.yml
@@ -49,3 +49,54 @@ en:
       subtitle: "Are you sure you want to delete your account?"
       description: "To confirm you would like to delete your account please type in the following phrase into the text box below:"
       type_to_confirm: "Type phrase below to confirm"
+de:
+  download_request:
+    section_title: "Mein Kommentar-Archiv herunterladen"
+    you_will_get_a_copy: "Sie werden eine E-Mail mit einem Download-Link erhalten. Sie können"
+    download_rate: "eine Download-Anfrage alle {0} Tage stellen"
+    most_recent_request: "Ihre letzte Anfrage"
+    request: "Kommentar-Archiv anfordern"
+    rate_limit: "Sie können die nächste Anfrage stellen in {0}"
+    hours: "{0} Stunden"
+    days: "{0} Tagen"
+    hour: "{0} Stunde"
+    day: "{0} Tag"
+    download_preparing: "Bereite Konto-Download vor - Überprüfen Sie Ihr E-Mail-Postfach, sie sollten den Download-Link demnächst erhalten"
+  delete_request:
+    account_deletion_cancelled: 'Konto-Löschung abgebrochen - Ihre Anfrage, Ihr Konto zu löschen wurde abgebrochen.'
+    account_deletion_requested: 'Konto-Löschung angefordert'
+    received_on: "Die Anfrage, Ihr Konto zu löschen haben wir erhalten am "
+    cancel_request_description: "Fall Sie ihr Konto wieder aktivieren möchten, können Sie die Lösch-Anfrage hier abbrechen"
+    before: "vorher"
+    cancel_account_deletion_request: "Konto-Lösch-Anfrage abbrechen"
+    delete_my_account: "Mein Benutzerkonto löschen"
+    delete_my_account_description: "Mit dem Löschen Ihres Kontos werden Ihr Profil sowie alle Ihre Kommentare dauerhaft von dieser Website entfernt."
+    already_submitted_request_description: "Sie haben bereits eine Lösch-Anfrage gestellt. Ihr Konto wird nach dem {0} gelöscht. Bis zu diesem Zeitpunkt können Sie die Anfrage noch abbrechen"
+    your_request_submitted_description: "Ihre Lösch-Anfrage wurde übermittelt und eine Bestätigungsanfrage an die dem Konto zugehörige E-Mail-Adresse geschickt."
+    your_account_deletion_scheduled: "Ihr Benutzerkonto wird gelöscht nach dem:"
+    changed_your_mind: "Haben Sie Ihre Meinung geändert?"
+    simply_go_to: "Gehen Sie einfach vor dem Zeitpunkt zu Ihrem Konto und klicken Sie"
+    tell_us_why: "Sagen Sie uns warum"
+    feedback_copy: "Wir würden gern erfahren, warum Sie sich entschieden haben, Ihr Konto zu löschen. Schicken Sie uns eine E-Mail mit Feedback an"
+    done: "Fertig"
+    cancel: "Abbrechen"
+    proceed: "Fortfahren"
+    input_is_not_correct: "Die Eingabe ist nicht korrekt"
+    step_0:
+      you_are_attempting: "Sie versuchen Ihr Konto zu löschen. Das bedeutet:"
+      item_1: "Alle Ihre Kommentare werden von der Website entfernt"
+      item_2: "Alle Ihre Kommentare werden aus unserer Datenbank gelöscht"
+      item_3: "Ihr Nutzername und Ihre E-Mail-Adresse werden aus unserem System gelöscht"
+    step_1:
+      subtitle: "Wann wird mein Benutzerkonto entfernt?"
+      description: "Ihr Konto wird {0} Stunden nachdem Sie die Anfrage gestellt haben gelöscht."
+      subtitle_2: "Kann ich weiterhin Kommentare schreiben, bis mein Konto gelöscht wird?"
+      description_2: "Ja, Sie können kommentieren, antworten usw. bis die {0} Stunden abgelaufen sind."
+    step_2:
+      description: "Bevor Ihr Konto gelöscht wird, empfehlen wir Ihnen, Ihr Kommentar-Archiv herunterzuladen. Nach der Konto-Löschung ist dies nicht mehr möglich."
+      to_download: "Um Ihr Konto-Archiv herunterzuladen gehen sie zu:"
+      path: "Profil > Mein Kommentar-Archiv herunterladen"
+    step_3:
+      subtitle: "Sind Sie sicher, dass Sie Ihr Benutzerkonto löschen möchten?"
+      description: "Um zu bestätigen, dass Sie Ihr Konto löschen möchten, geben Sie bitte folgende Zeichen in das Textfeld ein:"
+      type_to_confirm: "Zur Bestätigung Zeichenfolge eingeben"
diff --git a/plugins/talk-plugin-profile-data/translations.yml b/plugins/talk-plugin-profile-data/translations.yml
index 51555d305..c3b7e40ca 100644
--- a/plugins/talk-plugin-profile-data/translations.yml
+++ b/plugins/talk-plugin-profile-data/translations.yml
@@ -35,3 +35,40 @@ en:
       body: "You have cancelled your account deletion request for {0}. Your account is now reactivated."
   error:
     DOWNLOAD_TOKEN_INVALID: "Your download link is not valid."
+de:
+  download_landing:
+    download_your_account: "Mein Kommentar-Archiv herunterladen"
+    download_details: "Ihr Kommentar-Archiv wird als ZIP-Datei bereitgestellt. Nach dem Entpacken erhalten Sie eine CSV-Datei, die einfach in ein Tabellenkalkulationsprogramm importiert werden kann."
+    all_information_included: "Für jeden Ihrer Kommentare sind folgende Informationen enthalten:"
+    information_included:
+      date: "Wann Sie den Kommentar geschrieben haben"
+      url: "Die dauerhafte URL (Internetadresse) des Kommentars"
+      body: "Der Kommentar-Text"
+      asset_url: "Die URL (Internetadresse) des Artikels an dem der Kommentar erscheint"
+    confirm: "Kommentar-Archiv herunterladen"
+  email:
+    download:
+      subject: "Ihre Kommentare sind zum Download bereit: {0}"
+      download_link_ready: "Hier klicken, um Ihre Kommentare von {0} bis {1} herunterzuladen:"
+      download_archive: "Archiv herunterladen"
+    delete:
+      subject: "Ihr Benutzerkonto bei {0} ist zur Löschung vorgesehen"
+      body: |
+        Wir haben eine Anfrage erhalten, Ihr Benutzerkonto zu löschen. Die Löschung ist geplant für den {1}.
+
+        Nach diesem Zeitpunkt werden alle Ihre Kommentare von der Website und aus unserer Datenbank gelöscht. Außerdem werden Ihr Nutzername und Ihre E-Mail-Adresse aus unserem System enfernt.
+
+        Falls Sie es sich noch anders überlegen, können Sie sich bis spätestens zum angegebenen Lösch-Zeitpunkt einloggen und die Lösch-Anfrage abbrechen.
+    deleted:
+      subject: "Ihre Benutzerkonto bei {0} wurde gelöscht"
+      body: |
+        Ihr Kommentar-Konto bei {0} ist nun gelöscht. Schade, auf Wiedersehen!
+
+        Falls Sie sich in Zukunft erneut an der Diskussion beteiligen möchten, können Sie jederzeit ein neues Benutzerkonto einrichten.
+
+        Wenn Sie Lust haben, schreiben Sie uns doch eine Rückmeldung, Feedback, oder Kritik an {1}, damit wir unsere Community verbessern können. Vielen Dank!
+    cancelDelete:
+      subject: "Die Lösch-Anfrage für Ihr Benutzerkonto bei {0} wurde abgebrochen"
+      body: "Sie haben die Lösch-Anfrage für Ihr Benutzerkonto bei {0} abgebrochen. Das Konto ist nun wieder aktiv."
+  error:
+    DOWNLOAD_TOKEN_INVALID: "Der Download-Link ist ungültig."

From 1f40d6b7bbf79a81c678157f18f67ecc232c71db Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Fri, 18 May 2018 13:05:46 -0300
Subject: [PATCH 037/144] replacing by a one liner :)

---
 .../coral-admin/src/routes/Community/components/People.js  | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/client/coral-admin/src/routes/Community/components/People.js b/client/coral-admin/src/routes/Community/components/People.js
index 6d1457cb8..ce9a8b75a 100644
--- a/client/coral-admin/src/routes/Community/components/People.js
+++ b/client/coral-admin/src/routes/Community/components/People.js
@@ -132,12 +132,7 @@ class People extends React.Component {
                           <span className={styles.email}>
                             {user.email
                               ? user.email
-                              : user.profiles.map(({ id }, i) => {
-                                  if (i === user.profiles.length - 1) {
-                                    return id;
-                                  }
-                                  return `${id}, `;
-                                })}
+                              : user.profiles.map(p => p.id).join(', ')}
                           </span>
                         </td>
                         <td className="mdl-data-table__cell--non-numeric">

From 0e8065cdf97452e583e79896eb7bf26462506c90 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Fri, 18 May 2018 13:31:50 -0300
Subject: [PATCH 038/144] Styling

---
 .../src/components/KarmaTooltip.css           |  6 ++-
 .../coral-admin/src/components/UserDetail.css | 10 ++++-
 .../coral-admin/src/components/UserDetail.js  | 44 ++++++++-----------
 3 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/client/coral-admin/src/components/KarmaTooltip.css b/client/coral-admin/src/components/KarmaTooltip.css
index 1f7e1b732..dc766c5f0 100644
--- a/client/coral-admin/src/components/KarmaTooltip.css
+++ b/client/coral-admin/src/components/KarmaTooltip.css
@@ -1,7 +1,7 @@
 .karmaTooltip {
   position: relative;
   display: inline-block;
-  margin: 0 4px;
+  margin: 2px 4px 0;
 }
 
 .icon {
@@ -13,6 +13,10 @@
   -webkit-touch-callout:none;
   user-select: none;
   -webkit-tap-highlight-color:rgba(0,0,0,0);
+
+  > i {
+    vertical-align: baseline;
+  }
 }
 
 .icon:hover {
diff --git a/client/coral-admin/src/components/UserDetail.css b/client/coral-admin/src/components/UserDetail.css
index 0f034d419..ffd076cdb 100644
--- a/client/coral-admin/src/components/UserDetail.css
+++ b/client/coral-admin/src/components/UserDetail.css
@@ -35,6 +35,10 @@
   margin-right: 20px;
 }
 
+.karmaStat {
+  display: flex;
+}
+
 .stat:last-child {
   margin-right: 0px;
 }
@@ -47,20 +51,22 @@
   font-size: 0.9em;
   line-height: normal;
   letter-spacing: 0.4px;
-  min-width: 35px;
-  display: inline-block;
+  min-width: 25px;
+  display: block;
 }
 
 .statResult {
   font-size: 1.5em;
   padding: 5px 0;
   display: inline-block;
+  text-align: center; 
 }
 
 .statReportResult, .statKarmaResult {
   color: white;
   margin: 5px 0;
   font-weight: 400;
+  text-align: center;
 }
 
 .statReportResult.reliable, .statKarmaResult.good {
diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index 070f22ba4..5573d2166 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -205,29 +205,23 @@ class UserDetail extends React.Component {
 
             <ul className={styles.stats}>
               <li className={styles.stat}>
-                <div>
-                  <span className={styles.statItem}>
-                    {t('user_detail.total_comments')}
-                  </span>
-                </div>
+                <span className={styles.statItem}>
+                  {t('user_detail.total_comments')}
+                </span>
                 <span className={styles.statResult}>{totalComments}</span>
               </li>
               <li className={styles.stat}>
-                <div>
-                  <span className={styles.statItem}>
-                    {t('user_detail.reject_rate')}
-                  </span>
-                </div>
+                <span className={styles.statItem}>
+                  {t('user_detail.reject_rate')}
+                </span>
                 <span className={styles.statResult}>
                   {rejectedPercent.toFixed(1)}%
                 </span>
               </li>
               <li className={styles.stat}>
-                <div>
-                  <span className={styles.statItem}>
-                    {t('user_detail.reports')}
-                  </span>
-                </div>
+                <span className={styles.statItem}>
+                  {t('user_detail.reports')}
+                </span>
                 <span
                   className={cn(
                     styles.statReportResult,
@@ -237,21 +231,21 @@ class UserDetail extends React.Component {
                   {capitalize(getReliability(user.reliable.flagger))}
                 </span>
               </li>
-              <li className={styles.stat}>
+              <li className={cn(styles.stat, styles.karmaStat)}>
                 <div>
                   <span className={styles.statItem}>
                     {t('user_detail.karma')}
                   </span>
-                  <KarmaTooltip />
+                  <span
+                    className={cn(
+                      styles.statKarmaResult,
+                      styles[getKarma(user.reliable.commenter)]
+                    )}
+                  >
+                    {user.reliable.commenterScore}
+                  </span>
                 </div>
-                <span
-                  className={cn(
-                    styles.statKarmaResult,
-                    styles[getKarma(user.reliable.commenter)]
-                  )}
-                >
-                  {user.reliable.commenterScore}
-                </span>
+                <KarmaTooltip />
               </li>
             </ul>
           </div>

From ffa6b99d09aadc14e4c6109cdce3148cad5ff0ac Mon Sep 17 00:00:00 2001
From: Mendel Konikov <mendel.konikov@wsj.com>
Date: Fri, 18 May 2018 12:32:24 -0400
Subject: [PATCH 039/144] Wrap els in div

---
 .../client/components/DeleteMyAccount.js           | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js b/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js
index 6eae91043..c2055a16e 100644
--- a/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js
+++ b/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js
@@ -64,15 +64,17 @@ class DeleteMyAccount extends React.Component {
           {t('delete_request.delete_my_account_description')}
         </p>
         {scheduledDeletionDate ? (
-          <p className="talk-plugin-auth--delete-my-account-description">
-            {t(
+          <div>
+            <p className="talk-plugin-auth--delete-my-account-description">
+              {t(
                 'delete_request.already_submitted_request_description',
                 moment(scheduledDeletionDate).format('MMM Do YYYY, h:mm:ss a')
               )}
-          </p>
-          <Button onClick={this.cancelAccountDeletion}>
-            {t('delete_request.cancel_account_deletion_request')}
-          </Button>
+            </p>
+            <Button onClick={this.cancelAccountDeletion}>
+              {t('delete_request.cancel_account_deletion_request')}
+            </Button>
+          </div>
         ) : (
           <Button icon="delete" onClick={this.showDialog}>
             {t('delete_request.delete_my_account')}

From b816053191e93c83effe3135e1d6d65e51fc1a87 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Fri, 18 May 2018 14:07:10 -0300
Subject: [PATCH 040/144] Updating the cache

---
 client/coral-admin/src/graphql/index.js | 38 +++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/graphql/index.js b/client/coral-admin/src/graphql/index.js
index 3874e6c94..2b5b5d8c0 100644
--- a/client/coral-admin/src/graphql/index.js
+++ b/client/coral-admin/src/graphql/index.js
@@ -24,6 +24,16 @@ const userRoleFragment = gql`
   }
 `;
 
+const toBoolean = value => {
+  if (value === 0) {
+    return null;
+  } else if (value > 0) {
+    return true;
+  } else {
+    return false;
+  }
+};
+
 export default {
   mutations: {
     SetUserRole: ({ variables: { id, role } }) => ({
@@ -156,7 +166,9 @@ export default {
           }
           const updated = update(prev, {
             users: {
-              nodes: { $apply: nodes => nodes.filter(node => node.id !== id) },
+              nodes: {
+                $apply: nodes => nodes.filter(node => node.id !== id),
+              },
             },
           });
           return updated;
@@ -185,7 +197,9 @@ export default {
           const updated = update(prev, {
             ...decrement,
             flaggedUsers: {
-              nodes: { $apply: nodes => nodes.filter(node => node.id !== id) },
+              nodes: {
+                $apply: nodes => nodes.filter(node => node.id !== id),
+              },
             },
           });
           return updated;
@@ -295,12 +309,32 @@ export default {
       updateQueries: {
         CoralAdmin_UserDetail: prev => {
           const increment = {
+            user: {
+              reliable: {
+                commenter: {
+                  $set: toBoolean(prev.user.reliable.commenterScore - 1),
+                },
+                commenterScore: {
+                  $apply: count => count - 1,
+                },
+              },
+            },
             rejectedComments: {
               $apply: count => (count < prev.totalComments ? count + 1 : count),
             },
           };
 
           const decrement = {
+            user: {
+              reliable: {
+                commenter: {
+                  $set: toBoolean(prev.user.reliable.commenterScore + 1),
+                },
+                commenterScore: {
+                  $apply: count => count + 1,
+                },
+              },
+            },
             rejectedComments: {
               $apply: count => (count > 0 ? count - 1 : 0),
             },

From f58e3df439fb696cf7456f25122e0fa77a0c362e Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 18 May 2018 15:27:29 -0600
Subject: [PATCH 041/144] added config for report only mode

---
 config.js                                   | 5 +++++
 docs/source/02-02-advanced-configuration.md | 7 +++++++
 middleware/contentSecurityPolicy.js         | 4 +++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/config.js b/config.js
index 6a1f999a7..ec04a8c9d 100644
--- a/config.js
+++ b/config.js
@@ -48,6 +48,11 @@ const CONFIG = {
   // request all of the records. Otherwise, minimum limits of 0 are enforced.
   ALLOW_NO_LIMIT_QUERIES: process.env.TALK_ALLOW_NO_LIMIT_QUERIES === 'TRUE',
 
+  // ONLY_REPORT_CSP_VIOLATIONS disables strict CSP enforcement, and only
+  // reports CSP violations instead of blocking them.
+  ONLY_REPORT_CSP_VIOLATIONS:
+    process.env.TALK_ONLY_REPORT_CSP_VIOLATIONS === 'TRUE',
+
   // LOGGING_LEVEL specifies the logging level used by the bunyan logger.
   LOGGING_LEVEL: ['fatal', 'error', 'warn', 'info', 'debug', 'trace'].includes(
     process.env.TALK_LOGGING_LEVEL
diff --git a/docs/source/02-02-advanced-configuration.md b/docs/source/02-02-advanced-configuration.md
index 5b638401d..d4ef5f2f7 100644
--- a/docs/source/02-02-advanced-configuration.md
+++ b/docs/source/02-02-advanced-configuration.md
@@ -497,6 +497,13 @@ tracing of GraphQL requests.
 
 **Note: Apollo Engine is a premium service, charges may apply.**
 
+## TALK_ONLY_REPORT_CSP_VIOLATIONS
+
+Setting this to `TRUE` will enable the [report only](https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP#Testing_your_policy)
+mode of the Content Security Policy. The policy is not enforced, but any
+violations are reported to a provided URI. If you are encountering issues with
+resources not loading, try experimenting with this parameter. (Default `FALSE`)
+
 ## ALLOW_NO_LIMIT_QUERIES
 
 Setting this to `TRUE` will allow queries to execute without a limit (returns
diff --git a/middleware/contentSecurityPolicy.js b/middleware/contentSecurityPolicy.js
index 992e41e36..ca30f7c6e 100644
--- a/middleware/contentSecurityPolicy.js
+++ b/middleware/contentSecurityPolicy.js
@@ -1,5 +1,5 @@
 const helmet = require('helmet');
-const { WEBSOCKET_LIVE_URI } = require('../config');
+const { WEBSOCKET_LIVE_URI, ONLY_REPORT_CSP_VIOLATIONS } = require('../config');
 const { BASE_PATH, BASE_URL, STATIC_URL } = require('../url');
 const { URL } = require('url');
 
@@ -46,4 +46,6 @@ module.exports = helmet.contentSecurityPolicy({
     ],
   },
   browserSniff: false,
+  // Allow the configuration to disable strict enforcement of CSP.
+  reportOnly: ONLY_REPORT_CSP_VIOLATIONS,
 });

From 5403872bb70c147316dba2b944bf0647280c2430 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 18 May 2018 16:21:41 -0600
Subject: [PATCH 042/144] disable by default

---
 config.js                                   |  7 +++----
 docs/source/02-02-advanced-configuration.md | 11 ++++++-----
 middleware/contentSecurityPolicy.js         |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/config.js b/config.js
index ec04a8c9d..77ed4ab2b 100644
--- a/config.js
+++ b/config.js
@@ -48,10 +48,9 @@ const CONFIG = {
   // request all of the records. Otherwise, minimum limits of 0 are enforced.
   ALLOW_NO_LIMIT_QUERIES: process.env.TALK_ALLOW_NO_LIMIT_QUERIES === 'TRUE',
 
-  // ONLY_REPORT_CSP_VIOLATIONS disables strict CSP enforcement, and only
-  // reports CSP violations instead of blocking them.
-  ONLY_REPORT_CSP_VIOLATIONS:
-    process.env.TALK_ONLY_REPORT_CSP_VIOLATIONS === 'TRUE',
+  // ENABLE_STRICT_CSP enables strict CSP enforcement, and will enforce as well
+  // as report CSP violations.
+  ENABLE_STRICT_CSP: process.env.TALK_ENABLE_STRICT_CSP === 'TRUE',
 
   // LOGGING_LEVEL specifies the logging level used by the bunyan logger.
   LOGGING_LEVEL: ['fatal', 'error', 'warn', 'info', 'debug', 'trace'].includes(
diff --git a/docs/source/02-02-advanced-configuration.md b/docs/source/02-02-advanced-configuration.md
index d4ef5f2f7..035d994b6 100644
--- a/docs/source/02-02-advanced-configuration.md
+++ b/docs/source/02-02-advanced-configuration.md
@@ -497,12 +497,13 @@ tracing of GraphQL requests.
 
 **Note: Apollo Engine is a premium service, charges may apply.**
 
-## TALK_ONLY_REPORT_CSP_VIOLATIONS
+## TALK_ENABLE_STRICT_CSP
 
-Setting this to `TRUE` will enable the [report only](https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP#Testing_your_policy)
-mode of the Content Security Policy. The policy is not enforced, but any
-violations are reported to a provided URI. If you are encountering issues with
-resources not loading, try experimenting with this parameter. (Default `FALSE`)
+Setting this to `TRUE` will enforce the [Content Security Policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP)
+(or CSP) policy. By default, this configuration is set to
+[report only](https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP#Testing_your_policy)
+where the policy is not enforced, but any violations are reported to a provided
+URI. (Default `FALSE`)
 
 ## ALLOW_NO_LIMIT_QUERIES
 
diff --git a/middleware/contentSecurityPolicy.js b/middleware/contentSecurityPolicy.js
index ca30f7c6e..d6036ca76 100644
--- a/middleware/contentSecurityPolicy.js
+++ b/middleware/contentSecurityPolicy.js
@@ -1,5 +1,5 @@
 const helmet = require('helmet');
-const { WEBSOCKET_LIVE_URI, ONLY_REPORT_CSP_VIOLATIONS } = require('../config');
+const { WEBSOCKET_LIVE_URI, ENABLE_STRICT_CSP } = require('../config');
 const { BASE_PATH, BASE_URL, STATIC_URL } = require('../url');
 const { URL } = require('url');
 
@@ -47,5 +47,5 @@ module.exports = helmet.contentSecurityPolicy({
   },
   browserSniff: false,
   // Allow the configuration to disable strict enforcement of CSP.
-  reportOnly: ONLY_REPORT_CSP_VIOLATIONS,
+  reportOnly: !ENABLE_STRICT_CSP,
 });

From 868343a29b223022a46adcd5e97731d46508bfc7 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 18 May 2018 16:42:23 -0600
Subject: [PATCH 043/144] fixes to csp policy

---
 middleware/contentSecurityPolicy.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/middleware/contentSecurityPolicy.js b/middleware/contentSecurityPolicy.js
index d6036ca76..c47faa74e 100644
--- a/middleware/contentSecurityPolicy.js
+++ b/middleware/contentSecurityPolicy.js
@@ -3,11 +3,15 @@ const { WEBSOCKET_LIVE_URI, ENABLE_STRICT_CSP } = require('../config');
 const { BASE_PATH, BASE_URL, STATIC_URL } = require('../url');
 const { URL } = require('url');
 
-// websocketSrc represents the host where we can connect for websocket requests.
-const websocketSrc = new URL(WEBSOCKET_LIVE_URI || BASE_URL).host;
+// websocketUri represents the host where we can connect for websocket requests.
+const websocketUri = new URL(WEBSOCKET_LIVE_URI || BASE_URL);
+websocketUri.protocol = websocketUri.protocol.startsWith('https')
+  ? 'wss'
+  : 'ws';
+const { origin: websocketSrc } = websocketUri;
 
 // staticSrc represents any static asset hosted on the static host.
-const staticSrc = new URL(STATIC_URL).host;
+const { host: staticSrc } = new URL(STATIC_URL);
 
 // nonceSrc represents the nonce source that is used to indicate a safe resource
 // to load.

From dd0ad17038604e0608046a0fdf4f3c5c813930e6 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 18 May 2018 16:44:43 -0600
Subject: [PATCH 044/144] fix for custom css

---
 views/partials/custom-css.njk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/partials/custom-css.njk b/views/partials/custom-css.njk
index 6d725e31e..4e5a494e6 100644
--- a/views/partials/custom-css.njk
+++ b/views/partials/custom-css.njk
@@ -1,3 +1,3 @@
 {% if customCssUrl %}
-<link href="{{ customCssUrl }}" rel="stylesheet">
+<link nonce="{{ nonce }}" href="{{ customCssUrl }}" rel="stylesheet">
 {% endif %}

From 5aba578a986b06f41cf4a924cefcc31e689fc93d Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 18 May 2018 16:47:58 -0600
Subject: [PATCH 045/144] doc patch

---
 docs/source/02-02-advanced-configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/02-02-advanced-configuration.md b/docs/source/02-02-advanced-configuration.md
index 035d994b6..c4f86dbb8 100644
--- a/docs/source/02-02-advanced-configuration.md
+++ b/docs/source/02-02-advanced-configuration.md
@@ -500,7 +500,7 @@ tracing of GraphQL requests.
 ## TALK_ENABLE_STRICT_CSP
 
 Setting this to `TRUE` will enforce the [Content Security Policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP)
-(or CSP) policy. By default, this configuration is set to
+(or CSP). By default, this configuration is set to
 [report only](https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP#Testing_your_policy)
 where the policy is not enforced, but any violations are reported to a provided
 URI. (Default `FALSE`)

From 2c9d30bfd236576f34bc7b66fb306fde3f77354a Mon Sep 17 00:00:00 2001
From: Kiwi <vinh@wikiwi.io>
Date: Mon, 21 May 2018 17:09:36 -0300
Subject: [PATCH 046/144] Small modification

Removed obsolete line and add todo
---
 .../client/components/DownloadCommentHistory.css              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/talk-plugin-profile-data/client/components/DownloadCommentHistory.css b/plugins/talk-plugin-profile-data/client/components/DownloadCommentHistory.css
index cd523a0cd..873e4acba 100644
--- a/plugins/talk-plugin-profile-data/client/components/DownloadCommentHistory.css
+++ b/plugins/talk-plugin-profile-data/client/components/DownloadCommentHistory.css
@@ -1,7 +1,7 @@
 .button {
   margin: 0;
   &:disabled {
-    overflow: visible;
+    /* TODO: better optimize for mobile so this styling is not necessary */
     height: auto;
   }
   i {
@@ -12,4 +12,4 @@
 
 .most_recent {
   color: #808080;
-}
\ No newline at end of file
+}

From 476735437901eb67e2152beaf7d3b6b720c0d2a2 Mon Sep 17 00:00:00 2001
From: Fabian Neumann <neumann@ferret-go.com>
Date: Tue, 22 May 2018 12:36:25 +0200
Subject: [PATCH 047/144] German translations for the email notification
 plugins.

---
 .../client/translations.yml                    |  3 +++
 .../translations.yml                           |  8 +++++++-
 .../client/translations.yml                    |  3 +++
 .../translations.yml                           |  8 +++++++-
 .../client/translations.yml                    |  3 +++
 .../translations.yml                           |  8 +++++++-
 .../client/translations.yml                    |  4 ++++
 .../client/translations.yml                    |  4 ++++
 .../client/translations.yml                    | 18 ++++++++++++++++++
 .../server/translations.yml                    | 16 +++++++++++++++-
 10 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/plugins/talk-plugin-notifications-category-featured/client/translations.yml b/plugins/talk-plugin-notifications-category-featured/client/translations.yml
index 7077943ef..1249b6147 100644
--- a/plugins/talk-plugin-notifications-category-featured/client/translations.yml
+++ b/plugins/talk-plugin-notifications-category-featured/client/translations.yml
@@ -1,3 +1,6 @@
 en:
   talk-plugin-notifications-category-featured:
     toggle_description: My comment is featured
+de:
+  talk-plugin-notifications-category-featured:
+    toggle_description: Mein Kommentar wird empfohlen
diff --git a/plugins/talk-plugin-notifications-category-featured/translations.yml b/plugins/talk-plugin-notifications-category-featured/translations.yml
index 18b00ea71..d11b66300 100644
--- a/plugins/talk-plugin-notifications-category-featured/translations.yml
+++ b/plugins/talk-plugin-notifications-category-featured/translations.yml
@@ -3,4 +3,10 @@ en:
     categories:
       featured:
         subject: "One of your comments was featured on {0}"
-        body: "{0}\nA member of our team has selected this comment to be featured for other readers: {1}"
\ No newline at end of file
+        body: "{0}\nA member of our team has selected this comment to be featured for other readers: {1}"
+de:
+  talk-plugin-notifications:
+    categories:
+      featured:
+        subject: "Einer Ihrer Kommentare wurde auf {0} hervorgehoben"
+        body: "{0}\nEin Mitglied unseres Teams hat diesen Kommentar ausgewählt, er wird jetzt für andere Leser besonders hervorgehoben: {1}"
diff --git a/plugins/talk-plugin-notifications-category-reply/client/translations.yml b/plugins/talk-plugin-notifications-category-reply/client/translations.yml
index 703891de5..83fd4e1cd 100644
--- a/plugins/talk-plugin-notifications-category-reply/client/translations.yml
+++ b/plugins/talk-plugin-notifications-category-reply/client/translations.yml
@@ -1,3 +1,6 @@
 en:
   talk-plugin-notifications-category-reply:
     toggle_description: My comment receives a reply
+de:
+  talk-plugin-notifications-category-reply:
+    toggle_description: Jemand antwortet auf meinen Kommentar
diff --git a/plugins/talk-plugin-notifications-category-reply/translations.yml b/plugins/talk-plugin-notifications-category-reply/translations.yml
index 0f28ca105..2138b750f 100644
--- a/plugins/talk-plugin-notifications-category-reply/translations.yml
+++ b/plugins/talk-plugin-notifications-category-reply/translations.yml
@@ -3,4 +3,10 @@ en:
     categories:
       reply:
         subject: "Someone has replied to your comment on {0}"
-        body: "{0}\n{1} replied to your comment: {2}"
\ No newline at end of file
+        body: "{0}\n{1} replied to your comment: {2}"
+de:
+  talk-plugin-notifications:
+    categories:
+      reply:
+        subject: "Jemand hat bei {0} auf Ihren Kommentar geantwortet"
+        body: "{0}\n{1} antwortete auf Ihren Kommentar: {2}"
diff --git a/plugins/talk-plugin-notifications-category-staff/client/translations.yml b/plugins/talk-plugin-notifications-category-staff/client/translations.yml
index ba831cf37..496d8def6 100644
--- a/plugins/talk-plugin-notifications-category-staff/client/translations.yml
+++ b/plugins/talk-plugin-notifications-category-staff/client/translations.yml
@@ -1,3 +1,6 @@
 en:
   talk-plugin-notifications-category-staff:
     toggle_description: A staff member replies to my comment
+de:
+  talk-plugin-notifications-category-staff:
+    toggle_description: Ein Redaktionsmitglied antwortet auf meinen Kommentar
diff --git a/plugins/talk-plugin-notifications-category-staff/translations.yml b/plugins/talk-plugin-notifications-category-staff/translations.yml
index 38b534e1d..1bfcf0210 100644
--- a/plugins/talk-plugin-notifications-category-staff/translations.yml
+++ b/plugins/talk-plugin-notifications-category-staff/translations.yml
@@ -3,4 +3,10 @@ en:
     categories:
       staff:
         subject: "Someone at {0} has replied to your comment"
-        body: "{0}\n{1} works for {2} and has replied to your comment: {3}"
\ No newline at end of file
+        body: "{0}\n{1} works for {2} and has replied to your comment: {3}"
+de:
+  talk-plugin-notifications:
+    categories:
+      staff:
+        subject: "Jemand hat bei {0} auf Ihren Kommentar geantwortet"
+        body: "{0}\n{1} arbeitet für {2} und hat auf Ihren Kommentar geantwortet: {3}"
diff --git a/plugins/talk-plugin-notifications-digest-daily/client/translations.yml b/plugins/talk-plugin-notifications-digest-daily/client/translations.yml
index 1744918ec..955229708 100644
--- a/plugins/talk-plugin-notifications-digest-daily/client/translations.yml
+++ b/plugins/talk-plugin-notifications-digest-daily/client/translations.yml
@@ -2,3 +2,7 @@ en:
   talk-plugin-notifications:
     digest_enum:
       DAILY: In a daily digest
+de:
+  talk-plugin-notifications:
+    digest_enum:
+      DAILY: Einmal täglich
diff --git a/plugins/talk-plugin-notifications-digest-hourly/client/translations.yml b/plugins/talk-plugin-notifications-digest-hourly/client/translations.yml
index da4bad14f..f11812068 100644
--- a/plugins/talk-plugin-notifications-digest-hourly/client/translations.yml
+++ b/plugins/talk-plugin-notifications-digest-hourly/client/translations.yml
@@ -2,3 +2,7 @@ en:
   talk-plugin-notifications:
     digest_enum:
       HOURLY: In an hourly digest
+de:
+  talk-plugin-notifications:
+    digest_enum:
+      HOURLY: Stündlich
diff --git a/plugins/talk-plugin-notifications/client/translations.yml b/plugins/talk-plugin-notifications/client/translations.yml
index 3ed123502..d4cc716e0 100644
--- a/plugins/talk-plugin-notifications/client/translations.yml
+++ b/plugins/talk-plugin-notifications/client/translations.yml
@@ -16,3 +16,21 @@ en:
     digest_option: Send notifications
     digest_enum:
       NONE: Immediately
+de:
+  talk-plugin-notifications:
+    settings_title: Benachrichtigungen
+    settings_subtitle: Benachrichtige mich wenn
+    turn_off_all: Ich möchte keine Benachrichtigungen erhalten
+    banner_info:
+      title: Bestätigte E-Mail-Adresse benötigt
+      text: Um E-Mail-Benachrichtigungen zu erhalten, müssen Sie eine bestätigte E-Mail-Adresse haben.
+      verify_now: E-Mail-Adresse jetzt bestätigen
+    banner_success:
+      title: E-Mail-Bestätigungsanfrage verschickt
+      text: Eine E-Mail mit einem Bestätigungslink wurde an {0} geschickt.
+    banner_error:
+      title: Fehler
+      text: Beim Versand der Bestätigungsmail gab es einen Fehler. Bitte versuchen Sie es später erneut.
+    digest_option: Benachrichtigungen senden
+    digest_enum:
+      NONE: Sofort
diff --git a/plugins/talk-plugin-notifications/server/translations.yml b/plugins/talk-plugin-notifications/server/translations.yml
index c3b5a2417..e6211ffbb 100644
--- a/plugins/talk-plugin-notifications/server/translations.yml
+++ b/plugins/talk-plugin-notifications/server/translations.yml
@@ -11,4 +11,18 @@ en:
       click_to_confirm: "Click below to confirm that you would like to unsubscribe from all notifications"
       confirm: "Confirm"
       are_unsubscribed: "You are now unsubscribed from all notifications."
-      token_invalid: "Unsubscribe link is invalid, click the link from a more recent email or visit a comment stream and login to change your notification preferences"
\ No newline at end of file
+      token_invalid: "Unsubscribe link is invalid, click the link from a more recent email or visit a comment stream and login to change your notification preferences"
+de:
+  talk-plugin-notifications:
+    templates:
+      digest:
+        subject: "Ihre Kommentaraktivität bei {0}"
+      footer: "Sie erhalten diese Benachrichtigung, weil Sie Community-Mitglied bei {0} sind und diese E-Mails abonniert haben."
+      links:
+        unsubscribe: "E-Mail-Benachrichtigungen abbestellen"
+    unsubscribe_page:
+      unsubscribe: "Kommentar-Benachrichtigungen abbestellen"
+      click_to_confirm: "Klicken Sie folgenden Link, um zu bestätigen, dass Sie alle Benachrichtigungen abbestellen möchten"
+      confirm: "Bestätigen"
+      are_unsubscribed: "Sie haben haben alle Benachrichtigungen erfolgreich abbestellt."
+      token_invalid: "Der Abbestell-Link ist ungültig. Klicken Sie den Link einer neueren E-Mail oder gehen Sie zu einem Kommentarbereich, melden Sie sich an und ändern Sie dort Ihre Benachrichtigungseinstellungen"

From 1aed51468fedc92032340ca23da4fa8430d52ecb Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Tue, 22 May 2018 12:40:21 -0300
Subject: [PATCH 048/144] req not properly passed

---
 plugins/talk-plugin-akismet/server/hooks.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/plugins/talk-plugin-akismet/server/hooks.js b/plugins/talk-plugin-akismet/server/hooks.js
index b06557783..19f918630 100644
--- a/plugins/talk-plugin-akismet/server/hooks.js
+++ b/plugins/talk-plugin-akismet/server/hooks.js
@@ -28,8 +28,11 @@ let enabled = true;
 module.exports = {
   RootMutation: {
     createComment: {
-      async pre(_, { input }, { loaders, parent: req }) {
-        // If the key validation failed, then we can't run with the client.
+      async pre(_, { input }, ctx) {
+        const req = ctx.parent.parent;
+        const loaders = ctx.loaders;
+
+        //If the key validation failed, then we can't run with the client.
         if (!enabled) {
           debug('not enabled, passing');
           return;
@@ -37,7 +40,7 @@ module.exports = {
 
         let spam = false;
         try {
-          const user_ip = get(req, 'ip', false);
+          const user_ip = get(req.connection, 'remoteAddress', false);
           if (!user_ip) {
             debug('no ip on request');
             return;

From b411f3e059d10a1f5a85a06a270988cac3f49e12 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Tue, 22 May 2018 13:08:59 -0300
Subject: [PATCH 049/144] relying on ip

---
 plugins/talk-plugin-akismet/server/hooks.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/talk-plugin-akismet/server/hooks.js b/plugins/talk-plugin-akismet/server/hooks.js
index 19f918630..4e24af4b3 100644
--- a/plugins/talk-plugin-akismet/server/hooks.js
+++ b/plugins/talk-plugin-akismet/server/hooks.js
@@ -40,7 +40,7 @@ module.exports = {
 
         let spam = false;
         try {
-          const user_ip = get(req.connection, 'remoteAddress', false);
+          const user_ip = get(req, 'ip', false);
           if (!user_ip) {
             debug('no ip on request');
             return;

From 6667bbe01f271fb3c32dc7f5ff5b939374e47e21 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Tue, 22 May 2018 13:18:28 -0400
Subject: [PATCH 050/144] Docs typo

---
 docs/source/03-07-product-guide-trust.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/03-07-product-guide-trust.md b/docs/source/03-07-product-guide-trust.md
index 72248e7d1..aa0a89259 100644
--- a/docs/source/03-07-product-guide-trust.md
+++ b/docs/source/03-07-product-guide-trust.md
@@ -25,7 +25,7 @@ If their next comment is also rejected, their user karma score is now `-2`, and
 
 We strongly recommend not telling your community how this system works, or where the threshholds lie. Firstly, they might try to game the system to meet approval, and secondly, it makes it harder for you to change the threshhold in the future. We suggest using language such as "We hold back comments for approval for a variety of reasons, including content, account history, and more."
 
-If you see that a high proportion of first-time commenters on your site are abusive, you might want to change the threshhold to `0`, at least temporarily. You can configure your own Trust thresholds by using [TRUST_THRESHOLD](/talk/advanced-configuration/#trust-thresholds) in your site configuration.
+If you see that a high proportion of first-time commenters on your site are abusive, you might want to change the threshhold to `0`, at least temporarily. You can configure your own Trust thresholds by using [TRUST_THRESHOLDS](/talk/advanced-configuration/#trust-thresholds) in your site configuration.
 
 
 ## Reliable and Unreliable Flaggers
@@ -49,7 +49,7 @@ Here are the default thresholds:
 0 to +1: Neutral
 +2 and higher: Reliable
 ```
-You can configure your own Trust thresholds by using [TRUST_THRESHOLD](/talk/advanced-configuration/#trust-thresholds) in your
+You can configure your own Trust thresholds by using [TRUST_THRESHOLDS](/talk/advanced-configuration/#trust-thresholds) in your
 configuration.
 
 Note: Report Karma doesn't include reports of "I don't agree with this comment".

From 4f5f424c7752cb371fc5f8caac9be068b9dfd57e Mon Sep 17 00:00:00 2001
From: Mendel Konikov <mendel.konikov@wsj.com>
Date: Tue, 22 May 2018 15:49:19 -0400
Subject: [PATCH 051/144] Remove wordbreak

---
 .../coral-admin/src/routes/Moderation/components/Comment.css   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.css b/client/coral-admin/src/routes/Moderation/components/Comment.css
index 0f8f91a97..864f6f5fa 100644
--- a/client/coral-admin/src/routes/Moderation/components/Comment.css
+++ b/client/coral-admin/src/routes/Moderation/components/Comment.css
@@ -74,7 +74,6 @@
   max-width: 500px;
   font-weight: 300;
   font-size: 16px;
-  word-break: break-all;
 }
 
 .created {
@@ -200,4 +199,4 @@
 
 .commentContentFooter {
   flex: 1;
-}
\ No newline at end of file
+}

From 10a786f84d9ba962fcbe762fc9ea076bafc07435 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Tue, 22 May 2018 14:21:32 -0600
Subject: [PATCH 052/144] simplified language negotiation

---
 client/coral-framework/services/i18n.js | 131 +++++++++++-------------
 locales/fi_FI.yml                       |   4 +-
 package.json                            |   2 +-
 services/i18n.js                        |  76 ++++++++------
 yarn.lock                               |   6 +-
 5 files changed, 110 insertions(+), 109 deletions(-)

diff --git a/client/coral-framework/services/i18n.js b/client/coral-framework/services/i18n.js
index 03a0b4712..02258a585 100644
--- a/client/coral-framework/services/i18n.js
+++ b/client/coral-framework/services/i18n.js
@@ -1,7 +1,10 @@
-import ta from 'timeago.js';
+import { negotiateLanguages } from 'fluent-langneg/compat';
+
 import has from 'lodash/has';
 import get from 'lodash/get';
 import merge from 'lodash/merge';
+import first from 'lodash/first';
+import isUndefined from 'lodash/isUndefined';
 
 import moment from 'moment';
 import 'moment/locale/ar';
@@ -12,8 +15,8 @@ import 'moment/locale/fr';
 import 'moment/locale/nl';
 import 'moment/locale/pt-br';
 
-import { createStorage } from 'coral-framework/services/storage';
-
+// timeago
+import ta from 'timeago.js';
 import arTA from 'timeago.js/locales/ar';
 import daTA from 'timeago.js/locales/da';
 import deTA from 'timeago.js/locales/de';
@@ -24,6 +27,7 @@ import pt_BRTA from 'timeago.js/locales/pt_BR';
 import zh_CNTA from 'timeago.js/locales/zh_CN';
 import zh_TWTA from 'timeago.js/locales/zh_TW';
 
+// locales
 import ar from '../../../locales/ar.yml';
 import en from '../../../locales/en.yml';
 import da from '../../../locales/da.yml';
@@ -35,8 +39,9 @@ import pt_BR from '../../../locales/pt_BR.yml';
 import zh_CN from '../../../locales/zh_CN.yml';
 import zh_TW from '../../../locales/zh_TW.yml';
 
-const defaultLanguage = process.env.TALK_DEFAULT_LANG;
-const translations = {
+export const defaultLocale = process.env.TALK_DEFAULT_LANG.replace(/-/g, '_');
+
+export const translations = {
   ...ar,
   ...en,
   ...da,
@@ -49,84 +54,62 @@ const translations = {
   ...zh_TW,
 };
 
-let lang;
-let timeagoInstance;
+export const supportedLocales = Object.keys(translations);
 
-function setLocale(storage, locale) {
-  storage.setItem('locale', locale);
-}
+let LOCALE;
+let TIMEAGO_INSTANCE;
 
 // detectLanguage will try to get the locale from storage if available,
 // otherwise will try to get it from the navigator, otherwise, it will fallback
 // to the default language.
-function detectLanguage(storage) {
-  try {
-    const lang = storage.getItem('locale') || navigator.language;
-    if (lang) {
-      return lang;
-    }
-  } catch (err) {
-    console.warn(
-      'Error while trying to detect language, will fallback to',
-      err
-    );
-  }
-
-  console.warn('Could not detect language, will fallback to', defaultLanguage);
-  return defaultLanguage;
-}
-
-// getLocale will get the users locale from the local detector and parse it to a
-// format we can work with.
-function getLocale(storage) {
-  // Get the language from the local detector.
-  const lang = detectLanguage(storage);
-
-  // Some language strings come with additional subtags as defined in:
-  //
-  // https://www.ietf.org/rfc/bcp/bcp47.txt
-  //
-  // So we should strip that off if we find it.
-  return lang.split('-')[0];
-}
+const detectLanguage = () =>
+  first(
+    negotiateLanguages(navigator.languages, supportedLocales, {
+      defaultLocale,
+      strategy: 'lookup',
+    })
+  );
 
 export function setupTranslations() {
-  // Setup the translation framework with the storage.
-  const storage = createStorage('localStorage');
+  // locale
+  LOCALE = detectLanguage();
 
-  const locale = getLocale(storage);
-  setLocale(storage, locale);
-
-  // Setting moment
-  moment.locale(locale);
-
-  // Extract language key.
-  lang = locale.split('-')[0];
-
-  // Check if we have a translation in this language.
-  if (!(lang in translations)) {
-    lang = defaultLanguage;
-  }
+  // moment
+  moment.locale(LOCALE);
 
+  // timeago
   ta.register('ar', arTA);
   ta.register('es', esTA);
   ta.register('da', daTA);
   ta.register('de', deTA);
   ta.register('fr', frTA);
-  ta.register('nl_NL', nlTA);
-  ta.register('pt_BR', pt_BRTA);
-  ta.register('zh_CN', zh_CNTA);
-  ta.register('zh_TW', zh_TWTA);
-
-  timeagoInstance = ta();
+  ta.register('nl-NL', nlTA);
+  ta.register('pt-BR', pt_BRTA);
+  ta.register('zh-CN', zh_CNTA);
+  ta.register('zh-TW', zh_TWTA);
+  TIMEAGO_INSTANCE = ta();
 }
 
+/**
+ * loadTranslations will load the new language pack into the existing ones.
+ *
+ * @param {Object} newTranslations translation object to merge into the existing
+ *                                 languages.
+ */
 export function loadTranslations(newTranslations) {
+  // Merge the new translations into the existing translations.
   merge(translations, newTranslations);
+
+  // Push new languages into the supportedLocales array.
+  Object.keys(newTranslations).forEach(language => {
+    if (!supportedLocales.includes(language)) {
+      supportedLocales.push(language);
+    }
+  });
 }
 
 export function timeago(time) {
-  return timeagoInstance.format(new Date(time), lang);
+  return TIMEAGO_INSTANCE.format(new Date(time), LOCALE);
 }
 
 /**
@@ -140,24 +123,24 @@ export function timeago(time) {
  */
 export function t(key, ...replacements) {
   let translation;
-  if (has(translations[lang], key)) {
-    translation = get(translations[lang], key);
+  if (has(translations[LOCALE], key)) {
+    translation = get(translations[LOCALE], key);
   } else if (has(translations['en'], key)) {
     translation = get(translations['en'], key);
-    console.warn(`${lang}.${key} language key not set`);
+    console.warn(`${LOCALE}.${key} language key not set`);
   }
 
-  if (translation) {
-    // replace any {n} with the arguments passed to this method
-    replacements.forEach((str, i) => {
-      translation = translation.replace(new RegExp(`\\{${i}\\}`, 'g'), str);
-    });
-
-    return translation;
-  } else {
-    console.warn(`${lang}.${key} and en.${key} language key not set`);
+  if (!translation) {
+    console.warn(`${LOCALE}.${key} and en.${key} language key not set`);
     return key;
   }
+
+  // Handle replacements in the translation string.
+  return translation.replace(
+    /{(\d+)}/g,
+    (match, number) =>
+      !isUndefined(replacements[number]) ? replacements[number] : match
+  );
 }
 
 export default t;
diff --git a/locales/fi_FI.yml b/locales/fi_FI.yml
index 71416b4ff..494a48cdb 100644
--- a/locales/fi_FI.yml
+++ b/locales/fi_FI.yml
@@ -413,7 +413,7 @@ fi_FI:
     title_reject: "Huomasimme sinun hylänneen käyttäjänimen"
     suspend_user: "Aseta väliaikainen käyttökielto"
     yes_suspend: "Kyllä, sulje väliaikaisesti"
-    email_message_reject: "Toinen yhteisön jäsen on ilmiantanut käyttäjänimesi ja sen perusteella nimi on hylätty. Et voi enää osallistua keskusteluun. Ole ystävällisesti yhteydessä meihin, jos sinulla on asiasta kysyttävää." 
+    email_message_reject: "Toinen yhteisön jäsen on ilmiantanut käyttäjänimesi ja sen perusteella nimi on hylätty. Et voi enää osallistua keskusteluun. Ole ystävällisesti yhteydessä meihin, jos sinulla on asiasta kysyttävää."
     write_message: "Kirjoita viesti"
     send: Lähetä
   thank_you: "Arvostamme palautettasi. Moderaattorimme käy läpi tekemäsi ilmiannon."
@@ -462,4 +462,4 @@ fi_FI:
       close: "Sulje asennusnäkymä"
   admin_sidebar:
     view_options: "Näytä asetukset"
-sort_comments: "Järjestä kommentit"
\ No newline at end of file
+    sort_comments: "Järjestä kommentit"
diff --git a/package.json b/package.json
index c387d6145..5dcb5c6ff 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,6 @@
   "dependencies": {
     "@coralproject/gql-merge": "^0.1.0",
     "@coralproject/graphql-anywhere-optimized": "^0.1.0",
-    "accepts": "^1.3.4",
     "apollo-client": "^1.9.1",
     "apollo-engine": "^0.8.1",
     "apollo-server-express": "^1.2.0",
@@ -108,6 +107,7 @@
     "express-static-gzip": "^0.3.1",
     "extract-text-webpack-plugin": "^3.0.2",
     "file-loader": "^0.11.2",
+    "fluent-langneg": "^0.1.0",
     "form-data": "^2.3.1",
     "fs-extra": "^4.0.1",
     "graphql": "^0.10.1",
diff --git a/services/i18n.js b/services/i18n.js
index 666f15a59..52c34a4ed 100644
--- a/services/i18n.js
+++ b/services/i18n.js
@@ -1,8 +1,11 @@
 const fs = require('fs');
 const path = require('path');
 const debug = require('debug')('talk:services:i18n');
-const accepts = require('accepts');
-const { get, has, merge } = require('lodash');
+const {
+  acceptedLanguages,
+  negotiateLanguages,
+} = require('fluent-langneg/compat');
+const { first, get, has, merge, isUndefined } = require('lodash');
 const yaml = require('yamljs');
 const plugins = require('./plugins');
 const { DEFAULT_LANG } = require('../config');
@@ -11,7 +14,7 @@ const resolve = (...paths) =>
   path.resolve(path.join(__dirname, '..', 'locales', ...paths));
 
 // Load all the translations.
-let translations = fs
+const translations = fs
   .readdirSync(resolve())
 
   // Resolve all the filenames relative the the locales directory.
@@ -23,26 +26,22 @@ let translations = fs
   // Load the translation files from disk.
   .map(filename => fs.readFileSync(filename, 'utf8'))
 
-  // Load the translation files.
-  .reduce((packs, contents) => {
-    const pack = yaml.parse(contents);
-
-    return merge(packs, pack);
-  }, {});
+  // Load the translation files and merge the yaml into the existing packs.
+  .reduce((packs, contents) => merge(packs, yaml.parse(contents)), {});
 
 // Create a list of all supported translations.
-const languages = Object.keys(translations);
+const supportedLocales = Object.keys(translations);
 
 // Move the default language to the front.
-if (languages.includes(DEFAULT_LANG)) {
-  const from = languages.indexOf(DEFAULT_LANG);
-  languages.splice(from, 1);
-  languages.splice(0, 0, DEFAULT_LANG);
+if (supportedLocales.includes(DEFAULT_LANG)) {
+  const from = supportedLocales.indexOf(DEFAULT_LANG);
+  supportedLocales.splice(from, 1);
+  supportedLocales.splice(0, 0, DEFAULT_LANG);
 }
-debug(`loaded language sets for ${languages}`);
+debug(`loaded language sets for ${supportedLocales}`);
 
 let loadedPluginTranslations = false;
-const loadPluginTranslations = () => {
+const lazyLoadPluginTranslations = () => {
   if (loadedPluginTranslations) {
     return;
   }
@@ -55,7 +54,15 @@ const loadPluginTranslations = () => {
 
       const pack = yaml.parse(fs.readFileSync(filename, 'utf8'));
 
-      translations = merge(translations, pack);
+      // Merge the translations into the system translations.
+      merge(translations, pack);
+
+      // Push new languages into the supportedLocales array.
+      Object.keys(pack).forEach(language => {
+        if (!supportedLocales.includes(language)) {
+          supportedLocales.push(language);
+        }
+      });
     });
 
   loadedPluginTranslations = true;
@@ -64,7 +71,7 @@ const loadPluginTranslations = () => {
 const t = lang => (key, ...replacements) => {
   // Loads the translations into the translations array from plugins. This is
   // done lazily to ensure that we don't have an import cycle.
-  loadPluginTranslations();
+  lazyLoadPluginTranslations();
 
   let translation;
   if (has(translations[lang], key)) {
@@ -74,16 +81,17 @@ const t = lang => (key, ...replacements) => {
     console.warn(`${lang}.${key} language key not set`);
   }
 
-  if (translation) {
-    // replace any {n} with the arguments passed to this method
-    replacements.forEach((str, i) => {
-      translation = translation.replace(new RegExp(`\\{${i}\\}`, 'g'), str);
-    });
-    return translation;
-  } else {
+  if (!translation) {
     console.warn(`${lang}.${key} and en.${key} language key not set`);
     return key;
   }
+
+  // Handle replacements in the translation string.
+  return translation.replace(
+    /{(\d+)}/g,
+    (match, number) =>
+      !isUndefined(replacements[number]) ? replacements[number] : match
+  );
 };
 
 /**
@@ -92,13 +100,19 @@ const t = lang => (key, ...replacements) => {
  */
 const i18n = {
   request(req) {
-    debug(`possible languages given request '${accepts(req).languages()}'`);
-    const lang = accepts(req).language(languages);
-    debug(`parsed request language as '${lang}'`);
-    const language = lang ? lang : DEFAULT_LANG;
-    debug(`decided language as '${language}'`);
+    const acceptsLanguages = acceptedLanguages(req.headers['accept-language']);
+    debug(`possible languages given request '${acceptsLanguages}'`);
 
-    return t(language);
+    // negotiate the language.
+    const lang = first(
+      negotiateLanguages(acceptsLanguages, supportedLocales, {
+        defaultLocale: DEFAULT_LANG,
+        strategy: 'lookup',
+      })
+    );
+    debug(`decided language as '${lang}'`);
+
+    return t(lang);
   },
   t: t(DEFAULT_LANG),
 };
diff --git a/yarn.lock b/yarn.lock
index 13da4b2f7..dff8e4dab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -167,7 +167,7 @@ abbrev@1, abbrev@^1.0.7:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
 
-accepts@^1.3.4, accepts@~1.3.4:
+accepts@~1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.4.tgz#86246758c7dd6d21a6474ff084a4740ec05eb21f"
   dependencies:
@@ -3975,6 +3975,10 @@ flexbuffer@0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/flexbuffer/-/flexbuffer-0.0.6.tgz#039fdf23f8823e440c38f3277e6fef1174215b30"
 
+fluent-langneg@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/fluent-langneg/-/fluent-langneg-0.1.0.tgz#aa12054fbfa4b728daec38331efc12f01faae93a"
+
 flush-write-stream@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.2.tgz#c81b90d8746766f1a609a46809946c45dd8ae417"

From 849fe37b9bb0dd8ff4c45a3f5b44a8caec668641 Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <contact@brendanabolivier.com>
Date: Tue, 22 May 2018 23:25:12 +0200
Subject: [PATCH 053/144] Fix incorrect statement regarding GDPR

GDPR's reach doesn't depend on the person or business's location, but on whether this person or this business include european citizen in its target (which can be easy to state for a business, but not that much for an individual).
---
 docs/source/03-08-gdpr.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/source/03-08-gdpr.md b/docs/source/03-08-gdpr.md
index b6689be0e..b5e4ca404 100644
--- a/docs/source/03-08-gdpr.md
+++ b/docs/source/03-08-gdpr.md
@@ -11,9 +11,9 @@ can enable the following plugins:
 - [talk-plugin-local-auth](/talk/plugin/talk-plugin-local-auth) - to facilitate email changes and email association
 - [talk-plugin-profile-data](/talk/plugin/talk-plugin-profile-data) - to facilitate account download and deletion
 
-Even if you don't reside in a location where GDPR will apply, it is recommended
-to enable these features as a best practice to provide your users with control over their
-own data.
+Even if GDPR will not apply apply to you, it is recommended to enable these
+features as a best practice to provide your users with control over their own
+data.
 
 ## GPDR Feature Overview
 

From 8e24d4f5c6898be79c628b4031f387e0ba07abbc Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Tue, 22 May 2018 20:12:17 -0400
Subject: [PATCH 054/144] Make it so low threshold is included in karma calc

---
 services/karma.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/karma.js b/services/karma.js
index c39c93a32..72533d328 100644
--- a/services/karma.js
+++ b/services/karma.js
@@ -121,7 +121,7 @@ class KarmaService {
     if (trust && trust[name]) {
       if (trust[name].karma > THRESHOLDS[name].RELIABLE) {
         return true;
-      } else if (trust[name].karma < THRESHOLDS[name].UNRELIABLE) {
+      } else if (trust[name].karma <= THRESHOLDS[name].UNRELIABLE) {
         return false;
       }
     } else if (THRESHOLDS[name].RELIABLE < 0) {

From 879865a4c11dac27d79330cfb86aa7ea5a2e85f6 Mon Sep 17 00:00:00 2001
From: Simon <mastersimon@users.noreply.github.com>
Date: Wed, 23 May 2018 09:14:32 +0200
Subject: [PATCH 055/144] Fix broken link to tokenusernotfound

Fix broken link to tokenusernotfound
---
 docs/source/integrating/authentication.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/integrating/authentication.md b/docs/source/integrating/authentication.md
index b7340caf5..5b19768fe 100644
--- a/docs/source/integrating/authentication.md
+++ b/docs/source/integrating/authentication.md
@@ -81,5 +81,5 @@ example issuer and Talk must match:
 reference, the basic takeaway is that the secret used to sign the tokens issued
 by the issuer must be able to be verified by Talk.
 
-For an example of implementing the plugin, refer to [`tokenUserNotFound`](/talk/reference/server/#tokenUserNotFound)
+For an example of implementing the plugin, refer to [`tokenUserNotFound`](/talk/api/server/#tokenusernotfound)
 reference.

From a95d55b6da8ce18285d6421f1ca071396de952ee Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <contact@brendanabolivier.com>
Date: Wed, 23 May 2018 10:05:21 +0200
Subject: [PATCH 056/144] Remuve dupe "apply"

---
 docs/source/03-08-gdpr.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/03-08-gdpr.md b/docs/source/03-08-gdpr.md
index b5e4ca404..e3fd8623f 100644
--- a/docs/source/03-08-gdpr.md
+++ b/docs/source/03-08-gdpr.md
@@ -11,7 +11,7 @@ can enable the following plugins:
 - [talk-plugin-local-auth](/talk/plugin/talk-plugin-local-auth) - to facilitate email changes and email association
 - [talk-plugin-profile-data](/talk/plugin/talk-plugin-profile-data) - to facilitate account download and deletion
 
-Even if GDPR will not apply apply to you, it is recommended to enable these
+Even if GDPR will not apply to you, it is recommended to enable these
 features as a best practice to provide your users with control over their own
 data.
 

From 17f76e85b0091e913d2b00789e91a0a53b33a01e Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Wed, 23 May 2018 13:07:34 -0300
Subject: [PATCH 057/144] changes

---
 client/coral-admin/src/components/KarmaTooltip.css | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/client/coral-admin/src/components/KarmaTooltip.css b/client/coral-admin/src/components/KarmaTooltip.css
index dc766c5f0..0742f5f71 100644
--- a/client/coral-admin/src/components/KarmaTooltip.css
+++ b/client/coral-admin/src/components/KarmaTooltip.css
@@ -7,10 +7,6 @@
 .icon {
   font-size: 16px;
   color: #0D5B8F;
-  -ms-user-select:none;
-  -moz-user-select: none;
-  -webkit-user-select: none;
-  -webkit-touch-callout:none;
   user-select: none;
   -webkit-tap-highlight-color:rgba(0,0,0,0);
 
@@ -29,7 +25,6 @@
   border-radius: 3px;
   padding: 10px;
   position: absolute;
-  -webkit-box-shadow: 0 2px 2px 0 rgba(0,0,0,0.14), 0 1px 5px 0 rgba(0,0,0,0.12), 0 3px 1px -2px rgba(0,0,0,0.2);
   box-shadow: 0 2px 2px 0 rgba(0,0,0,0.14), 0 1px 5px 0 rgba(0,0,0,0.12), 0 3px 1px -2px rgba(0,0,0,0.2);
   z-index: 10;
   top: 32px;

From f7f6ed635c0e9f699f97d5d5996b851eb91a9381 Mon Sep 17 00:00:00 2001
From: Erik Reyna <erikreyna@users.noreply.github.com>
Date: Wed, 23 May 2018 14:24:11 -0400
Subject: [PATCH 058/144] add from to import statement

from expected from import statement, thanks eslint
---
 docs/source/api/client.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/api/client.md b/docs/source/api/client.md
index fd0ec42fc..e5b46a0d4 100644
--- a/docs/source/api/client.md
+++ b/docs/source/api/client.md
@@ -264,7 +264,7 @@ Coral UI is a set of components to help you build your UI. This powers our core.
 
 ### Import 
 ```js
-import {Button} 'plugin-api/beta/components/ui';
+import {Button} from 'plugin-api/beta/components/ui';
 ```
 
 ### Components

From a6ec021bd1a31f66634b0998909b198fff7fed6e Mon Sep 17 00:00:00 2001
From: Mendel Konikov <mendel.konikov@wsj.com>
Date: Wed, 23 May 2018 17:25:09 -0400
Subject: [PATCH 059/144] Explicitly set opacity to 1 for iPhone

---
 .../client/components/DeleteMyAccountStep.css                  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/talk-plugin-profile-data/client/components/DeleteMyAccountStep.css b/plugins/talk-plugin-profile-data/client/components/DeleteMyAccountStep.css
index 7d02b4e6f..b4cac6a62 100644
--- a/plugins/talk-plugin-profile-data/client/components/DeleteMyAccountStep.css
+++ b/plugins/talk-plugin-profile-data/client/components/DeleteMyAccountStep.css
@@ -58,7 +58,7 @@
     display: flex;
     flex-direction: column;
     align-items: center;
-  } 
+  }
 }
 
 .title {
@@ -97,6 +97,7 @@
   color: #3B4A53;
   font-size: 1em;
   margin-bottom: 15px;
+  opacity: 1;
 }
 
 .block {

From 92420ae827bd72c207c2ed315cefdf2d959c4ccb Mon Sep 17 00:00:00 2001
From: Mendel Konikov <mendel.konikov@wsj.com>
Date: Wed, 23 May 2018 17:42:40 -0400
Subject: [PATCH 060/144] Fix hr line on older devices

---
 .../client/components/StepProgress.css                        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/talk-plugin-profile-data/client/components/StepProgress.css b/plugins/talk-plugin-profile-data/client/components/StepProgress.css
index bede31511..814a75b6c 100644
--- a/plugins/talk-plugin-profile-data/client/components/StepProgress.css
+++ b/plugins/talk-plugin-profile-data/client/components/StepProgress.css
@@ -24,6 +24,8 @@
   box-sizing: border-box;
   margin: 0;
   padding: 0;
+  top: calc(50% - 2px);
+  left: 0;
 }
 
 .container {
@@ -33,4 +35,4 @@
   align-items: center;
   height: 50px;
   margin: 0 20px;
-}
\ No newline at end of file
+}

From 975448ec69fb8756dbc2f55f383242d1de5a9340 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 23 May 2018 15:10:44 -0600
Subject: [PATCH 061/144] patches to reliability computation based on settings

---
 .../coral-admin/src/containers/UserDetail.js  |  8 +++
 client/coral-admin/src/graphql/index.js       | 29 +++++++---
 graph/resolvers/index.js                      |  2 +
 graph/resolvers/karma_threshold.js            |  6 +++
 graph/resolvers/settings.js                   | 10 +++-
 graph/typeDefs.graphql                        | 26 +++++++++
 services/karma.js                             | 15 +++---
 test/server/services/karma.js                 | 53 +++++++++++++++++++
 8 files changed, 131 insertions(+), 18 deletions(-)
 create mode 100644 graph/resolvers/karma_threshold.js
 create mode 100644 test/server/services/karma.js

diff --git a/client/coral-admin/src/containers/UserDetail.js b/client/coral-admin/src/containers/UserDetail.js
index 4a6a93e84..666e6c8f2 100644
--- a/client/coral-admin/src/containers/UserDetail.js
+++ b/client/coral-admin/src/containers/UserDetail.js
@@ -228,6 +228,14 @@ export const withUserDetailQuery = withQuery(
       }
       ${getSlotFragmentSpreads(slots, 'user')}
     }
+    settings {
+      karma {
+        comment {
+          reliable
+          unreliable
+        }
+      }
+    }
     me {
       id
     }
diff --git a/client/coral-admin/src/graphql/index.js b/client/coral-admin/src/graphql/index.js
index 2b5b5d8c0..bb4b35b74 100644
--- a/client/coral-admin/src/graphql/index.js
+++ b/client/coral-admin/src/graphql/index.js
@@ -24,14 +24,23 @@ const userRoleFragment = gql`
   }
 `;
 
-const toBoolean = value => {
-  if (value === 0) {
-    return null;
-  } else if (value > 0) {
+/**
+ * calculateReliability will determine the reliability of a karma score based on
+ * the settings for the karma type.
+ *
+ * @param {Number} karma - the current karma value/score for the given user
+ * @param {Object} thresholds - the karma thresholds to base the karma computation on
+ */
+const calculateReliability = (karma, { reliable, unreliable }) => {
+  if (karma >= reliable) {
     return true;
-  } else {
+  }
+
+  if (karma <= unreliable) {
     return false;
   }
+
+  return null;
 };
 
 export default {
@@ -312,7 +321,10 @@ export default {
             user: {
               reliable: {
                 commenter: {
-                  $set: toBoolean(prev.user.reliable.commenterScore - 1),
+                  $set: calculateReliability(
+                    prev.user.reliable.commenterScore - 1,
+                    prev.settings.karma.comment
+                  ),
                 },
                 commenterScore: {
                   $apply: count => count - 1,
@@ -328,7 +340,10 @@ export default {
             user: {
               reliable: {
                 commenter: {
-                  $set: toBoolean(prev.user.reliable.commenterScore + 1),
+                  $set: calculateReliability(
+                    prev.user.reliable.commenterScore + 1,
+                    prev.settings.karma.comment
+                  ),
                 },
                 commenterScore: {
                   $apply: count => count + 1,
diff --git a/graph/resolvers/index.js b/graph/resolvers/index.js
index a8765f743..4bc9d9624 100644
--- a/graph/resolvers/index.js
+++ b/graph/resolvers/index.js
@@ -15,6 +15,7 @@ const DontAgreeActionSummary = require('./dont_agree_action_summary');
 const FlagAction = require('./flag_action');
 const FlagActionSummary = require('./flag_action_summary');
 const GenericUserError = require('./generic_user_error');
+const KarmaThreshold = require('./karma_threshold');
 const LocalUserProfile = require('./local_user_profile');
 const RootMutation = require('./root_mutation');
 const RootQuery = require('./root_query');
@@ -48,6 +49,7 @@ let resolvers = {
   FlagAction,
   FlagActionSummary,
   GenericUserError,
+  KarmaThreshold,
   LocalUserProfile,
   RootMutation,
   RootQuery,
diff --git a/graph/resolvers/karma_threshold.js b/graph/resolvers/karma_threshold.js
new file mode 100644
index 000000000..693b1042c
--- /dev/null
+++ b/graph/resolvers/karma_threshold.js
@@ -0,0 +1,6 @@
+const { property } = require('lodash');
+
+module.exports = {
+  reliable: property('RELIABLE'),
+  unreliable: property('UNRELIABLE'),
+};
diff --git a/graph/resolvers/settings.js b/graph/resolvers/settings.js
index 6ad1aa455..11e21068b 100644
--- a/graph/resolvers/settings.js
+++ b/graph/resolvers/settings.js
@@ -1,8 +1,13 @@
 const { VIEW_PROTECTED_SETTINGS } = require('../../perms/constants');
-
 const { decorateWithPermissionCheck } = require('./util');
 
-const Settings = {};
+const Settings = {
+  karma: (
+    settings,
+    args,
+    { connectors: { services: { Karma: { THRESHOLDS } } } }
+  ) => THRESHOLDS,
+};
 
 // PROTECTED_SETTINGS are the settings keys that must be protected for only some
 // eyes.
@@ -11,6 +16,7 @@ const PROTECTED_SETTINGS = {
   autoCloseStream: [VIEW_PROTECTED_SETTINGS],
   wordlist: [VIEW_PROTECTED_SETTINGS],
   domains: [VIEW_PROTECTED_SETTINGS],
+  karma: [VIEW_PROTECTED_SETTINGS],
 };
 
 // decorate the fields on the settings resolver with a permission check.
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 1c323e6f4..1f3016a18 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -801,6 +801,29 @@ type Domains {
   whitelist: [String!]!
 }
 
+# KarmaThreshold defines the bounds for which a User will become unreliable or
+# reliable based on their karma score. If the score is equal or less than the
+# unreliable value, they are unreliable. If the score is equal or more than the
+# reliable value, they are reliable. If they are neither reliable or unreliable
+# then they are neutral.
+type KarmaThreshold {
+  reliable: Int!
+  unreliable: Int!
+}
+
+# KarmaThresholds contains the currently set thresholds for triggering Trust
+# beheviour.
+type KarmaThresholds {
+
+  # flag represents karma settings in relation to how well a User's flagging
+  # ability aligns with the moderation decicions made by moderators.
+  flag: KarmaThreshold!
+
+  # comment represents the karma setting in relation to how well a User's
+  # comments are moderated.
+  comment: KarmaThreshold!
+}
+
 # Settings stores the global settings for a given installation.
 type Settings {
 
@@ -873,6 +896,9 @@ type Settings {
 
   # domains will return a given list of domains.
   domains: Domains
+
+  # karma contains the currently set thresholds for triggering Trust beheviour.
+  karma: KarmaThresholds
 }
 
 ################################################################################
diff --git a/services/karma.js b/services/karma.js
index 72533d328..e255e3b14 100644
--- a/services/karma.js
+++ b/services/karma.js
@@ -115,18 +115,14 @@ class KarmaService {
   /**
    * Inspects the reliability of a property and returns it if known.
    * @param {String} name - name of the property
-   * @param {Object} trust - object possibly containing the propertys
+   * @param {Object} trust - object possibly containing the properties
    */
   static isReliable(name, trust) {
-    if (trust && trust[name]) {
-      if (trust[name].karma > THRESHOLDS[name].RELIABLE) {
-        return true;
-      } else if (trust[name].karma <= THRESHOLDS[name].UNRELIABLE) {
-        return false;
-      }
-    } else if (THRESHOLDS[name].RELIABLE < 0) {
+    const karma = get(trust, [name, 'karma'], 0);
+
+    if (karma >= THRESHOLDS[name].RELIABLE) {
       return true;
-    } else if (THRESHOLDS[name].UNRELIABLE > 0) {
+    } else if (karma <= THRESHOLDS[name].UNRELIABLE) {
       return false;
     }
 
@@ -171,3 +167,4 @@ class KarmaService {
 }
 
 module.exports = KarmaService;
+module.exports.THRESHOLDS = THRESHOLDS;
diff --git a/test/server/services/karma.js b/test/server/services/karma.js
new file mode 100644
index 000000000..d725d8308
--- /dev/null
+++ b/test/server/services/karma.js
@@ -0,0 +1,53 @@
+const chai = require('chai');
+const { expect } = chai;
+const { merge } = require('lodash');
+const Karma = require('../../../services/karma');
+
+const thresholdsBackup = {};
+const thresholdsOverride = {
+  comment: {
+    RELIABLE: 1,
+    UNRELIABLE: -1,
+  },
+  flag: {
+    RELIABLE: 1,
+    UNRELIABLE: -1,
+  },
+};
+
+describe('services.Karma', () => {
+  before(() => {
+    // Backup the existing thresholds.
+    merge(thresholdsBackup, Karma.THRESHOLDS);
+
+    // Configure the thresholds to a known value.
+    merge(Karma.THRESHOLDS, thresholdsOverride);
+
+    expect(Karma.THRESHOLDS).to.deep.equal(thresholdsOverride);
+  });
+
+  after(() => {
+    // Restore the thresholds.
+    merge(Karma.THRESHOLDS, thresholdsBackup);
+
+    expect(Karma.THRESHOLDS).to.deep.equal(thresholdsBackup);
+  });
+
+  describe('#isReliable', () => {
+    it('neutral', () => {
+      expect(Karma.isReliable('comment', {})).to.be.null;
+      expect(Karma.isReliable('comment', { comment: {} })).to.be.null;
+      expect(Karma.isReliable('comment', { comment: { karma: 0 } })).to.be.null;
+    });
+    it('unreliable', () => {
+      expect(Karma.isReliable('comment', { comment: { karma: -1 } })).to.be
+        .false;
+      expect(Karma.isReliable('comment', { comment: { karma: -2 } })).to.be
+        .false;
+    });
+    it('reliable', () => {
+      expect(Karma.isReliable('comment', { comment: { karma: 1 } })).to.be.true;
+      expect(Karma.isReliable('comment', { comment: { karma: 2 } })).to.be.true;
+    });
+  });
+});

From f36b6e2cb64c792469712dea13a08c5428f5b6fa Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 23 May 2018 15:14:41 -0600
Subject: [PATCH 062/144] field renamed

---
 client/coral-admin/src/components/UserDetail.js | 2 +-
 client/coral-admin/src/containers/UserDetail.js | 2 +-
 client/coral-admin/src/graphql/index.js         | 8 ++++----
 graph/typeDefs.graphql                          | 8 ++++----
 services/karma.js                               | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index d227b2dd6..f81274934 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -255,7 +255,7 @@ class UserDetail extends React.Component {
                       styles[getKarma(user.reliable.commenter)]
                     )}
                   >
-                    {user.reliable.commenterScore}
+                    {user.reliable.commenterKarma}
                   </span>
                 </div>
                 <KarmaTooltip />
diff --git a/client/coral-admin/src/containers/UserDetail.js b/client/coral-admin/src/containers/UserDetail.js
index 666e6c8f2..1664e7cae 100644
--- a/client/coral-admin/src/containers/UserDetail.js
+++ b/client/coral-admin/src/containers/UserDetail.js
@@ -187,7 +187,7 @@ export const withUserDetailQuery = withQuery(
       reliable {
         flagger
         commenter
-        commenterScore
+        commenterKarma
       }
       state {
         status {
diff --git a/client/coral-admin/src/graphql/index.js b/client/coral-admin/src/graphql/index.js
index bb4b35b74..d1bbf501b 100644
--- a/client/coral-admin/src/graphql/index.js
+++ b/client/coral-admin/src/graphql/index.js
@@ -322,11 +322,11 @@ export default {
               reliable: {
                 commenter: {
                   $set: calculateReliability(
-                    prev.user.reliable.commenterScore - 1,
+                    prev.user.reliable.commenterKarma - 1,
                     prev.settings.karma.comment
                   ),
                 },
-                commenterScore: {
+                commenterKarma: {
                   $apply: count => count - 1,
                 },
               },
@@ -341,11 +341,11 @@ export default {
               reliable: {
                 commenter: {
                   $set: calculateReliability(
-                    prev.user.reliable.commenterScore + 1,
+                    prev.user.reliable.commenterKarma + 1,
                     prev.settings.karma.comment
                   ),
                 },
-                commenterScore: {
+                commenterKarma: {
                   $apply: count => count + 1,
                 },
               },
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 1f3016a18..5bc102736 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -20,17 +20,17 @@ type Reliability {
   # `null` if the reliability cannot be determined.
   flagger: Boolean
 
-  # flaggerScore will contains the number of agreed flags vs disagred flag
+  # flaggerKarma will contains the number of agreed flags vs disagred flag
   # count.
-  flaggerScore: Int!
+  flaggerKarma: Int!
 
   # Commenter will be `true` when the commenter is reliable, `false` if not, or
   # `null` if the reliability cannot be determined.
   commenter: Boolean
 
-  # commenterScore the number of approved comments (not untouched) subtracted by
+  # commenterKarma the number of approved comments (not untouched) subtracted by
   # the number of rejected comments.
-  commenterScore: Int!
+  commenterKarma: Int!
 }
 
 ################################################################################
diff --git a/services/karma.js b/services/karma.js
index e255e3b14..0437ad98a 100644
--- a/services/karma.js
+++ b/services/karma.js
@@ -84,7 +84,7 @@ class KarmaModel {
     return KarmaService.isReliable('flag', this.model);
   }
 
-  get flaggerScore() {
+  get flaggerKarma() {
     return get(this.model, 'flag.karma', 0);
   }
 
@@ -92,7 +92,7 @@ class KarmaModel {
     return KarmaService.isReliable('comment', this.model);
   }
 
-  get commenterScore() {
+  get commenterKarma() {
     return get(this.model, 'comment.karma', 0);
   }
 }

From 97416d421b3355ded1d782d275d807b33f0a1e44 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 23 May 2018 16:17:38 -0600
Subject: [PATCH 063/144] adjusted karma tooltip

---
 .../src/components/KarmaTooltip.css           | 30 ++++++++++++++++++-
 .../src/components/KarmaTooltip.js            | 29 ++++++++++++++++++
 .../coral-admin/src/components/UserDetail.js  | 24 ++-------------
 .../coral-admin/src/containers/UserDetail.js  |  1 -
 locales/en.yml                                |  2 +-
 5 files changed, 62 insertions(+), 24 deletions(-)

diff --git a/client/coral-admin/src/components/KarmaTooltip.css b/client/coral-admin/src/components/KarmaTooltip.css
index dc766c5f0..ff6f8b742 100644
--- a/client/coral-admin/src/components/KarmaTooltip.css
+++ b/client/coral-admin/src/components/KarmaTooltip.css
@@ -59,6 +59,34 @@
   transform: rotate(180deg);
 }
 
+.menu ul {
+  list-style: none;
+  padding: 0;
+  
+  li {
+    display: flex;
+    justify-content: space-between;
+    margin: 5px 0;
+  }
+}
+
+.label {
+  padding: 4px 5px;
+  border-radius: 3px;
+  color: #fff;
+  font-weight: 400;
+  text-align: center;
+  font-size: .9em;
+  line-height: normal;
+  letter-spacing: .4px;
+  min-width: 25px;
+  display: block;
+
+  /* &.reliable { background-color: #03AB61; } */
+  /* &.neutral { background-color: #616161; } */
+  &.unreliable { background-color: #F44336; }
+}
+
 .descriptionList {
   padding: 0;
   margin: 0;
@@ -77,4 +105,4 @@
   color: #2B7EB5;
   text-decoration: underline;
   display: block;
-}
\ No newline at end of file
+}
diff --git a/client/coral-admin/src/components/KarmaTooltip.js b/client/coral-admin/src/components/KarmaTooltip.js
index 370856f1f..772b119e9 100644
--- a/client/coral-admin/src/components/KarmaTooltip.js
+++ b/client/coral-admin/src/components/KarmaTooltip.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import cn from 'classnames';
 import { Icon } from 'coral-ui';
 import styles from './KarmaTooltip.css';
@@ -8,6 +9,13 @@ import t from 'coral-framework/services/i18n';
 const initialState = { menuVisible: false };
 
 class KarmaTooltip extends React.Component {
+  static propTypes = {
+    settings: PropTypes.shape({
+      reliable: PropTypes.number.isRequired,
+      unreliable: PropTypes.number.isRequired,
+    }).isRequired,
+  };
+
   state = initialState;
 
   toogleMenu = () => {
@@ -19,6 +27,7 @@ class KarmaTooltip extends React.Component {
   };
 
   render() {
+    const { settings: { unreliable } } = this.props;
     const { menuVisible } = this.state;
 
     return (
@@ -34,6 +43,26 @@ class KarmaTooltip extends React.Component {
           {menuVisible && (
             <div className={cn(styles.menu, 'talk-admin-karma-tooltip-menu')}>
               <strong>{t('user_detail.user_karma_score')}</strong>
+              <ul>
+                {/* <li>
+                  <span>Reliable</span>{' '}
+                  <span className={cn(styles.label, styles.reliable)}>
+                    &ge; {reliable}
+                  </span>
+                </li>
+                <li>
+                  <span>Neutral</span>{' '}
+                  <span className={cn(styles.label, styles.neutral)}>
+                    &lt; {reliable}, &gt; {unreliable}
+                  </span>
+                </li> */}
+                <li>
+                  <span>{t('user_detail.unreliable')}</span>{' '}
+                  <span className={cn(styles.label, styles.unreliable)}>
+                    &le; {unreliable}
+                  </span>
+                </li>
+              </ul>
               <a
                 className={styles.link}
                 href={t('user_detail.karma_docs_link')}
diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index f81274934..1b3fe4333 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -6,12 +6,7 @@ import styles from './UserDetail.css';
 import UserHistory from './UserHistory';
 import { Slot } from 'coral-framework/components';
 import UserDetailCommentList from '../components/UserDetailCommentList';
-import {
-  getReliability,
-  isSuspended,
-  isBanned,
-  getKarma,
-} from 'coral-framework/utils/user';
+import { isSuspended, isBanned, getKarma } from 'coral-framework/utils/user';
 import ButtonCopyToClipboard from './ButtonCopyToClipboard';
 import ClickOutside from 'coral-framework/components/ClickOutside';
 import {
@@ -81,7 +76,7 @@ class UserDetail extends React.Component {
   renderLoaded() {
     const {
       root,
-      root: { me, user, totalComments, rejectedComments },
+      root: { me, user, totalComments, rejectedComments, settings: { karma } },
       activeTab,
       selectedCommentIds,
       toggleSelect,
@@ -231,19 +226,6 @@ class UserDetail extends React.Component {
                   {rejectedPercent.toFixed(1)}%
                 </span>
               </li>
-              <li className={styles.stat}>
-                <span className={styles.statItem}>
-                  {t('user_detail.reports')}
-                </span>
-                <span
-                  className={cn(
-                    styles.statReportResult,
-                    styles[getReliability(user.reliable.flagger)]
-                  )}
-                >
-                  {capitalize(getReliability(user.reliable.flagger))}
-                </span>
-              </li>
               <li className={cn(styles.stat, styles.karmaStat)}>
                 <div>
                   <span className={styles.statItem}>
@@ -258,7 +240,7 @@ class UserDetail extends React.Component {
                     {user.reliable.commenterKarma}
                   </span>
                 </div>
-                <KarmaTooltip />
+                <KarmaTooltip settings={karma.comment} />
               </li>
             </ul>
           </div>
diff --git a/client/coral-admin/src/containers/UserDetail.js b/client/coral-admin/src/containers/UserDetail.js
index 1664e7cae..f12b26b30 100644
--- a/client/coral-admin/src/containers/UserDetail.js
+++ b/client/coral-admin/src/containers/UserDetail.js
@@ -185,7 +185,6 @@ export const withUserDetailQuery = withQuery(
         provider
       }
       reliable {
-        flagger
         commenter
         commenterKarma
       }
diff --git a/locales/en.yml b/locales/en.yml
index 273a6d423..9b38c833f 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -466,10 +466,10 @@ en:
     email: "Email"
     total_comments: "Total Comments"
     reject_rate: "Reject Rate"
-    reports: "Reports"
     all: "All"
     rejected: "Rejected"
     user_history: "User History"
+    unreliable: "Unreliable"
     karma: "Karma"
     learn_more: "Learn More"
     user_karma_score: "User Karma Score"

From 9a73c6db59ebde11429bc96a2e62013d115bfb44 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 23 May 2018 16:18:10 -0600
Subject: [PATCH 064/144] "Trust" flag to "Karma" and updated translations

---
 locales/ar.yml    | 149 +---------------------------------------------
 locales/da.yml    |   3 -
 locales/de.yml    |   1 -
 locales/en.yml    |   2 +-
 locales/es.yml    |   1 -
 locales/fi_FI.yml |   1 -
 locales/fr.yml    |   1 -
 locales/nl_NL.yml |   1 -
 locales/pt_BR.yml |  49 ---------------
 locales/zh_CN.yml |  68 +--------------------
 locales/zh_TW.yml |  70 ----------------------
 11 files changed, 3 insertions(+), 343 deletions(-)

diff --git a/locales/ar.yml b/locales/ar.yml
index 852b9ac1b..2b320a621 100644
--- a/locales/ar.yml
+++ b/locales/ar.yml
@@ -292,55 +292,7 @@ ar:
          suspect_word: "كلمة مشتبهة"
          banned_word: "كلمة محظورة"
          body_count: "يتجاوز النص الحد الأقصى للطول المسموح"
-         trust: "ثقة"
          links: "رابط"
-  modqueue:
-    account: "account flags"
-    actions: Actions
-    all: all
-    all_streams: "All Streams"
-    notify_edited: '{0} edited comment "{1}"'
-    notify_accepted: '{0} accepted comment "{1}"'
-    notify_rejected: '{0} rejected comment "{1}"'
-    notify_flagged: '{0} flagged comment "{1}"'
-    notify_reset: '{0} reset status of comment "{1}"'
-    approve: "Approve"
-    approved: "Approved"
-    ban_user: "Ban"
-    billion: B
-    close: Close
-    empty_queue: "No more comments to moderate! You're all caught up. Go have some ☕️"
-    flagged: flagged
-    reported: reported
-    less_detail: "Less detail"
-    likes: likes
-    million: M
-    mod_faster: "Moderate faster with keyboard shortcuts"
-    moderate: "Moderate →"
-    more_detail: "More detail"
-    new: New
-    newest_first: "Newest First"
-    navigation: Navigation
-    next_comment: "Go to the next comment"
-    toggle_search: "Open search"
-    next_queue: "Switch queues"
-    oldest_first: "Oldest First"
-    premod: pre-mod
-    prev_comment: "Go to the previous comment"
-    reject: "Reject"
-    rejected: "Rejected"
-    reply: "Reply"
-    select_stream: "Select Stream"
-    shift_key: "⇧"
-    shortcuts: "Shortcuts"
-    sort: "Sort"
-    show_shortcuts: "Show Shortcuts"
-    singleview: "Zen mode"
-    thismenu: "Open this menu"
-    jump_to_queue: "Jump to specific queue"
-    thousand: k
-    try_these: "Try these"
-    view_more_shortcuts: "View more shortcuts"
   my_comment_history: "سجل التعليقات"
   name: اسم
   no_agree_comment: "لا أوافق على هذا التعليق"
@@ -358,9 +310,6 @@ ar:
   report_notif: "شكرا على الإبلاغ عن هذا التعليق. تم إبلاغ فريق الإشراف لدينا وسيراجعه قريبًا."
   report_notif_remove: "لقد تمت إزالة بلاغك."
   reported: بلغ عنه
-  comment_history_blank:
-    title: You have not written any comments
-    info: A history of your comments will appear here
   settings:
     from_settings_page: "من صفحة الملف الشخصي يمكنك مشاهدة سجل التعليقات."
     my_comment_history: "سجل التعليقات"
@@ -378,104 +327,8 @@ ar:
   step_1_header: "بلغ عن مشكلة"
   step_2_header: "ساعدنا على الفهم"
   step_3_header: "شكرا لك على المساهمة الخاصة بك"
-  streams:
-    all: All
-    article: Story
-    closed: Closed
-    empty_result: "No assets match this search. Maybe try widening your search?"
-    filter_streams: "Filter Streams"
-    newest: Newest
-    oldest: Oldest
-    open: Open
-    pubdate: "Publication Date"
-    search: Search
-    sort_by: "Sort By"
-    status: "Stream Status"
-    stream_status: "Stream Status"
-  suspenduser:
-    title_suspend: "Suspend User"
-    description_suspend: "You are suspending {0}. This comment will go to the Rejected queue, and {0} will not be allowed to like, report, reply or post until the suspension time is complete."
-    select_duration: "Select suspension duration"
-    one_hour: "1 hour"
-    hours: "{0} hours"
-    days: "{0} days"
-    hour: "{0} hours"
-    day: "{0} days"
-    cancel: "Cancel"
-    suspend_user: "Suspend User"
-    email_message_suspend: "Dear {0},\n\nIn accordance with {1}’s community guidelines, your account has been temporarily suspended. During the suspension, you will be unable to comment, flag or engage with fellow commenters. Please rejoin the conversation {2}."
-    title_notify: "Notify the user of their temporary suspension"
-    notify_suspend_until: "User {0} has been temporarily suspended. This suspension will automatically end {1}."
-    description_notify: "Suspending this user will temporarily disable their account."
-    write_message: "Write a message"
-    send: Send
-  reject_username:
-    username: username
-    no_cancel: "No cancel"
-    description_reject: "Would you like to temporarily ban this user because of their {0}? Doing so will temporarily suspend this user until they rewrite their {0}."
-    title_notify: "Notify the user of their temporary suspension"
-    description_notify: "Suspending this user will temporarily disable their account."
-    title_reject: "We noticed you rejected a username"
-    suspend_user: "Suspend User"
-    yes_suspend: "Yes suspend"
-    email_message_reject: "Another member of the community recently flagged your username for review. Because of its content your user was rejected. This means you can no longer comment, like, or flag content until you rewrite your username. Please e-mail us if you have any questions or concerns."
-    write_message: "Write a message"
-    send: Send
   thank_you: "نحن نقدر سلامتك وردود الفعل. سيراجع المشرف التقرير الخاص بك"
-  user:
-    bio_flags: "flags for this bio"
-    user_bio: "User Bio"
-    username_flags: "flags for this username"
-  user_detail:
-    remove_suspension: "Remove Suspension"
-    suspend: "Suspend User"
-    remove_ban: "Remove Ban"
-    ban: "Ban User"
-    member_since: "Member Since"
-    email: "Email"
-    total_comments: "Total Comments"
-    reject_rate: "Reject Rate"
-    reports: "Reports"
-    all: "All"
-    rejected: "Rejected"
-    user_history: "User History"
-  user_history:
-    user_banned: "User banned"
-    ban_removed: "Ban removed"
-    username_status: "Username {0}"
-    suspended: "Suspended, {0}"
-    suspension_removed: "Suspension removed"
-    system: "System"
-    date: "Date"
-    action: "Action"
-    taken_by: "Taken By"
   user_impersonating: "هذا المستخدم ينتحل شخصية"
   user_no_comment: "لم تترك تعليقا مطلقا. إنضم إلى المحادثة!"
   username_offensive: "اسم المستخدم هذا مسيء"
-  view_conversation: "عرض المحادثة"
-  install:
-    initial:
-      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."
-      label: "Organization Name"
-      save: "Save"
-    create:
-      email: "Email address"
-      username: "Username"
-      password: "Password"
-      confirm_password: "Confirm Password"
-      organization_contact_email: "Organization Contact Email"
-      save: "Save"
-    permitted_domains:
-      title: "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:
-      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"
-  admin_sidebar:
-    view_options: "View Options"
-    sort_comments: "Sort Comments"
+  view_conversation: "عرض المحادثة"
\ No newline at end of file
diff --git a/locales/da.yml b/locales/da.yml
index 4bcb3bb1d..d21a1aee6 100644
--- a/locales/da.yml
+++ b/locales/da.yml
@@ -211,7 +211,6 @@ da:
     NO_SPECIAL_CHARACTERS: "Brugernavne kan kun indeholder bogstaver og _"
     PASSWORD_LENGTH: "Adgangskoden er for kort"
     PROFANITY_ERROR: "Brugernavne må ikke inholde stødende indhold. Kontakt venligst administratoren, hvis du mener at dette er en fejl."
-    RATE_LIMIT_EXCEEDED: "Rate limit exceeded"
     USERNAME_IN_USE: "Brugernavnet er allerede i brug"
     USERNAME_REQUIRED: "Du skal indtaste et brugernavn"
     EMAIL_NOT_VERIFIED: "E-mail address not verified"
@@ -287,10 +286,8 @@ da:
         comment_spam: "Spam"
         comment_noagree: "Uenig"
         comment_other: "Andre"
-        suspect_word: "Suspect Word"
         banned_word: "Forbudt ord"
         body_count: "Body overstiger max længde"
-        trust: "Stol"
         links: "Link"
   modqueue:
     account: "konto flag"
diff --git a/locales/de.yml b/locales/de.yml
index bec73fa5d..2bf137991 100644
--- a/locales/de.yml
+++ b/locales/de.yml
@@ -322,7 +322,6 @@ de:
          suspect_word: "Verdächtiges Wort"
          banned_word: "Unzulässiges Wort"
          body_count: "Text überschreitet Zeichenlimit"
-         trust: "Vertrauen"
          links: "Link"
   modqueue:
     account: "Konto-Markierungen"
diff --git a/locales/en.yml b/locales/en.yml
index 9b38c833f..32399fd9d 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -322,7 +322,7 @@ en:
          suspect_word: "Suspect Word"
          banned_word: "Banned Word"
          body_count: "Body exceeds max length"
-         trust: "Trust"
+         trust: "Karma"
          links: "Link"
   modqueue:
     account: "account flags"
diff --git a/locales/es.yml b/locales/es.yml
index ff2777c41..fc9b93b36 100644
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -310,7 +310,6 @@ es:
          suspect_word: "Palabra sospechosa"
          banned_word: "Palabra prohibida"
          body_count: "El texto exede el límite permitido"
-         trust: "Trust"
          links: "Link"
   modqueue:
     account: "reportes de cuentas"
diff --git a/locales/fi_FI.yml b/locales/fi_FI.yml
index 494a48cdb..4758a2920 100644
--- a/locales/fi_FI.yml
+++ b/locales/fi_FI.yml
@@ -292,7 +292,6 @@ fi_FI:
          suspect_word: "Epäilyttävä sana"
          banned_word: "Kielletty sana"
          body_count: "Liian pitkä viesti"
-         trust: "Luotettava"
          links: "Linkki"
   modqueue:
     account: "Liputuksia"
diff --git a/locales/fr.yml b/locales/fr.yml
index 1e9e0e496..4e32cf66c 100644
--- a/locales/fr.yml
+++ b/locales/fr.yml
@@ -300,7 +300,6 @@ fr:
          suspect_word: "Mot suspect"
          banned_word: "Mot banni"
          body_count: "Le texte dépasse la longueur maximale"
-         trust: "Trust"
          links: "Lien"
   modqueue:
     account: "Signalements du compte"
diff --git a/locales/nl_NL.yml b/locales/nl_NL.yml
index 9d4057065..297917c9e 100644
--- a/locales/nl_NL.yml
+++ b/locales/nl_NL.yml
@@ -290,7 +290,6 @@ nl_NL:
          suspect_word: "Verdacht woord"
          banned_word: "Geblokeerd woord"
          body_count: "Tekst is te lang"
-         trust: "Vertrouwen"
          links: "Link"
   modqueue:
     account: "account meldingen"
diff --git a/locales/pt_BR.yml b/locales/pt_BR.yml
index 4b7b5c3e3..c464480e0 100644
--- a/locales/pt_BR.yml
+++ b/locales/pt_BR.yml
@@ -61,11 +61,6 @@ pt_BR:
     reaction: 'Reação'
     reactions: 'Reações'
     story: 'Conversas'
-  flagged_usernames:
-    notify_approved: '{0} approved username {1}'
-    notify_rejected: '{0} rejected username {1}'
-    notify_flagged: '{0} reported username {1}'
-    notify_changed: 'user {0} changed their username to {1}'
   community:
     account_creation_date: "Data de criação da conta"
     active: Ativo
@@ -273,24 +268,6 @@ pt_BR:
   loading_results: "Carregando resultados"
   marketing: "Isso parece um anúncio/marketing"
   moderate_this_stream: "Moderar comentários"
-  flags:
-    reasons:
-      user:
-        username_offensive: "Offensive"
-        username_nolike: "Dislike"
-        username_impersonating: "Impersonation"
-        username_spam: "Spam"
-        username_other: "Other"
-      comment:
-        comment_offensive: "Offensive"
-        comment_spam: "Spam"
-        comment_noagree: "Disagree"
-        comment_other: "Other"
-        suspect_word: "Suspect Word"
-        banned_word: "Banned Word"
-        body_count: "Body exceeds max length"
-        trust: "Trust"
-        links: "Link"
   modqueue:
     account: "contas marcadas"
     actions: Ações
@@ -418,29 +395,6 @@ pt_BR:
     bio_flags: "Marcadas para este perfil"
     user_bio: "Perfil do usuário"
     username_flags: "Marcadas para este usuário"
-  user_detail:
-    remove_suspension: "Remove Suspension"
-    suspend: "Suspend User"
-    remove_ban: "Remove Ban"
-    ban: "Ban User"
-    member_since: "Member Since"
-    email: "Email"
-    total_comments: "Total Comments"
-    reject_rate: "Reject Rate"
-    reports: "Reports"
-    all: "All"
-    rejected: "Rejected"
-    user_history: "User History"
-  user_history:
-    user_banned: "User banned"
-    ban_removed: "Ban removed"
-    username_status: "Username {0}"
-    suspended: "Suspended, {0}"
-    suspension_removed: "Suspension removed"
-    system: "System"
-    date: "Date"
-    action: "Action"
-    taken_by: "Taken By"
   user_impersonating: "Este usuário está representando"
   user_no_comment: "Você nunca deixou um comentário. Participe da conversa!"
   username_offensive: "Esse nome de usuário é ofensivo"
@@ -468,6 +422,3 @@ pt_BR:
       description: "Obrigado por instalar o Talk! Enviamos um e-mail para verificar seu endereço de e-mail. Enquanto você terminar de configurar a conta, você pode começar a se envolver com seus leitores agora."
       launch: "Iniciar Talk"
       close: "Feche este instalador"
-  admin_sidebar:
-    view_options: "View Options"
-    sort_comments: "Sort Comments"
diff --git a/locales/zh_CN.yml b/locales/zh_CN.yml
index b3307a886..c70f5b779 100644
--- a/locales/zh_CN.yml
+++ b/locales/zh_CN.yml
@@ -12,22 +12,11 @@ zh_CN:
     note_reject_comment: "封禁该用户将使这条评论被移入“被拒”队列。"
     note_ban_user: "封禁该用户将使其无法编辑或删除评论。"
     yes_ban_user: "是的，封禁该用户"
-    write_a_message: "Write a message"
-    send: "Send"
-    notify_ban_headline: "Notify the user of ban"
-    notify_ban_description: "This will notify the user by email that they have been banned from the community"
-    email_message_ban: "Dear {0},\n\nSomeone with access to your account has violated our community guidelines. As a result, your account has been banned. You will no longer be able to comment, like or report comments. if you think this has been done in error, please contact our community team."
   bio_offensive: "该简介含有冒犯言语"
   cancel: "取消"
   confirm_email:
     click_to_confirm: "Click below to confirm your email address"
     confirm: "Confirm"
-  password_reset:
-    set_new_password: "Change Your Password"
-    new_password: "New Password"
-    new_password_help: "Password must be at least 8 characters"
-    confirm_new_password: "Confirm New Password"
-    change_password: "Change Password"
   characters_remaining: "字符剩余可用"
   comment:
     anon: "匿名"
@@ -61,11 +50,6 @@ zh_CN:
     reaction: '回应'
     reactions: '回应'
     story: '文章'
-  flagged_usernames:
-    notify_approved: '{0} approved username {1}'
-    notify_rejected: '{0} rejected username {1}'
-    notify_flagged: '{0} reported username {1}'
-    notify_changed: 'user {0} changed their username to {1}'
   community:
     account_creation_date: "账户创建日期"
     active: "活动中"
@@ -203,9 +187,6 @@ zh_CN:
   embedlink:
     copy: "复制到粘贴板"
   error:
-    COMMENT_PARENT_NOT_VISIBLE: "The comment that you're replying to has been removed or doesn't exist."
-    EMAIL_VERIFICATION_TOKEN_INVALID: "Email verification token is invalid."
-    PASSWORD_RESET_TOKEN_INVALID: "Your password reset link is invalid."
     COMMENT_TOO_SHORT: "评论至少应有一个字符。请修改您的评论，再度尝试。"
     NOT_AUTHORIZED: "您没有权限进行该操作"
     NO_SPECIAL_CHARACTERS: "用户名只能包含字母、数字跟下划线"
@@ -237,7 +218,6 @@ zh_CN:
     username: "用户名只能包含字母、数字跟下划线"
     unexpected: "发生了异常错误。对不起！"
     required_field: "该字段必填"
-    temporarily_suspended: "Your account is currently suspended. It will be reactivated {0}. Please contact us if you have any questions."
   flag_comment: "举报评论"
   flag_reason: "举报理由（可选）"
   flag_username: "举报用户名"
@@ -256,8 +236,6 @@ zh_CN:
       error: "用户名只能包含字母、数字跟下划线"
       label: "新用户名"
       msg: "由于您的用户名不当，您的帐号目前被暂停使用。如要恢复您的帐户，请输入一个新的用户名。如有任何疑问，请与我们联系。"
-    changed_name:
-      msg: "Your username change is under review by our moderation team."
     my_comments: "我的评论"
     my_profile: "我的资料"
     new_count: "查看 {0} 更多 {1}"
@@ -275,24 +253,6 @@ zh_CN:
   loading_results: "加载结果中"
   marketing: "这看起来像是广告"
   moderate_this_stream: "审查该流"
-  flags:
-    reasons:
-       user:
-         username_offensive: "Offensive"
-         username_nolike: "Dislike"
-         username_impersonating: "Impersonation"
-         username_spam: "Spam"
-         username_other: "Other"
-       comment:
-         comment_offensive: "Offensive"
-         comment_spam: "Spam"
-         comment_noagree: "Disagree"
-         comment_other: "Other"
-         suspect_word: "Suspect Word"
-         banned_word: "Banned Word"
-         body_count: "Body exceeds max length"
-         trust: "Trust"
-         links: "Link"
   modqueue:
     account: "帐户标记"
     actions: "操作"
@@ -420,29 +380,6 @@ zh_CN:
     bio_flags: "对简介的举报"
     user_bio: "用户简介"
     username_flags: "对用户名的举报"
-  user_detail:
-    remove_suspension: "Remove Suspension"
-    suspend: "Suspend User"
-    remove_ban: "Remove Ban"
-    ban: "Ban User"
-    member_since: "Member Since"
-    email: "Email"
-    total_comments: "Total Comments"
-    reject_rate: "Reject Rate"
-    reports: "Reports"
-    all: "All"
-    rejected: "Rejected"
-    user_history: "User History"
-  user_history:
-    user_banned: "User banned"
-    ban_removed: "Ban removed"
-    username_status: "Username {0}"
-    suspended: "Suspended, {0}"
-    suspension_removed: "Suspension removed"
-    system: "System"
-    date: "Date"
-    action: "Action"
-    taken_by: "Taken By"
   user_impersonating: "冒名用户"
   user_no_comment: "您未曾发表评论。现在就来加入对话吧！"
   username_offensive: "用户名有冒犯性"
@@ -468,7 +405,4 @@ zh_CN:
     final:
       description: "感谢您安装 Talk！我们已向您的邮箱发送一封验证邮件。当您进行帐号设置时，您可以开始跟您的读者开始互动。"
       launch: "启动 Talk"
-      close: "关闭安装程序"
-  admin_sidebar:
-    view_options: "View Options"
-    sort_comments: "Sort Comments"
+      close: "关闭安装程序"
\ No newline at end of file
diff --git a/locales/zh_TW.yml b/locales/zh_TW.yml
index c186a667f..2b5db5d44 100644
--- a/locales/zh_TW.yml
+++ b/locales/zh_TW.yml
@@ -12,22 +12,8 @@ zh_TW:
     note_reject_comment: "封禁該用戶將使這條評論被移入“被拒”列表。"
     note_ban_user: "封禁該用戶將使其無法編輯或刪除評論。"
     yes_ban_user: "是的，封禁該用戶"
-    write_a_message: "Write a message"
-    send: "Send"
-    notify_ban_headline: "Notify the user of ban"
-    notify_ban_description: "This will notify the user by email that they have been banned from the community"
-    email_message_ban: "Dear {0},\n\nSomeone with access to your account has violated our community guidelines. As a result, your account has been banned. You will no longer be able to comment, like or report comments. if you think this has been done in error, please contact our community team."
   bio_offensive: "該介紹包含具有攻擊性的內容。"
   cancel: "取消"
-  confirm_email:
-    click_to_confirm: "Click below to confirm your email address"
-    confirm: "Confirm"
-  password_reset:
-    set_new_password: "Change Your Password"
-    new_password: "New Password"
-    new_password_help: "Password must be at least 8 characters"
-    confirm_new_password: "Confirm New Password"
-    change_password: "Change Password"
   characters_remaining: "剩餘字符數"
   comment:
     anon: "匿名用戶"
@@ -61,11 +47,6 @@ zh_TW:
     reaction: '回應'
     reactions: '回應'
     story: '故事'
-  flagged_usernames:
-    notify_approved: '{0} approved username {1}'
-    notify_rejected: '{0} rejected username {1}'
-    notify_flagged: '{0} reported username {1}'
-    notify_changed: 'user {0} changed their username to {1}'
   community:
     account_creation_date: "賬戶創建日期"
     active: 激活
@@ -203,9 +184,6 @@ zh_TW:
   embedlink:
     copy: "覆制到剪貼板"
   error:
-    COMMENT_PARENT_NOT_VISIBLE: "The comment that you're replying to has been removed or doesn't exist."
-    EMAIL_VERIFICATION_TOKEN_INVALID: "Email verification token is invalid."
-    PASSWORD_RESET_TOKEN_INVALID: "Your password reset link is invalid."
     COMMENT_TOO_SHORT: "評論長度必須超過一個字符，請您修改評論後重試。"
     NOT_AUTHORIZED: "您無權執行該操作。"
     NO_SPECIAL_CHARACTERS: "用戶名只能包含字母、數字和下劃線"
@@ -237,7 +215,6 @@ zh_TW:
     username: "用戶名只能包含字母、數字和下劃線。"
     unexpected: "發生了意外錯誤。抱歉!"
     required_field: "該字段必填"
-    temporarily_suspended: "Your account is currently suspended. It will be reactivated {0}. Please contact us if you have any questions."
   flag_comment: "舉報評論"
   flag_reason: "舉報原因（可選）"
   flag_username: "舉報用戶名"
@@ -256,8 +233,6 @@ zh_TW:
       error: "用戶名只能包含字母、數字和下劃線。"
       label: "新用戶名"
       msg: "由於您的用戶名不當，您的帳號目前已被暫停使用。如要恢復您的帳戶，請輸入一個新的用戶名。如有任何疑問，請與我們聯繫。"
-    changed_name:
-      msg: "Your username change is under review by our moderation team."
     my_comments: "我的評論"
     my_profile: "我的概況"
     new_count: "查看{0}更多{1}"
@@ -275,24 +250,6 @@ zh_TW:
   loading_results: "加載結果"
   marketing: "這看起來像是廣告/營銷"
   moderate_this_stream: "審核這個流"
-  flags:
-    reasons:
-       user:
-         username_offensive: "Offensive"
-         username_nolike: "Dislike"
-         username_impersonating: "Impersonation"
-         username_spam: "Spam"
-         username_other: "Other"
-       comment:
-         comment_offensive: "Offensive"
-         comment_spam: "Spam"
-         comment_noagree: "Disagree"
-         comment_other: "Other"
-         suspect_word: "Suspect Word"
-         banned_word: "Banned Word"
-         body_count: "Body exceeds max length"
-         trust: "Trust"
-         links: "Link"
   modqueue:
     account: "帳戶標記"
     actions: 操作
@@ -345,7 +302,6 @@ zh_TW:
   no_agree_comment: "我不同意這個評論"
   no_like_bio: "我不喜歡這個個人簡介"
   no_like_username: "我不喜歡這個用戶名"
-  already_flagged_username: "You have already flagged this username."
   other: 其他
   permalink: 分享
   personal_info: "該評論洩露了個人身份資訊"
@@ -420,29 +376,6 @@ zh_TW:
     bio_flags: "該簡介的標記"
     user_bio: "用戶簡介"
     username_flags: "該用戶名的標記"
-  user_detail:
-    remove_suspension: "Remove Suspension"
-    suspend: "Suspend User"
-    remove_ban: "Remove Ban"
-    ban: "Ban User"
-    member_since: "Member Since"
-    email: "Email"
-    total_comments: "Total Comments"
-    reject_rate: "Reject Rate"
-    reports: "Reports"
-    all: "All"
-    rejected: "Rejected"
-    user_history: "User History"
-  user_history:
-    user_banned: "User banned"
-    ban_removed: "Ban removed"
-    username_status: "Username {0}"
-    suspended: "Suspended, {0}"
-    suspension_removed: "Suspension removed"
-    system: "System"
-    date: "Date"
-    action: "Action"
-    taken_by: "Taken By"
   user_impersonating: "此用戶正在冒充"
   user_no_comment: "您尚未評論過。加入對話吧！"
   username_offensive: "這個用戶名有冒犯性"
@@ -469,6 +402,3 @@ zh_TW:
       description: "感謝安裝Talk！我們給您發送了一封郵件以驗證您的電子郵箱地址。在完成帳戶設置後，您即可開始與您的讀者互動。"
       launch: "啟動Talk"
       close: "關閉安裝程序"
-  admin_sidebar:
-    view_options: "View Options"
-    sort_comments: "Sort Comments"

From 0835f3f32163cbdf0ee3766f2e93d38ec9cadbb6 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 23 May 2018 17:16:51 -0600
Subject: [PATCH 065/144] fixed translations

---
 client/coral-admin/src/components/CommentLabels.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/components/CommentLabels.js b/client/coral-admin/src/components/CommentLabels.js
index 1f71d9771..5c7da08c7 100644
--- a/client/coral-admin/src/components/CommentLabels.js
+++ b/client/coral-admin/src/components/CommentLabels.js
@@ -2,6 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import Label from 'coral-ui/components/Label';
 import Slot from 'coral-framework/components/Slot';
+import { t } from 'coral-framework/services/i18n';
 import FlagLabel from 'coral-ui/components/FlagLabel';
 import cn from 'classnames';
 import styles from './CommentLabels.css';
@@ -63,10 +64,14 @@ const CommentLabels = ({
           <FlagLabel iconName="person">{getUserFlaggedType(actions)}</FlagLabel>
         )}
         {hasSuspectedWords(actions) && (
-          <FlagLabel iconName="sms_failed">Suspect</FlagLabel>
+          <FlagLabel iconName="sms_failed">
+            {t('flags.reasons.comment.suspect_word')}
+          </FlagLabel>
         )}
         {hasHistoryFlag(actions) && (
-          <FlagLabel iconName="sentiment_very_dissatisfied">History</FlagLabel>
+          <FlagLabel iconName="sentiment_very_dissatisfied">
+            {t('flags.reasons.comment.trust')}
+          </FlagLabel>
         )}
       </div>
       <Slot

From 0c1e4873f8f3a6e9655251361398434d089e7929 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 24 May 2018 10:09:44 -0600
Subject: [PATCH 066/144] fixed first time user

---
 services/moderation/phases/karma.js | 42 ++++++++++++++---------------
 test/server/services/karma.js       | 20 +++++++-------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/services/moderation/phases/karma.js b/services/moderation/phases/karma.js
index ad55b37a7..7a929824b 100644
--- a/services/moderation/phases/karma.js
+++ b/services/moderation/phases/karma.js
@@ -6,28 +6,26 @@ module.exports = ctx => {
   const { connectors: { services: { Karma } } } = ctx;
   const trust = get(ctx, 'user.metadata.trust', null);
 
-  if (trust !== null) {
-    // If the user is not a reliable commenter (passed the unreliability
-    // threshold by having too many rejected comments) then we can change the
-    // status of the comment to `SYSTEM_WITHHELD`, therefore pushing the user's
-    // comments away from the public eye until a moderator can manage them. This of
-    // course can only be applied if the comment's current status is `NONE`,
-    // we don't want to interfere if the comment was rejected.
-    if (Karma.isReliable('comment', trust) === false) {
-      // Add the flag related to Trust to the comment.
-      return {
-        status: 'SYSTEM_WITHHELD',
-        actions: [
-          {
-            action_type: 'FLAG',
-            user_id: null,
-            group_id: 'TRUST',
-            metadata: {
-              trust,
-            },
+  // If the user is not a reliable commenter (passed the unreliability
+  // threshold by having too many rejected comments) then we can change the
+  // status of the comment to `SYSTEM_WITHHELD`, therefore pushing the user's
+  // comments away from the public eye until a moderator can manage them. This of
+  // course can only be applied if the comment's current status is `NONE`,
+  // we don't want to interfere if the comment was rejected.
+  if (Karma.isReliable('comment', trust) === false) {
+    // Add the flag related to Trust to the comment.
+    return {
+      status: 'SYSTEM_WITHHELD',
+      actions: [
+        {
+          action_type: 'FLAG',
+          user_id: null,
+          group_id: 'TRUST',
+          metadata: {
+            trust,
           },
-        ],
-      };
-    }
+        },
+      ],
+    };
   }
 };
diff --git a/test/server/services/karma.js b/test/server/services/karma.js
index d725d8308..4a6753125 100644
--- a/test/server/services/karma.js
+++ b/test/server/services/karma.js
@@ -6,8 +6,8 @@ const Karma = require('../../../services/karma');
 const thresholdsBackup = {};
 const thresholdsOverride = {
   comment: {
-    RELIABLE: 1,
-    UNRELIABLE: -1,
+    RELIABLE: 2,
+    UNRELIABLE: 0,
   },
   flag: {
     RELIABLE: 1,
@@ -35,19 +35,21 @@ describe('services.Karma', () => {
 
   describe('#isReliable', () => {
     it('neutral', () => {
-      expect(Karma.isReliable('comment', {})).to.be.null;
-      expect(Karma.isReliable('comment', { comment: {} })).to.be.null;
-      expect(Karma.isReliable('comment', { comment: { karma: 0 } })).to.be.null;
+      expect(Karma.isReliable('comment', { comment: { karma: 1 } })).to.be.null;
+      expect(Karma.isReliable('comment', { comment: { karma: 0 } })).to.not.be
+        .null;
+      expect(Karma.isReliable('comment', { comment: { karma: -1 } })).to.not.be
+        .null;
     });
     it('unreliable', () => {
-      expect(Karma.isReliable('comment', { comment: { karma: -1 } })).to.be
-        .false;
-      expect(Karma.isReliable('comment', { comment: { karma: -2 } })).to.be
+      expect(Karma.isReliable('comment', {})).to.be.false;
+      expect(Karma.isReliable('comment', { comment: {} })).to.be.false;
+      expect(Karma.isReliable('comment', { comment: { karma: 0 } })).to.be
         .false;
     });
     it('reliable', () => {
-      expect(Karma.isReliable('comment', { comment: { karma: 1 } })).to.be.true;
       expect(Karma.isReliable('comment', { comment: { karma: 2 } })).to.be.true;
+      expect(Karma.isReliable('comment', { comment: { karma: 3 } })).to.be.true;
     });
   });
 });

From e1298e4fd96bae86af23194c6fba50ba3dca4ca4 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Thu, 24 May 2018 19:00:07 +0200
Subject: [PATCH 067/144] Fix Touch issues on IOS Safari (iPad)

---
 views/embed/stream.njk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/views/embed/stream.njk b/views/embed/stream.njk
index ddc620f8e..d6c53b210 100644
--- a/views/embed/stream.njk
+++ b/views/embed/stream.njk
@@ -9,6 +9,13 @@
 
 {% block html %}
 <div id="talk-embed-stream-container"></div>
+
+{#
+  Resolves touch handling issues encountered on IOS Safari under certain circumstances
+  https://www.pivotaltracker.com/n/projects/1863625
+#}
+<script nonce="{{ nonce }}">document.body.addEventListener('touchstart', function() {});</script>
+
 {% endblock %}
 
 {% block js %}

From 945ab9a1b66d294325e6fcaf6c8adaf6ba20d0b8 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 24 May 2018 12:32:06 -0600
Subject: [PATCH 068/144] Added support for forcing languages

---
 Dockerfile.onbuild                          |  3 ++-
 client/coral-framework/services/i18n.js     | 27 +++++++++++++++++----
 config.js                                   | 18 ++++++++++++++
 docs/source/02-02-advanced-configuration.md | 15 ++++++++++++
 services/i18n.js                            | 14 +++++++----
 webpack.config.js                           |  1 +
 6 files changed, 67 insertions(+), 11 deletions(-)

diff --git a/Dockerfile.onbuild b/Dockerfile.onbuild
index 3e837aad6..85becf461 100644
--- a/Dockerfile.onbuild
+++ b/Dockerfile.onbuild
@@ -7,6 +7,7 @@ ONBUILD ARG TALK_REPLY_COMMENTS_LOAD_DEPTH=3
 ONBUILD ARG TALK_THREADING_LEVEL=3
 ONBUILD ARG TALK_DEFAULT_STREAM_TAB=all
 ONBUILD ARG TALK_DEFAULT_LANG=en
+ONBUILD ARG TALK_WHITELISTED_LANGUAGES
 ONBUILD ARG TALK_PLUGINS_JSON
 ONBUILD ARG TALK_WEBPACK_SOURCE_MAP
 
@@ -20,4 +21,4 @@ ONBUILD COPY . /usr/src/app
 ONBUILD RUN cli plugins reconcile && \
             yarn && \
             yarn build && \
-            yarn cache clean
\ No newline at end of file
+            yarn cache clean
diff --git a/client/coral-framework/services/i18n.js b/client/coral-framework/services/i18n.js
index 02258a585..42a0b2030 100644
--- a/client/coral-framework/services/i18n.js
+++ b/client/coral-framework/services/i18n.js
@@ -39,7 +39,20 @@ import pt_BR from '../../../locales/pt_BR.yml';
 import zh_CN from '../../../locales/zh_CN.yml';
 import zh_TW from '../../../locales/zh_TW.yml';
 
-export const defaultLocale = process.env.TALK_DEFAULT_LANG.replace(/-/g, '_');
+// the list of languages that are whitelisted. If false, all languages that are
+// supported by Talk will be enabled.
+const whitelistedLanguages =
+  process.env.TALK_WHITELISTED_LANGUAGES &&
+  process.env.TALK_WHITELISTED_LANGUAGES.split(',').map(l => l.trim());
+
+// The default language. If the whitelisted languages is specified and the
+// default language is not in that list, then the first language in the
+// whitelisted list will be used as the default.
+export const defaultLocale = whitelistedLanguages
+  ? !whitelistedLanguages.includes(process.env.TALK_DEFAULT_LANG)
+    ? whitelistedLanguages[0]
+    : process.env.TALK_DEFAULT_LANG
+  : process.env.TALK_DEFAULT_LANG;
 
 export const translations = {
   ...ar,
@@ -64,10 +77,14 @@ let TIMEAGO_INSTANCE;
 // to the default language.
 const detectLanguage = () =>
   first(
-    negotiateLanguages(navigator.languages, supportedLocales, {
-      defaultLocale,
-      strategy: 'lookup',
-    })
+    negotiateLanguages(
+      navigator.languages,
+      whitelistedLanguages || supportedLocales,
+      {
+        defaultLocale,
+        strategy: 'lookup',
+      }
+    )
   );
 
 export function setupTranslations() {
diff --git a/config.js b/config.js
index 77ed4ab2b..4ce755f93 100644
--- a/config.js
+++ b/config.js
@@ -36,6 +36,13 @@ const CONFIG = {
   // rendered text.
   DEFAULT_LANG: process.env.TALK_DEFAULT_LANG || 'en',
 
+  // WHITELISTED_LANGUAGES is a comma separated list of language/locales that
+  // should be supported. If the default language is not included in the
+  // whitelist list, the first entry will be used as the default.
+  WHITELISTED_LANGUAGES:
+    process.env.TALK_WHITELISTED_LANGUAGES &&
+    process.env.TALK_WHITELISTED_LANGUAGES.split(',').map(l => l.trim()),
+
   // When TRUE, it ensures that database indexes created in core will not add
   // indexes.
   CREATE_MONGO_INDEXES: process.env.DISABLE_CREATE_MONGO_INDEXES !== 'TRUE',
@@ -317,6 +324,17 @@ CONFIG.JWT_COOKIE_NAMES = uniq(
   ])
 );
 
+//------------------------------------------------------------------------------
+// Locale validation
+//------------------------------------------------------------------------------
+
+if (
+  CONFIG.WHITELISTED_LANGUAGES &&
+  !CONFIG.WHITELISTED_LANGUAGES.includes(CONFIG.DEFAULT_LANG)
+) {
+  CONFIG.DEFAULT_LANG = CONFIG.WHITELISTED_LANGUAGES[0];
+}
+
 //------------------------------------------------------------------------------
 // External database url's
 //------------------------------------------------------------------------------
diff --git a/docs/source/02-02-advanced-configuration.md b/docs/source/02-02-advanced-configuration.md
index c4f86dbb8..9d351ed2b 100644
--- a/docs/source/02-02-advanced-configuration.md
+++ b/docs/source/02-02-advanced-configuration.md
@@ -31,6 +31,21 @@ image you can specify it with `--build-arg TALK_DEFAULT_LANG=en`.
 
 Specify the default translation language. (Default `en`)
 
+## TALK_WHITELIST_LANGUAGES
+
+This is a **Build Variable** and must be consumed during build. If using the
+[Docker-onbuild](/talk/installation-from-docker/#onbuild)
+image you can specify it with `--build-arg TALK_WHITELIST_LANGUAGES=en`.
+
+Specify the comma separated whitelisted languages that you want the Talk
+application to serve. This will override the available set of languages that
+Talk will allow to be served.
+
+If the [TALK_DEFAULT_LANG](#talk-default-lang) is not included in this list of
+whitelisted languages, then the first whitelisted language will become the
+default language. If this parameter is empty, then all languages supported by
+Talk will be whitelisted. (Default ``)
+
 ## TALK_DEFAULT_STREAM_TAB
 
 This is a **Build Variable** and must be consumed during build. If using the
diff --git a/services/i18n.js b/services/i18n.js
index 52c34a4ed..0a99f1aa0 100644
--- a/services/i18n.js
+++ b/services/i18n.js
@@ -8,7 +8,7 @@ const {
 const { first, get, has, merge, isUndefined } = require('lodash');
 const yaml = require('yamljs');
 const plugins = require('./plugins');
-const { DEFAULT_LANG } = require('../config');
+const { DEFAULT_LANG, WHITELISTED_LANGUAGES } = require('../config');
 
 const resolve = (...paths) =>
   path.resolve(path.join(__dirname, '..', 'locales', ...paths));
@@ -105,10 +105,14 @@ const i18n = {
 
     // negotiate the language.
     const lang = first(
-      negotiateLanguages(acceptsLanguages, supportedLocales, {
-        defaultLocale: DEFAULT_LANG,
-        strategy: 'lookup',
-      })
+      negotiateLanguages(
+        acceptsLanguages,
+        WHITELISTED_LANGUAGES || supportedLocales,
+        {
+          defaultLocale: DEFAULT_LANG,
+          strategy: 'lookup',
+        }
+      )
     );
     debug(`decided language as '${lang}'`);
 
diff --git a/webpack.config.js b/webpack.config.js
index c6b3a770f..6914499bf 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -169,6 +169,7 @@ const config = {
       TALK_REPLY_COMMENTS_LOAD_DEPTH: '3',
       TALK_DEFAULT_STREAM_TAB: 'all',
       TALK_DEFAULT_LANG: 'en',
+      TALK_WHITELISTED_LANGUAGES: '',
     }),
     new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
 

From c642cc811c625807666f39a6845c603d2bc128c3 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 24 May 2018 12:34:58 -0600
Subject: [PATCH 069/144] fix

---
 docs/source/02-02-advanced-configuration.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/02-02-advanced-configuration.md b/docs/source/02-02-advanced-configuration.md
index 9d351ed2b..da7112706 100644
--- a/docs/source/02-02-advanced-configuration.md
+++ b/docs/source/02-02-advanced-configuration.md
@@ -31,11 +31,11 @@ image you can specify it with `--build-arg TALK_DEFAULT_LANG=en`.
 
 Specify the default translation language. (Default `en`)
 
-## TALK_WHITELIST_LANGUAGES
+## TALK_WHITELISTED_LANGUAGES
 
 This is a **Build Variable** and must be consumed during build. If using the
 [Docker-onbuild](/talk/installation-from-docker/#onbuild)
-image you can specify it with `--build-arg TALK_WHITELIST_LANGUAGES=en`.
+image you can specify it with `--build-arg TALK_WHITELISTED_LANGUAGES=en`.
 
 Specify the comma separated whitelisted languages that you want the Talk
 application to serve. This will override the available set of languages that

From 8f4846404a932e668808f6fdb13806ef4e7e8af6 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 24 May 2018 12:35:45 -0600
Subject: [PATCH 070/144] fixed default doc

---
 docs/source/02-02-advanced-configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/02-02-advanced-configuration.md b/docs/source/02-02-advanced-configuration.md
index da7112706..13ad2c35a 100644
--- a/docs/source/02-02-advanced-configuration.md
+++ b/docs/source/02-02-advanced-configuration.md
@@ -44,7 +44,7 @@ Talk will allow to be served.
 If the [TALK_DEFAULT_LANG](#talk-default-lang) is not included in this list of
 whitelisted languages, then the first whitelisted language will become the
 default language. If this parameter is empty, then all languages supported by
-Talk will be whitelisted. (Default ``)
+Talk will be whitelisted. (Default '')
 
 ## TALK_DEFAULT_STREAM_TAB
 

From 0c35badd951a71f3c4f85bd19b3184c4403def5a Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 24 May 2018 12:58:55 -0600
Subject: [PATCH 071/144] name changes

---
 client/coral-admin/src/components/KarmaTooltip.js | 4 ++--
 client/coral-admin/src/components/UserDetail.js   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/coral-admin/src/components/KarmaTooltip.js b/client/coral-admin/src/components/KarmaTooltip.js
index 772b119e9..0b0866ef1 100644
--- a/client/coral-admin/src/components/KarmaTooltip.js
+++ b/client/coral-admin/src/components/KarmaTooltip.js
@@ -10,7 +10,7 @@ const initialState = { menuVisible: false };
 
 class KarmaTooltip extends React.Component {
   static propTypes = {
-    settings: PropTypes.shape({
+    thresholds: PropTypes.shape({
       reliable: PropTypes.number.isRequired,
       unreliable: PropTypes.number.isRequired,
     }).isRequired,
@@ -27,7 +27,7 @@ class KarmaTooltip extends React.Component {
   };
 
   render() {
-    const { settings: { unreliable } } = this.props;
+    const { thresholds: { unreliable } } = this.props;
     const { menuVisible } = this.state;
 
     return (
diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index 1b3fe4333..a221e8b86 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -240,7 +240,7 @@ class UserDetail extends React.Component {
                     {user.reliable.commenterKarma}
                   </span>
                 </div>
-                <KarmaTooltip settings={karma.comment} />
+                <KarmaTooltip thresholds={karma.comment} />
               </li>
             </ul>
           </div>

From a046162f9c20d433f43cbee6dcadf39b17ae39d9 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 24 May 2018 13:57:15 -0600
Subject: [PATCH 072/144] `karma` -> `karmaThresholds`

---
 client/coral-admin/src/components/UserDetail.js | 10 ++++++++--
 client/coral-admin/src/containers/UserDetail.js |  2 +-
 client/coral-admin/src/graphql/index.js         |  4 ++--
 graph/resolvers/settings.js                     |  4 ++--
 graph/typeDefs.graphql                          |  5 +++--
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index a221e8b86..fd609373d 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -76,7 +76,13 @@ class UserDetail extends React.Component {
   renderLoaded() {
     const {
       root,
-      root: { me, user, totalComments, rejectedComments, settings: { karma } },
+      root: {
+        me,
+        user,
+        totalComments,
+        rejectedComments,
+        settings: { karmaThresholds },
+      },
       activeTab,
       selectedCommentIds,
       toggleSelect,
@@ -240,7 +246,7 @@ class UserDetail extends React.Component {
                     {user.reliable.commenterKarma}
                   </span>
                 </div>
-                <KarmaTooltip thresholds={karma.comment} />
+                <KarmaTooltip thresholds={karmaThresholds.comment} />
               </li>
             </ul>
           </div>
diff --git a/client/coral-admin/src/containers/UserDetail.js b/client/coral-admin/src/containers/UserDetail.js
index f12b26b30..e34d4df6e 100644
--- a/client/coral-admin/src/containers/UserDetail.js
+++ b/client/coral-admin/src/containers/UserDetail.js
@@ -228,7 +228,7 @@ export const withUserDetailQuery = withQuery(
       ${getSlotFragmentSpreads(slots, 'user')}
     }
     settings {
-      karma {
+      karmaThresholds {
         comment {
           reliable
           unreliable
diff --git a/client/coral-admin/src/graphql/index.js b/client/coral-admin/src/graphql/index.js
index d1bbf501b..6a1b06a6e 100644
--- a/client/coral-admin/src/graphql/index.js
+++ b/client/coral-admin/src/graphql/index.js
@@ -323,7 +323,7 @@ export default {
                 commenter: {
                   $set: calculateReliability(
                     prev.user.reliable.commenterKarma - 1,
-                    prev.settings.karma.comment
+                    prev.settings.karmaThresholds.comment
                   ),
                 },
                 commenterKarma: {
@@ -342,7 +342,7 @@ export default {
                 commenter: {
                   $set: calculateReliability(
                     prev.user.reliable.commenterKarma + 1,
-                    prev.settings.karma.comment
+                    prev.settings.karmaThresholds.comment
                   ),
                 },
                 commenterKarma: {
diff --git a/graph/resolvers/settings.js b/graph/resolvers/settings.js
index 11e21068b..a299530f2 100644
--- a/graph/resolvers/settings.js
+++ b/graph/resolvers/settings.js
@@ -2,7 +2,7 @@ const { VIEW_PROTECTED_SETTINGS } = require('../../perms/constants');
 const { decorateWithPermissionCheck } = require('./util');
 
 const Settings = {
-  karma: (
+  karmaThresholds: (
     settings,
     args,
     { connectors: { services: { Karma: { THRESHOLDS } } } }
@@ -16,7 +16,7 @@ const PROTECTED_SETTINGS = {
   autoCloseStream: [VIEW_PROTECTED_SETTINGS],
   wordlist: [VIEW_PROTECTED_SETTINGS],
   domains: [VIEW_PROTECTED_SETTINGS],
-  karma: [VIEW_PROTECTED_SETTINGS],
+  karmaThresholds: [VIEW_PROTECTED_SETTINGS],
 };
 
 // decorate the fields on the settings resolver with a permission check.
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 5bc102736..1ca003de6 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -897,8 +897,9 @@ type Settings {
   # domains will return a given list of domains.
   domains: Domains
 
-  # karma contains the currently set thresholds for triggering Trust beheviour.
-  karma: KarmaThresholds
+  # karmaThresholds contains the currently set thresholds for triggering Trust
+  # beheviour.
+  karmaThresholds: KarmaThresholds
 }
 
 ################################################################################

From e39bcb11ba7cd74aa7b70f6897ea1fdf32a0a5bb Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 24 May 2018 14:02:02 -0600
Subject: [PATCH 073/144] added comment

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

diff --git a/client/coral-admin/src/components/KarmaTooltip.js b/client/coral-admin/src/components/KarmaTooltip.js
index 0b0866ef1..9c4184afd 100644
--- a/client/coral-admin/src/components/KarmaTooltip.js
+++ b/client/coral-admin/src/components/KarmaTooltip.js
@@ -44,6 +44,7 @@ class KarmaTooltip extends React.Component {
             <div className={cn(styles.menu, 'talk-admin-karma-tooltip-menu')}>
               <strong>{t('user_detail.user_karma_score')}</strong>
               <ul>
+                {/* NOTE: we may display this data in the future, keeping around for that eventuality */}
                 {/* <li>
                   <span>Reliable</span>{' '}
                   <span className={cn(styles.label, styles.reliable)}>

From f8cc658c54e8291d49153b88d58af9b1ef085a1a Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 24 May 2018 14:34:13 -0600
Subject: [PATCH 074/144] csp fixes

---
 routes/api/v1/csp.js | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/routes/api/v1/csp.js b/routes/api/v1/csp.js
index ad1101987..5d7005b4e 100644
--- a/routes/api/v1/csp.js
+++ b/routes/api/v1/csp.js
@@ -4,13 +4,18 @@ const { logger } = require('../../../services/logging');
 const router = express.Router();
 
 const schema = Joi.object().keys({
-  'csp-report': Joi.object().keys({
-    'document-uri': Joi.string(),
-    referrer: Joi.string(),
-    'blocked-uri': Joi.string(),
-    'violated-directive': Joi.string(),
-    'original-policy': Joi.string(),
-  }),
+  'csp-report': Joi.object()
+    .keys({
+      'document-uri': Joi.string(),
+      referrer: Joi.string().allow(''),
+      'blocked-uri': Joi.string(),
+      'violated-directive': Joi.string(),
+      'original-policy': Joi.string(),
+      'script-sample': Joi.string()
+        .allow('')
+        .optional(),
+    })
+    .optionalKeys('referrer', 'script-sample'),
 });
 
 const json = express.json({ type: 'application/csp-report' });
@@ -18,7 +23,7 @@ const json = express.json({ type: 'application/csp-report' });
 router.post('/', json, async (req, res, next) => {
   const { value, error: err } = Joi.validate(req.body, schema, {
     stripUnknown: true,
-    presence: 'required',
+    presence: 'optional',
   });
   if (err) {
     res.status(400).end();

From 64c16a18050861815f690075504da361cea8658b Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 24 May 2018 15:02:08 -0600
Subject: [PATCH 075/144] support the __webpack_nonce__ parameter

---
 .../helpers/{publicPath.js => webpackGlobals.js}   | 14 ++++++++++++--
 middleware/nonce.js                                |  9 ++++++++-
 middleware/staticTemplate.js                       |  2 +-
 webpack.config.js                                  |  7 +++++--
 4 files changed, 26 insertions(+), 6 deletions(-)
 rename client/coral-framework/helpers/{publicPath.js => webpackGlobals.js} (57%)

diff --git a/client/coral-framework/helpers/publicPath.js b/client/coral-framework/helpers/webpackGlobals.js
similarity index 57%
rename from client/coral-framework/helpers/publicPath.js
rename to client/coral-framework/helpers/webpackGlobals.js
index 57b6b7d15..99569529b 100644
--- a/client/coral-framework/helpers/publicPath.js
+++ b/client/coral-framework/helpers/webpackGlobals.js
@@ -1,9 +1,9 @@
-/* global __webpack_public_path__ */ // eslint-disable-line no-unused-vars
+/* global __webpack_public_path__, __webpack_nonce__ */ // eslint-disable-line no-unused-vars
 
 import { getStaticConfiguration } from 'coral-framework/services/staticConfiguration';
 
 // Load the static url from the static configuration.
-const { STATIC_URL } = getStaticConfiguration();
+const { STATIC_URL, SCRIPT_NONCE } = getStaticConfiguration();
 
 // Update the static url for the imported public path so dynamically imported
 // chunks will use the correct path as defined by the process.env.STATIC_URL
@@ -14,3 +14,13 @@ const { STATIC_URL } = getStaticConfiguration();
 // https://webpack.js.org/configuration/output/#output-publicpath
 //
 __webpack_public_path__ = STATIC_URL + 'static/';
+
+// All dynamically included scripts that support nonce's will add this to their
+// script tags.
+//
+// The __webpack_nonce__ can be referenced: https://webpack.js.org/guides/csp/
+//
+// Pending issues:
+// - https://github.com/webpack-contrib/style-loader/pull/319
+//
+__webpack_nonce__ = SCRIPT_NONCE;
diff --git a/middleware/nonce.js b/middleware/nonce.js
index 1181fac85..7d072cf37 100644
--- a/middleware/nonce.js
+++ b/middleware/nonce.js
@@ -1,9 +1,16 @@
+const { get, merge } = require('lodash');
 const uuid = require('uuid/v4');
 
 // nonce is designed to create a random value that can be used in conjunction
 // with the csp middleware.
 module.exports = (req, res, next) => {
-  res.locals.nonce = uuid();
+  const nonce = uuid();
+
+  // Attach the nonce to the locals.
+  res.locals.nonce = nonce;
+  res.locals.data = merge({}, get(res.locals, 'data', {}), {
+    SCRIPT_NONCE: nonce,
+  });
 
   next();
 };
diff --git a/middleware/staticTemplate.js b/middleware/staticTemplate.js
index d8137693e..8d467fcda 100644
--- a/middleware/staticTemplate.js
+++ b/middleware/staticTemplate.js
@@ -48,7 +48,7 @@ const attachStaticLocals = locals => {
   for (const key in TEMPLATE_LOCALS) {
     const value = TEMPLATE_LOCALS[key];
 
-    locals[key] = value;
+    merge(locals, { [key]: value });
   }
 };
 
diff --git a/webpack.config.js b/webpack.config.js
index 6914499bf..96c09dd9e 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -74,7 +74,7 @@ const config = {
   target: 'web',
   output: {
     path: path.join(__dirname, 'dist'),
-    publicPath: '',
+    webpackGlobals: '',
     filename: '[name].[chunkhash].js',
     chunkFilename: '[name].[chunkhash].chunk.js',
   },
@@ -309,7 +309,10 @@ const applyConfig = (entries, root = {}) =>
       entry: entries.reduce(
         (entry, { name, path: modulePath, disablePolyfill = false }) => {
           const entries = [
-            path.join(__dirname, 'client/coral-framework/helpers/publicPath'),
+            path.join(
+              __dirname,
+              'client/coral-framework/helpers/webpackGlobals'
+            ),
           ];
           if (disablePolyfill) {
             entries.push(modulePath);

From abafa45be754903b99716a969e4ed2573ca573f9 Mon Sep 17 00:00:00 2001
From: Mendel Konikov <mendel.konikov@wsj.com>
Date: Thu, 24 May 2018 17:20:54 -0400
Subject: [PATCH 076/144] Replace break all with break-word

---
 client/coral-admin/src/routes/Moderation/components/Comment.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.css b/client/coral-admin/src/routes/Moderation/components/Comment.css
index 864f6f5fa..342c27775 100644
--- a/client/coral-admin/src/routes/Moderation/components/Comment.css
+++ b/client/coral-admin/src/routes/Moderation/components/Comment.css
@@ -74,6 +74,7 @@
   max-width: 500px;
   font-weight: 300;
   font-size: 16px;
+  word-break: break-word;
 }
 
 .created {

From 16573b127e785c28cca77e4aeb2c7851a6684261 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 24 May 2018 16:19:52 -0600
Subject: [PATCH 077/144] text-replace error

---
 webpack.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webpack.config.js b/webpack.config.js
index 96c09dd9e..3d815e53b 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -74,7 +74,7 @@ const config = {
   target: 'web',
   output: {
     path: path.join(__dirname, 'dist'),
-    webpackGlobals: '',
+    publicPath: '',
     filename: '[name].[chunkhash].js',
     chunkFilename: '[name].[chunkhash].chunk.js',
   },

From 4800e3275837449e5fdbe3c047db548aeeb2aee5 Mon Sep 17 00:00:00 2001
From: Mendel Konikov <mkonikov@gmail.com>
Date: Thu, 24 May 2018 19:07:00 -0400
Subject: [PATCH 078/144] Use overflow wrap for better compatibility

---
 .../routes/Moderation/components/Comment.css   | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.css b/client/coral-admin/src/routes/Moderation/components/Comment.css
index 342c27775..dd5f0637c 100644
--- a/client/coral-admin/src/routes/Moderation/components/Comment.css
+++ b/client/coral-admin/src/routes/Moderation/components/Comment.css
@@ -1,5 +1,4 @@
 @custom-media --big-viewport (min-width: 780px);
-
 .root {
   border-bottom: 1px solid #e0e0e0;
   font-size: 18px;
@@ -13,7 +12,6 @@
   margin-top: 13px;
   min-height: 0;
   outline: 0;
-
   /*
    Fix rendering issues in Safari by promoting this
    into its own layer.
@@ -21,7 +19,6 @@
    https://www.pivotaltracker.com/story/show/151142211
   */
   transform: translateZ(0);
-
   &:last-child {
     border-bottom: none;
   }
@@ -39,7 +36,6 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-
 }
 
 .author {
@@ -74,7 +70,7 @@
   max-width: 500px;
   font-weight: 300;
   font-size: 16px;
-  word-break: break-word;
+  overflow-wrap: break-word;
 }
 
 .created {
@@ -95,7 +91,6 @@
   font-weight: 500;
   line-height: 1.2;
   max-width: 500px;
-
   a {
     display: inline-block;
     color: #063b9a;
@@ -103,17 +98,15 @@
     font-weight: 500;
     letter-spacing: .5px;
     margin-left: 10px;
-
     font-size: 13px;
     margin-left: 5px;
     padding-bottom: 0px;
     border-bottom: solid 1px;
     line-height: 16px;
-
     &:hover {
       opacity: .9;
       cursor: pointer;
-     }
+    }
   }
 }
 
@@ -138,12 +131,10 @@
   cursor: pointer;
   font-weight: normal;
   white-space: nowrap;
-
   &:hover {
     text-decoration: underline;
     opacity: .9;
   }
-
   i {
     font-size: 12px;
     position: relative;
@@ -172,7 +163,6 @@
   align-items: center;
   justify-content: flex-end;
   margin-right: 14px;
-
   i {
     margin-right: 5px;
   }
@@ -181,7 +171,6 @@
 @media (--big-viewport) {
   .root {
     margin-bottom: 30px;
-
     &:last-child {
       border-bottom: 1px solid #e0e0e0;
     }
@@ -190,7 +179,6 @@
 
 .commentContent {
   display: flex;
-
   blockquote {
     font-size: inherit;
     line-height: inherit;
@@ -200,4 +188,4 @@
 
 .commentContentFooter {
   flex: 1;
-}
+}
\ No newline at end of file

From 56483f38886f5840b202e5af9d6d2ec3a71ee186 Mon Sep 17 00:00:00 2001
From: Fabian Neumann <neumann@ferret-go.com>
Date: Fri, 25 May 2018 16:09:38 +0200
Subject: [PATCH 079/144] Add missing translations (en/de) for plugins
 ignore-user and local-auth.

---
 plugins/talk-plugin-ignore-user/client/translations.yml   | 1 +
 .../client/components/ChangePassword.js                   | 8 +++++---
 .../client/components/ChangeUsernameContentDialog.js      | 2 +-
 plugins/talk-plugin-local-auth/translations.yml           | 8 ++++++++
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/plugins/talk-plugin-ignore-user/client/translations.yml b/plugins/talk-plugin-ignore-user/client/translations.yml
index 84a4ca11c..fdf2b1daf 100644
--- a/plugins/talk-plugin-ignore-user/client/translations.yml
+++ b/plugins/talk-plugin-ignore-user/client/translations.yml
@@ -39,6 +39,7 @@ en:
     confirmation_title: Ignore {0}?
 de:
   talk-plugin-ignore-user:
+    blank_info: Sie ignorieren derzeit keine Nutzer
     section_title: Ignorierte Nutzer
     section_info: Weil Sie die folgenden Nutzer ignorieren, sind deren Kommentare versteckt.
     stop_ignoring: Ignorieren beenden
diff --git a/plugins/talk-plugin-local-auth/client/components/ChangePassword.js b/plugins/talk-plugin-local-auth/client/components/ChangePassword.js
index 010df0826..cae112203 100644
--- a/plugins/talk-plugin-local-auth/client/components/ChangePassword.js
+++ b/plugins/talk-plugin-local-auth/client/components/ChangePassword.js
@@ -185,7 +185,7 @@ class ChangePassword extends React.Component {
           >
             <InputField
               id="oldPassword"
-              label="Old Password"
+              label={t('talk-plugin-local-auth.change_password.old_password')}
               name="oldPassword"
               type="password"
               onChange={this.onChange}
@@ -205,7 +205,7 @@ class ChangePassword extends React.Component {
             </InputField>
             <InputField
               id="newPassword"
-              label="New Password"
+              label={t('talk-plugin-local-auth.change_password.new_password')}
               name="newPassword"
               type="password"
               onChange={this.onChange}
@@ -216,7 +216,9 @@ class ChangePassword extends React.Component {
             />
             <InputField
               id="confirmNewPassword"
-              label="Confirm New Password"
+              label={t(
+                'talk-plugin-local-auth.change_password.confirm_new_password'
+              )}
               name="confirmNewPassword"
               type="password"
               onChange={this.onChange}
diff --git a/plugins/talk-plugin-local-auth/client/components/ChangeUsernameContentDialog.js b/plugins/talk-plugin-local-auth/client/components/ChangeUsernameContentDialog.js
index 3e7107922..3ec2385fd 100644
--- a/plugins/talk-plugin-local-auth/client/components/ChangeUsernameContentDialog.js
+++ b/plugins/talk-plugin-local-auth/client/components/ChangeUsernameContentDialog.js
@@ -65,7 +65,7 @@ class ChangeUsernameContentDialog extends React.Component {
           <form onSubmit={this.confirmChanges}>
             <InputField
               id="confirmNewUsername"
-              label="Re-enter new username"
+              label={t('talk-plugin-local-auth.change_username.re_enter')}
               name="confirmNewUsername"
               type="text"
               onChange={this.props.onChange}
diff --git a/plugins/talk-plugin-local-auth/translations.yml b/plugins/talk-plugin-local-auth/translations.yml
index 864af57a4..c4dd56061 100644
--- a/plugins/talk-plugin-local-auth/translations.yml
+++ b/plugins/talk-plugin-local-auth/translations.yml
@@ -13,6 +13,9 @@ en:
       passwords_dont_match: "Passwords don`t match"
       required_field: "This field is required"
       forgot_password: "Forgot your password?"
+      old_password: "Old Password"
+      new_password: "New Password"
+      confirm_new_password: "Confirm New Password"
       save: "Save"
       cancel: "Cancel"
       edit: "Edit"
@@ -28,6 +31,7 @@ en:
       description: "You are attempting to change your username. Your new username will appear on all of your past and future comments."
       old_username: "Old Username"
       new_username: "New Username"
+      re_enter: "Re-enter new username"
       bottom_note: "Note: You will not be able to change your username again for 14 days"
       confirm_changes: "Confirm Changes"
       username_does_not_match: "Username does not match"
@@ -84,6 +88,9 @@ de:
       passwords_dont_match: "Die Passwörter stimmen nicht überein"
       required_field: "Diese Angabe ist erforderlich"
       forgot_password: "Passwort vergessen?"
+      old_password: "Altes Passwort"
+      new_password: "Neues Passwort"
+      confirm_new_password: "Neues Passwort bestätigen"
       save: "Speichern"
       cancel: "Abbrechen"
       edit: "Ändern"
@@ -98,6 +105,7 @@ de:
       description: "Sie möchten Ihren Nutzernamen ändern: der neue Nutzername wird an allen alten und neuen Kommentaren erscheinen."
       old_username: "Alter Nutzername"
       new_username: "Neuer Nutzername"
+      re_enter: "Neuen Nutzernamen bestätigen"
       bottom_note: "Achtung: die nächste Änderung des Nutzernamens ist erst nach 14 Tagen möglich"
       confirm_changes: "Änderung bestätigen"
       username_does_not_match: "Die Nutzernamen stimmen nicht überein"

From ab6a193dcb72dd4cbf95c23d37b2b9ac857e37f8 Mon Sep 17 00:00:00 2001
From: Fabian Neumann <neumann@ferret-go.com>
Date: Fri, 25 May 2018 16:31:07 +0200
Subject: [PATCH 080/144] One more missing German translation

---
 plugins/talk-plugin-local-auth/translations.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/talk-plugin-local-auth/translations.yml b/plugins/talk-plugin-local-auth/translations.yml
index c4dd56061..ec5bc90d7 100644
--- a/plugins/talk-plugin-local-auth/translations.yml
+++ b/plugins/talk-plugin-local-auth/translations.yml
@@ -98,6 +98,7 @@ de:
       forgot_password_sent: "Passwort vergessen - Wir haben Ihnen eine E-Mail zum Zurücksetzen des Passwortes geschickt"
     change_username:
       change_username_note: "Nutzernamen können nur alle 14 Tage geändert werden. Ihr Nutzername ist zur Zeit nicht editierbar."
+      is_not_eligible: "Sie können Ihren Benutzernamen derzeit nicht ändern."
       save: "Speichern"
       edit_profile: "Profil ändern"
       cancel: "Abbrechen"

From 325e763fd0f8417b49879afd4df8f089b6755f6c Mon Sep 17 00:00:00 2001
From: Fabian Neumann <neumann@ferret-go.com>
Date: Fri, 25 May 2018 16:34:29 +0200
Subject: [PATCH 081/144] Remove redundancy

---
 plugins/talk-plugin-local-auth/translations.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/talk-plugin-local-auth/translations.yml b/plugins/talk-plugin-local-auth/translations.yml
index ec5bc90d7..fa9515432 100644
--- a/plugins/talk-plugin-local-auth/translations.yml
+++ b/plugins/talk-plugin-local-auth/translations.yml
@@ -97,8 +97,8 @@ de:
       changed_password_msg: "Passwort geändert - Ihr Passwort wurde erfolgreich geändert"
       forgot_password_sent: "Passwort vergessen - Wir haben Ihnen eine E-Mail zum Zurücksetzen des Passwortes geschickt"
     change_username:
-      change_username_note: "Nutzernamen können nur alle 14 Tage geändert werden. Ihr Nutzername ist zur Zeit nicht editierbar."
-      is_not_eligible: "Sie können Ihren Benutzernamen derzeit nicht ändern."
+      change_username_note: "Nutzernamen können nur alle 14 Tage geändert werden."
+      is_not_eligible: "Sie können Ihren Nutzernamen derzeit nicht ändern."
       save: "Speichern"
       edit_profile: "Profil ändern"
       cancel: "Abbrechen"

From b7d2621cb89f510c16b2b4f2d0e8af0e2dfa1f8f Mon Sep 17 00:00:00 2001
From: Fabian Neumann <neumann@ferret-go.com>
Date: Fri, 25 May 2018 17:19:43 +0200
Subject: [PATCH 082/144] Remove redundant period. It's in the translation
 strings already.

---
 services/mailer/templates/password-reset.txt.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/mailer/templates/password-reset.txt.ejs b/services/mailer/templates/password-reset.txt.ejs
index 2b5e60a9b..577f23bec 100644
--- a/services/mailer/templates/password-reset.txt.ejs
+++ b/services/mailer/templates/password-reset.txt.ejs
@@ -1,3 +1,3 @@
-<%= t('email.password_reset.we_received_a_request') %>. <%= t('email.password_reset.if_you_did') %> <%= t('email.password_reset.please_click') %>:
+<%= t('email.password_reset.we_received_a_request') %> <%= t('email.password_reset.if_you_did') %> <%= t('email.password_reset.please_click') %>:
 
 <%= BASE_URL %>account/password/reset#<%= token %>

From e1d77daf47afceddcf73a3d9ae4f9bc920caccb6 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 25 May 2018 11:16:24 -0600
Subject: [PATCH 083/144] enhanced docs around jwt's

---
 docs/source/02-01-required-configuration.md |  2 +-
 docs/source/integrating/authentication.md   | 31 +++++++++++++++------
 docs/themes/coral/source/css/talk.scss      |  5 ++--
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/docs/source/02-01-required-configuration.md b/docs/source/02-01-required-configuration.md
index be1e1d0b2..a4a26b73d 100644
--- a/docs/source/02-01-required-configuration.md
+++ b/docs/source/02-01-required-configuration.md
@@ -81,4 +81,4 @@ TALK_JWT_SECRET=jX9y8G2ApcVLwyL{$6s3
 
 Be default, we sign our tokens with HMAC using a SHA-256 hash algorithm. If you
 want to change the signing algorithm, or use multiple signing/verifying keys,
-refer to our [Advanced Configuration](/talk/advanced-configuration/) documentation.
+refer to our [Advanced Configuration](/talk/advanced-configuration/#talk-jwt-secret) documentation.
diff --git a/docs/source/integrating/authentication.md b/docs/source/integrating/authentication.md
index 5b19768fe..77315a9d8 100644
--- a/docs/source/integrating/authentication.md
+++ b/docs/source/integrating/authentication.md
@@ -25,9 +25,10 @@ state (you don't use the auth anywhere else now). A great example of this is our
 You can integrate Talk with any authentication service to enable single sign-on
 for users. The steps to do that are:
 
-1. Create a service that generates [JWT tokens](https://jwt.io).
+1. Create a service that generates [JWT tokens](https://jwt.io/introduction/).
 2. Push the token into the embed.
-3. Implement the `tokenUserNotFound` hook to process the token.
+3. Implement the [`tokenUserNotFound`](#implement-tokenusernotfound) hook to
+   process the token.
 
 ### Create JWT Token
 
@@ -39,7 +40,20 @@ Using that demo application, you'll see how you can:
 
 1. Create a node application that can issue JWT's that are compatible with Talk.
 2. Provide a validation endpoint that can be used by Talk to validate the token
-   and get the user via the `tokenUserNotFound` hook.
+   and get the user via the [`tokenUserNotFound`](#implement-tokenusernotfound)
+   hook.
+
+It's also important to note a few requirements for proper integration with Talk.
+The generated JWT must contain the following claims:
+
+- [`jti`](https://tools.ietf.org/html/rfc7519#section-4.1.7): a unique identifier for the token (like a uuid/v4)
+- [`exp`](https://tools.ietf.org/html/rfc7519#section-4.1.4): the expiry date of the token as a unix timestamp
+- [`sub`](https://tools.ietf.org/html/rfc7519#section-4.1.2): the user identifier that can be used to lookup the user in the mongo
+  database
+  - The user may not yet exist in the database, but that's the responsibility
+    of the [`tokenUserNotFound`](#implement-tokenusernotfound) hook.
+- [`iss`](https://tools.ietf.org/html/rfc7519#section-4.1.1): the issuer for the token must match the value of `TALK_JWT_ISSUER`
+- [`aud`](https://tools.ietf.org/html/rfc7519#section-4.1.3): the audience for the token must match the value of `TALK_JWT_AUDIENCE`
 
 ### Push token into embed
 
@@ -47,7 +61,8 @@ We're assuming that your CMS is capable of authenticating a user account, or
 at least having the user's details available to send off to the token creation
 service we created/used in the previous step.
 
-Using the token that was created for the user, you simply have to ammend the template where Talk is rendering to read as the following:
+Using the token that was created for the user, you simply have to amend the
+template where Talk is rendering to read as the following:
 
 ```js
 Coral.Talk.render(document.getElementById('coralStreamEmbed'), {
@@ -72,12 +87,12 @@ example issuer and Talk must match:
 
 | Talk | Token Issuer Example |
 |------|----------------------|
-|`JWT_ISSUER`|`JWT_ISSUER`|
-|`JWT_AUDIENCE`|`JWT_AUDIENCE`|
-|`SECRET`|`JWT_SECRET`*|
+|[`TALK_JWT_ISSUER`](/talk/advanced-configuration/#talk-jwt-issuer)|`JWT_ISSUER`|
+|[`TALK_JWT_AUDIENCE`](/talk/advanced-configuration/#talk-jwt-audience)|`JWT_AUDIENCE`|
+|[`TALK_JWT_SECRET`](/talk/advanced-configuration/#talk-jwt-secret)|`JWT_SECRET`*|
 
 \* Note that secrets is a pretty complex topic, refer to the
-[TALK-JWT-SECRET](/talk/advanced-configuration/#TALK-JWT-SECRET) configuration
+[TALK_JWT_SECRET](/talk/advanced-configuration/#talk-jwt-secret) configuration
 reference, the basic takeaway is that the secret used to sign the tokens issued
 by the issuer must be able to be verified by Talk.
 
diff --git a/docs/themes/coral/source/css/talk.scss b/docs/themes/coral/source/css/talk.scss
index afbd6f3af..f3b0c24e8 100644
--- a/docs/themes/coral/source/css/talk.scss
+++ b/docs/themes/coral/source/css/talk.scss
@@ -291,11 +291,10 @@ pre {
 
 .content {
   article {
-    p a:not(.plain-link) {
-      @extend .coral-link;
-    }
+    p a:not(.plain-link),
     ul:not(.toc__menu) li a,
     ol li a,
+    td a,
     dd > a {
       @extend .coral-link;
     }

From 3a79cc684b9bf6df799bfef8aebe1ae3fce8c282 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 25 May 2018 11:19:02 -0600
Subject: [PATCH 084/144] added missing translation

---
 locales/en.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/locales/en.yml b/locales/en.yml
index 534593679..950f4bbd2 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -227,6 +227,7 @@ en:
   embedlink:
     copy: "Copy to Clipboard"
   error:
+    AUTHENTICATION: "An error occurred trying to authenticate your account."
     PASSWORD_INCORRECT: "Your current password was entered incorrectly"
     COMMENT_PARENT_NOT_VISIBLE: "The comment that you're replying to has been removed or doesn't exist."
     EMAIL_VERIFICATION_TOKEN_INVALID: "Email verification token is invalid."

From 7d861236b8b4ab578456b1a2f34e59412b131445 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 25 May 2018 11:21:53 -0600
Subject: [PATCH 085/144] disable CSP until we can work on configuration +
 webpack issues

---
 docs/source/02-02-advanced-configuration.md | 5 +++--
 routes/index.js                             | 4 ++--
 routes/plugins.js                           | 5 ++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/source/02-02-advanced-configuration.md b/docs/source/02-02-advanced-configuration.md
index 13ad2c35a..451865e47 100644
--- a/docs/source/02-02-advanced-configuration.md
+++ b/docs/source/02-02-advanced-configuration.md
@@ -512,13 +512,14 @@ tracing of GraphQL requests.
 
 **Note: Apollo Engine is a premium service, charges may apply.**
 
-## TALK_ENABLE_STRICT_CSP
+<!-- TODO: re-add CSP once we've resolved issues with dynamic webpack loading. -->
+<!-- ## TALK_ENABLE_STRICT_CSP
 
 Setting this to `TRUE` will enforce the [Content Security Policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP)
 (or CSP). By default, this configuration is set to
 [report only](https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP#Testing_your_policy)
 where the policy is not enforced, but any violations are reported to a provided
-URI. (Default `FALSE`)
+URI. (Default `FALSE`) -->
 
 ## ALLOW_NO_LIMIT_QUERIES
 
diff --git a/routes/index.js b/routes/index.js
index 5183e2881..cb8e03b33 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -9,7 +9,6 @@ const path = require('path');
 const compression = require('compression');
 const plugins = require('../services/plugins');
 const staticTemplate = require('../middleware/staticTemplate');
-const contentSecurityPolicy = require('../middleware/contentSecurityPolicy');
 const nonce = require('../middleware/nonce');
 const staticServer = require('express-static-gzip');
 const { DISABLE_STATIC_SERVER } = require('../config');
@@ -76,7 +75,8 @@ router.use(compression());
 // STATIC ROUTES
 //==============================================================================
 
-const staticMiddleware = [staticTemplate, nonce, contentSecurityPolicy];
+// TODO: re-add CSP once we've resolved issues with dynamic webpack loading.
+const staticMiddleware = [staticTemplate, nonce];
 
 router.use('/admin', ...staticMiddleware, require('./admin'));
 router.use('/account', ...staticMiddleware, require('./account'));
diff --git a/routes/plugins.js b/routes/plugins.js
index fcc1125b9..8504c0c94 100644
--- a/routes/plugins.js
+++ b/routes/plugins.js
@@ -2,13 +2,12 @@ const express = require('express');
 const debug = require('debug')('talk:routes:plugins');
 const plugins = require('../services/plugins');
 const staticTemplate = require('../middleware/staticTemplate');
-const contentSecurityPolicy = require('../middleware/contentSecurityPolicy');
 const nonce = require('../middleware/nonce');
 
 const router = express.Router();
 
-// Apply the middleware.
-router.use(staticTemplate, nonce, contentSecurityPolicy);
+// TODO: re-add CSP once we've resolved issues with dynamic webpack loading.
+router.use(staticTemplate, nonce);
 
 // Inject server route plugins.
 plugins.get('server', 'router').forEach(plugin => {

From 540df09b5bbe60af48ea4473e0beb750a7399ed9 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 25 May 2018 11:48:55 -0600
Subject: [PATCH 086/144] Update stream.njk

---
 views/embed/stream.njk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/embed/stream.njk b/views/embed/stream.njk
index d6c53b210..8b9cf52b6 100644
--- a/views/embed/stream.njk
+++ b/views/embed/stream.njk
@@ -11,8 +11,8 @@
 <div id="talk-embed-stream-container"></div>
 
 {#
-  Resolves touch handling issues encountered on IOS Safari under certain circumstances
-  https://www.pivotaltracker.com/n/projects/1863625
+  Resolves touch handling issues encountered on IOS Safari under certain circumstances:
+    https://stackoverflow.com/questions/12363742/touchstart-event-is-not-firing-inside-iframe-ios-6
 #}
 <script nonce="{{ nonce }}">document.body.addEventListener('touchstart', function() {});</script>
 

From c1eab3f2c65b46de00daa33f662ffc8322b2e91e Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 25 May 2018 11:51:43 -0600
Subject: [PATCH 087/144] moved event handler to bundle

---
 client/coral-embed-stream/src/index.js | 5 +++++
 views/embed/stream.njk                 | 7 -------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/client/coral-embed-stream/src/index.js b/client/coral-embed-stream/src/index.js
index a4c6bcd39..1142239c6 100644
--- a/client/coral-embed-stream/src/index.js
+++ b/client/coral-embed-stream/src/index.js
@@ -8,6 +8,11 @@ import reducers from './reducers';
 import TalkProvider from 'coral-framework/components/TalkProvider';
 import pluginsConfig from 'pluginsConfig';
 
+// Resolves touch handling issues encountered on IOS Safari under certain
+// circumstances. It may be related to issues reported here:
+//   https://stackoverflow.com/questions/12363742/touchstart-event-is-not-firing-inside-iframe-ios-6
+document.body.addEventListener('touchstart', () => {});
+
 async function main() {
   const context = await createContext({
     reducers,
diff --git a/views/embed/stream.njk b/views/embed/stream.njk
index 8b9cf52b6..ddc620f8e 100644
--- a/views/embed/stream.njk
+++ b/views/embed/stream.njk
@@ -9,13 +9,6 @@
 
 {% block html %}
 <div id="talk-embed-stream-container"></div>
-
-{#
-  Resolves touch handling issues encountered on IOS Safari under certain circumstances:
-    https://stackoverflow.com/questions/12363742/touchstart-event-is-not-firing-inside-iframe-ios-6
-#}
-<script nonce="{{ nonce }}">document.body.addEventListener('touchstart', function() {});</script>
-
 {% endblock %}
 
 {% block js %}

From ba2abab3589211aaf6ebec1854147f67ef892670 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 25 May 2018 11:54:34 -0600
Subject: [PATCH 088/144] added pivotal tracker ref

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

diff --git a/client/coral-embed-stream/src/index.js b/client/coral-embed-stream/src/index.js
index 1142239c6..a2718e49d 100644
--- a/client/coral-embed-stream/src/index.js
+++ b/client/coral-embed-stream/src/index.js
@@ -10,7 +10,10 @@ import pluginsConfig from 'pluginsConfig';
 
 // Resolves touch handling issues encountered on IOS Safari under certain
 // circumstances. It may be related to issues reported here:
-//   https://stackoverflow.com/questions/12363742/touchstart-event-is-not-firing-inside-iframe-ios-6
+//
+//  https://stackoverflow.com/questions/12363742/touchstart-event-is-not-firing-inside-iframe-ios-6
+//
+// Further details: https://www.pivotaltracker.com/story/show/157794038
 document.body.addEventListener('touchstart', () => {});
 
 async function main() {

From 2c6843129a47b8abf26110e7e1842486c924e38e Mon Sep 17 00:00:00 2001
From: Erik Reyna <erik@erikreyna.com>
Date: Fri, 25 May 2018 15:02:34 -0400
Subject: [PATCH 089/144] move placeholder right behind contentEditable

---
 plugins/talk-plugin-rich-text/client/components/rte/RTE.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/talk-plugin-rich-text/client/components/rte/RTE.css b/plugins/talk-plugin-rich-text/client/components/rte/RTE.css
index 2bf1feaf5..0927c7eb3 100644
--- a/plugins/talk-plugin-rich-text/client/components/rte/RTE.css
+++ b/plugins/talk-plugin-rich-text/client/components/rte/RTE.css
@@ -1,5 +1,5 @@
 .contentEditable {
-  background: #fff;
+  background: transparent;
   border: solid 1px #bbb;
   min-height: 120px;
   box-sizing: border-box;
@@ -15,6 +15,7 @@
   position: absolute;
   margin: 12px 0 0 12px;
   color: #bbb;
+  z-index: -1;
 }
 
 .toolbarDisabled {

From cedabf04e305514aaaac709064ae637d47fb3b60 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Fri, 25 May 2018 15:04:00 -0400
Subject: [PATCH 090/144] Bump version to 4.4.2

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

diff --git a/package.json b/package.json
index b21e2f78a..2697484c4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "talk",
-  "version": "4.4.1",
+  "version": "4.4.2",
   "description": "A better commenting experience from Mozilla, The New York Times, and the Washington Post. https://coralproject.net",
   "main": "app.js",
   "private": true,

From 90e4682cf68acbd3d534d1e8edbcd3ac94bc0771 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 25 May 2018 22:49:35 +0200
Subject: [PATCH 091/144] Take karma into account when doing e2e

---
 .../src/components/ApproveButton.js           |  3 +-
 .../src/components/RejectButton.js            |  3 +-
 .../Moderation/components/ModerationMenu.js   |  1 +
 .../Moderation/components/ModerationQueue.js  | 10 +++-
 test/e2e/globals.js                           |  3 --
 test/e2e/page_objects/admin.js                | 23 ++++++++-
 test/e2e/specs/03_embedStream.js              | 10 ++--
 test/e2e/specs/05_banUser.js                  | 49 +++++++++++++++++++
 test/e2e/specs/06_suspendUser.js              | 19 +++----
 9 files changed, 98 insertions(+), 23 deletions(-)

diff --git a/client/coral-admin/src/components/ApproveButton.js b/client/coral-admin/src/components/ApproveButton.js
index 884ac3da5..96dbdd375 100644
--- a/client/coral-admin/src/components/ApproveButton.js
+++ b/client/coral-admin/src/components/ApproveButton.js
@@ -14,7 +14,8 @@ const ApproveButton = ({ active, minimal, onClick, className, disabled }) => {
       className={cn(
         styles.root,
         { [styles.minimal]: minimal, [styles.active]: active },
-        className
+        className,
+        'talk-admin-approve-button'
       )}
       onClick={onClick}
       disabled={disabled || active}
diff --git a/client/coral-admin/src/components/RejectButton.js b/client/coral-admin/src/components/RejectButton.js
index 69e1047e6..2aabff007 100644
--- a/client/coral-admin/src/components/RejectButton.js
+++ b/client/coral-admin/src/components/RejectButton.js
@@ -14,7 +14,8 @@ const RejectButton = ({ active, minimal, onClick, className, disabled }) => {
       className={cn(
         styles.root,
         { [styles.minimal]: minimal, [styles.active]: active },
-        className
+        className,
+        'talk-admin-reject-button'
       )}
       onClick={onClick}
       disabled={disabled || active}
diff --git a/client/coral-admin/src/routes/Moderation/components/ModerationMenu.js b/client/coral-admin/src/routes/Moderation/components/ModerationMenu.js
index 27394c6c9..5300ce3eb 100644
--- a/client/coral-admin/src/routes/Moderation/components/ModerationMenu.js
+++ b/client/coral-admin/src/routes/Moderation/components/ModerationMenu.js
@@ -24,6 +24,7 @@ const ModerationMenu = ({ asset = {}, items, getModPath, activeTab }) => {
         >
           {items.map(queue => (
             <Link
+              id={`talk-admin-moderate-tab-${queue.key}`}
               key={queue.key}
               to={getModPath(queue.key, asset.id)}
               className={cn('mdl-tabs__tab', styles.tab, {
diff --git a/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js b/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js
index c22843c8f..bf7fa327d 100644
--- a/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js
+++ b/client/coral-admin/src/routes/Moderation/components/ModerationQueue.js
@@ -15,6 +15,7 @@ import {
 } from 'react-virtualized';
 import throttle from 'lodash/throttle';
 import key from 'keymaster';
+import cn from 'classnames';
 
 const hasComment = (nodes, id) => nodes.some(node => node.id === id);
 
@@ -380,6 +381,11 @@ class ModerationQueue extends React.Component {
       ...props
     } = this.props;
 
+    const rootClassName = cn(
+      styles.root,
+      `talk-admin-moderate-queue-${this.props.activeTab}`
+    );
+
     if (comments.length === 0) {
       return (
         <div className={styles.root}>
@@ -401,7 +407,7 @@ class ModerationQueue extends React.Component {
 
       const comment = comments[index];
       return (
-        <div className={styles.root}>
+        <div className={rootClassName}>
           <Comment
             root={this.props.root}
             key={comment.id}
@@ -423,7 +429,7 @@ class ModerationQueue extends React.Component {
     const view = this.state.view;
 
     return (
-      <div className={styles.root}>
+      <div className={rootClassName}>
         <ViewMore
           viewMore={() => this.viewNewComments()}
           count={comments.length - view.length}
diff --git a/test/e2e/globals.js b/test/e2e/globals.js
index aeecd204e..6a7eb07fb 100644
--- a/test/e2e/globals.js
+++ b/test/e2e/globals.js
@@ -23,9 +23,6 @@ module.exports = {
       username: 'user',
       password: 'testtest',
     },
-    comment: {
-      body: 'This is a test comment',
-    },
     organizationName: 'Coral',
     organizationContactEmail: 'coral@coralproject.net',
   },
diff --git a/test/e2e/page_objects/admin.js b/test/e2e/page_objects/admin.js
index 8e319e499..64d22c97b 100644
--- a/test/e2e/page_objects/admin.js
+++ b/test/e2e/page_objects/admin.js
@@ -70,9 +70,28 @@ module.exports = {
     },
     moderate: {
       selector: '.talk-admin-moderation-container',
+      commands: [
+        {
+          url: function() {
+            return `${this.api.launchUrl}/admin/moderate`;
+          },
+          ready() {
+            return this.waitForElementVisible('body');
+          },
+          goToQueue(queue) {
+            this.click(`#talk-admin-moderate-tab-${queue}`).expect.section(
+              `.talk-admin-moderate-queue-${queue}`
+            ).to.be.visible;
+            return this;
+          },
+        },
+      ],
       elements: {
-        comment: '.talk-admin-moderate-comment',
-        commentUsername: '.talk-admin-moderate-comment-username',
+        firstComment: '.talk-admin-moderate-comment',
+        firstCommentUsername: '.talk-admin-moderate-comment-username',
+        firstCommentContent: '.talk-admin-comment',
+        firstCommentApprove: '.talk-admin-approve-button',
+        firstCommentReject: '.talk-admin-reject-button',
       },
     },
     stories: {
diff --git a/test/e2e/specs/03_embedStream.js b/test/e2e/specs/03_embedStream.js
index 4b6831271..9eca7a736 100644
--- a/test/e2e/specs/03_embedStream.js
+++ b/test/e2e/specs/03_embedStream.js
@@ -1,3 +1,5 @@
+const commentBody = 'Embed Stream Test';
+
 module.exports = {
   '@tags': ['embedStream', 'login'],
 
@@ -40,28 +42,26 @@ module.exports = {
   },
   'user posts a comment': client => {
     const comments = client.page.embedStream().section.comments;
-    const { testData: { comment } } = client.globals;
 
     comments
       .waitForElementVisible('@commentBoxTextarea')
-      .setValue('@commentBoxTextarea', comment.body)
+      .setValue('@commentBoxTextarea', commentBody)
       .waitForElementVisible('@commentBoxPostButton')
       .click('@commentBoxPostButton')
       .waitForElementVisible('@firstCommentContent')
       .getText('@firstCommentContent', result => {
-        comments.assert.equal(result.value, comment.body);
+        comments.assert.equal(result.value, commentBody);
       });
   },
 
   'signed in user sees comment history': client => {
     const profile = client.page.embedStream().goToProfileSection();
-    const { testData: { comment } } = client.globals;
 
     profile
       .waitForElementVisible('@myCommentHistory')
       .waitForElementVisible('@myCommentHistoryComment')
       .getText('@myCommentHistoryComment', result => {
-        profile.assert.equal(result.value, comment.body);
+        profile.assert.equal(result.value, commentBody);
       });
   },
   'user sees replies and reactions to comments': client => {
diff --git a/test/e2e/specs/05_banUser.js b/test/e2e/specs/05_banUser.js
index 45ab0c347..51055a180 100644
--- a/test/e2e/specs/05_banUser.js
+++ b/test/e2e/specs/05_banUser.js
@@ -1,3 +1,5 @@
+const commentBody = 'Ban User Test';
+
 module.exports = {
   before: client => {
     client.setWindowPosition(0, 0);
@@ -109,4 +111,51 @@ module.exports = {
       .waitForElementVisible('@commentBoxTextarea')
       .waitForElementVisible('@commentBoxPostButton');
   },
+  'user posts comment, karma should stop it from happening': client => {
+    const comments = client.page.embedStream().section.comments;
+
+    comments
+      .waitForElementVisible('@commentBoxTextarea')
+      .setValue('@commentBoxTextarea', commentBody)
+      .waitForElementVisible('@commentBoxPostButton')
+      .click('@commentBoxPostButton');
+
+    client.pause(2000);
+
+    comments.waitForElementNotPresent('@firstCommentContent');
+  },
+  'user logs out 3': client => {
+    const embedStream = client.page.embedStream();
+    const comments = embedStream.section.comments;
+
+    comments.logout();
+  },
+  'admin logs in (3)': client => {
+    const adminPage = client.page.admin();
+    const { testData: { admin } } = client.globals;
+
+    adminPage.navigateAndLogin(admin);
+  },
+  'admin goes to moderation queue reported': client => {
+    const adminPage = client.page.admin();
+
+    adminPage.goToModerate().goToQueue('reported');
+  },
+  'comment should be in reported queue': client => {
+    const moderate = client.page.admin().section.moderate;
+
+    moderate
+      .waitForElementVisible('@firstComment')
+      .getText('@firstCommentContent', result => {
+        moderate.assert.equal(result.value, commentBody);
+      });
+  },
+  'approve comment to restore karma': client => {
+    const moderate = client.page.admin().section.moderate;
+
+    moderate.click('@firstCommentApprove');
+
+    // TODO: check why this fails.
+    //  .waitForElementNotPresent('@firstComment');
+  },
 };
diff --git a/test/e2e/specs/06_suspendUser.js b/test/e2e/specs/06_suspendUser.js
index 81fde3781..e02f21db9 100644
--- a/test/e2e/specs/06_suspendUser.js
+++ b/test/e2e/specs/06_suspendUser.js
@@ -1,3 +1,5 @@
+const commentBody = 'Suspend User Test';
+
 module.exports = {
   before: client => {
     client.setWindowPosition(0, 0);
@@ -25,16 +27,15 @@ module.exports = {
   },
   'user posts comment': client => {
     const comments = client.page.embedStream().section.comments;
-    const { testData: { comment } } = client.globals;
 
     comments
       .waitForElementVisible('@commentBoxTextarea')
-      .setValue('@commentBoxTextarea', comment.body)
+      .setValue('@commentBoxTextarea', commentBody)
       .waitForElementVisible('@commentBoxPostButton')
       .click('@commentBoxPostButton')
       .waitForElementVisible('@firstCommentContent')
       .getText('@firstCommentContent', result => {
-        comments.assert.equal(result.value, comment.body);
+        comments.assert.equal(result.value, commentBody);
       });
   },
   'user logs out': client => {
@@ -84,9 +85,9 @@ module.exports = {
       .goToModerate();
 
     moderate
-      .waitForElementVisible('@comment')
-      .waitForElementVisible('@commentUsername')
-      .click('@commentUsername');
+      .waitForElementVisible('@firstComment')
+      .waitForElementVisible('@firstCommentUsername')
+      .click('@firstCommentUsername');
 
     userDetailDrawer
       .waitForElementVisible('@actionsMenu')
@@ -112,9 +113,9 @@ module.exports = {
     const { moderate, userDetailDrawer } = adminPage.section;
 
     moderate
-      .waitForElementVisible('@comment')
-      .waitForElementVisible('@commentUsername')
-      .click('@commentUsername');
+      .waitForElementVisible('@firstComment')
+      .waitForElementVisible('@firstCommentUsername')
+      .click('@firstCommentUsername');
 
     userDetailDrawer
       .waitForElementVisible('@tabBar')

From ba3af0aeb34f5e1ababde2a44ab0980906035e41 Mon Sep 17 00:00:00 2001
From: Erik Reyna <erik@erikreyna.com>
Date: Fri, 25 May 2018 18:07:41 -0400
Subject: [PATCH 092/144] apply @cvle suggestion for fix

---
 plugins/talk-plugin-rich-text/client/components/rte/RTE.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/talk-plugin-rich-text/client/components/rte/RTE.css b/plugins/talk-plugin-rich-text/client/components/rte/RTE.css
index 0927c7eb3..683388707 100644
--- a/plugins/talk-plugin-rich-text/client/components/rte/RTE.css
+++ b/plugins/talk-plugin-rich-text/client/components/rte/RTE.css
@@ -1,5 +1,5 @@
 .contentEditable {
-  background: transparent;
+  background: #fff;
   border: solid 1px #bbb;
   min-height: 120px;
   box-sizing: border-box;
@@ -15,7 +15,8 @@
   position: absolute;
   margin: 12px 0 0 12px;
   color: #bbb;
-  z-index: -1;
+  user-select: none;
+  pointer-events: none;
 }
 
 .toolbarDisabled {

From 1fb206daa42d8d1ef1fa08c4f0c5bd6c2ab6bc52 Mon Sep 17 00:00:00 2001
From: Helmut Januschka <helmut@januschka.com>
Date: Mon, 28 May 2018 10:56:46 +0200
Subject: [PATCH 093/144] add missing dependency

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

diff --git a/package.json b/package.json
index 2697484c4..de37ff004 100644
--- a/package.json
+++ b/package.json
@@ -157,6 +157,7 @@
     "node-emoji": "^1.8.1",
     "node-fetch": "^1.7.2",
     "nodemailer": "^2.6.4",
+    "nunjucks": "^3.1.3",
     "npm-run-all": "^4.1.2",
     "parallel-webpack": "^2.2.0",
     "passport": "^0.4.0",

From 657736593068ed0c41311313faf6800db064bd18 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 28 May 2018 16:19:56 +0200
Subject: [PATCH 094/144] Use standard buttons to fix IOS bug

---
 client/coral-framework/styles/reset.css  |  1 +
 client/coral-ui/components/BareButton.js | 25 +++++++++++++-------
 client/coral-ui/components/Dropdown.css  | 30 ++++++++++--------------
 client/coral-ui/components/Dropdown.js   | 24 ++++---------------
 client/coral-ui/components/Option.css    |  2 ++
 client/coral-ui/components/Option.js     | 25 +++++++++++---------
 6 files changed, 51 insertions(+), 56 deletions(-)

diff --git a/client/coral-framework/styles/reset.css b/client/coral-framework/styles/reset.css
index 8cfd14c41..0a7ddb46b 100644
--- a/client/coral-framework/styles/reset.css
+++ b/client/coral-framework/styles/reset.css
@@ -6,6 +6,7 @@
   border: none;
   touch-action: manipulation;
   padding: 0;
+  margin: 0;
 
   overflow: hidden;
 
diff --git a/client/coral-ui/components/BareButton.js b/client/coral-ui/components/BareButton.js
index 6d3f9fa93..911d76297 100644
--- a/client/coral-ui/components/BareButton.js
+++ b/client/coral-ui/components/BareButton.js
@@ -7,17 +7,26 @@ import cn from 'classnames';
  *  BareButton is a button whose styling is stripped off to a minimum.
  *  Can pass anchor=true to use `a` instead of `button`
  */
-const BareButton = ({ anchor, className, ...props }) => {
-  let Element = 'button';
-  if (anchor) {
-    Element = 'a';
+export default class BareButton extends React.Component {
+  ref = null;
+
+  handleRef = ref => (this.ref = ref);
+  focus = () => this.ref.focus();
+
+  render() {
+    const { anchor, className, ...props } = this.props;
+    const Element = anchor ? 'a' : 'button';
+    return (
+      <Element
+        {...props}
+        className={cn(styles.bare, className)}
+        ref={this.handleRef}
+      />
+    );
   }
-  return <Element {...props} className={cn(styles.bare, className)} />;
-};
+}
 
 BareButton.propTypes = {
   className: PropTypes.string,
   anchor: PropTypes.bool,
 };
-
-export default BareButton;
diff --git a/client/coral-ui/components/Dropdown.css b/client/coral-ui/components/Dropdown.css
index c17e6322a..3128a8be4 100644
--- a/client/coral-ui/components/Dropdown.css
+++ b/client/coral-ui/components/Dropdown.css
@@ -1,32 +1,26 @@
 .dropdown {
   position: relative;
-  height: 34px;
-  background: #2c2c2c;
-  box-sizing: border-box;
-  color: white;
-  border-radius: 3px;
-  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);
-  line-height: 20px;
-
-  font-size: 0.98em;
-  border-radius: 3px;
-  cursor: pointer;
-
-  &.disabled {
-    color: #e5e5e5;
-    background: #888;
-    cursor: default;
-    pointer-events: none;
-  }
 }
 
 .toggle {
   padding: 8px 45px 8px 15px;
   outline: none;
+  color: white;
+  background: #2c2c2c;
+  border-radius: 3px;
+  height: 34px;
+  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);
+  line-height: 20px;
+  font-size: 0.98em;
 
   &:focus {
     background: #888;
   }
+
+  &:disabled {
+    color: #e5e5e5;
+    background: #888;
+  }
 }
 
 .toggleOpen {
diff --git a/client/coral-ui/components/Dropdown.js b/client/coral-ui/components/Dropdown.js
index bf885477f..380d6c91f 100644
--- a/client/coral-ui/components/Dropdown.js
+++ b/client/coral-ui/components/Dropdown.js
@@ -4,6 +4,7 @@ import styles from './Dropdown.css';
 import Icon from './Icon';
 import cn from 'classnames';
 import ClickOutside from 'coral-framework/components/ClickOutside';
+import { BareButton } from 'coral-ui';
 
 class Dropdown extends React.Component {
   toggleRef = null;
@@ -88,16 +89,6 @@ class Dropdown extends React.Component {
     this.toggle();
   };
 
-  handleKeyDown = e => {
-    const code = e.which;
-
-    // 13 = Return, 32 = Space
-    if (code === 13 || code === 32) {
-      e.preventDefault();
-      this.toggle();
-    }
-  };
-
   hideMenu = () => {
     this.setState({
       isOpen: false,
@@ -155,23 +146,18 @@ class Dropdown extends React.Component {
             styles.dropdown,
             className,
             containerClassName,
-            'dd dd-container',
-            {
-              [styles.disabled]: disabled,
-            }
+            'dd dd-container'
           )}
         >
-          <div
+          <BareButton
             className={cn(styles.toggle, toggleClassName, {
               [cn(this.state.isOpen, toggleOpenClassName)]: this.state.isOpen,
             })}
             onClick={this.handleClick}
-            onKeyDown={this.handleKeyDown}
-            role="button"
             aria-pressed={this.state.isOpen}
             aria-haspopup="true"
-            tabIndex={disabled ? '-1' : '0'}
             ref={this.handleToggleRef}
+            disabled={disabled}
           >
             {this.props.icon && (
               <Icon
@@ -194,7 +180,7 @@ class Dropdown extends React.Component {
                 aria-hidden="true"
               />
             )}
-          </div>
+          </BareButton>
           {this.state.isOpen && (
             <div>
               <div tabIndex="0" onFocus={this.trapFocusBegin} />
diff --git a/client/coral-ui/components/Option.css b/client/coral-ui/components/Option.css
index 892bc4e7c..eb76df93d 100644
--- a/client/coral-ui/components/Option.css
+++ b/client/coral-ui/components/Option.css
@@ -1,7 +1,9 @@
 .option {
+  width: 100%;
   padding: 10px;
   outline: none;
   white-space: nowrap;
+  text-align: left;
 
   &:focus, &:hover {
     background-color: #ccc;
diff --git a/client/coral-ui/components/Option.js b/client/coral-ui/components/Option.js
index 704bca179..95473d4c6 100644
--- a/client/coral-ui/components/Option.js
+++ b/client/coral-ui/components/Option.js
@@ -1,13 +1,15 @@
 import React from 'react';
+import { findDOMNode } from 'react-dom';
 import PropTypes from 'prop-types';
 import styles from './Option.css';
 import cn from 'classnames';
+import { BareButton } from 'coral-ui';
 
 class Option extends React.Component {
   ref = null;
 
   handleRef = ref => {
-    this.ref = ref;
+    this.ref = findDOMNode(ref);
   };
 
   focus = () => {
@@ -19,16 +21,17 @@ class Option extends React.Component {
     const { className, label = '', onClick, onKeyDown } = this.props;
     const id = this.props.id ? this.props.id : this.props.value;
     return (
-      <li
-        className={cn(styles.option, className, 'dd-option')}
-        onClick={onClick}
-        onKeyDown={onKeyDown}
-        role="option"
-        tabIndex="0"
-        ref={this.handleRef}
-        id={id}
-      >
-        {label}
+      <li>
+        <BareButton
+          className={cn(styles.option, className, 'dd-option')}
+          onClick={onClick}
+          onKeyDown={onKeyDown}
+          role="option"
+          ref={this.handleRef}
+          id={id}
+        >
+          {label}
+        </BareButton>
       </li>
     );
   }

From 6d35c648d65e07849eb0b5eff77ae481a36990d1 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Mon, 28 May 2018 12:13:02 -0300
Subject: [PATCH 095/144] updates

---
 client/coral-admin/src/components/UserDetail.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index 450b2cecc..7a7d7a672 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -8,13 +8,12 @@ import { Slot } from 'coral-framework/components';
 import UserDetailCommentList from '../components/UserDetailCommentList';
 
 import {
-  getReliability,
   isSuspended,
-  isBanned,
   isUsernameRejected,
   isUsernameChanged,
   getActiveStatuses,
-  isSuspended, isBanned, getKarma
+  isBanned,
+  getKarma,
 } from 'coral-framework/utils/user';
 
 import ButtonCopyToClipboard from './ButtonCopyToClipboard';
@@ -113,6 +112,13 @@ class UserDetail extends React.Component {
     router.push('/admin/community/flagged');
   };
 
+  rejectUsername = data => {
+    // trigger modal or tooltip
+    // flag user and then
+    // perform rejection
+    this.props.rejectUsername(data);
+  };
+
   renderLoaded() {
     const {
       root,
@@ -133,7 +139,6 @@ class UserDetail extends React.Component {
       unbanUser,
       unsuspendUser,
       modal,
-      rejectUsername,
       acceptComment,
       rejectComment,
       bulkAccept,
@@ -225,7 +230,7 @@ class UserDetail extends React.Component {
                 </ActionsMenuItem>
               ) : (
                 <ActionsMenuItem
-                  onClick={() => rejectUsername({ id: user.id })}
+                  onClick={() => this.rejectUsername({ id: user.id })}
                   disabled={me.id === user.id}
                 >
                   {t('user_detail.reject_username')}

From ed679096c84f2437ee5fc9b25c9850020eccc441 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 28 May 2018 17:16:44 +0200
Subject: [PATCH 096/144] Workaround RTE Button focus bug on IOS

---
 .../client/components/rte/factories/createToggle.js   | 11 -----------
 .../client/components/rte/lib/api.js                  | 11 ++++++++++-
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/plugins/talk-plugin-rich-text/client/components/rte/factories/createToggle.js b/plugins/talk-plugin-rich-text/client/components/rte/factories/createToggle.js
index 59b75fdf2..1fe8641f6 100644
--- a/plugins/talk-plugin-rich-text/client/components/rte/factories/createToggle.js
+++ b/plugins/talk-plugin-rich-text/client/components/rte/factories/createToggle.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import Button from '../components/Button';
-import bowser from 'bowser';
 
 /**
  *  createToggle creates a button that can be active, inactive or disabled
@@ -33,17 +32,7 @@ const createToggle = (
       this.execCommand();
     };
 
-    // Detect whether there was focus on the RTE before the click.
-    hadFocusBeforeClick = false;
-    handleMouseDown = () => (this.hadFocusBeforeClick = this.props.api.focused);
-
     handleClick = () => {
-      // Skip IOS when the focus was not there before.
-      // IOS fails to focus to the RTE correctly and scrolls to nirvana.
-      // See https://www.pivotaltracker.com/story/show/157607216
-      if (!this.hadFocusBeforeClick && bowser.ios) {
-        return;
-      }
       this.props.api.focus();
       this.formatToggle();
       this.props.api.focus();
diff --git a/plugins/talk-plugin-rich-text/client/components/rte/lib/api.js b/plugins/talk-plugin-rich-text/client/components/rte/lib/api.js
index 9e018f093..0c5fbcf2f 100644
--- a/plugins/talk-plugin-rich-text/client/components/rte/lib/api.js
+++ b/plugins/talk-plugin-rich-text/client/components/rte/lib/api.js
@@ -1,4 +1,4 @@
-import { isSelectionInside } from './dom';
+import { isSelectionInside, selectEndOfNode } from '../lib/dom';
 
 /**
  * An instance of API is passed to all the buttons to
@@ -26,6 +26,15 @@ function createAPI(
       return getContainer();
     },
     focus() {
+      // IOS workaround inspired by https://github.com/facebook/draft-js/issues/1075#issuecomment-369700275.
+      // Putting the selection inside the contentEditable before calling `focus`
+      // prevents an undesired scroll jump.
+      if (!isSelectionInside(this.container)) {
+        if (this.container.childNodes.length === 0) {
+          this.container.appendChild(document.createTextNode(''));
+        }
+        selectEndOfNode(this.container);
+      }
       this.container.focus();
     },
     isSelectionInside() {

From da820ad6db73811b2cdb52e15fc04414b4d36f91 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Mon, 28 May 2018 09:42:22 -0600
Subject: [PATCH 097/144] updated yarn.lock

---
 yarn.lock | 131 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 130 insertions(+), 1 deletion(-)

diff --git a/yarn.lock b/yarn.lock
index a65a3524d..59b3958d6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1977,6 +1977,24 @@ chokidar@^1.5.2, chokidar@^1.6.0, chokidar@^1.6.1, chokidar@^1.7.0:
   optionalDependencies:
     fsevents "^1.0.0"
 
+chokidar@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.3.tgz#dcbd4f6cbb2a55b4799ba8a840ac527e5f4b1176"
+  dependencies:
+    anymatch "^2.0.0"
+    async-each "^1.0.0"
+    braces "^2.3.0"
+    glob-parent "^3.1.0"
+    inherits "^2.0.1"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    normalize-path "^2.1.1"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.0.0"
+    upath "^1.0.0"
+  optionalDependencies:
+    fsevents "^1.1.2"
+
 chokidar@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.2.tgz#4dc65139eeb2714977735b6a35d06e97b494dfd7"
@@ -2834,7 +2852,7 @@ debug@*, debug@3.1.0, debug@^3.0.0, debug@^3.0.1, debug@^3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@2, debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8:
+debug@2, debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
@@ -4106,6 +4124,12 @@ fs-extra@^4.0.1:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
+fs-minipass@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+  dependencies:
+    minipass "^2.2.1"
+
 fs-promise@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/fs-promise/-/fs-promise-0.3.1.tgz#bf34050368f24d6dc9dfc6688ab5cead8f86842a"
@@ -4136,6 +4160,13 @@ fsevents@^1.0.0, fsevents@^1.1.1:
     nan "^2.3.0"
     node-pre-gyp "^0.6.39"
 
+fsevents@^1.1.2:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
+  dependencies:
+    nan "^2.9.2"
+    node-pre-gyp "^0.10.0"
+
 fstream-ignore@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
@@ -5019,6 +5050,12 @@ iconv-lite@0.4.19, iconv-lite@^0.4.17, iconv-lite@~0.4.13:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
 
+iconv-lite@^0.4.4:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
 icss-replace-symbols@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
@@ -5051,6 +5088,12 @@ ignore-by-default@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
 
+ignore-walk@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+  dependencies:
+    minimatch "^3.0.4"
+
 ignore@^3.3.3, ignore@^3.3.5:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
@@ -7359,6 +7402,19 @@ minimist@~0.0.1:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
 
+minipass@^2.2.1, minipass@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.3.tgz#a7dcc8b7b833f5d368759cce544dccb55f50f233"
+  dependencies:
+    safe-buffer "^5.1.2"
+    yallist "^3.0.0"
+
+minizlib@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
+  dependencies:
+    minipass "^2.2.1"
+
 mississippi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
@@ -7566,6 +7622,10 @@ nan@^2.3.2:
   version "2.9.2"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.9.2.tgz#f564d75f5f8f36a6d9456cca7a6c4fe488ab7866"
 
+nan@^2.9.2:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
+
 nanomatch@^1.2.9:
   version "1.2.9"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2"
@@ -7620,6 +7680,14 @@ nearley@^2.7.10:
     railroad-diagrams "^1.0.0"
     randexp "^0.4.2"
 
+needle@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.1.tgz#b5e325bd3aae8c2678902fa296f729455d1d3a7d"
+  dependencies:
+    debug "^2.1.2"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
 negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
@@ -7759,6 +7827,21 @@ node-notifier@^5.2.1:
     shellwords "^0.1.1"
     which "^1.3.0"
 
+node-pre-gyp@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.0.tgz#6e4ef5bb5c5203c6552448828c852c40111aac46"
+  dependencies:
+    detect-libc "^1.0.2"
+    mkdirp "^0.5.1"
+    needle "^2.2.0"
+    nopt "^4.0.1"
+    npm-packlist "^1.1.6"
+    npmlog "^4.0.2"
+    rc "^1.1.7"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^4"
+
 node-pre-gyp@^0.6.39:
   version "0.6.39"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649"
@@ -7965,6 +8048,17 @@ normalize-url@~2.0.0:
     query-string "^5.0.1"
     sort-keys "^2.0.0"
 
+npm-bundled@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308"
+
+npm-packlist@^1.1.6:
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.10.tgz#1039db9e985727e464df066f4cf0ab6ef85c398a"
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+
 npm-path@^2.0.2:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.4.tgz#c641347a5ff9d6a09e4d9bce5580c4f505278e64"
@@ -8033,6 +8127,17 @@ nunjucks@^3.1.2:
   optionalDependencies:
     chokidar "^1.6.0"
 
+nunjucks@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/nunjucks/-/nunjucks-3.1.3.tgz#9a23c844af01c143a0b40f3bdd1212a9d7877260"
+  dependencies:
+    a-sync-waterfall "^1.0.0"
+    asap "^2.0.3"
+    postinstall-build "^5.0.1"
+    yargs "^3.32.0"
+  optionalDependencies:
+    chokidar "^2.0.0"
+
 "nwmatcher@>= 1.3.7 < 2.0.0", nwmatcher@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.3.tgz#64348e3b3d80f035b40ac11563d278f8b72db89c"
@@ -10161,6 +10266,10 @@ safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, s
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
+safe-buffer@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+
 safe-json-stringify@~1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.1.0.tgz#bd2b6dad1ebafab3c24672a395527f01804b7e19"
@@ -10171,6 +10280,10 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
+"safer-buffer@>= 2.1.2 < 3":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+
 samsam@1.1.2, samsam@~1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.1.2.tgz#bec11fdc83a9fda063401210e40176c3024d1567"
@@ -11145,6 +11258,18 @@ tar@^2.0.0, tar@^2.2.1:
     fstream "^1.0.2"
     inherits "2"
 
+tar@^4:
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.4.tgz#ec8409fae9f665a4355cc3b4087d0820232bb8cd"
+  dependencies:
+    chownr "^1.0.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.3.3"
+    minizlib "^1.1.0"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.2"
+    yallist "^3.0.2"
+
 tcomb@^2.5.1:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/tcomb/-/tcomb-2.7.0.tgz#10d62958041669a5d53567b9a4ee8cde22b1c2b0"
@@ -12041,6 +12166,10 @@ yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
 
+yallist@^3.0.0, yallist@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
+
 yaml-lint@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/yaml-lint/-/yaml-lint-1.0.0.tgz#655068f583263eec7e2a0ded8f5b1895dd667e1c"

From b0d76f2f6a22524b22be1a12dba75fb9d1283350 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Mon, 28 May 2018 14:52:03 -0300
Subject: [PATCH 098/144] progress

---
 .../src/actions/rejectUsernameDialog.js       |  14 ++
 .../src/components/RejectUsernameDialog.css   |  90 +++++++++
 .../src/components/RejectUsernameDialog.js    | 188 ++++++++++++++++++
 .../coral-admin/src/components/UserDetail.js  |   8 +-
 .../src/constants/rejectUsernameDialog.js     |   2 +
 client/coral-admin/src/containers/Layout.js   |   2 +
 .../src/containers/RejectUsernameDialog.js    |  79 ++++++++
 .../coral-admin/src/containers/UserDetail.js  |   4 +
 client/coral-admin/src/reducers/index.js      |   2 +
 .../src/reducers/rejectUsernameDialog.js      |  29 +++
 10 files changed, 417 insertions(+), 1 deletion(-)
 create mode 100644 client/coral-admin/src/actions/rejectUsernameDialog.js
 create mode 100644 client/coral-admin/src/components/RejectUsernameDialog.css
 create mode 100644 client/coral-admin/src/components/RejectUsernameDialog.js
 create mode 100644 client/coral-admin/src/constants/rejectUsernameDialog.js
 create mode 100644 client/coral-admin/src/containers/RejectUsernameDialog.js
 create mode 100644 client/coral-admin/src/reducers/rejectUsernameDialog.js

diff --git a/client/coral-admin/src/actions/rejectUsernameDialog.js b/client/coral-admin/src/actions/rejectUsernameDialog.js
new file mode 100644
index 000000000..946b36ef7
--- /dev/null
+++ b/client/coral-admin/src/actions/rejectUsernameDialog.js
@@ -0,0 +1,14 @@
+import {
+  SHOW_REJECT_USERNAME_DIALOG,
+  HIDE_REJECT_USERNAME_DIALOG,
+} from '../constants/rejectUsernameDialog';
+
+export const showRejectUsernameDialog = ({ userId, username }) => ({
+  type: SHOW_REJECT_USERNAME_DIALOG,
+  userId,
+  username,
+});
+
+export const hideRejectUsernameDialog = () => ({
+  type: HIDE_REJECT_USERNAME_DIALOG,
+});
diff --git a/client/coral-admin/src/components/RejectUsernameDialog.css b/client/coral-admin/src/components/RejectUsernameDialog.css
new file mode 100644
index 000000000..1c96f509a
--- /dev/null
+++ b/client/coral-admin/src/components/RejectUsernameDialog.css
@@ -0,0 +1,90 @@
+.dialog {
+  border: none;
+  box-shadow: 0 9px 46px 8px rgba(0, 0, 0, 0.14), 0 11px 15px -7px rgba(0, 0, 0, 0.12), 0 24px 38px 3px rgba(0, 0, 0, 0.2);
+  width: 400px;
+  top: 50%;
+  transform: translateY(-50%);
+  padding: 20px;
+  border-radius: 4px;
+}
+
+.header {
+  color: black;
+  font-size: 1.5em;
+  font-weight: 500;
+  margin: 0 0 8px 0;
+}
+
+.close {
+  display: block;
+  position: absolute;
+  top: 24px;
+  right: 20px;
+}
+
+.closeButton {
+  userSelect: none;
+  outline: none;
+  border: none;
+  touchAction: manipulation;
+  &::-moz-focus-inner: {
+    border: 0;
+  }
+  background: 0;
+  padding: 0;
+  font-size: 24px;
+  line-height: 14px;
+  cursor: pointer;
+  color: #363636;
+  &:hover {
+    color: #6b6b6b;
+  }
+}
+
+.legend {
+  padding: 0;
+  font-weight: bold;
+}
+
+div.radioGroup {
+  margin-top: 6px;
+}
+
+label.radioGroup {
+
+  &:global(.is-checked) > :global(.mdl-radio__outer-circle),
+  > :global(.mdl-radio__outer-circle) {
+    border-color: #212121;
+  }
+
+  > :global(.mdl-radio__inner-circle) {
+    background: #212121;
+  }
+
+  > :global(.mdl-radio__label) {
+    font-size: 14px;
+    line-height: 20px;
+  }
+}
+
+.messageInput {
+  border-radius: 3px;
+  width: 100%;
+  padding: 10px;
+  font-size: 14px;
+  box-sizing: border-box;
+}
+
+.cancel {
+  margin-right: 5px;
+}
+
+.perform {
+  min-width: 90px;
+}
+
+.buttons {
+  margin-top: 8px;
+  margin-bottom: 6px;
+  text-align: right;
+}
diff --git a/client/coral-admin/src/components/RejectUsernameDialog.js b/client/coral-admin/src/components/RejectUsernameDialog.js
new file mode 100644
index 000000000..cdd211bc4
--- /dev/null
+++ b/client/coral-admin/src/components/RejectUsernameDialog.js
@@ -0,0 +1,188 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Dialog } from 'coral-ui';
+import { RadioGroup, Radio } from 'react-mdl';
+import styles from './SuspendUserDialog.css';
+import cn from 'classnames';
+
+import Button from 'coral-ui/components/Button';
+
+import t, { timeago } from 'coral-framework/services/i18n';
+import { dateAdd } from 'coral-framework/utils';
+
+const initialState = { step: 0, duration: '3' };
+
+function durationsToDate(hours) {
+  // Add 1 minute more to help `timeago.js` to display the correct duration.
+  return dateAdd(new Date(), 'minute', hours * 60 + 1);
+}
+
+class SuspendUserDialog extends React.Component {
+  state = initialState;
+
+  componentWillReceiveProps(next) {
+    if (this.props.open && !next.open) {
+      this.setState(initialState);
+    }
+  }
+
+  handleDurationChange = event => {
+    this.setState({ duration: event.target.value });
+  };
+
+  handleMessageChange = event => {
+    this.setState({ message: event.target.value });
+  };
+
+  goToStep1 = () => {
+    this.setState({
+      step: 1,
+      message: t(
+        'suspenduser.email_message_suspend',
+        this.props.username,
+        this.props.organizationName,
+        timeago(durationsToDate(this.state.duration))
+      ),
+    });
+  };
+
+  handlePerform = () => {
+    this.props.onPerform({
+      message: this.state.message,
+
+      // Add 1 minute more to help `timeago.js` to display the correct duration.
+      until: durationsToDate(this.state.duration),
+    });
+  };
+
+  renderStep0() {
+    const { onCancel, username } = this.props;
+    const { duration } = this.state;
+    return (
+      <section className="talk-admin-suspend-user-dialog-step-0">
+        <h1 className={styles.header}>{t('suspenduser.title_suspend')}</h1>
+        <p className={styles.description}>
+          {t('suspenduser.description_suspend', username)}
+        </p>
+        <fieldset>
+          <legend className={styles.legend}>
+            {t('suspenduser.select_duration')}
+          </legend>
+          <RadioGroup
+            name="status filter"
+            value={duration}
+            childContainer="div"
+            onChange={this.handleDurationChange}
+            className={styles.radioGroup}
+          >
+            <Radio value="1">{t('suspenduser.one_hour')}</Radio>
+            <Radio value="3">{t('suspenduser.hours', 3)}</Radio>
+            <Radio value="24">{t('suspenduser.hours', 24)}</Radio>
+            <Radio value="168">{t('suspenduser.days', 7)}</Radio>
+          </RadioGroup>
+        </fieldset>
+        <div className={styles.buttons}>
+          <Button
+            cStyle="white"
+            className={styles.cancel}
+            onClick={onCancel}
+            raised
+          >
+            {t('suspenduser.cancel')}
+          </Button>
+          <Button
+            cStyle="black"
+            className={cn(
+              styles.perform,
+              'talk-admin-suspend-user-dialog-confirm'
+            )}
+            onClick={this.goToStep1}
+            raised
+          >
+            {t('suspenduser.suspend_user')}
+          </Button>
+        </div>
+      </section>
+    );
+  }
+
+  renderStep1() {
+    const { message } = this.state;
+    const { onCancel, username } = this.props;
+    return (
+      <section className="talk-admin-suspend-user-dialog-step-1">
+        <h1 className={styles.header}>{t('suspenduser.title_notify')}</h1>
+        <p className={styles.description}>
+          {t('suspenduser.description_notify', username)}
+        </p>
+        <fieldset>
+          <legend className={styles.legend}>
+            {t('suspenduser.write_message')}
+          </legend>
+          <textarea
+            rows={5}
+            className={styles.messageInput}
+            value={message}
+            onChange={this.handleMessageChange}
+          />
+        </fieldset>
+        <div className={styles.buttons}>
+          <Button
+            cStyle="white"
+            className={styles.cancel}
+            onClick={onCancel}
+            raised
+          >
+            {t('suspenduser.cancel')}
+          </Button>
+          <Button
+            cStyle="black"
+            className={cn(
+              styles.perform,
+              'talk-admin-suspend-user-dialog-send'
+            )}
+            onClick={this.handlePerform}
+            disabled={this.state.message.length === 0}
+            raised
+          >
+            {t('suspenduser.send')}
+          </Button>
+        </div>
+      </section>
+    );
+  }
+
+  render() {
+    const { open, onCancel } = this.props;
+    const { step } = this.state;
+    return (
+      <Dialog
+        className={cn(styles.dialog, 'talk-admin-suspend-user-dialog')}
+        onCancel={onCancel}
+        open={open}
+      >
+        <div className={styles.close}>
+          <button
+            aria-label="Close"
+            onClick={onCancel}
+            className={styles.closeButton}
+          >
+            ×
+          </button>
+        </div>
+        {step === 0 && this.renderStep0()}
+        {step === 1 && this.renderStep1()}
+      </Dialog>
+    );
+  }
+}
+
+SuspendUserDialog.propTypes = {
+  open: PropTypes.bool.isRequired,
+  onPerform: PropTypes.func.isRequired,
+  onCancel: PropTypes.func.isRequired,
+  organizationName: PropTypes.string,
+  username: PropTypes.string,
+};
+
+export default SuspendUserDialog;
diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index 7a7d7a672..5572c7d71 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -51,6 +51,12 @@ class UserDetail extends React.Component {
       username: this.props.root.user.username,
     });
 
+  showRejectUsername = () =>
+    this.props.showBanUserDialog({
+      userId: this.props.root.user.id,
+      username: this.props.root.user.username,
+    });
+
   renderLoading() {
     return (
       <ClickOutside onClickOutside={this.props.hideUserDetail}>
@@ -230,7 +236,7 @@ class UserDetail extends React.Component {
                 </ActionsMenuItem>
               ) : (
                 <ActionsMenuItem
-                  onClick={() => this.rejectUsername({ id: user.id })}
+                  onClick={this.showRejectUsername}
                   disabled={me.id === user.id}
                 >
                   {t('user_detail.reject_username')}
diff --git a/client/coral-admin/src/constants/rejectUsernameDialog.js b/client/coral-admin/src/constants/rejectUsernameDialog.js
new file mode 100644
index 000000000..8ab48c106
--- /dev/null
+++ b/client/coral-admin/src/constants/rejectUsernameDialog.js
@@ -0,0 +1,2 @@
+export const SHOW_REJECT_USERNAME_DIALOG = 'SHOW_REJECT_USERNAME_DIALOG';
+export const HIDE_REJECT_USERNAME_DIALOG = 'HIDE_REJECT_USERNAME_DIALOG';
diff --git a/client/coral-admin/src/containers/Layout.js b/client/coral-admin/src/containers/Layout.js
index 580b20f9b..d8ca11732 100644
--- a/client/coral-admin/src/containers/Layout.js
+++ b/client/coral-admin/src/containers/Layout.js
@@ -6,6 +6,7 @@ import Login from '../containers/Login';
 import { FullLoading } from '../components/FullLoading';
 import BanUserDialog from './BanUserDialog';
 import SuspendUserDialog from './SuspendUserDialog';
+import RejectUsernameDialog from './RejectUsernameDialog';
 import { toggleModal as toggleShortcutModal } from '../actions/moderation';
 import { logout } from 'coral-framework/actions/auth';
 import { can } from 'coral-framework/services/perms';
@@ -41,6 +42,7 @@ class LayoutContainer extends React.Component {
           >
             <BanUserDialog />
             <SuspendUserDialog />
+            <RejectUsernameDialog />
             <UserDetail />
             {children}
           </Layout>
diff --git a/client/coral-admin/src/containers/RejectUsernameDialog.js b/client/coral-admin/src/containers/RejectUsernameDialog.js
new file mode 100644
index 000000000..83551200f
--- /dev/null
+++ b/client/coral-admin/src/containers/RejectUsernameDialog.js
@@ -0,0 +1,79 @@
+// import React, { Component } from 'react';
+// import PropTypes from 'prop-types';
+// import { connect } from 'react-redux';
+// import { bindActionCreators } from 'redux';
+// import RejectUsernameDialog from '../components/RejectUsernameDialog';
+// import { hideRejectUsernameDialog } from '../actions/rejectUsernameDialog';
+// import { withRejectUsername } from 'coral-framework/graphql/mutations';
+// import { compose } from 'react-apollo';
+// import t from 'coral-framework/services/i18n';
+
+// class RejectUsernameDialogContainer extends Component {
+//   banUser = async () => {
+//     const {
+//       userId,
+//       commentId,
+//       commentStatus,
+//       banUser,
+//       setCommentStatus,
+//       hideBanUserDialog,
+//     } = this.props;
+//     await banUser({ id: userId, message: '' });
+//     hideBanUserDialog();
+//     if (commentId && commentStatus && commentStatus !== 'REJECTED') {
+//       await setCommentStatus({ commentId, status: 'REJECTED' });
+//     }
+//   };
+
+//   getInfo() {
+//     let note = t('bandialog.note_ban_user');
+//     if (this.props.commentStatus && this.props.commentStatus !== 'REJECTED') {
+//       note = t('bandialog.note_reject_comment');
+//     }
+//     return t('bandialog.note', note);
+//   }
+
+//   render() {
+//     return (
+//       <BanUserDialog
+//         open={RejectUsernameDialog.props.open}
+//         onPerform={this.banUser}
+//         onCancel={this.props.hideBanUserDialog}
+//         username={this.props.username}
+
+//       />
+//     );
+//   }
+// }
+
+// BanUserDialogContainer.propTypes = {
+//   banUser: PropTypes.func.isRequired,
+//   hideBanUserDialog: PropTypes.func,
+//   open: PropTypes.bool,
+//   username: PropTypes.string,
+//   commentStatus: PropTypes.string,
+// };
+
+// const mapStateToProps = ({
+//   banUserDialog: { open, userId, username, commentId, commentStatus },
+// }) => ({
+//   open,
+//   userId,
+//   username,
+//   commentId,
+//   commentStatus,
+// });
+
+// const mapDispatchToProps = dispatch => ({
+//   ...bindActionCreators(
+//     {
+//       hideRejectUsernameDialog,
+//     },
+//     dispatch
+//   ),
+// });
+
+// export default compose(
+//   connect(mapStateToProps, mapDispatchToProps),
+//   withRejectUsername
+// )(RejectUsernameDialogContainer);
diff --git a/client/coral-admin/src/containers/UserDetail.js b/client/coral-admin/src/containers/UserDetail.js
index 5ab572afc..03ffee007 100644
--- a/client/coral-admin/src/containers/UserDetail.js
+++ b/client/coral-admin/src/containers/UserDetail.js
@@ -23,11 +23,13 @@ import {
   withUnbanUser,
   withUnsuspendUser,
   withRejectUsername,
+  withPostFlag,
 } from 'coral-framework/graphql/mutations';
 import UserDetailComment from './UserDetailComment';
 import update from 'immutability-helper';
 import { showBanUserDialog } from 'actions/banUserDialog';
 import { showSuspendUserDialog } from 'actions/suspendUserDialog';
+import { showRejectUsernameDialog } from 'actions/rejectUsernameDialog';
 
 const commentConnectionFragment = gql`
   fragment CoralAdmin_UserDetail_CommentConnection on CommentConnection {
@@ -279,6 +281,7 @@ const mapDispatchToProps = dispatch => ({
     {
       showBanUserDialog,
       showSuspendUserDialog,
+      showRejectUsernameDialog,
       changeTab,
       clearUserDetailSelections,
       toggleSelectCommentInUserDetail,
@@ -297,5 +300,6 @@ export default compose(
   withUnbanUser,
   withUnsuspendUser,
   withRejectUsername,
+  withPostFlag,
   withRouter
 )(UserDetailContainer);
diff --git a/client/coral-admin/src/reducers/index.js b/client/coral-admin/src/reducers/index.js
index be0a8a606..e806f5d11 100644
--- a/client/coral-admin/src/reducers/index.js
+++ b/client/coral-admin/src/reducers/index.js
@@ -5,10 +5,12 @@ import moderation from './moderation';
 import install from './install';
 import banUserDialog from './banUserDialog';
 import suspendUserDialog from './suspendUserDialog';
+import rejectUsernameDialog from './rejectUsernameDialog';
 import userDetail from './userDetail';
 import ui from './ui';
 
 export default {
+  rejectUsernameDialog,
   banUserDialog,
   configure,
   suspendUserDialog,
diff --git a/client/coral-admin/src/reducers/rejectUsernameDialog.js b/client/coral-admin/src/reducers/rejectUsernameDialog.js
new file mode 100644
index 000000000..2ed31066b
--- /dev/null
+++ b/client/coral-admin/src/reducers/rejectUsernameDialog.js
@@ -0,0 +1,29 @@
+import {
+  SHOW_REJECT_USERNAME_DIALOG,
+  HIDE_REJECT_USERNAME_DIALOG,
+} from '../constants/rejectUsernameDialog';
+
+const initialState = {
+  open: false,
+  userId: null,
+  username: '',
+};
+
+export default function rejectUsernameDialog(state = initialState, action) {
+  switch (action.type) {
+    case SHOW_REJECT_USERNAME_DIALOG:
+      return {
+        ...state,
+        open: true,
+        userId: action.userId,
+        username: action.username,
+      };
+    case HIDE_REJECT_USERNAME_DIALOG:
+      return {
+        ...state,
+        open: false,
+      };
+    default:
+      return state;
+  }
+}

From 4299c373bac2faede859bd7c08d4f7ad4c4e21c6 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Mon, 28 May 2018 15:17:31 -0300
Subject: [PATCH 099/144] changes and updates to the e2e

---
 nightwatch.conf.js |   6 +-
 package.json       |   2 +-
 yarn.lock          | 250 ++++++++++++++++++++++++++++++++++-----------
 3 files changed, 196 insertions(+), 62 deletions(-)

diff --git a/nightwatch.conf.js b/nightwatch.conf.js
index 75dfa5ef6..16777b844 100644
--- a/nightwatch.conf.js
+++ b/nightwatch.conf.js
@@ -10,15 +10,15 @@ module.exports = {
   selenium: {
     start_process: true,
     server_path:
-      'node_modules/selenium-standalone/.selenium/selenium-server/3.7.1-server.jar',
+      'node_modules/selenium-standalone/.selenium/selenium-server/3.8.1-server.jar',
     log_path: REPORTS_FOLDER,
     host: '127.0.0.1',
     port: 6666,
     cli_args: {
       'webdriver.chrome.driver':
-        'node_modules/selenium-standalone/.selenium/chromedriver/2.33-x64-chromedriver',
+        'node_modules/selenium-standalone/.selenium/chromedriver/2.37-x64-chromedriver',
       'webdriver.gecko.driver':
-        'node_modules/selenium-standalone/.selenium/geckodriver/0.19.1-x64-geckodriver',
+        'node_modules/selenium-standalone/.selenium/geckodriver/0.20.1-x64-geckodriver',
     },
   },
   test_settings: {
diff --git a/package.json b/package.json
index de37ff004..adee3da8d 100644
--- a/package.json
+++ b/package.json
@@ -157,8 +157,8 @@
     "node-emoji": "^1.8.1",
     "node-fetch": "^1.7.2",
     "nodemailer": "^2.6.4",
-    "nunjucks": "^3.1.3",
     "npm-run-all": "^4.1.2",
+    "nunjucks": "^3.1.3",
     "parallel-webpack": "^2.2.0",
     "passport": "^0.4.0",
     "passport-jwt": "^3.0.0",
diff --git a/yarn.lock b/yarn.lock
index 59b3958d6..a4cec7ec7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -649,12 +649,18 @@ async@^1.4.0, async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
-async@^2.0.0, async@^2.1.2, async@^2.1.4, async@^2.4.1, async@~2.6.0:
+async@^2.0.0, async@^2.1.2, async@^2.4.1, async@~2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
   dependencies:
     lodash "^4.14.0"
 
+async@^2.1.4:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
+  dependencies:
+    lodash "^4.17.10"
+
 async@~0.2.6:
   version "0.2.10"
   resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
@@ -690,7 +696,11 @@ aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
 
-aws4@^1.2.1, aws4@^1.6.0:
+aws4@^1.2.1:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289"
+
+aws4@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
 
@@ -1413,10 +1423,11 @@ binary-extensions@^1.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
 
 bl@^1.0.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.1.tgz#cac328f7bee45730d404b692203fcb590e172d5e"
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c"
   dependencies:
-    readable-stream "^2.0.5"
+    readable-stream "^2.3.5"
+    safe-buffer "^5.1.1"
 
 block-stream@*:
   version "0.0.9"
@@ -1648,6 +1659,17 @@ bson@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/bson/-/bson-1.0.6.tgz#444db59ddd4c24f0cb063aabdc5c8c7b0ceca912"
 
+buffer-alloc-unsafe@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-0.1.1.tgz#ffe1f67551dd055737de253337bfe853dfab1a6a"
+
+buffer-alloc@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.1.0.tgz#05514d33bf1656d3540c684f65b1202e90eca303"
+  dependencies:
+    buffer-alloc-unsafe "^0.1.0"
+    buffer-fill "^0.1.0"
+
 buffer-crc32@^0.2.1, buffer-crc32@~0.2.3:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
@@ -1656,6 +1678,10 @@ buffer-equal-constant-time@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
 
+buffer-fill@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-0.1.1.tgz#76d825c4d6e50e06b7a31eb520c04d08cc235071"
+
 buffer-xor@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
@@ -2235,8 +2261,8 @@ colors@^1.1.2, colors@~1.1.2:
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
 
 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"
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
   dependencies:
     delayed-stream "~1.0.0"
 
@@ -2256,7 +2282,7 @@ commander@2.9.0:
   dependencies:
     graceful-readlink ">= 1.0.0"
 
-commander@^2.11.0, commander@^2.9.0:
+commander@^2.11.0:
   version "2.12.2"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
 
@@ -2264,6 +2290,10 @@ commander@^2.14.1:
   version "2.14.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa"
 
+commander@^2.9.0:
+  version "2.15.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
+
 commander@~2.13.0:
   version "2.13.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
@@ -2627,6 +2657,16 @@ cross-spawn@^5.0.1, cross-spawn@^5.1.0:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
+cross-spawn@^6.0.0:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
 crypt@~0.0.1:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
@@ -4097,6 +4137,10 @@ from@~0:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
 
+fs-constants@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
+
 fs-extra@^0.24.0:
   version "0.24.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.24.0.tgz#d4e4342a96675cb7846633a6099249332b539952"
@@ -5465,12 +5509,17 @@ is-ip@1.0.0:
   dependencies:
     ip-regex "^1.0.0"
 
+is-my-ip-valid@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824"
+
 is-my-json-valid@^2.12.4:
-  version "2.16.1"
-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz#5a846777e2c2620d1e69104e5d3a03b1f6088f11"
+  version "2.17.2"
+  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz#6b2103a288e94ef3de5cf15d29dd85fc4b78d65c"
   dependencies:
     generate-function "^2.0.0"
     generate-object-property "^1.1.0"
+    is-my-ip-valid "^1.0.0"
     jsonpointer "^4.0.0"
     xtend "^4.0.0"
 
@@ -6990,11 +7039,11 @@ lodash.values@^4.3.0:
   version "4.17.5"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
 
-lodash@^4.0.0, lodash@^4.1.0, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1:
+lodash@^4.0.0, lodash@^4.1.0, lodash@^4.2.0, lodash@^4.2.1:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
-lodash@^4.17.10:
+lodash@^4.14.0, lodash@^4.17.10, lodash@^4.17.4:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
@@ -7352,16 +7401,22 @@ miller-rabin@^4.0.0:
   version "1.30.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
 
-"mime-db@>= 1.33.0 < 2":
+"mime-db@>= 1.33.0 < 2", mime-db@~1.33.0:
   version "1.33.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
 
-mime-types@^2.1.10, mime-types@^2.1.12, mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.17, mime-types@~2.1.7:
+mime-types@^2.1.10, mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.17:
   version "2.1.17"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
   dependencies:
     mime-db "~1.30.0"
 
+mime-types@^2.1.12, mime-types@~2.1.7:
+  version "2.1.18"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
+  dependencies:
+    mime-db "~1.33.0"
+
 mime@1.4.1, mime@^1.3.4, mime@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
@@ -7702,6 +7757,10 @@ nib@~1.1.2:
   dependencies:
     stylus "0.54.5"
 
+nice-try@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.4.tgz#d93962f6c52f2c1558c0fbda6d512819f1efe1c4"
+
 nightwatch@^0.9.16:
   version "0.9.19"
   resolved "https://registry.yarnpkg.com/nightwatch/-/nightwatch-0.9.19.tgz#4bd9757273d30b845f04847a98b71be9bb7c4b3b"
@@ -8549,7 +8608,7 @@ path-is-inside@^1.0.1, path-is-inside@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
 
-path-key@^2.0.0:
+path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
 
@@ -9778,7 +9837,7 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.4, readable-stream@^2.1.5, readable-stream@^2.2.2:
+"readable-stream@1 || 2", readable-stream@^2.0.4, readable-stream@^2.1.5, readable-stream@^2.2.2:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.5.tgz#b4f85003a938cbb6ecbce2a124fb1012bd1a838d"
   dependencies:
@@ -9808,7 +9867,7 @@ readable-stream@1.1.x:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@2, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.3.3:
+readable-stream@2, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
   dependencies:
@@ -9820,6 +9879,18 @@ readable-stream@2, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stre
     string_decoder "~1.0.3"
     util-deprecate "~1.0.1"
 
+readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.3.0, readable-stream@^2.3.5:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
 readdirp@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
@@ -10050,31 +10121,6 @@ request@2, request@^2.55.0, request@^2.74.0, request@^2.81.0, request@^2.83.0:
     tunnel-agent "^0.6.0"
     uuid "^3.1.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:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.11.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~2.0.6"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    oauth-sign "~0.8.1"
-    qs "~6.3.0"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "~0.4.1"
-    uuid "^3.0.0"
-
 request@2.81.0:
   version "2.81.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
@@ -10102,6 +10148,56 @@ request@2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
+request@2.87.0:
+  version "2.87.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.6.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.1"
+    forever-agent "~0.6.1"
+    form-data "~2.3.1"
+    har-validator "~5.0.3"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.17"
+    oauth-sign "~0.8.2"
+    performance-now "^2.1.0"
+    qs "~6.5.1"
+    safe-buffer "^5.1.1"
+    tough-cookie "~2.3.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.1.0"
+
+request@~2.79.0:
+  version "2.79.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
+  dependencies:
+    aws-sign2 "~0.6.0"
+    aws4 "^1.2.1"
+    caseless "~0.11.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.0"
+    forever-agent "~0.6.1"
+    form-data "~2.1.1"
+    har-validator "~2.0.6"
+    hawk "~3.1.3"
+    http-signature "~1.1.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.7"
+    oauth-sign "~0.8.1"
+    qs "~6.3.0"
+    stringstream "~0.0.4"
+    tough-cookie "~2.3.0"
+    tunnel-agent "~0.4.1"
+    uuid "^3.0.0"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -10262,11 +10358,11 @@ rxjs@^5.4.2:
   dependencies:
     symbol-observable "1.0.1"
 
-safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
-safe-buffer@^5.1.2:
+safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
 
@@ -10367,19 +10463,19 @@ select@^1.1.2:
   resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
 
 selenium-standalone@^6.11.0:
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/selenium-standalone/-/selenium-standalone-6.12.0.tgz#789730db09a105f1cce12c6424d795d11c543bd4"
+  version "6.15.0"
+  resolved "https://registry.yarnpkg.com/selenium-standalone/-/selenium-standalone-6.15.0.tgz#c8dc77bd45154afbda7509ec53dc599809f63ee4"
   dependencies:
     async "^2.1.4"
     commander "^2.9.0"
-    cross-spawn "^5.1.0"
+    cross-spawn "^6.0.0"
     debug "^3.0.0"
     lodash "^4.17.4"
     minimist "^1.2.0"
     mkdirp "^0.5.1"
     progress "2.0.0"
-    request "2.79.0"
-    tar-stream "1.5.2"
+    request "2.87.0"
+    tar-stream "1.6.1"
     urijs "^1.18.4"
     which "^1.2.12"
     yauzl "^2.5.0"
@@ -10394,7 +10490,7 @@ semver-diff@^2.0.0:
   dependencies:
     semver "^5.0.3"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
@@ -10838,8 +10934,8 @@ srcset@^1.0.0:
     number-is-nan "^1.0.0"
 
 sshpk@^1.7.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.1.tgz#130f5975eddad963f1d56f92b9ac6c51fa9f83eb"
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
@@ -10992,6 +11088,12 @@ string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
 
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  dependencies:
+    safe-buffer "~5.1.0"
+
 stringify-object@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.2.2.tgz#9853052e5a88fb605a44cd27445aa257ad7ffbcd"
@@ -11000,7 +11102,11 @@ stringify-object@^3.2.2:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-stringstream@~0.0.4, stringstream@~0.0.5:
+stringstream@~0.0.4:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72"
+
+stringstream@~0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
 
@@ -11232,7 +11338,19 @@ tar-pack@^3.4.0:
     tar "^2.2.1"
     uid-number "^0.0.6"
 
-tar-stream@1.5.2, tar-stream@^1.1.2:
+tar-stream@1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.1.tgz#f84ef1696269d6223ca48f6e1eeede3f7e81f395"
+  dependencies:
+    bl "^1.0.0"
+    buffer-alloc "^1.1.0"
+    end-of-stream "^1.0.0"
+    fs-constants "^1.0.0"
+    readable-stream "^2.3.0"
+    to-buffer "^1.1.0"
+    xtend "^4.0.0"
+
+tar-stream@^1.1.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.5.2.tgz#fbc6c6e83c1a19d4cb48c7d96171fc248effc7bf"
   dependencies:
@@ -11391,6 +11509,10 @@ to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
 
+to-buffer@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
+
 to-capital-case@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/to-capital-case/-/to-capital-case-1.0.0.tgz#a57c5014fd5a37217cf05099ff8a421bbf9c9b7f"
@@ -11473,12 +11595,18 @@ touch@^3.1.0:
   dependencies:
     nopt "~1.0.10"
 
-tough-cookie@>=2.3.3, tough-cookie@^2.2.0, tough-cookie@^2.3.3, tough-cookie@~2.3.0, tough-cookie@~2.3.3:
+tough-cookie@>=2.3.3, tough-cookie@^2.2.0, tough-cookie@^2.3.3, tough-cookie@~2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
   dependencies:
     punycode "^1.4.1"
 
+tough-cookie@~2.3.0:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
+  dependencies:
+    punycode "^1.4.1"
+
 tr46@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
@@ -11742,8 +11870,8 @@ upper-case@^1.1.1:
   resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
 
 urijs@^1.18.4:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.0.tgz#d8aa284d0e7469703a6988ad045c4cbfdf08ada0"
+  version "1.19.1"
+  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.1.tgz#5b0ff530c0cbde8386f6342235ba5ca6e995d25a"
 
 urix@^0.1.0:
   version "0.1.0"
@@ -12008,12 +12136,18 @@ which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
 
-which@1, which@^1.2.10, which@^1.2.12, which@^1.2.9, which@^1.3.0:
+which@1, which@^1.2.10, which@^1.2.9, which@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
   dependencies:
     isexe "^2.0.0"
 
+which@^1.2.12:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  dependencies:
+    isexe "^2.0.0"
+
 wide-align@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710"

From b15a306c433beb44f518e209f6e2ca1310889439 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Mon, 28 May 2018 16:20:20 -0300
Subject: [PATCH 100/144] =?UTF-8?q?=C3=A7hanges?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/coral-admin/src/routes/Moderation/graphql.js | 5 +++++
 test/e2e/page_objects/popup.js                      | 4 +++-
 test/e2e/specs/05_banUser.js                        | 7 +++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/graphql.js b/client/coral-admin/src/routes/Moderation/graphql.js
index 8bb6349d8..31d124d93 100644
--- a/client/coral-admin/src/routes/Moderation/graphql.js
+++ b/client/coral-admin/src/routes/Moderation/graphql.js
@@ -298,6 +298,11 @@ export function handleCommentChange(
     notificationShown = true;
   };
 
+  console.log('root.me', root.me);
+  console.log('comment.status_history', comment.status_history);
+
+  debugger;
+
   Object.keys(queueConfig).forEach(queue => {
     // Comment should be placed in queue.
     if (nextQueues.indexOf(queue) >= 0) {
diff --git a/test/e2e/page_objects/popup.js b/test/e2e/page_objects/popup.js
index 824546e5b..cb35563f5 100644
--- a/test/e2e/page_objects/popup.js
+++ b/test/e2e/page_objects/popup.js
@@ -5,7 +5,9 @@ module.exports = {
         return this.waitForElementVisible('body');
       },
       login(user) {
-        return this.setValue('@emailInput', user.email)
+        return this.waitForElementVisible('@emailInput')
+          .setValue('@emailInput', user.email)
+          .waitForElementVisible('@passwordInput')
           .setValue('@passwordInput', user.password)
           .waitForElementVisible('@signIn')
           .waitForElementVisible('@loginButton')
diff --git a/test/e2e/specs/05_banUser.js b/test/e2e/specs/05_banUser.js
index 51055a180..6a5dfb12c 100644
--- a/test/e2e/specs/05_banUser.js
+++ b/test/e2e/specs/05_banUser.js
@@ -86,7 +86,7 @@ module.exports = {
       .waitForElementVisible('@firstRow')
       .waitForElementVisible('@dropdownStatus')
       .click('@dropdownStatus')
-      .waitForElementVisible('@dropdownStatusActive')
+      .waitForElementVisible('@optionRemoveBan')
       .click('@optionRemoveBan');
   },
   'admin logs out 2': client => {
@@ -154,8 +154,7 @@ module.exports = {
     const moderate = client.page.admin().section.moderate;
 
     moderate.click('@firstCommentApprove');
-
-    // TODO: check why this fails.
-    //  .waitForElementNotPresent('@firstComment');
+    client.pause(1000000);
+    moderate.waitForElementNotPresent('@firstComment');
   },
 };

From 3a84da94958d70e2df2e8fb6c30cc16310e35099 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 29 May 2018 16:42:04 +0200
Subject: [PATCH 101/144] Activate Websocket and add browser console logging

---
 bin/cli-assets                                |  2 +-
 bin/cli-token                                 |  2 +-
 bin/cli-users                                 |  2 +-
 .../src/routes/Moderation/graphql.js          |  5 ---
 package.json                                  |  2 +-
 scripts/e2e.js                                |  4 +-
 .../{utils => helpers}/SortedWindowHandler.js |  0
 test/e2e/helpers/printBrowserLog.js           | 37 +++++++++++++++++++
 test/e2e/page_objects/embedStream.js          |  2 +-
 test/e2e/specs/01_install.js                  |  5 ++-
 test/e2e/specs/02_admin.js                    |  5 ++-
 test/e2e/specs/03_embedStream.js              |  4 +-
 test/e2e/specs/04_userStatus.js               |  5 ++-
 test/e2e/specs/05_banUser.js                  | 10 +++--
 test/e2e/specs/06_suspendUser.js              |  4 +-
 yarn.lock                                     | 17 ++++++---
 16 files changed, 80 insertions(+), 26 deletions(-)
 rename test/e2e/{utils => helpers}/SortedWindowHandler.js (100%)
 create mode 100644 test/e2e/helpers/printBrowserLog.js

diff --git a/bin/cli-assets b/bin/cli-assets
index 5c1afb741..8242a02d6 100755
--- a/bin/cli-assets
+++ b/bin/cli-assets
@@ -7,7 +7,7 @@
 const util = require('./util');
 const program = require('commander');
 const parseDuration = require('ms');
-const Table = require('cli-table');
+const Table = require('cli-table2');
 const AssetModel = require('../models/asset');
 const CommentModel = require('../models/comment');
 const AssetsService = require('../services/assets');
diff --git a/bin/cli-token b/bin/cli-token
index b131728e6..0d4dc4e10 100755
--- a/bin/cli-token
+++ b/bin/cli-token
@@ -8,7 +8,7 @@ const util = require('./util');
 const program = require('commander');
 const mongoose = require('../services/mongoose');
 const TokensService = require('../services/tokens');
-const Table = require('cli-table');
+const Table = require('cli-table2');
 
 // Register the shutdown criteria.
 util.onshutdown([() => mongoose.disconnect()]);
diff --git a/bin/cli-users b/bin/cli-users
index bf34cce97..743119a0a 100755
--- a/bin/cli-users
+++ b/bin/cli-users
@@ -8,7 +8,7 @@ const util = require('./util');
 const program = require('commander');
 const inquirer = require('inquirer');
 const { stripIndent } = require('common-tags');
-const Table = require('cli-table');
+const Table = require('cli-table2');
 
 // Make things colorful!
 require('colors');
diff --git a/client/coral-admin/src/routes/Moderation/graphql.js b/client/coral-admin/src/routes/Moderation/graphql.js
index 31d124d93..8bb6349d8 100644
--- a/client/coral-admin/src/routes/Moderation/graphql.js
+++ b/client/coral-admin/src/routes/Moderation/graphql.js
@@ -298,11 +298,6 @@ export function handleCommentChange(
     notificationShown = true;
   };
 
-  console.log('root.me', root.me);
-  console.log('comment.status_history', comment.status_history);
-
-  debugger;
-
   Object.keys(queueConfig).forEach(queue => {
     // Comment should be placed in queue.
     if (nextQueues.indexOf(queue) >= 0) {
diff --git a/package.json b/package.json
index adee3da8d..a313c1ec0 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
     "brotli-webpack-plugin": "^0.5.0",
     "bunyan": "^1.8.12",
     "bunyan-debug-stream": "^1.0.8",
-    "cli-table": "^0.3.1",
+    "cli-table2": "^0.2.0",
     "clipboard": "^1.7.1",
     "colors": "^1.1.2",
     "commander": "^2.11.0",
diff --git a/scripts/e2e.js b/scripts/e2e.js
index 37ada228a..d86b3ba47 100755
--- a/scripts/e2e.js
+++ b/scripts/e2e.js
@@ -5,7 +5,7 @@ process.env['NODE_ENV'] = 'test';
 const browserstack = require('browserstack-local');
 const { onshutdown, shutdown } = require('../bin/util');
 const program = require('commander');
-const Table = require('cli-table');
+const Table = require('cli-table2');
 const serve = require('../serve');
 const childProcess = require('child_process');
 const uuid = require('uuid').v4;
@@ -181,7 +181,7 @@ class E2E {
       console.log('Dropping test database');
       await mongoose.connection.dropDatabase();
       console.log('Starting the server');
-      await serve();
+      await serve({ websockets: true });
 
       if (this.browserstackEnabled) {
         browserstack.localIdentifier = this.localIdentifier;
diff --git a/test/e2e/utils/SortedWindowHandler.js b/test/e2e/helpers/SortedWindowHandler.js
similarity index 100%
rename from test/e2e/utils/SortedWindowHandler.js
rename to test/e2e/helpers/SortedWindowHandler.js
diff --git a/test/e2e/helpers/printBrowserLog.js b/test/e2e/helpers/printBrowserLog.js
new file mode 100644
index 000000000..b40fb4507
--- /dev/null
+++ b/test/e2e/helpers/printBrowserLog.js
@@ -0,0 +1,37 @@
+// Make things colorful!
+require('colors');
+
+const Table = require('cli-table2');
+
+function getLevelColoried(level) {
+  switch (level) {
+    case 'WARNING':
+      return level.yellow;
+    case 'SEVERE':
+      return level.red;
+    default:
+      return level;
+  }
+}
+
+function printBrowserLog(client) {
+  return new Promise(resolve => {
+    client.getLog('browser', entries => {
+      if (entries.length) {
+        let table = new Table({
+          head: ['Level'.cyan, 'Message'.cyan],
+          wordWrap: true,
+          colWidths: [10, 80],
+        });
+
+        for (let entry of entries) {
+          table.push([getLevelColoried(entry.level), entry.message]);
+        }
+        console.log(table.toString());
+      }
+      resolve();
+    });
+  });
+}
+
+module.exports = printBrowserLog;
diff --git a/test/e2e/page_objects/embedStream.js b/test/e2e/page_objects/embedStream.js
index de3a29973..42dedefba 100644
--- a/test/e2e/page_objects/embedStream.js
+++ b/test/e2e/page_objects/embedStream.js
@@ -1,5 +1,5 @@
 const iframeId = 'coralStreamEmbed_iframe';
-const SortedWindowHandler = require('../utils/SortedWindowHandler');
+const SortedWindowHandler = require('../helpers/SortedWindowHandler');
 
 module.exports = {
   commands: [
diff --git a/test/e2e/specs/01_install.js b/test/e2e/specs/01_install.js
index 75e6a60eb..91f08f7af 100644
--- a/test/e2e/specs/01_install.js
+++ b/test/e2e/specs/01_install.js
@@ -1,3 +1,5 @@
+const printBrowserLog = require('../helpers/printBrowserLog');
+
 module.exports = {
   '@tags': ['install'],
 
@@ -6,7 +8,8 @@ module.exports = {
     client.resizeWindow(1600, 1200);
   },
 
-  afterEach: (client, done) => {
+  afterEach: async (client, done) => {
+    await printBrowserLog(client);
     if (client.currentTest.results.failed) {
       throw new Error('Test Case failed, skipping all the rest');
     }
diff --git a/test/e2e/specs/02_admin.js b/test/e2e/specs/02_admin.js
index 07f5b574c..844e653fe 100644
--- a/test/e2e/specs/02_admin.js
+++ b/test/e2e/specs/02_admin.js
@@ -1,3 +1,5 @@
+const printBrowserLog = require('../helpers/printBrowserLog');
+
 module.exports = {
   '@tags': ['admin', 'login'],
 
@@ -6,7 +8,8 @@ module.exports = {
     client.resizeWindow(1024, 800);
   },
 
-  afterEach: (client, done) => {
+  afterEach: async (client, done) => {
+    await printBrowserLog(client);
     if (client.currentTest.results.failed) {
       throw new Error('Test Case failed, skipping all the rest');
     }
diff --git a/test/e2e/specs/03_embedStream.js b/test/e2e/specs/03_embedStream.js
index 9eca7a736..d98c0f9a7 100644
--- a/test/e2e/specs/03_embedStream.js
+++ b/test/e2e/specs/03_embedStream.js
@@ -1,3 +1,4 @@
+const printBrowserLog = require('../helpers/printBrowserLog');
 const commentBody = 'Embed Stream Test';
 
 module.exports = {
@@ -8,7 +9,8 @@ module.exports = {
     client.resizeWindow(1600, 1200);
   },
 
-  afterEach: (client, done) => {
+  afterEach: async (client, done) => {
+    await printBrowserLog(client);
     if (client.currentTest.results.failed) {
       throw new Error('Test Case failed, skipping all the rest');
     }
diff --git a/test/e2e/specs/04_userStatus.js b/test/e2e/specs/04_userStatus.js
index 8d659221d..c54aa308c 100644
--- a/test/e2e/specs/04_userStatus.js
+++ b/test/e2e/specs/04_userStatus.js
@@ -1,10 +1,13 @@
+const printBrowserLog = require('../helpers/printBrowserLog');
+
 module.exports = {
   before: client => {
     client.setWindowPosition(0, 0);
     client.resizeWindow(1600, 1200);
   },
 
-  afterEach: (client, done) => {
+  afterEach: async (client, done) => {
+    await printBrowserLog(client);
     if (client.currentTest.results.failed) {
       throw new Error('Test Case failed, skipping all the rest');
     }
diff --git a/test/e2e/specs/05_banUser.js b/test/e2e/specs/05_banUser.js
index 6a5dfb12c..3f6a33cf9 100644
--- a/test/e2e/specs/05_banUser.js
+++ b/test/e2e/specs/05_banUser.js
@@ -1,3 +1,4 @@
+const printBrowserLog = require('../helpers/printBrowserLog');
 const commentBody = 'Ban User Test';
 
 module.exports = {
@@ -6,7 +7,8 @@ module.exports = {
     client.resizeWindow(1600, 1200);
   },
 
-  afterEach: (client, done) => {
+  afterEach: async (client, done) => {
+    await printBrowserLog(client);
     if (client.currentTest.results.failed) {
       throw new Error('Test Case failed, skipping all the rest');
     }
@@ -153,8 +155,8 @@ module.exports = {
   'approve comment to restore karma': client => {
     const moderate = client.page.admin().section.moderate;
 
-    moderate.click('@firstCommentApprove');
-    client.pause(1000000);
-    moderate.waitForElementNotPresent('@firstComment');
+    moderate
+      .click('@firstCommentApprove')
+      .waitForElementNotPresent('@firstComment');
   },
 };
diff --git a/test/e2e/specs/06_suspendUser.js b/test/e2e/specs/06_suspendUser.js
index e02f21db9..1febe820c 100644
--- a/test/e2e/specs/06_suspendUser.js
+++ b/test/e2e/specs/06_suspendUser.js
@@ -1,3 +1,4 @@
+const printBrowserLog = require('../helpers/printBrowserLog');
 const commentBody = 'Suspend User Test';
 
 module.exports = {
@@ -6,7 +7,8 @@ module.exports = {
     client.resizeWindow(1600, 1200);
   },
 
-  afterEach: (client, done) => {
+  afterEach: async (client, done) => {
+    await printBrowserLog(client);
     if (client.currentTest.results.failed) {
       throw new Error('Test Case failed, skipping all the rest');
     }
diff --git a/yarn.lock b/yarn.lock
index a4cec7ec7..0f6606433 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2114,11 +2114,14 @@ cli-spinners@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-0.1.2.tgz#bb764d88e185fb9e1e6a2a1f19772318f605e31c"
 
-cli-table@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"
+cli-table2@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/cli-table2/-/cli-table2-0.2.0.tgz#2d1ef7f218a0e786e214540562d4bd177fe32d97"
   dependencies:
-    colors "1.0.3"
+    lodash "^3.10.1"
+    string-width "^1.0.1"
+  optionalDependencies:
+    colors "^1.1.2"
 
 cli-truncate@^0.2.1:
   version "0.2.1"
@@ -2248,7 +2251,7 @@ colors@0.5.x:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/colors/-/colors-0.5.1.tgz#7d0023eaeb154e8ee9fce75dcb923d0ed1667774"
 
-colors@1.0.3, colors@1.0.x:
+colors@1.0.x:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
 
@@ -7039,6 +7042,10 @@ lodash.values@^4.3.0:
   version "4.17.5"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
 
+lodash@^3.10.1:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
+
 lodash@^4.0.0, lodash@^4.1.0, lodash@^4.2.0, lodash@^4.2.1:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"

From 576820f1f8cd30ce82516a8419eaa767dea78f7b Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 29 May 2018 16:50:11 +0200
Subject: [PATCH 102/144] Fix warnings

---
 client/coral-framework/components/TalkProvider.js      |  2 +-
 .../talk-plugin-auth/client/login/components/SignUp.js | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/coral-framework/components/TalkProvider.js b/client/coral-framework/components/TalkProvider.js
index 9caba7fb8..804e57862 100644
--- a/client/coral-framework/components/TalkProvider.js
+++ b/client/coral-framework/components/TalkProvider.js
@@ -1,5 +1,5 @@
 import React from 'react';
-const PropTypes = require('prop-types');
+import PropTypes from 'prop-types';
 import { ApolloProvider } from 'react-apollo';
 
 class TalkProvider extends React.Component {
diff --git a/plugins/talk-plugin-auth/client/login/components/SignUp.js b/plugins/talk-plugin-auth/client/login/components/SignUp.js
index 96dadcd67..878b53b5d 100644
--- a/plugins/talk-plugin-auth/client/login/components/SignUp.js
+++ b/plugins/talk-plugin-auth/client/login/components/SignUp.js
@@ -75,7 +75,7 @@ class SignUp extends React.Component {
                 showErrors={!!emailError}
                 errorMsg={emailError}
                 onChange={this.handleEmailChange}
-                autocomplete="off"
+                autoComplete="off"
               />
               <TextField
                 id="username"
@@ -86,8 +86,8 @@ class SignUp extends React.Component {
                 showErrors={!!usernameError}
                 errorMsg={usernameError}
                 onChange={this.handleUsernameChange}
-                autocomplete="off"
-                autocapitalize="none"
+                autoComplete="off"
+                autoCapitalize="none"
               />
               <TextField
                 id="password"
@@ -99,7 +99,7 @@ class SignUp extends React.Component {
                 errorMsg={passwordError}
                 onChange={this.handlePasswordChange}
                 minLength="8"
-                autocomplete="off"
+                autoComplete="off"
               />
               {passwordError && (
                 <span className={styles.hint}>
@@ -116,7 +116,7 @@ class SignUp extends React.Component {
                 errorMsg={passwordRepeatError}
                 onChange={this.handlePasswordRepeatChange}
                 minLength="8"
-                autocomplete="off"
+                autoComplete="off"
               />
               <Slot
                 fill="talkPluginAuth.formField"

From 606f46333192484794b562bf8b094417c6b643a6 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 29 May 2018 16:52:07 +0200
Subject: [PATCH 103/144] Typo

---
 test/e2e/helpers/printBrowserLog.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/e2e/helpers/printBrowserLog.js b/test/e2e/helpers/printBrowserLog.js
index b40fb4507..a9b8e50f4 100644
--- a/test/e2e/helpers/printBrowserLog.js
+++ b/test/e2e/helpers/printBrowserLog.js
@@ -3,7 +3,7 @@ require('colors');
 
 const Table = require('cli-table2');
 
-function getLevelColoried(level) {
+function getLevelColorized(level) {
   switch (level) {
     case 'WARNING':
       return level.yellow;
@@ -25,7 +25,7 @@ function printBrowserLog(client) {
         });
 
         for (let entry of entries) {
-          table.push([getLevelColoried(entry.level), entry.message]);
+          table.push([getLevelColorized(entry.level), entry.message]);
         }
         console.log(table.toString());
       }

From 25947cb27851f20efe825a3ec43a3a2cf668b0f0 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Tue, 29 May 2018 12:41:54 -0300
Subject: [PATCH 104/144] Reject Username fully working

---
 .../src/components/RejectUsernameDialog.js    | 207 +++++++-----------
 .../coral-admin/src/components/UserDetail.js  |  14 +-
 .../src/containers/RejectUsernameDialog.js    | 137 ++++++------
 3 files changed, 144 insertions(+), 214 deletions(-)

diff --git a/client/coral-admin/src/components/RejectUsernameDialog.js b/client/coral-admin/src/components/RejectUsernameDialog.js
index cdd211bc4..a15d5e02a 100644
--- a/client/coral-admin/src/components/RejectUsernameDialog.js
+++ b/client/coral-admin/src/components/RejectUsernameDialog.js
@@ -1,23 +1,15 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Dialog } from 'coral-ui';
-import { RadioGroup, Radio } from 'react-mdl';
 import styles from './SuspendUserDialog.css';
 import cn from 'classnames';
-
+import { RadioGroup, Radio } from 'react-mdl';
 import Button from 'coral-ui/components/Button';
+import { username as flagReason } from 'coral-framework/graphql/flagReasons';
 
-import t, { timeago } from 'coral-framework/services/i18n';
-import { dateAdd } from 'coral-framework/utils';
+const initialState = { reason: flagReason.offensive, message: '' };
 
-const initialState = { step: 0, duration: '3' };
-
-function durationsToDate(hours) {
-  // Add 1 minute more to help `timeago.js` to display the correct duration.
-  return dateAdd(new Date(), 'minute', hours * 60 + 1);
-}
-
-class SuspendUserDialog extends React.Component {
+class RejectUsernameDialog extends React.Component {
   state = initialState;
 
   componentWillReceiveProps(next) {
@@ -26,138 +18,28 @@ class SuspendUserDialog extends React.Component {
     }
   }
 
-  handleDurationChange = event => {
-    this.setState({ duration: event.target.value });
+  handleReasonChange = event => {
+    this.setState({ reason: event.target.value });
   };
 
   handleMessageChange = event => {
     this.setState({ message: event.target.value });
   };
 
-  goToStep1 = () => {
-    this.setState({
-      step: 1,
-      message: t(
-        'suspenduser.email_message_suspend',
-        this.props.username,
-        this.props.organizationName,
-        timeago(durationsToDate(this.state.duration))
-      ),
-    });
-  };
-
   handlePerform = () => {
     this.props.onPerform({
+      reason: this.state.reason,
       message: this.state.message,
-
-      // Add 1 minute more to help `timeago.js` to display the correct duration.
-      until: durationsToDate(this.state.duration),
     });
   };
 
-  renderStep0() {
-    const { onCancel, username } = this.props;
-    const { duration } = this.state;
-    return (
-      <section className="talk-admin-suspend-user-dialog-step-0">
-        <h1 className={styles.header}>{t('suspenduser.title_suspend')}</h1>
-        <p className={styles.description}>
-          {t('suspenduser.description_suspend', username)}
-        </p>
-        <fieldset>
-          <legend className={styles.legend}>
-            {t('suspenduser.select_duration')}
-          </legend>
-          <RadioGroup
-            name="status filter"
-            value={duration}
-            childContainer="div"
-            onChange={this.handleDurationChange}
-            className={styles.radioGroup}
-          >
-            <Radio value="1">{t('suspenduser.one_hour')}</Radio>
-            <Radio value="3">{t('suspenduser.hours', 3)}</Radio>
-            <Radio value="24">{t('suspenduser.hours', 24)}</Radio>
-            <Radio value="168">{t('suspenduser.days', 7)}</Radio>
-          </RadioGroup>
-        </fieldset>
-        <div className={styles.buttons}>
-          <Button
-            cStyle="white"
-            className={styles.cancel}
-            onClick={onCancel}
-            raised
-          >
-            {t('suspenduser.cancel')}
-          </Button>
-          <Button
-            cStyle="black"
-            className={cn(
-              styles.perform,
-              'talk-admin-suspend-user-dialog-confirm'
-            )}
-            onClick={this.goToStep1}
-            raised
-          >
-            {t('suspenduser.suspend_user')}
-          </Button>
-        </div>
-      </section>
-    );
-  }
-
-  renderStep1() {
-    const { message } = this.state;
-    const { onCancel, username } = this.props;
-    return (
-      <section className="talk-admin-suspend-user-dialog-step-1">
-        <h1 className={styles.header}>{t('suspenduser.title_notify')}</h1>
-        <p className={styles.description}>
-          {t('suspenduser.description_notify', username)}
-        </p>
-        <fieldset>
-          <legend className={styles.legend}>
-            {t('suspenduser.write_message')}
-          </legend>
-          <textarea
-            rows={5}
-            className={styles.messageInput}
-            value={message}
-            onChange={this.handleMessageChange}
-          />
-        </fieldset>
-        <div className={styles.buttons}>
-          <Button
-            cStyle="white"
-            className={styles.cancel}
-            onClick={onCancel}
-            raised
-          >
-            {t('suspenduser.cancel')}
-          </Button>
-          <Button
-            cStyle="black"
-            className={cn(
-              styles.perform,
-              'talk-admin-suspend-user-dialog-send'
-            )}
-            onClick={this.handlePerform}
-            disabled={this.state.message.length === 0}
-            raised
-          >
-            {t('suspenduser.send')}
-          </Button>
-        </div>
-      </section>
-    );
-  }
-
   render() {
     const { open, onCancel } = this.props;
-    const { step } = this.state;
+    const { reason, message } = this.state;
     return (
       <Dialog
-        className={cn(styles.dialog, 'talk-admin-suspend-user-dialog')}
+        className={cn(styles.dialog, 'talk-admin-reject-username-dialog')}
+        id="rejectUsernameDialog"
         onCancel={onCancel}
         open={open}
       >
@@ -170,19 +52,78 @@ class SuspendUserDialog extends React.Component {
             ×
           </button>
         </div>
-        {step === 0 && this.renderStep0()}
-        {step === 1 && this.renderStep1()}
+        <section className="talk-admin-reject-username-dialog-section">
+          <h1 className={styles.header}>
+            Reject Username: {this.props.username}
+          </h1>
+          <p className={styles.description}>Help us understand</p>
+          <fieldset>
+            <legend className={styles.legend}>Reason</legend>
+            <RadioGroup
+              name="reason"
+              value={reason}
+              childContainer="div"
+              onChange={this.handleReasonChange}
+              className={styles.radioGroup}
+            >
+              <Radio value={flagReason.offensive}>
+                This username is offensive
+              </Radio>
+              <Radio value={flagReason.nolike}>I dont like this username</Radio>
+              <Radio value={flagReason.impersonating}>
+                This user is impersonating
+              </Radio>
+              <Radio value={flagReason.spam}>
+                This looks like an ad/marketing
+              </Radio>
+              <Radio value={flagReason.other}>Other</Radio>
+            </RadioGroup>
+            {reason === flagReason.other && (
+              <fieldset>
+                <legend className={styles.legend}>
+                  Reason for reporting (Optional)
+                </legend>
+                <textarea
+                  rows={5}
+                  className={styles.messageInput}
+                  value={message}
+                  onChange={this.handleMessageChange}
+                />
+              </fieldset>
+            )}
+          </fieldset>
+          <div className={styles.buttons}>
+            <Button
+              cStyle="white"
+              className={styles.cancel}
+              onClick={onCancel}
+              raised
+            >
+              Cancel
+            </Button>
+            <Button
+              cStyle="black"
+              className={cn(
+                styles.perform,
+                'talk-admin-reject-username-dialog-continue'
+              )}
+              onClick={this.handlePerform}
+              raised
+            >
+              Reject Username
+            </Button>
+          </div>
+        </section>
       </Dialog>
     );
   }
 }
 
-SuspendUserDialog.propTypes = {
+RejectUsernameDialog.propTypes = {
   open: PropTypes.bool.isRequired,
   onPerform: PropTypes.func.isRequired,
   onCancel: PropTypes.func.isRequired,
-  organizationName: PropTypes.string,
   username: PropTypes.string,
 };
 
-export default SuspendUserDialog;
+export default RejectUsernameDialog;
diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index 5572c7d71..70238ecd5 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -51,8 +51,8 @@ class UserDetail extends React.Component {
       username: this.props.root.user.username,
     });
 
-  showRejectUsername = () =>
-    this.props.showBanUserDialog({
+  showRejectUsernameDialog = () =>
+    this.props.showRejectUsernameDialog({
       userId: this.props.root.user.id,
       username: this.props.root.user.username,
     });
@@ -118,13 +118,6 @@ class UserDetail extends React.Component {
     router.push('/admin/community/flagged');
   };
 
-  rejectUsername = data => {
-    // trigger modal or tooltip
-    // flag user and then
-    // perform rejection
-    this.props.rejectUsername(data);
-  };
-
   renderLoaded() {
     const {
       root,
@@ -236,7 +229,7 @@ class UserDetail extends React.Component {
                 </ActionsMenuItem>
               ) : (
                 <ActionsMenuItem
-                  onClick={this.showRejectUsername}
+                  onClick={this.showRejectUsernameDialog}
                   disabled={me.id === user.id}
                 >
                   {t('user_detail.reject_username')}
@@ -450,6 +443,7 @@ UserDetail.propTypes = {
   selectedCommentIds: PropTypes.array.isRequired,
   viewUserDetail: PropTypes.any.isRequired,
   loadMore: PropTypes.any.isRequired,
+  showRejectUsernameDialog: PropTypes.func,
   showSuspendUserDialog: PropTypes.func,
   showBanUserDialog: PropTypes.func,
   unbanUser: PropTypes.func.isRequired,
diff --git a/client/coral-admin/src/containers/RejectUsernameDialog.js b/client/coral-admin/src/containers/RejectUsernameDialog.js
index 83551200f..d2a2e61fa 100644
--- a/client/coral-admin/src/containers/RejectUsernameDialog.js
+++ b/client/coral-admin/src/containers/RejectUsernameDialog.js
@@ -1,79 +1,74 @@
-// import React, { Component } from 'react';
-// import PropTypes from 'prop-types';
-// import { connect } from 'react-redux';
-// import { bindActionCreators } from 'redux';
-// import RejectUsernameDialog from '../components/RejectUsernameDialog';
-// import { hideRejectUsernameDialog } from '../actions/rejectUsernameDialog';
-// import { withRejectUsername } from 'coral-framework/graphql/mutations';
-// import { compose } from 'react-apollo';
-// import t from 'coral-framework/services/i18n';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+import { bindActionCreators } from 'redux';
+import RejectUsernameDialog from '../components/RejectUsernameDialog';
+import { hideRejectUsernameDialog } from '../actions/rejectUsernameDialog';
+import {
+  withRejectUsername,
+  withPostFlag,
+} from 'coral-framework/graphql/mutations';
+import { compose } from 'react-apollo';
 
-// class RejectUsernameDialogContainer extends Component {
-//   banUser = async () => {
-//     const {
-//       userId,
-//       commentId,
-//       commentStatus,
-//       banUser,
-//       setCommentStatus,
-//       hideBanUserDialog,
-//     } = this.props;
-//     await banUser({ id: userId, message: '' });
-//     hideBanUserDialog();
-//     if (commentId && commentStatus && commentStatus !== 'REJECTED') {
-//       await setCommentStatus({ commentId, status: 'REJECTED' });
-//     }
-//   };
+class RejectUsernameDialogContainer extends Component {
+  rejectUsername = async ({ reason, message }) => {
+    const {
+      postFlag,
+      rejectUsername,
+      hideRejectUsernameDialog,
+      userId,
+    } = this.props;
 
-//   getInfo() {
-//     let note = t('bandialog.note_ban_user');
-//     if (this.props.commentStatus && this.props.commentStatus !== 'REJECTED') {
-//       note = t('bandialog.note_reject_comment');
-//     }
-//     return t('bandialog.note', note);
-//   }
+    await postFlag({
+      item_id: userId,
+      item_type: 'USERS',
+      reason,
+      message,
+    });
 
-//   render() {
-//     return (
-//       <BanUserDialog
-//         open={RejectUsernameDialog.props.open}
-//         onPerform={this.banUser}
-//         onCancel={this.props.hideBanUserDialog}
-//         username={this.props.username}
+    await rejectUsername({ id: userId });
+    hideRejectUsernameDialog();
+  };
 
-//       />
-//     );
-//   }
-// }
+  render() {
+    return (
+      <RejectUsernameDialog
+        open={this.props.open}
+        onPerform={this.rejectUsername}
+        onCancel={this.props.hideRejectUsernameDialog}
+        username={this.props.username}
+      />
+    );
+  }
+}
 
-// BanUserDialogContainer.propTypes = {
-//   banUser: PropTypes.func.isRequired,
-//   hideBanUserDialog: PropTypes.func,
-//   open: PropTypes.bool,
-//   username: PropTypes.string,
-//   commentStatus: PropTypes.string,
-// };
+RejectUsernameDialogContainer.propTypes = {
+  rejectUsername: PropTypes.func.isRequired,
+  hideRejectUsernameDialog: PropTypes.func,
+  open: PropTypes.bool,
+  userId: PropTypes.string,
+  username: PropTypes.string,
+};
 
-// const mapStateToProps = ({
-//   banUserDialog: { open, userId, username, commentId, commentStatus },
-// }) => ({
-//   open,
-//   userId,
-//   username,
-//   commentId,
-//   commentStatus,
-// });
+const mapStateToProps = ({
+  rejectUsernameDialog: { open, userId, username },
+}) => ({
+  open,
+  userId,
+  username,
+});
 
-// const mapDispatchToProps = dispatch => ({
-//   ...bindActionCreators(
-//     {
-//       hideRejectUsernameDialog,
-//     },
-//     dispatch
-//   ),
-// });
+const mapDispatchToProps = dispatch => ({
+  ...bindActionCreators(
+    {
+      hideRejectUsernameDialog,
+    },
+    dispatch
+  ),
+});
 
-// export default compose(
-//   connect(mapStateToProps, mapDispatchToProps),
-//   withRejectUsername
-// )(RejectUsernameDialogContainer);
+export default compose(
+  connect(mapStateToProps, mapDispatchToProps),
+  withRejectUsername,
+  withPostFlag
+)(RejectUsernameDialogContainer);

From 6f06ac760cba6c198d66af6b6ddb490736a6dcc6 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Tue, 29 May 2018 12:58:26 -0300
Subject: [PATCH 105/144] Translations

---
 .../src/components/RejectUsernameDialog.js    | 31 +++++++++++--------
 locales/en.yml                                | 13 ++++++++
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/client/coral-admin/src/components/RejectUsernameDialog.js b/client/coral-admin/src/components/RejectUsernameDialog.js
index a15d5e02a..4fe9d8462 100644
--- a/client/coral-admin/src/components/RejectUsernameDialog.js
+++ b/client/coral-admin/src/components/RejectUsernameDialog.js
@@ -6,6 +6,7 @@ import cn from 'classnames';
 import { RadioGroup, Radio } from 'react-mdl';
 import Button from 'coral-ui/components/Button';
 import { username as flagReason } from 'coral-framework/graphql/flagReasons';
+import t from 'coral-framework/services/i18n';
 
 const initialState = { reason: flagReason.offensive, message: '' };
 
@@ -54,11 +55,15 @@ class RejectUsernameDialog extends React.Component {
         </div>
         <section className="talk-admin-reject-username-dialog-section">
           <h1 className={styles.header}>
-            Reject Username: {this.props.username}
+            {t('reject_username_dialog.title')}: {this.props.username}
           </h1>
-          <p className={styles.description}>Help us understand</p>
+          <p className={styles.description}>
+            {t('reject_username_dialog.description')}
+          </p>
           <fieldset>
-            <legend className={styles.legend}>Reason</legend>
+            <legend className={styles.legend}>
+              {t('reject_username_dialog.reason')}
+            </legend>
             <RadioGroup
               name="reason"
               value={reason}
@@ -67,21 +72,21 @@ class RejectUsernameDialog extends React.Component {
               className={styles.radioGroup}
             >
               <Radio value={flagReason.offensive}>
-                This username is offensive
+                {t('flag_reasons.offensive')}
+              </Radio>
+              <Radio value={flagReason.nolike}>
+                {t('flag_reasons.nolike')}
               </Radio>
-              <Radio value={flagReason.nolike}>I dont like this username</Radio>
               <Radio value={flagReason.impersonating}>
-                This user is impersonating
+                {t('flag_reasons.impersonating')}
               </Radio>
-              <Radio value={flagReason.spam}>
-                This looks like an ad/marketing
-              </Radio>
-              <Radio value={flagReason.other}>Other</Radio>
+              <Radio value={flagReason.spam}>{t('flag_reasons.spam')}</Radio>
+              <Radio value={flagReason.other}>{t('flag_reasons.other')}</Radio>
             </RadioGroup>
             {reason === flagReason.other && (
               <fieldset>
                 <legend className={styles.legend}>
-                  Reason for reporting (Optional)
+                  {t('reject_username_dialog.message')}
                 </legend>
                 <textarea
                   rows={5}
@@ -99,7 +104,7 @@ class RejectUsernameDialog extends React.Component {
               onClick={onCancel}
               raised
             >
-              Cancel
+              {t('reject_username_dialog.cancel')}
             </Button>
             <Button
               cStyle="black"
@@ -110,7 +115,7 @@ class RejectUsernameDialog extends React.Component {
               onClick={this.handlePerform}
               raised
             >
-              Reject Username
+              {t('reject_username_dialog.reject_username')}
             </Button>
           </div>
         </section>
diff --git a/locales/en.yml b/locales/en.yml
index 808c9a86f..0c9f05a9e 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -3,6 +3,19 @@ en:
   your_account_has_been_banned: Your account has been banned.
   your_username_has_been_rejected: Your account has been suspended because your username has been deemed inappropriate. To restore your account please enter a new username.
   embed_comments_tab: Comments
+  reject_username_dialog:
+    title: "Reject Username"
+    description: "Help us understand"
+    reason: "Reason"
+    message: "Reason for reporting (Optional)"
+    cancel: "Cancel"
+    reject_username: "Reject Username" 
+  flag_reasons:
+    offensive: "This username is offensive"
+    nolike: "I dont likes this username"
+    impersonating: "This username is offensive"
+    spam: "This username is offensive"
+    other: "Other"
   bandialog:
     are_you_sure: "Are you sure you would like to ban {0}?"
     ban_user: "Ban User?"

From 4f76163541fd8e5dab36132e2588e68006eb05bb Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Tue, 29 May 2018 13:00:24 -0300
Subject: [PATCH 106/144] Adding translations

---
 .../src/components/RejectUsernameDialog.js         | 14 +++++++++-----
 locales/en.yml                                     | 11 ++++++-----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/client/coral-admin/src/components/RejectUsernameDialog.js b/client/coral-admin/src/components/RejectUsernameDialog.js
index 4fe9d8462..a3e97c8b8 100644
--- a/client/coral-admin/src/components/RejectUsernameDialog.js
+++ b/client/coral-admin/src/components/RejectUsernameDialog.js
@@ -72,16 +72,20 @@ class RejectUsernameDialog extends React.Component {
               className={styles.radioGroup}
             >
               <Radio value={flagReason.offensive}>
-                {t('flag_reasons.offensive')}
+                {t('flag_reasons.username.offensive')}
               </Radio>
               <Radio value={flagReason.nolike}>
-                {t('flag_reasons.nolike')}
+                {t('flag_reasons.username.nolike')}
               </Radio>
               <Radio value={flagReason.impersonating}>
-                {t('flag_reasons.impersonating')}
+                {t('flag_reasons.username.impersonating')}
+              </Radio>
+              <Radio value={flagReason.spam}>
+                {t('flag_reasons.username.spam')}
+              </Radio>
+              <Radio value={flagReason.other}>
+                {t('flag_reasons.username.other')}
               </Radio>
-              <Radio value={flagReason.spam}>{t('flag_reasons.spam')}</Radio>
-              <Radio value={flagReason.other}>{t('flag_reasons.other')}</Radio>
             </RadioGroup>
             {reason === flagReason.other && (
               <fieldset>
diff --git a/locales/en.yml b/locales/en.yml
index 0c9f05a9e..4def7e54b 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -11,11 +11,12 @@ en:
     cancel: "Cancel"
     reject_username: "Reject Username" 
   flag_reasons:
-    offensive: "This username is offensive"
-    nolike: "I dont likes this username"
-    impersonating: "This username is offensive"
-    spam: "This username is offensive"
-    other: "Other"
+    username: 
+      offensive: "This username is offensive"
+      nolike: "I dont likes this username"
+      impersonating: "This username is offensive"
+      spam: "This username is offensive"
+      other: "Other"
   bandialog:
     are_you_sure: "Are you sure you would like to ban {0}?"
     ban_user: "Ban User?"

From 595e19231e6dcf249e49817f026c6b00f9b392f2 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Tue, 29 May 2018 13:24:53 -0300
Subject: [PATCH 107/144] if username changed, reject username should be
 disabled

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

diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index 70238ecd5..addac9eda 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -230,7 +230,7 @@ class UserDetail extends React.Component {
               ) : (
                 <ActionsMenuItem
                   onClick={this.showRejectUsernameDialog}
-                  disabled={me.id === user.id}
+                  disabled={me.id === user.id || usernameChanged}
                 >
                   {t('user_detail.reject_username')}
                 </ActionsMenuItem>

From 5c7345313e0bcb9c106a85d1b840d98fcd2649b4 Mon Sep 17 00:00:00 2001
From: Leandro <leeeandroo@gmail.com>
Date: Wed, 30 May 2018 09:25:10 +0200
Subject: [PATCH 108/144] remove unused method

---
 client/coral-admin/src/components/BanUserDialog.js | 10 ++++++++--
 client/coral-admin/src/containers/BanUserDialog.js |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/client/coral-admin/src/components/BanUserDialog.js b/client/coral-admin/src/components/BanUserDialog.js
index 430ee2fe4..a5a2d2a5f 100644
--- a/client/coral-admin/src/components/BanUserDialog.js
+++ b/client/coral-admin/src/components/BanUserDialog.js
@@ -30,6 +30,12 @@ class BanUserDialog extends React.Component {
     });
   };
 
+  handlePerform = () => {
+    this.props.onPerform({
+      message: this.state.message,
+    });
+  };
+
   renderStep0() {
     const { onCancel, username, info } = this.props;
 
@@ -63,7 +69,7 @@ class BanUserDialog extends React.Component {
   }
 
   renderStep1() {
-    const { onCancel, onPerform } = this.props;
+    const { onCancel } = this.props;
     const { message } = this.state;
 
     return (
@@ -95,7 +101,7 @@ class BanUserDialog extends React.Component {
           <Button
             className={cn('talk-ban-user-dialog-button-confirm')}
             cStyle="black"
-            onClick={onPerform}
+            onClick={this.handlePerform}
             raised
           >
             {t('bandialog.send')}
diff --git a/client/coral-admin/src/containers/BanUserDialog.js b/client/coral-admin/src/containers/BanUserDialog.js
index 3617902ff..c869626c9 100644
--- a/client/coral-admin/src/containers/BanUserDialog.js
+++ b/client/coral-admin/src/containers/BanUserDialog.js
@@ -12,7 +12,7 @@ import { compose } from 'react-apollo';
 import t from 'coral-framework/services/i18n';
 
 class BanUserDialogContainer extends Component {
-  banUser = async () => {
+  banUser = async ({ message }) => {
     const {
       userId,
       commentId,
@@ -21,7 +21,7 @@ class BanUserDialogContainer extends Component {
       setCommentStatus,
       hideBanUserDialog,
     } = this.props;
-    await banUser({ id: userId, message: '' });
+    await banUser({ id: userId, message });
     hideBanUserDialog();
     if (commentId && commentStatus && commentStatus !== 'REJECTED') {
       await setCommentStatus({ commentId, status: 'REJECTED' });

From b9e3a01cddc7708561508ab598ccfba724852e23 Mon Sep 17 00:00:00 2001
From: Cristian <cristian.dean@corp.globo.com>
Date: Wed, 30 May 2018 09:19:59 -0300
Subject: [PATCH 109/144] Added missing translation pt_BR

---
 locales/pt_BR.yml | 75 ++++++++++++++++++++++++-----------------------
 1 file changed, 39 insertions(+), 36 deletions(-)

diff --git a/locales/pt_BR.yml b/locales/pt_BR.yml
index c464480e0..82e2d27d9 100644
--- a/locales/pt_BR.yml
+++ b/locales/pt_BR.yml
@@ -12,26 +12,26 @@ pt_BR:
     note_reject_comment: "Banir esse usuário também colocará esse comentário na fila rejeitada."
     note_ban_user: "Banir este usuário não os permitirá editar comentários ou remover qualquer coisa."
     yes_ban_user: "Sim, banir o usuário"
-    write_a_message: "Write a message"
-    send: "Send"
-    notify_ban_headline: "Notify the user of ban"
-    notify_ban_description: "This will notify the user by email that they have been banned from the community"
-    email_message_ban: "Dear {0},\n\nSomeone with access to your account has violated our community guidelines. As a result, your account has been banned. You will no longer be able to comment, like or report comments. if you think this has been done in error, please contact our community team."
+    write_a_message: "Escrever uma mensagem"
+    send: "Enviar"
+    notify_ban_headline: "Notificar o usuário do banimento"
+    notify_ban_description: "Isso notificará o usuário por email que ele foi banido da comunidade."
+    email_message_ban: "Caro {0},\n\nAlguém com acesso a sua conta violou nossas diretrizes da comunidade. Em consequência disso, sua conta foi banida. Você não poderá mais comentar, curtir ou denunciar comentários. Se você acha que isso foi um engano, entre em contato com nossa equipe."
   bio_offensive: "Esse perfil é ofensiva"
   cancel: "Cancelar"
   confirm_email:
-    click_to_confirm: "Click below to confirm your email address"
-    confirm: "Confirm"
+    click_to_confirm: "Clique abaixo para confirmar seu endereço de email"
+    confirm: "Confirmar"
   password_reset:
-    set_new_password: "Change Your Password"
-    new_password: "New Password"
-    new_password_help: "Password must be at least 8 characters"
-    confirm_new_password: "Confirm New Password"
-    change_password: "Change Password"
+    set_new_password: "Alterar sua senha"
+    new_password: "Nova senha"
+    new_password_help: "A senha deve ter mais de 8 caracteres"
+    confirm_new_password: "Confirmar nova senha"
+    change_password: "Alterar senha"
   characters_remaining: "caracteres restantes"
   comment:
     anon: "Anônimo"
-    undo_reject: "Undo"
+    undo_reject: "Desfazer"
     ban_user: "Banir o usuário"
     comment: "Escreva um comentário..."
     edited: Editado
@@ -90,7 +90,7 @@ pt_BR:
     status: Situação
     username_and_email: "Nome de usuário e email"
     yes_ban_user: "Sim, banir este usuário"
-    commenter: "Commenter"
+    commenter: "Comentador"
   configure:
     apply: Aplicar
     banned_word_text: "Os comentários que contenham essas palavras ou frases (não sensíveis a maiúsculas e minúsculas) serão automaticamente removidos da lista de comentários. Digite uma palavra e pressione Enter ou Tab para adicionar ou cole uma lista separada por vírgulas."
@@ -181,10 +181,10 @@ pt_BR:
     minutes_plural: "minutos"
   email:
     suspended:
-      subject: "Your account has been suspended"
+      subject: "Sua conta foi suspensa"
     banned:
-      subject: "Your account has been banned"
-      body: "In accordance with The Coral Project’s community guidelines, your account has been banned. You are now longer allowed to comment, flag or engage with our community."
+      subject: "Sua conta foi banida"
+      body: "De acordo com as diretrizes da comunidade do Coral Project, sua conta foi banida. Você não tem mais permissão para comentar, sinalizar ou interagir com nossa comunidade."
     confirm:
       has_been_requested: "Uma confirmação de e-mail foi solicitada para a seguinte conta:"
       to_confirm: "Para confirmar a conta, visite este link: "
@@ -198,18 +198,18 @@ pt_BR:
   embedlink:
     copy: "Copiar para área de transferência"
   error:
-    COMMENT_PARENT_NOT_VISIBLE: "The comment that you're replying to has been removed or doesn't exist."
-    EMAIL_VERIFICATION_TOKEN_INVALID: "Email verification token is invalid."
-    PASSWORD_RESET_TOKEN_INVALID: "Your password reset link is invalid."
+    COMMENT_PARENT_NOT_VISIBLE: "O comentário que você está respondendo foi removido ou não existe."
+    EMAIL_VERIFICATION_TOKEN_INVALID: "O token de verificação do email é inválido."
+    PASSWORD_RESET_TOKEN_INVALID: "Seu link de redefinição de senha é inválido."
     COMMENT_TOO_SHORT: "Seu comentário precisar ter mais de um caracter. Revise seu comentário e envie novamente"
     NOT_AUTHORIZED: "Você não está autorizado a executar esta ação."
     NO_SPECIAL_CHARACTERS: "Nomes de usuários podem conter números de letras e _ somente"
     PASSWORD_LENGTH: "A senha é muito curta"
     PROFANITY_ERROR: "Os nomes de usuários não devem conter palavrões. Entre em contato com o administrador se você acredita que isso seja incorreto."
-    RATE_LIMIT_EXCEEDED: "Rate limit exceeded"
+    RATE_LIMIT_EXCEEDED: "Tentativas excedidas"
     USERNAME_IN_USE: "Nome de usuário já em uso"
-    USERNAME_REQUIRED: "Must input a username"
-    EMAIL_NOT_VERIFIED: "E-mail address not verified"
+    USERNAME_REQUIRED: "O nome do usuário é obrigatório"
+    EMAIL_NOT_VERIFIED: "E-mail não verificado"
     EDIT_WINDOW_ENDED: "Você não pode mais editar esse comentário. O tempo expirou."
     EDIT_USERNAME_NOT_AUTHORIZED: "Você não tem permissão para revisar seu nome de usuário."
     SAME_USERNAME_PROVIDED: "Você deve enviar um nome de usuário diferente."
@@ -221,7 +221,7 @@ pt_BR:
     NOT_FOUND: "Recurso não encontrado"
     ALREADY_EXISTS: "O recurso já existe"
     INVALID_ASSET_URL: "O URL do recurso é inválido"
-    CANNOT_IGNORE_STAFF: "Cannot ignore Staff members."
+    CANNOT_IGNORE_STAFF: "Não é possível ignorar membros Staff."
     email: "Não é um e-mail válido"
     confirm_password: "Suas senhas não coincidem. Por favor, tente novamente."
     network_error: "Falha ao conectar-se ao servidor. Verifique a sua conexão com a internet e tente novamente."
@@ -239,8 +239,8 @@ pt_BR:
     banned_account_body: "Isso significa que você não pode curtir, informar ou escrever comentários."
     comment: comentário
     comment_is_ignored: "Este comentário está oculto porque você ignorou esse usuário."
-    comment_is_rejected: "You have rejected this comment."
-    comment_is_hidden: "This comment is not available."
+    comment_is_rejected: "Você rejeitou este comentário."
+    comment_is_hidden: "Este comentário não está disponível."
     comments: comentários
     configure_stream: "Configurar"
     content_not_available: "Este conteúdo não está disponível"
@@ -250,7 +250,7 @@ pt_BR:
       label: "Novo usuário"
       msg: "Sua conta está suspensa porque seu nome de usuário foi considerado inapropriado. Para restaurar sua conta, insira um novo nome de usuário. Entre em contato conosco se você tiver alguma dúvida."
     changed_name:
-      msg: "Your username change is under review by our moderation team."
+      msg: "Sua alteração de nome de usuário está sendo analisada por nossa equipe de moderação."
     my_comments: "Meus comentários"
     my_profile: "Meu perfil"
     new_count: "Ver {0} {1}"
@@ -279,7 +279,7 @@ pt_BR:
     notify_flagged: '{0} marcou o comentário "{1}"'
     approve: "Aprovar"
     approved: "Aprovado"
-    ban_user: "Prohibi-lo"
+    ban_user: "Banir"
     billion: B
     close: Fechar
     dont_like_username: "Eu não gosto desse nome de usuário"
@@ -296,22 +296,22 @@ pt_BR:
     newest_first: "Mais novos primeiro"
     navigation: Navegação
     next_comment: "Vá para o próximo comentário"
-    toggle_search: "Open search"
-    next_queue: "Switch queues"
+    toggle_search: "Abrir busca"
+    next_queue: "Trocar filas"
     oldest_first: "Mais velhos primeiro"
     premod: pré-moderação
     prev_comment: "Vá para o comentário anterior"
     reject: "Rejeitar"
     rejected: "Rejeitado"
-    reply: "Reply"
+    reply: "Responder"
     select_stream: "Selecione a lista"
     shift_key: "⇧"
     shortcuts: "Atalhos"
-    sort: "Sort"
+    sort: "Ordenar"
     show_shortcuts: "Ver atalhos"
     singleview: "Modo zen"
     thismenu: "Abra este menu"
-    jump_to_queue: "Jump to specific queue"
+    jump_to_queue: "Ir para fila específica"
     thousand: k
     try_these: "Tente este"
     view_more_shortcuts: "Ver mais atalhos"
@@ -320,7 +320,7 @@ pt_BR:
   no_agree_comment: "Eu não concordo com este comentário"
   no_like_bio: "Eu não gosto dessa descrição de perfil"
   no_like_username: "Eu não gosto deste nome de usuário"
-  already_flagged_username: "You have already flagged this username."
+  already_flagged_username: "Você já sinalizou este usuário."
   other: Outro
   permalink: Compartilhar
   personal_info: "Este comentário revela informações de identificação pessoal"
@@ -344,8 +344,8 @@ pt_BR:
     all_comments: "Todos os comentários"
     temporarily_suspended: "De acordo com as diretrizes da comunidade de {0}, sua conta foi temporariamente suspensa. Por favor, volte para a conversa {1}."
     comment_not_found: "Este comentário foi removido ou não existe."
-    no_comments: "There are no comments yet, why don’t you write one?"
-    no_comments_and_closed: "There were no comments on this article."
+    no_comments: "Ainda não há comentários, por que não escrever um?"
+    no_comments_and_closed: "Não houve comentários sobre este artigo."
   step_1_header: "Relatar um problema"
   step_2_header: "Ajude-nos a entender"
   step_3_header: "Obrigdo por sua contribuição"
@@ -422,3 +422,6 @@ pt_BR:
       description: "Obrigado por instalar o Talk! Enviamos um e-mail para verificar seu endereço de e-mail. Enquanto você terminar de configurar a conta, você pode começar a se envolver com seus leitores agora."
       launch: "Iniciar Talk"
       close: "Feche este instalador"
+  admin_sidebar:
+    view_options: "Opções de visualização"
+    sort_comments: "Ordenar comentários"
\ No newline at end of file

From ede273a3e06d4d0fa40d40f90278a1b7c23356ed Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 30 May 2018 10:00:04 -0600
Subject: [PATCH 110/144] fix to target handler

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

diff --git a/client/coral-admin/src/components/BanUserDialog.js b/client/coral-admin/src/components/BanUserDialog.js
index a5a2d2a5f..f211a9f2c 100644
--- a/client/coral-admin/src/components/BanUserDialog.js
+++ b/client/coral-admin/src/components/BanUserDialog.js
@@ -19,7 +19,7 @@ class BanUserDialog extends React.Component {
   }
 
   handleMessageChange = e => {
-    const { value: message } = e;
+    const { target: { value: message } } = e;
     this.setState({ message });
   };
 

From c24251e8f2dba6666abb77ae7459a314442773e1 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 30 May 2018 14:22:13 -0600
Subject: [PATCH 111/144] Fixed double encoding

---
 views/auth-callback.njk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/auth-callback.njk b/views/auth-callback.njk
index 7119a6255..cfd439ea0 100644
--- a/views/auth-callback.njk
+++ b/views/auth-callback.njk
@@ -4,7 +4,7 @@
     {% include "partials/data.njk" %}
   </head>
   <body>
-    <script type="application/json" id="auth">{{ encodeJSONForHTML(auth) }}</script>
+    <script type="application/json" id="auth">{{ encodeJSONForHTML(auth) | safe }}</script>
     <script type="text/javascript" src="{{ resolve('coral-auth-callback/bundle.js') }}"></script>
   </body>
 </html>

From c98830aa63bc6caeb4cd83ea96b2a17fb841bc04 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Wed, 30 May 2018 22:23:52 +0200
Subject: [PATCH 112/144] Fix DropDown display bug

---
 .../src/routes/Community/components/People.css     |  1 +
 .../src/routes/Community/components/People.js      |  2 +-
 .../src/routes/Stories/components/Stories.css      |  5 +----
 .../src/routes/Stories/components/Stories.js       | 14 +++-----------
 client/coral-ui/components/Dropdown.css            |  1 +
 client/coral-ui/components/Option.css              |  1 +
 6 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/client/coral-admin/src/routes/Community/components/People.css b/client/coral-admin/src/routes/Community/components/People.css
index 669da480d..ac565c8f8 100644
--- a/client/coral-admin/src/routes/Community/components/People.css
+++ b/client/coral-admin/src/routes/Community/components/People.css
@@ -133,6 +133,7 @@ th.header:nth-child(2), th.header:nth-child(3) {
 
 .roleDropdown {
   width: 150px;
+  text-align: left;
 }
 
 .roleOption {
diff --git a/client/coral-admin/src/routes/Community/components/People.js b/client/coral-admin/src/routes/Community/components/People.js
index ce9a8b75a..d152f83e3 100644
--- a/client/coral-admin/src/routes/Community/components/People.js
+++ b/client/coral-admin/src/routes/Community/components/People.js
@@ -202,7 +202,7 @@ class People extends React.Component {
                         </td>
                         <td className="mdl-data-table__cell--non-numeric">
                           <Dropdown
-                            className={cn(
+                            toggleClassName={cn(
                               'talk-admin-community-people-dd-role',
                               styles.roleDropdown
                             )}
diff --git a/client/coral-admin/src/routes/Stories/components/Stories.css b/client/coral-admin/src/routes/Stories/components/Stories.css
index 28f67151d..76c3e8e7e 100644
--- a/client/coral-admin/src/routes/Stories/components/Stories.css
+++ b/client/coral-admin/src/routes/Stories/components/Stories.css
@@ -92,9 +92,6 @@
 
 .statusDropdown {
   width: 150px;
-}
-
-.statusDropdownOption {
-  min-width: 100px;
+  text-align: left;
 }
 
diff --git a/client/coral-admin/src/routes/Stories/components/Stories.js b/client/coral-admin/src/routes/Stories/components/Stories.js
index ad2c7c5fc..fa0e33db5 100644
--- a/client/coral-admin/src/routes/Stories/components/Stories.js
+++ b/client/coral-admin/src/routes/Stories/components/Stories.js
@@ -22,20 +22,12 @@ class Stories extends Component {
     const closed = !!(closedAt && new Date(closedAt).getTime() < Date.now());
     return (
       <Dropdown
-        className={styles.statusDropdown}
+        toggleClassName={styles.statusDropdown}
         value={closed}
         onChange={value => this.props.onStatusChange(value, id)}
       >
-        <Option
-          value={false}
-          label={t('streams.open')}
-          className={styles.statusDropdownOption}
-        />
-        <Option
-          value={true}
-          label={t('streams.closed')}
-          className={styles.statusDropdownOption}
-        />
+        <Option value={false} label={t('streams.open')} />
+        <Option value={true} label={t('streams.closed')} />
       </Dropdown>
     );
   };
diff --git a/client/coral-ui/components/Dropdown.css b/client/coral-ui/components/Dropdown.css
index 3128a8be4..400654f94 100644
--- a/client/coral-ui/components/Dropdown.css
+++ b/client/coral-ui/components/Dropdown.css
@@ -1,4 +1,5 @@
 .dropdown {
+  display: inline-block;
   position: relative;
 }
 
diff --git a/client/coral-ui/components/Option.css b/client/coral-ui/components/Option.css
index eb76df93d..cc5ac1263 100644
--- a/client/coral-ui/components/Option.css
+++ b/client/coral-ui/components/Option.css
@@ -1,4 +1,5 @@
 .option {
+  min-width: 100px;
   width: 100%;
   padding: 10px;
   outline: none;

From f7899bc67036e0e2f7479668b5cf99c97d0d693a Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 30 May 2018 14:41:55 -0600
Subject: [PATCH 113/144] Translation Fixes

- Removed duplicated translations
- Fixed redundant text
---
 .../talk-plugin-auth/client/translations.yml  | 40 -------------------
 .../talk-plugin-local-auth/translations.yml   |  2 +-
 2 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/plugins/talk-plugin-auth/client/translations.yml b/plugins/talk-plugin-auth/client/translations.yml
index aa7579d74..e774c916b 100644
--- a/plugins/talk-plugin-auth/client/translations.yml
+++ b/plugins/talk-plugin-auth/client/translations.yml
@@ -142,32 +142,6 @@ en:
       cancel: "Cancel"
       edit: "Edit"
       changed_password_msg: "Changed Password - Your password has been successfully changed"
-    change_username:
-      change_username_note: "Usernames can be changed every 14 days"
-      save: "Save"
-      edit_profile: "Edit Profile"
-      cancel: "Cancel"
-      confirm_username_change: "Confirm Username Change"
-      description: "You are attempting to change your username. Your new username will appear on all of your past and future comments."
-      old_username: "Old Username"
-      new_username: "New Username"
-      bottom_note: "Note: You will not be able to change your username again for 14 days"
-      confirm_changes: "Confirm Changes"
-      username_does_not_match: "Username does not match"
-      cant_be_equal: "Your new {0} must be different to your current one"
-      change_username_attempt: "Username can't be updated. Usernames can be changed every 14 days"
-    change_email:
-      confirm_email_change: "Confirm Email Address Change"
-      description: "You are attempting to change your email address. Your new email address will be used for your login and to receive account notifications."
-      old_email: "Old Email Address" 
-      new_email: "New Email Address"
-      enter_password: "Enter Password"
-      incorrect_password: "Incorrect Password"
-      confirm_change: "Confirm Change"
-      cancel: "Cancel"
-      change_email_msg: "Email Address Changed - Your email address has been successfully changed. This email address will now be used for signing in and email notifications."
-      changed_username_success_msg: "Username Changed - Your username has been successfully changed. You will not be able to change your user name for 14 days."
-      change_username_attempt: "Username can't be updated. Usernames can only be changed every 14 days."
 de:
   talk-plugin-auth:
     login:
@@ -269,20 +243,6 @@ es:
       cancel: "Cancelar"
       edit: "Editar"
       changed_password_msg: "Contraseña Actualizada - Tu contraseña ha sido exitosamente actualizada"
-    change_username:
-      change_username_note: "El usuario puede ser cambiado cada 14 días"
-      save: "Guardar"
-      edit_profile: "Editar Perfil"
-      cancel: "Cancelar"
-      confirm_username_change: "Confirmar Cambio de Usuario"
-      description: "Estás intentando cambiar tu usuario. Tu nuevo usuario aparecerá en todos tus pasados y futuros comentarios."
-      old_username: "Usuario viejo"
-      new_username: "Usuario nuevo"
-      bottom_note: "Nota: No podrás cambiar tu usuario por 14 días"
-      confirm_changes: "Confirmar Cambios"
-      username_does_not_match: "El usuario no coincide"
-      changed_username_success_msg: "Usuario Actualizado - Tu usuario ha sido exitosamente actualizado. No podrás cambiar el usuario por 14 días."
-      change_username_attempt: "El usuario no puede ser actualizado. Los usuarios pueden ser cambiados cada 14 días."
 fr:
   talk-plugin-auth:
     login:
diff --git a/plugins/talk-plugin-local-auth/translations.yml b/plugins/talk-plugin-local-auth/translations.yml
index fa9515432..b1d92f947 100644
--- a/plugins/talk-plugin-local-auth/translations.yml
+++ b/plugins/talk-plugin-local-auth/translations.yml
@@ -47,7 +47,7 @@ en:
       incorrect_password: "Incorrect Password"
       confirm_change: "Confirm Change"
       cancel: "Cancel"
-      change_email_msg: "Email Address Changed - Your email address has been successfully changed. This email address will now be used for signing in and email notifications."
+      change_email_msg: "Email Address Changed. This email address will now be used for signing in and email notifications."
     add_email:
       add_email_address: "Add Email Address"
       enter_email_address: "Enter Email Address:"

From e68d5c8a14ec312ffea79598b39d2512500f721c Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Thu, 31 May 2018 11:03:17 -0400
Subject: [PATCH 114/144] Update copy

---
 locales/en.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/locales/en.yml b/locales/en.yml
index 4def7e54b..558bf4875 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -13,9 +13,9 @@ en:
   flag_reasons:
     username: 
       offensive: "This username is offensive"
-      nolike: "I dont likes this username"
-      impersonating: "This username is offensive"
-      spam: "This username is offensive"
+      nolike: "I don't like this username"
+      impersonating: "This user is impersonating"
+      spam: "This user is spamming"
       other: "Other"
   bandialog:
     are_you_sure: "Are you sure you would like to ban {0}?"

From b7768ccaf6a28f292d29be2ec828b4379f473f89 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Thu, 31 May 2018 11:07:12 -0400
Subject: [PATCH 115/144] Update copy

---
 locales/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/en.yml b/locales/en.yml
index 558bf4875..cf4cf04ef 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -15,7 +15,7 @@ en:
       offensive: "This username is offensive"
       nolike: "I don't like this username"
       impersonating: "This user is impersonating"
-      spam: "This user is spamming"
+      spam: "This looks like an ad/marketing"
       other: "Other"
   bandialog:
     are_you_sure: "Are you sure you would like to ban {0}?"

From 9d752685cdecfcb63eb1da778f33168d517ba799 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 31 May 2018 11:27:02 -0600
Subject: [PATCH 116/144] resolved custom css loading issue

---
 views/embed/stream.njk      | 3 +++
 views/login.njk             | 3 +++
 views/templates/account.njk | 3 +++
 views/templates/base.njk    | 1 -
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/views/embed/stream.njk b/views/embed/stream.njk
index ddc620f8e..c9504b3d0 100644
--- a/views/embed/stream.njk
+++ b/views/embed/stream.njk
@@ -5,6 +5,9 @@
 {% block css %}
 <link href="{{ resolve('embed/stream/default.css')}}" rel="stylesheet">
 <link href="{{ resolve('embed/stream/bundle.css')}}" rel="stylesheet">
+
+{# Custom CSS is included after the CSS block so that it's overrides will apply #}
+{% include "partials/custom-css.njk" %}
 {% endblock %}
 
 {% block html %}
diff --git a/views/login.njk b/views/login.njk
index 6a3c1112f..55e4ef45b 100644
--- a/views/login.njk
+++ b/views/login.njk
@@ -4,6 +4,9 @@
 
 {% block css %}
 <link href="{{ resolve('coral-login/bundle.css')}}" rel="stylesheet">
+
+{# Custom CSS is included after the CSS block so that it's overrides will apply #}
+{% include "partials/custom-css.njk" %}
 {% endblock %}
 
 {% block html %}
diff --git a/views/templates/account.njk b/views/templates/account.njk
index 7e1b6e6c9..0ff558c9d 100644
--- a/views/templates/account.njk
+++ b/views/templates/account.njk
@@ -3,4 +3,7 @@
 {% block css %}
 <link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.indigo-pink.min.css">
 <link rel="stylesheet" href="{{ BASE_PATH }}public/css/admin.css">
+
+{# Custom CSS is included after the CSS block so that it's overrides will apply #}
+{% include "partials/custom-css.njk" %}
 {% endblock %}
diff --git a/views/templates/base.njk b/views/templates/base.njk
index 23048151e..3a5331a1d 100644
--- a/views/templates/base.njk
+++ b/views/templates/base.njk
@@ -19,7 +19,6 @@
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
     <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600" rel="stylesheet">
-    {% include "partials/custom-css.njk" %}
     {% block css %}{% endblock %}
 
     {# Static data injection #}

From 135f0e300f0039d7031b9f782c96b9f4fe6dc43e Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Thu, 31 May 2018 13:33:34 -0400
Subject: [PATCH 117/144] Small typo

---
 views/embed/stream.njk      | 2 +-
 views/login.njk             | 2 +-
 views/templates/account.njk | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/embed/stream.njk b/views/embed/stream.njk
index c9504b3d0..9b237b5c2 100644
--- a/views/embed/stream.njk
+++ b/views/embed/stream.njk
@@ -6,7 +6,7 @@
 <link href="{{ resolve('embed/stream/default.css')}}" rel="stylesheet">
 <link href="{{ resolve('embed/stream/bundle.css')}}" rel="stylesheet">
 
-{# Custom CSS is included after the CSS block so that it's overrides will apply #}
+{# Custom CSS is included after the CSS block so that its overrides will apply #}
 {% include "partials/custom-css.njk" %}
 {% endblock %}
 
diff --git a/views/login.njk b/views/login.njk
index 55e4ef45b..7198dbdff 100644
--- a/views/login.njk
+++ b/views/login.njk
@@ -5,7 +5,7 @@
 {% block css %}
 <link href="{{ resolve('coral-login/bundle.css')}}" rel="stylesheet">
 
-{# Custom CSS is included after the CSS block so that it's overrides will apply #}
+{# Custom CSS is included after the CSS block so that its overrides will apply #}
 {% include "partials/custom-css.njk" %}
 {% endblock %}
 
diff --git a/views/templates/account.njk b/views/templates/account.njk
index 0ff558c9d..bcda22a67 100644
--- a/views/templates/account.njk
+++ b/views/templates/account.njk
@@ -4,6 +4,6 @@
 <link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.indigo-pink.min.css">
 <link rel="stylesheet" href="{{ BASE_PATH }}public/css/admin.css">
 
-{# Custom CSS is included after the CSS block so that it's overrides will apply #}
+{# Custom CSS is included after the CSS block so that its overrides will apply #}
 {% include "partials/custom-css.njk" %}
 {% endblock %}

From eb7f2abd97b8d80c5a5b49a86d8d2ec9471f621e Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Thu, 31 May 2018 14:37:53 -0400
Subject: [PATCH 118/144] Small tweaks

---
 plugins/talk-plugin-auth/client/translations.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/talk-plugin-auth/client/translations.yml b/plugins/talk-plugin-auth/client/translations.yml
index e774c916b..495e2a292 100644
--- a/plugins/talk-plugin-auth/client/translations.yml
+++ b/plugins/talk-plugin-auth/client/translations.yml
@@ -135,13 +135,13 @@ en:
       your_username: "Your username appears on every comment you post."
     change_password:
       change_password: "Change Password"
-      passwords_dont_match: "Passwords don`t match"
+      passwords_dont_match: "Passwords don't match"
       required_field: "This field is required"
       forgot_password: "Forgot your password?"
       save: "Save"
       cancel: "Cancel"
       edit: "Edit"
-      changed_password_msg: "Changed Password - Your password has been successfully changed"
+      changed_password_msg: "Your password has been successfully changed"
 de:
   talk-plugin-auth:
     login:

From 66f2d4103304d50aaf792e48a01309139143bfa3 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 31 May 2018 14:56:18 -0600
Subject: [PATCH 119/144] always call the rest logout command, don't vomit on
 the error

---
 client/coral-framework/actions/auth.js | 11 ++++++-----
 middleware/authorization.js            | 10 +++++-----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js
index 7e1785e62..e6e15e867 100644
--- a/client/coral-framework/actions/auth.js
+++ b/client/coral-framework/actions/auth.js
@@ -96,13 +96,14 @@ export const logout = () => async (
   _,
   { rest, client, pym, localStorage }
 ) => {
-  // Stop if the token doen't exist
-  if (!localStorage.getItem('token')) {
-    return;
+  try {
+    await rest('/auth', { method: 'DELETE' });
+  } catch (err) {
+    // We ignore any REST related errors from the delete action, which may/may
+    // not have had a cookie/token attached to it. The logout action was still
+    // called, so we still want to cleanup.
   }
 
-  await rest('/auth', { method: 'DELETE' });
-
   // Clear the auth data persisted to localStorage.
   cleanAuthData(localStorage);
 
diff --git a/middleware/authorization.js b/middleware/authorization.js
index 77376f08b..9462a5d0b 100644
--- a/middleware/authorization.js
+++ b/middleware/authorization.js
@@ -40,15 +40,15 @@ authorization.has = (user, ...roles) => {
  * @return {Callback}    connect middleware
  */
 authorization.needed = (...roles) => [
-  // Insert the pre-needed middlware.
+  // Insert the pre-needed middleware.
   ...authorization.middleware,
 
   // Insert the actual middleware to check for the required role.
   (req, res, next) => {
-    // All routes that are wrapepd with this middleware actually require a role.
+    // All routes that are wrapped with this middleware actually require a role.
     if (!req.user) {
-      debug(`No user on request, returning with ${ErrNotAuthorized}`);
-      return next(ErrNotAuthorized);
+      debug(`No user on request, returning with ErrNotAuthorized`);
+      return next(new ErrNotAuthorized());
     }
 
     // Check to see if the current user has all the roles requested for the given
@@ -56,7 +56,7 @@ authorization.needed = (...roles) => [
     // evaluate to true.
     if (!authorization.has(req.user, ...roles)) {
       debug('User does not have all the required roles to access this page');
-      return next(ErrNotAuthorized);
+      return next(new ErrNotAuthorized());
     }
 
     // Looks like they're allowed!

From 25852d68bdd4c710778632c65eaf3eb1b53dbe6f Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Fri, 1 Jun 2018 12:06:53 -0300
Subject: [PATCH 120/144] updated styles

---
 .../src/components/RejectUsernameDialog.css            | 10 ----------
 .../coral-admin/src/components/RejectUsernameDialog.js |  8 ++++----
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/client/coral-admin/src/components/RejectUsernameDialog.css b/client/coral-admin/src/components/RejectUsernameDialog.css
index 1c96f509a..57c9ca24a 100644
--- a/client/coral-admin/src/components/RejectUsernameDialog.css
+++ b/client/coral-admin/src/components/RejectUsernameDialog.css
@@ -23,18 +23,8 @@
 }
 
 .closeButton {
-  userSelect: none;
-  outline: none;
-  border: none;
-  touchAction: manipulation;
-  &::-moz-focus-inner: {
-    border: 0;
-  }
-  background: 0;
-  padding: 0;
   font-size: 24px;
   line-height: 14px;
-  cursor: pointer;
   color: #363636;
   &:hover {
     color: #6b6b6b;
diff --git a/client/coral-admin/src/components/RejectUsernameDialog.js b/client/coral-admin/src/components/RejectUsernameDialog.js
index a3e97c8b8..b14384eb8 100644
--- a/client/coral-admin/src/components/RejectUsernameDialog.js
+++ b/client/coral-admin/src/components/RejectUsernameDialog.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Dialog } from 'coral-ui';
-import styles from './SuspendUserDialog.css';
+import { Dialog, BareButton } from 'coral-ui';
+import styles from './RejectUsernameDialog.css';
 import cn from 'classnames';
 import { RadioGroup, Radio } from 'react-mdl';
 import Button from 'coral-ui/components/Button';
@@ -45,13 +45,13 @@ class RejectUsernameDialog extends React.Component {
         open={open}
       >
         <div className={styles.close}>
-          <button
+          <BareButton
             aria-label="Close"
             onClick={onCancel}
             className={styles.closeButton}
           >
             ×
-          </button>
+          </BareButton>
         </div>
         <section className="talk-admin-reject-username-dialog-section">
           <h1 className={styles.header}>

From f580608a3137bb6cac309184f47db65e06c35038 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 1 Jun 2018 15:13:58 -0600
Subject: [PATCH 121/144] feat: humanize karma number

---
 .../coral-admin/src/components/CountBadge.js  | 11 ++--------
 .../coral-admin/src/components/UserDetail.js  |  3 ++-
 client/coral-framework/helpers/numbers.js     | 22 +++++++++++++++++++
 3 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 client/coral-framework/helpers/numbers.js

diff --git a/client/coral-admin/src/components/CountBadge.js b/client/coral-admin/src/components/CountBadge.js
index c270817b9..24dff7c02 100644
--- a/client/coral-admin/src/components/CountBadge.js
+++ b/client/coral-admin/src/components/CountBadge.js
@@ -1,20 +1,13 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import styles from './CountBadge.css';
-
-import t from 'coral-framework/services/i18n';
+import { humanizeNumber } from 'coral-framework/helpers/numbers';
 
 const CountBadge = ({ count }) => {
   let number = count;
 
   // shorten large counts to abbreviations
-  if (number / 1e9 > 1) {
-    number = `${(number / 1e9).toFixed(1)}${t('modqueue.billion')}`;
-  } else if (number / 1e6 > 1) {
-    number = `${(number / 1e6).toFixed(1)}${t('modqueue.million')}`;
-  } else if (number / 1e3 > 1) {
-    number = `${(number / 1e3).toFixed(1)}${t('modqueue.thousand')}`;
-  }
+  number = humanizeNumber(number);
 
   return <span className={styles.count}>{number}</span>;
 };
diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index fd609373d..05af20c67 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -23,6 +23,7 @@ import ActionsMenuItem from 'coral-admin/src/components/ActionsMenuItem';
 import UserInfoTooltip from './UserInfoTooltip';
 import KarmaTooltip from './KarmaTooltip';
 import t from 'coral-framework/services/i18n';
+import { humanizeNumber } from 'coral-framework/helpers/numbers';
 
 class UserDetail extends React.Component {
   changeTab = tab => {
@@ -243,7 +244,7 @@ class UserDetail extends React.Component {
                       styles[getKarma(user.reliable.commenter)]
                     )}
                   >
-                    {user.reliable.commenterKarma}
+                    {humanizeNumber(user.reliable.commenterKarma)}
                   </span>
                 </div>
                 <KarmaTooltip thresholds={karmaThresholds.comment} />
diff --git a/client/coral-framework/helpers/numbers.js b/client/coral-framework/helpers/numbers.js
new file mode 100644
index 000000000..bd7f066da
--- /dev/null
+++ b/client/coral-framework/helpers/numbers.js
@@ -0,0 +1,22 @@
+import t from 'coral-framework/services/i18n';
+
+const DECIMAL_AMOUNT = 1;
+
+export function humanizeNumber(number) {
+  const abs = Math.abs(number);
+
+  if (abs >= 1e9) {
+    number = `${(number / 1e9).toFixed(DECIMAL_AMOUNT)}${t(
+      'modqueue.billion'
+    )}`;
+  } else if (abs >= 1e6) {
+    number = `${(number / 1e6).toFixed(DECIMAL_AMOUNT)}${t(
+      'modqueue.million'
+    )}`;
+  } else if (abs >= 1e3) {
+    number = `${(number / 1e3).toFixed(DECIMAL_AMOUNT)}${t(
+      'modqueue.thousand'
+    )}`;
+  }
+  return number;
+}

From d3158f5c7e4a4f4916be9887a9e12b294a5bf360 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 1 Jun 2018 15:14:49 -0600
Subject: [PATCH 122/144] GraphiQL Fixes (#1671)

* bug: fixed graphiql style, upgraded
---
 views/api/graphiql.njk | 103 ++++++++++++++++++++++-------------------
 1 file changed, 56 insertions(+), 47 deletions(-)

diff --git a/views/api/graphiql.njk b/views/api/graphiql.njk
index b726918f3..219046b1f 100644
--- a/views/api/graphiql.njk
+++ b/views/api/graphiql.njk
@@ -5,56 +5,82 @@
 {% block css %}
 {# Include the base development pieces #}
 {{ super() }}
+<link href="//cdn.jsdelivr.net/npm/graphiql@0.11.11/graphiql.css" rel="stylesheet" />
 <style type="text/css">
-  html, body, #graphiql {
+  html, body {
     height: 100%;
     margin: 0;
     overflow: hidden;
     width: 100%;
   }
+  #graphiql {
+    position: absolute;
+    right: 0;
+    left: 0;
+    bottom: 0;
+    top: 56px;
+  }
   *, ::after, ::before {
     box-sizing: inherit;
   }
 </style>
-<link href="//cdn.jsdelivr.net/graphiql/0.9.1/graphiql.css" rel="stylesheet" />
 {% endblock %}
 
 {% block js %}
+<script src="//cdn.jsdelivr.net/es6-promise/4.0.5/es6-promise.auto.min.js"></script>
 <script src="//cdn.jsdelivr.net/fetch/0.9.0/fetch.min.js"></script>
-<script src="//cdn.jsdelivr.net/react/15.0.0/react.min.js"></script>
-<script src="//cdn.jsdelivr.net/react/15.0.0/react-dom.min.js"></script>
-<script src="//cdn.jsdelivr.net/graphiql/0.9.1/graphiql.min.js"></script>
+<script src="//cdn.jsdelivr.net/react/15.4.2/react.min.js"></script>
+<script src="//cdn.jsdelivr.net/react/15.4.2/react-dom.min.js"></script>
+<script src="//cdn.jsdelivr.net/npm/graphiql@0.11.11/graphiql.min.js"></script>
 <script type="text/javascript">
-  // Collect the URL parameters
+  // Parse the search string to get url parameters.
+  var search = window.location.search;
   var parameters = {};
-  window.location.search.substr(1).split('&').forEach(function (entry) {
+  search.substr(1).split('&').forEach(function (entry) {
     var eq = entry.indexOf('=');
     if (eq >= 0) {
       parameters[decodeURIComponent(entry.slice(0, eq))] =
         decodeURIComponent(entry.slice(eq + 1));
     }
   });
-  // Produce a Location query string from a parameter object.
-  function locationQuery(params, location) {
-    return (location ? location: '') + '?' + Object.keys(params).map(function (key) {
-      return encodeURIComponent(key) + '=' +
-        encodeURIComponent(params[key]);
-    }).join('&');
-  }
-  // Derive a fetch URL from the current URL, sans the GraphQL parameters.
-  var graphqlParamNames = {
-    query: true,
-    variables: true,
-    operationName: true
-  };
-  var otherParams = {};
-  for (var k in parameters) {
-    if (parameters.hasOwnProperty(k) && graphqlParamNames[k] !== true) {
-      otherParams[k] = parameters[k];
+
+  // if variables was provided, try to format it.
+  if (parameters.variables) {
+    try {
+      parameters.variables =
+        JSON.stringify(JSON.parse(parameters.variables), null, 2);
+    } catch (e) {
+      // Do nothing, we want to display the invalid JSON as a string, rather
+      // than present an error.
     }
   }
+
+  // When the query and variables string is edited, update the URL bar so
+  // that it can be easily shared
+  function onEditQuery(newQuery) {
+    parameters.query = newQuery;
+    updateURL();
+  }
+  function onEditVariables(newVariables) {
+    parameters.variables = newVariables;
+    updateURL();
+  }
+  function onEditOperationName(newOperationName) {
+    parameters.operationName = newOperationName;
+    updateURL();
+  }
+  function updateURL() {
+    var newSearch = '?' + Object.keys(parameters).filter(function (key) {
+      return Boolean(parameters[key]);
+    }).map(function (key) {
+      return encodeURIComponent(key) + '=' +
+        encodeURIComponent(parameters[key]);
+    }).join('&');
+    history.replaceState(null, null, newSearch);
+  }
+
   // We don't use safe-serialize for location, because it's not client input.
-  var fetchURL = locationQuery(otherParams, '{{ BASE_URL }}{{ endpointURL }}');
+  var fetchURL = '{{ BASE_URL }}{{ endpointURL }}';
 
   // Defines a GraphQL fetcher using the fetch API.
   function graphQLFetcher(graphQLParams) {
@@ -87,34 +113,17 @@
       }
     });
   }
-  // When the query and variables string is edited, update the URL bar so
-  // that it can be easily shared.
-  function onEditQuery(newQuery) {
-    parameters.query = newQuery;
-    updateURL();
-  }
-  function onEditVariables(newVariables) {
-    parameters.variables = newVariables;
-    updateURL();
-  }
-  function onEditOperationName(newOperationName) {
-    parameters.operationName = newOperationName;
-    updateURL();
-  }
-  function updateURL() {
-    history.replaceState(null, null, locationQuery(parameters));
-  }
+
   // Render <GraphiQL /> into the body.
   ReactDOM.render(
     React.createElement(GraphiQL, {
       fetcher: graphQLFetcher,
+      query: parameters.query,
+      variables: parameters.variables,
+      operationName: parameters.operationName,
       onEditQuery: onEditQuery,
       onEditVariables: onEditVariables,
-      onEditOperationName: onEditOperationName,
-      query: null,
-      response: null,
-      variables: null,
-      operationName: null,
+      onEditOperationName: onEditOperationName
     }),
     document.querySelector("#graphiql")
   );

From 2f4dfa080bf66e5faab8ee0f86992ad690a56e65 Mon Sep 17 00:00:00 2001
From: Fabian Neumann <neumann@ferret-go.com>
Date: Mon, 4 Jun 2018 15:10:24 +0200
Subject: [PATCH 123/144] Use Markdown for the "asset is closed" message.

---
 .../src/routes/Configure/components/StreamSettings.js     | 8 ++++----
 .../src/tabs/stream/components/Stream.js                  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/coral-admin/src/routes/Configure/components/StreamSettings.js b/client/coral-admin/src/routes/Configure/components/StreamSettings.js
index 1f661fd72..969155d48 100644
--- a/client/coral-admin/src/routes/Configure/components/StreamSettings.js
+++ b/client/coral-admin/src/routes/Configure/components/StreamSettings.js
@@ -3,7 +3,7 @@ import { SelectField, Option } from 'react-mdl-selectfield';
 import t from 'coral-framework/services/i18n';
 import styles from './StreamSettings.css';
 import { Textfield } from 'react-mdl';
-import { Icon, TextArea } from 'coral-ui';
+import { Icon } from 'coral-ui';
 import PropTypes from 'prop-types';
 import Slot from 'coral-framework/components/Slot';
 import MarkdownEditor from 'coral-framework/components/MarkdownEditor';
@@ -66,8 +66,8 @@ class StreamSettings extends React.Component {
     this.props.updatePending({ updater });
   };
 
-  updateClosedMessage = event => {
-    const updater = { closedMessage: { $set: event.target.value } };
+  updateClosedMessage = value => {
+    const updater = { closedMessage: { $set: value } };
     this.props.updatePending({ updater });
   };
 
@@ -178,7 +178,7 @@ class StreamSettings extends React.Component {
         >
           <p>{t('configure.closed_comments_desc')}</p>
           <div>
-            <TextArea
+            <MarkdownEditor
               className={styles.descriptionBox}
               onChange={this.updateClosedMessage}
               value={settings.closedMessage}
diff --git a/client/coral-embed-stream/src/tabs/stream/components/Stream.js b/client/coral-embed-stream/src/tabs/stream/components/Stream.js
index a07f8ff8b..4ecb0a8bd 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/Stream.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/Stream.js
@@ -4,11 +4,11 @@ import StreamError from './StreamError';
 import Comment from '../containers/Comment';
 import BannedAccount from '../../../components/BannedAccount';
 import ChangeUsername from '../containers/ChangeUsername';
-import Markdown from 'coral-framework/components/Markdown';
 import Slot from 'coral-framework/components/Slot';
 import InfoBox from './InfoBox';
 import { can } from 'coral-framework/services/perms';
 import ModerationLink from './ModerationLink';
+import Markdown from 'coral-framework/components/Markdown';
 import RestrictedMessageBox from 'coral-framework/components/RestrictedMessageBox';
 import t, { timeago } from 'coral-framework/services/i18n';
 import CommentBox from '../containers/CommentBox';
@@ -298,7 +298,7 @@ class Stream extends React.Component {
         ) : (
           <div>
             {asset.isClosed ? (
-              <p>{asset.settings.closedMessage}</p>
+              <Markdown content={asset.settings.closedMessage} />
             ) : (
               <Markdown content={asset.settings.disableCommentingMessage} />
             )}

From b783ee8c0ba7fe23bbdc65b5faa62a29b56851ee Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 4 Jun 2018 15:45:31 +0200
Subject: [PATCH 124/144] Ignore already exists error

---
 .../src/containers/RejectUsernameDialog.js    | 29 ++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/client/coral-admin/src/containers/RejectUsernameDialog.js b/client/coral-admin/src/containers/RejectUsernameDialog.js
index d2a2e61fa..90e329812 100644
--- a/client/coral-admin/src/containers/RejectUsernameDialog.js
+++ b/client/coral-admin/src/containers/RejectUsernameDialog.js
@@ -8,7 +8,9 @@ import {
   withRejectUsername,
   withPostFlag,
 } from 'coral-framework/graphql/mutations';
+import { notify } from 'coral-framework/actions/notification';
 import { compose } from 'react-apollo';
+import { getErrorMessages } from 'coral-framework/utils';
 
 class RejectUsernameDialogContainer extends Component {
   rejectUsername = async ({ reason, message }) => {
@@ -19,12 +21,24 @@ class RejectUsernameDialogContainer extends Component {
       userId,
     } = this.props;
 
-    await postFlag({
-      item_id: userId,
-      item_type: 'USERS',
-      reason,
-      message,
-    });
+    // First flag the user.
+    try {
+      await postFlag({
+        item_id: userId,
+        item_type: 'USERS',
+        reason,
+        message,
+      });
+    } catch (error) {
+      // Ignore already exists error, otherwise show error.
+      if (
+        error.errors &&
+        (error.errors.length !== 1 ||
+          error.errors[0].translation_key !== 'ALREADY_EXISTS')
+      ) {
+        notify('error', getErrorMessages(error));
+      }
+    }
 
     await rejectUsername({ id: userId });
     hideRejectUsernameDialog();
@@ -62,6 +76,7 @@ const mapDispatchToProps = dispatch => ({
   ...bindActionCreators(
     {
       hideRejectUsernameDialog,
+      notify,
     },
     dispatch
   ),
@@ -70,5 +85,5 @@ const mapDispatchToProps = dispatch => ({
 export default compose(
   connect(mapStateToProps, mapDispatchToProps),
   withRejectUsername,
-  withPostFlag
+  withPostFlag({ notifyOnError: false })
 )(RejectUsernameDialogContainer);

From f142150b3e44f67dadba250e5d3a3619b6384798 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 4 Jun 2018 16:04:37 +0200
Subject: [PATCH 125/144] Fix unexpected error

---
 client/coral-admin/src/containers/RejectUsernameDialog.js | 2 +-
 client/coral-framework/graphql/mutations.js               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/containers/RejectUsernameDialog.js b/client/coral-admin/src/containers/RejectUsernameDialog.js
index 90e329812..24d1cd2d3 100644
--- a/client/coral-admin/src/containers/RejectUsernameDialog.js
+++ b/client/coral-admin/src/containers/RejectUsernameDialog.js
@@ -40,7 +40,7 @@ class RejectUsernameDialogContainer extends Component {
       }
     }
 
-    await rejectUsername({ id: userId });
+    await rejectUsername(userId);
     hideRejectUsernameDialog();
   };
 
diff --git a/client/coral-framework/graphql/mutations.js b/client/coral-framework/graphql/mutations.js
index b147fc354..722d8ea98 100644
--- a/client/coral-framework/graphql/mutations.js
+++ b/client/coral-framework/graphql/mutations.js
@@ -273,7 +273,7 @@ export const withRejectUsername = withMutation(
   `,
   {
     props: ({ mutate }) => ({
-      rejectUsername: ({ id }) => {
+      rejectUsername: id => {
         return mutate({
           variables: {
             id,

From 2d343029a10c6782622d18b54fc44d7edd968a0f Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Mon, 4 Jun 2018 15:25:30 -0300
Subject: [PATCH 126/144] updated - getUserStatusArray

---
 .../coral-admin/src/components/UserDetail.js  | 27 ++++++++++++++-----
 client/coral-framework/utils/user.js          | 19 -------------
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index addac9eda..ca289b2d0 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -11,7 +11,6 @@ import {
   isSuspended,
   isUsernameRejected,
   isUsernameChanged,
-  getActiveStatuses,
   isBanned,
   getKarma,
 } from 'coral-framework/utils/user';
@@ -32,7 +31,6 @@ import ActionsMenuItem from 'coral-admin/src/components/ActionsMenuItem';
 import UserInfoTooltip from './UserInfoTooltip';
 import KarmaTooltip from './KarmaTooltip';
 import t from 'coral-framework/services/i18n';
-import flatten from 'lodash/flatten';
 
 class UserDetail extends React.Component {
   changeTab = tab => {
@@ -78,14 +76,29 @@ class UserDetail extends React.Component {
   }
 
   getActionMenuLabel(user) {
-    const activeStatuses = getActiveStatuses(user);
-    const count = activeStatuses.length;
+    /**
+     * getUserStatusArray
+     * returns an array of active status(es)
+     * i.e if suspension is active, it returns suspension
+     */
+
+    const getUserStatusArray = user => {
+      const statusMap = {
+        suspended: isSuspended,
+        banned: isBanned,
+        usernameRejected: isUsernameRejected,
+        usernameChanged: isUsernameChanged,
+      };
+      return Object.keys(statusMap).filter(k => statusMap[k](user));
+    };
+
+    const userStatusArr = getUserStatusArray(user);
+    const count = userStatusArr.length;
 
     if (count > 1) {
-      return `Status(${count})`;
+      return `Status (${count})`;
     } else {
-      const activeStatus = flatten(activeStatuses)[0];
-
+      const activeStatus = userStatusArr[0];
       switch (activeStatus) {
         case 'suspended':
           return t('user_detail.suspended');
diff --git a/client/coral-framework/utils/user.js b/client/coral-framework/utils/user.js
index e010a7bc5..cdc0884d5 100644
--- a/client/coral-framework/utils/user.js
+++ b/client/coral-framework/utils/user.js
@@ -1,6 +1,4 @@
 import get from 'lodash/get';
-import mapValues from 'lodash/mapValues';
-import toPairs from 'lodash/toPairs';
 import moment from 'moment';
 
 /**
@@ -55,23 +53,6 @@ export const isUsernameChanged = user => {
   return get(user, 'state.status.username.status') === 'CHANGED';
 };
 
-/**
- * getActiveStatuses
- * returns an array of active status(es)
- * i.e if suspension is active, it returns suspension
- */
-
-export const getActiveStatuses = user => {
-  const statusMap = {
-    suspended: isSuspended,
-    banned: isBanned,
-    usernameRejected: isUsernameRejected,
-    usernameChanged: isUsernameChanged,
-  };
-
-  return toPairs(mapValues(statusMap, fn => fn(user))).filter(x => x[1]);
-};
-
 /**
  * canUsernameBeUpdated
  * retrieves boolean whether a username can be updated or not

From 18d58e4ea841bc1a8db3ef6ed4bdbce65203c54f Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Mon, 4 Jun 2018 19:58:26 +0100
Subject: [PATCH 127/144] Remove pell from plugin directory (#1675)

* Remove pell from plugin directory

* review: removed pell refernce
---
 docs/source/integrating/configuring-comment-stream.md | 9 ++-------
 docs/source/plugin/talk-plugin-rich-text-pell.md      | 1 -
 2 files changed, 2 insertions(+), 8 deletions(-)
 delete mode 120000 docs/source/plugin/talk-plugin-rich-text-pell.md

diff --git a/docs/source/integrating/configuring-comment-stream.md b/docs/source/integrating/configuring-comment-stream.md
index 613535a13..475598d9d 100644
--- a/docs/source/integrating/configuring-comment-stream.md
+++ b/docs/source/integrating/configuring-comment-stream.md
@@ -10,18 +10,13 @@ Using plugins and configuration variables, you can modify the way the Talk comme
 
 To enable our default rich text editor plugin, you'll need to:
 
-1. Enable `talk-plugin-rich-text` as a server-side plugin
-2. Enable `talk-plugin-rich-text-pell` as a client-side plugin
-3. If you have `talk-plugin-comment-content` enabled, you will need to disable this (this supports hyperlinks in the comment body)
+1. Enable `talk-plugin-rich-text` as a server-side and client-side plugin
+2. If you have `talk-plugin-comment-content` enabled, you will need to disable this (this supports hyperlinks in the comment body)
 
 Out of the box, our Talk Editor supports Bold, Italic, and Blockquote.
 
 If you want to support another editor, you can create a plugin and replace the client-side one with the editor of your choice.
 
-For more information on our implementation, see https://github.com/coralproject/talk/pull/1391
-
-For more information on Pell, check out https://jaredreich.com/pell
-
 ### Sorting/Filtering the Stream
 
 To enable sorting and filtering plugins, you will first need to enable the viewing options plugin:
diff --git a/docs/source/plugin/talk-plugin-rich-text-pell.md b/docs/source/plugin/talk-plugin-rich-text-pell.md
deleted file mode 120000
index e2162a51b..000000000
--- a/docs/source/plugin/talk-plugin-rich-text-pell.md
+++ /dev/null
@@ -1 +0,0 @@
-../../../plugins/talk-plugin-rich-text-pell/README.md
\ No newline at end of file

From 3ac392e3582984f8a3cbed35e3b16d5ab651acce Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Mon, 4 Jun 2018 13:32:40 -0600
Subject: [PATCH 128/144] locked node version at 8 via nvmrc

---
 .nvmrc | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .nvmrc

diff --git a/.nvmrc b/.nvmrc
new file mode 100644
index 000000000..2f954597a
--- /dev/null
+++ b/.nvmrc
@@ -0,0 +1,2 @@
+8
+

From 6c73e5b818e8a631ed740c2403403fdc512bc5e3 Mon Sep 17 00:00:00 2001
From: Cristian Dean <cristiandeanabreu@gmail.com>
Date: Mon, 4 Jun 2018 16:43:00 -0300
Subject: [PATCH 129/144] Add scraper proxy support (#1674)

* Add scraper proxy support
* review: doc updates
---
 config.js                                   |  3 +++
 docs/source/02-02-advanced-configuration.md |  4 ++++
 jobs/scraper/index.js                       |  8 +++++--
 package.json                                |  1 +
 yarn.lock                                   | 23 +++++++++++++++++++++
 5 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/config.js b/config.js
index 4ce755f93..b547636f4 100644
--- a/config.js
+++ b/config.js
@@ -204,6 +204,9 @@ const CONFIG = {
   // STATIC_URI is the base uri where static files are hosted.
   STATIC_URI: process.env.TALK_STATIC_URI || process.env.TALK_ROOT_URL,
 
+  // SCRAPER_PROXY_URL is the url to be used as a proxy by the scraper
+  SCRAPER_PROXY_URL: process.env.TALK_SCRAPER_PROXY_URL || null,
+
   // The keepalive timeout (in ms) that should be used to send keep alive
   // messages through the websocket to keep the socket alive.
   KEEP_ALIVE: process.env.TALK_KEEP_ALIVE || '30s',
diff --git a/docs/source/02-02-advanced-configuration.md b/docs/source/02-02-advanced-configuration.md
index 451865e47..3ac9b5c1b 100644
--- a/docs/source/02-02-advanced-configuration.md
+++ b/docs/source/02-02-advanced-configuration.md
@@ -568,3 +568,7 @@ A JSON string representing the configuration passed to the
 [fetch](https://www.npmjs.com/package/node-fetch) call for the scraper. It
 can be used to set an authorization header, or change the user agent. (Default
 `{}`)
+
+## TALK_SCRAPER_PROXY_URL
+
+Sets a specific HTTP/S proxy to be used by the Asset Scraper using [https-proxy-agent](https://www.npmjs.com/package/https-proxy-agent). (Default `null`)
diff --git a/jobs/scraper/index.js b/jobs/scraper/index.js
index 89bf8c1d3..1ae80b818 100644
--- a/jobs/scraper/index.js
+++ b/jobs/scraper/index.js
@@ -6,7 +6,8 @@ const logger = createLogger('jobs:scraper');
 const fetch = require('node-fetch');
 const { merge } = require('lodash');
 const { version } = require('../../package.json');
-const { SCRAPER_HEADERS } = require('../../config');
+const { SCRAPER_HEADERS, SCRAPER_PROXY_URL } = require('../../config');
+const HttpsProxyAgent = require('https-proxy-agent');
 
 // Load the scraper with the rules.
 const metascraper = require('metascraper').load([
@@ -35,12 +36,16 @@ const headers = merge(
   customHeaders
 );
 
+// Add proxy configuration if exists.
+const agent = SCRAPER_PROXY_URL ? new HttpsProxyAgent(SCRAPER_PROXY_URL) : null;
+
 /**
  * Scrapes the given asset for metadata.
  */
 async function scrape({ url }) {
   const res = await fetch(url, {
     headers,
+    agent,
   });
   const html = await res.text();
 
@@ -49,7 +54,6 @@ async function scrape({ url }) {
     html,
     url,
   });
-
   return metadata;
 }
 
diff --git a/package.json b/package.json
index a313c1ec0..7ebb04c9f 100644
--- a/package.json
+++ b/package.json
@@ -125,6 +125,7 @@
     "history": "^3.0.0",
     "hjson": "^3.1.1",
     "hjson-loader": "^1.0.0",
+    "https-proxy-agent": "^2.2.0",
     "immutability-helper": "^2.2.0",
     "imports-loader": "^0.7.1",
     "inquirer": "^3.2.2",
diff --git a/yarn.lock b/yarn.lock
index 0f6606433..ff5302ff0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -239,6 +239,12 @@ agent-base@2:
     extend "~3.0.0"
     semver "~5.0.1"
 
+agent-base@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.0.tgz#9838b5c3392b962bad031e6a4c5e1024abec45ce"
+  dependencies:
+    es6-promisify "^5.0.0"
+
 ajv-keywords@^2.0.0, ajv-keywords@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
@@ -3420,10 +3426,20 @@ es6-map@^0.1.3:
     es6-symbol "~3.1.1"
     event-emitter "~0.3.5"
 
+es6-promise@^4.0.3:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29"
+
 es6-promise@^4.0.5:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.1.1.tgz#8811e90915d9a0dba36274f0b242dbda78f9c92a"
 
+es6-promisify@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
+  dependencies:
+    es6-promise "^4.0.3"
+
 es6-set@~0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
@@ -5077,6 +5093,13 @@ https-proxy-agent@1, https-proxy-agent@^1.0.0:
     debug "2"
     extend "3"
 
+https-proxy-agent@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
+  dependencies:
+    agent-base "^4.1.0"
+    debug "^3.1.0"
+
 husky@^0.14.3:
   version "0.14.3"
   resolved "https://registry.yarnpkg.com/husky/-/husky-0.14.3.tgz#c69ed74e2d2779769a17ba8399b54ce0b63c12c3"

From ef86938a0e7d3bc56d23b2be314c292fd2336127 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Mon, 4 Jun 2018 13:45:49 -0600
Subject: [PATCH 130/144] Update package.json

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

diff --git a/package.json b/package.json
index 7ebb04c9f..896b0793a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "talk",
-  "version": "4.4.2",
+  "version": "4.5.0",
   "description": "A better commenting experience from Mozilla, The New York Times, and the Washington Post. https://coralproject.net",
   "main": "app.js",
   "private": true,

From 636bc9efa43e6eae0fc671aeb9dd23b09bec1807 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 4 Jun 2018 22:30:12 +0200
Subject: [PATCH 131/144] Manage cache

---
 client/coral-admin/src/graphql/index.js       | 70 ++++---------------
 .../routes/Community/containers/Indicator.js  |  6 ++
 .../src/routes/Community/graphql.js           | 21 +++++-
 client/coral-framework/graphql/mutations.js   | 52 ++++++++++++++
 4 files changed, 90 insertions(+), 59 deletions(-)

diff --git a/client/coral-admin/src/graphql/index.js b/client/coral-admin/src/graphql/index.js
index 6a1b06a6e..b51897a4b 100644
--- a/client/coral-admin/src/graphql/index.js
+++ b/client/coral-admin/src/graphql/index.js
@@ -194,6 +194,12 @@ export default {
       },
       updateQueries: {
         TalkAdmin_Community_FlaggedAccounts: (prev, { mutationResult }) => {
+          // No need to update, when user was not in the flagged users queue.
+          // TODO: this should be more generic, e.g. looking at the history.
+          if (!prev.flaggedUsers.nodes.find(node => node.id === id)) {
+            return prev;
+          }
+
           const decrement = {
             flaggedUsernamesCount: { $apply: count => count - 1 },
           };
@@ -214,35 +220,6 @@ export default {
           return updated;
         },
       },
-      update: proxy => {
-        proxy.writeFragment({
-          fragment: gql`
-            fragment Talk_ApproveUsername on User {
-              state {
-                status {
-                  username {
-                    status
-                  }
-                }
-              }
-            }
-          `,
-          id: `User_${id}`,
-          data: {
-            __typename: 'User',
-            state: {
-              __typename: 'UserState',
-              status: {
-                __typename: 'UserStatus',
-                username: {
-                  __typename: 'UsernameStatus',
-                  status: 'APPROVED',
-                },
-              },
-            },
-          },
-        });
-      },
     }),
     RejectUsername: ({ variables: { id } }) => ({
       optimisticResponse: {
@@ -254,6 +231,12 @@ export default {
       },
       updateQueries: {
         TalkAdmin_Community_FlaggedAccounts: (prev, { mutationResult }) => {
+          // No need to update, when user was not in the flagged users queue.
+          // TODO: this should be more generic, e.g. looking at the history.
+          if (!prev.flaggedUsers.nodes.find(node => node.id === id)) {
+            return prev;
+          }
+
           const decrement = {
             flaggedUsernamesCount: { $apply: count => count - 1 },
           };
@@ -274,35 +257,6 @@ export default {
           return updated;
         },
       },
-      update: proxy => {
-        proxy.writeFragment({
-          fragment: gql`
-            fragment Talk_RejectUsername on User {
-              state {
-                status {
-                  username {
-                    status
-                  }
-                }
-              }
-            }
-          `,
-          id: `User_${id}`,
-          data: {
-            __typename: 'User',
-            state: {
-              __typename: 'UserState',
-              status: {
-                __typename: 'UserStatus',
-                username: {
-                  __typename: 'UsernameStatus',
-                  status: 'REJECTED',
-                },
-              },
-            },
-          },
-        });
-      },
     }),
     UpdateSettings: ({ variables: { input } }) => ({
       updateQueries: {
diff --git a/client/coral-admin/src/routes/Community/containers/Indicator.js b/client/coral-admin/src/routes/Community/containers/Indicator.js
index 9e5be831a..3c078a8d7 100644
--- a/client/coral-admin/src/routes/Community/containers/Indicator.js
+++ b/client/coral-admin/src/routes/Community/containers/Indicator.js
@@ -98,9 +98,15 @@ const fields = `
     status {
       username {
         status
+        history {
+          status
+        }
       }
     }
   }
+  action_summaries {
+    count
+  }
 `;
 
 const USERNAME_FLAGGED_SUBSCRIPTION = gql`
diff --git a/client/coral-admin/src/routes/Community/graphql.js b/client/coral-admin/src/routes/Community/graphql.js
index 8d6941c41..c106fdd61 100644
--- a/client/coral-admin/src/routes/Community/graphql.js
+++ b/client/coral-admin/src/routes/Community/graphql.js
@@ -106,6 +106,23 @@ export function handleFlaggedAccountsChange(root, user, notify) {
   }
 }
 
+export const wasUsernameReported = user => {
+  const previousStatus =
+    user.state.status.username.history[
+      user.state.status.username.history.length - 2
+    ];
+
+  // Check for correct previous status
+  if (!['SET', 'CHANGES'].includes(previousStatus)) {
+    return false;
+  }
+  // Check for flags
+  if (user.action_summaries.every(as => as.count === 0)) {
+    return false;
+  }
+  return true;
+};
+
 /**
  * Track indicator status
  * @param  {Object}   root             current state of the store
@@ -119,7 +136,9 @@ export function handleIndicatorChange(root, user) {
       return incrementFlaggedUserCount(root);
     case 'APPROVED':
     case 'REJECTED':
-      return decrementFlaggedUserCount(root);
+      if (wasUsernameReported(user)) {
+        return decrementFlaggedUserCount(root);
+      }
     default:
   }
 }
diff --git a/client/coral-framework/graphql/mutations.js b/client/coral-framework/graphql/mutations.js
index 722d8ea98..245fe2b2f 100644
--- a/client/coral-framework/graphql/mutations.js
+++ b/client/coral-framework/graphql/mutations.js
@@ -242,6 +242,16 @@ export const withUnsuspendUser = withMutation(
   }
 );
 
+const SetUsernameStatusFragment = gql`
+  fragment Talk_SetUsernameStatus on User {
+    state {
+      status {
+        username
+      }
+    }
+  }
+`;
+
 export const withApproveUsername = withMutation(
   gql`
     mutation ApproveUsername($id: ID!) {
@@ -257,6 +267,27 @@ export const withApproveUsername = withMutation(
           variables: {
             id,
           },
+          update: proxy => {
+            const fragmentId = `User_${id}`;
+            const data = {
+              __typename: 'User',
+              state: {
+                __typename: 'UserState',
+                status: {
+                  __typename: 'UserStatus',
+                  username: {
+                    __typename: 'UsernameStatus',
+                    status: 'APPROVED',
+                  },
+                },
+              },
+            };
+            proxy.writeFragment({
+              fragment: SetUsernameStatusFragment,
+              id: fragmentId,
+              data,
+            });
+          },
         });
       },
     }),
@@ -278,6 +309,27 @@ export const withRejectUsername = withMutation(
           variables: {
             id,
           },
+          update: proxy => {
+            const fragmentId = `User_${id}`;
+            const data = {
+              __typename: 'User',
+              state: {
+                __typename: 'UserState',
+                status: {
+                  __typename: 'UserStatus',
+                  username: {
+                    __typename: 'UsernameStatus',
+                    status: 'REJECTED',
+                  },
+                },
+              },
+            };
+            proxy.writeFragment({
+              fragment: SetUsernameStatusFragment,
+              id: fragmentId,
+              data,
+            });
+          },
         });
       },
     }),

From 6674b657aba11410f72db19618b45af275c7f181 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 4 Jun 2018 22:32:23 +0200
Subject: [PATCH 132/144] Move helper out of class

---
 .../coral-admin/src/components/UserDetail.js  | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index ca289b2d0..f0b4cda20 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -32,6 +32,22 @@ import UserInfoTooltip from './UserInfoTooltip';
 import KarmaTooltip from './KarmaTooltip';
 import t from 'coral-framework/services/i18n';
 
+/**
+ * getUserStatusArray
+ * returns an array of active status(es)
+ * i.e if suspension is active, it returns suspension
+ */
+
+function getUserStatusArray(user) {
+  const statusMap = {
+    suspended: isSuspended,
+    banned: isBanned,
+    usernameRejected: isUsernameRejected,
+    usernameChanged: isUsernameChanged,
+  };
+  return Object.keys(statusMap).filter(k => statusMap[k](user));
+}
+
 class UserDetail extends React.Component {
   changeTab = tab => {
     this.props.changeTab(tab);
@@ -76,22 +92,6 @@ class UserDetail extends React.Component {
   }
 
   getActionMenuLabel(user) {
-    /**
-     * getUserStatusArray
-     * returns an array of active status(es)
-     * i.e if suspension is active, it returns suspension
-     */
-
-    const getUserStatusArray = user => {
-      const statusMap = {
-        suspended: isSuspended,
-        banned: isBanned,
-        usernameRejected: isUsernameRejected,
-        usernameChanged: isUsernameChanged,
-      };
-      return Object.keys(statusMap).filter(k => statusMap[k](user));
-    };
-
     const userStatusArr = getUserStatusArray(user);
     const count = userStatusArr.length;
 

From 58358450928c9350f04ba1cc0b9eaef1aebb5c6b Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 4 Jun 2018 22:37:31 +0200
Subject: [PATCH 133/144] Fix write fragment

---
 client/coral-framework/graphql/mutations.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/coral-framework/graphql/mutations.js b/client/coral-framework/graphql/mutations.js
index 245fe2b2f..8191c2cd0 100644
--- a/client/coral-framework/graphql/mutations.js
+++ b/client/coral-framework/graphql/mutations.js
@@ -246,7 +246,9 @@ const SetUsernameStatusFragment = gql`
   fragment Talk_SetUsernameStatus on User {
     state {
       status {
-        username
+        username {
+          status
+        }
       }
     }
   }

From 7a13b64fbe6c3a38c4e827d4a0551911a15bb8c1 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Mon, 4 Jun 2018 16:23:58 -0600
Subject: [PATCH 134/144] feat: cleanup of user details drawer

---
 .../coral-admin/src/components/UserDetail.js  | 44 +++++++++++++------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index 05af20c67..96d35d3ff 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -25,6 +25,8 @@ import KarmaTooltip from './KarmaTooltip';
 import t from 'coral-framework/services/i18n';
 import { humanizeNumber } from 'coral-framework/helpers/numbers';
 
+const filterOutLocalProfiles = ({ provider }) => provider !== 'local';
+
 class UserDetail extends React.Component {
   changeTab = tab => {
     this.props.changeTab(tab);
@@ -181,6 +183,18 @@ class UserDetail extends React.Component {
 
           <div>
             <ul className={styles.userDetailList}>
+              <li className={styles.userDetailItem}>
+                <Icon name="perm_identity" />
+                <span className={styles.userDetailItem}>
+                  {t('user_detail.id')}:
+                </span>
+                {user.id}{' '}
+                <ButtonCopyToClipboard
+                  className={styles.copyButton}
+                  icon="content_copy"
+                  copyText={user.id}
+                />
+              </li>
               <li className={styles.userDetailItem}>
                 <Icon name="assignment_ind" />
                 <span className={styles.userDetailItem}>
@@ -202,20 +216,22 @@ class UserDetail extends React.Component {
                 />
               </li>
 
-              {user.profiles.map(({ provider, id }) => (
-                <li key={id} className={styles.userDetailItem}>
-                  <Icon name="device_hub" />
-                  <span className={styles.userDetailItem}>
-                    {capitalize(provider)} {t('user_detail.id')}:
-                  </span>
-                  {id}{' '}
-                  <ButtonCopyToClipboard
-                    className={styles.copyButton}
-                    icon="content_copy"
-                    copyText={id}
-                  />
-                </li>
-              ))}
+              {user.profiles
+                .filter(filterOutLocalProfiles)
+                .map(({ provider, id }) => (
+                  <li key={id} className={styles.userDetailItem}>
+                    <Icon name="device_hub" />
+                    <span className={styles.userDetailItem}>
+                      {capitalize(provider)} {t('user_detail.id')}:
+                    </span>
+                    {id}{' '}
+                    <ButtonCopyToClipboard
+                      className={styles.copyButton}
+                      icon="content_copy"
+                      copyText={id}
+                    />
+                  </li>
+                ))}
             </ul>
 
             <ul className={styles.stats}>

From 375c8789a4f1116524c913eaebb797e4e7368cee Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Mon, 4 Jun 2018 21:48:51 -0300
Subject: [PATCH 135/144] updating yarn and nightwatch/selenium-standalone

---
 package.json |    2 +-
 yarn.lock    | 3705 ++++++++++++++++++++++----------------------------
 2 files changed, 1594 insertions(+), 2113 deletions(-)

diff --git a/package.json b/package.json
index 896b0793a..7a3c72567 100644
--- a/package.json
+++ b/package.json
@@ -239,7 +239,7 @@
     "mocha-junit-reporter": "^1.12.1",
     "nightwatch": "^0.9.16",
     "nodemon": "^1.11.0",
-    "selenium-standalone": "^6.11.0",
+    "selenium-standalone": "^6.15.0",
     "sinon": "^3.2.1",
     "sinon-chai": "^2.13.0",
     "yaml-lint": "^1.0.0"
diff --git a/yarn.lock b/yarn.lock
index ff5302ff0..47830a4fd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,67 +2,91 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@7.0.0-beta.36":
-  version "7.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.36.tgz#2349d7ec04b3a06945ae173280ef8579b63728e4"
+"@babel/code-frame@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.44.tgz#2a02643368de80916162be70865c97774f3adbd9"
   dependencies:
-    chalk "^2.0.0"
-    esutils "^2.0.2"
-    js-tokens "^3.0.0"
+    "@babel/highlight" "7.0.0-beta.44"
 
 "@babel/code-frame@^7.0.0-beta.35":
-  version "7.0.0-beta.40"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.40.tgz#37e2b0cf7c56026b4b21d3927cadf81adec32ac6"
+  version "7.0.0-beta.49"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.49.tgz#becd805482734440c9d137e46d77340e64d7f51b"
   dependencies:
-    "@babel/highlight" "7.0.0-beta.40"
+    "@babel/highlight" "7.0.0-beta.49"
 
-"@babel/helper-function-name@7.0.0-beta.36":
-  version "7.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.36.tgz#366e3bc35147721b69009f803907c4d53212e88d"
+"@babel/generator@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.44.tgz#c7e67b9b5284afcf69b309b50d7d37f3e5033d42"
   dependencies:
-    "@babel/helper-get-function-arity" "7.0.0-beta.36"
-    "@babel/template" "7.0.0-beta.36"
-    "@babel/types" "7.0.0-beta.36"
+    "@babel/types" "7.0.0-beta.44"
+    jsesc "^2.5.1"
+    lodash "^4.2.0"
+    source-map "^0.5.0"
+    trim-right "^1.0.1"
 
-"@babel/helper-get-function-arity@7.0.0-beta.36":
-  version "7.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.36.tgz#f5383bac9a96b274828b10d98900e84ee43e32b8"
+"@babel/helper-function-name@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.44.tgz#e18552aaae2231100a6e485e03854bc3532d44dd"
   dependencies:
-    "@babel/types" "7.0.0-beta.36"
+    "@babel/helper-get-function-arity" "7.0.0-beta.44"
+    "@babel/template" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
 
-"@babel/highlight@7.0.0-beta.40":
-  version "7.0.0-beta.40"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.40.tgz#b43d67d76bf46e1d10d227f68cddcd263786b255"
+"@babel/helper-get-function-arity@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.44.tgz#d03ca6dd2b9f7b0b1e6b32c56c72836140db3a15"
+  dependencies:
+    "@babel/types" "7.0.0-beta.44"
+
+"@babel/helper-split-export-declaration@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.44.tgz#c0b351735e0fbcb3822c8ad8db4e583b05ebd9dc"
+  dependencies:
+    "@babel/types" "7.0.0-beta.44"
+
+"@babel/highlight@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.44.tgz#18c94ce543916a80553edcdcf681890b200747d5"
   dependencies:
     chalk "^2.0.0"
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
-"@babel/template@7.0.0-beta.36":
-  version "7.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.36.tgz#02e903de5d68bd7899bce3c5b5447e59529abb00"
+"@babel/highlight@7.0.0-beta.49":
+  version "7.0.0-beta.49"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.49.tgz#96bdc6b43e13482012ba6691b1018492d39622cc"
   dependencies:
-    "@babel/code-frame" "7.0.0-beta.36"
-    "@babel/types" "7.0.0-beta.36"
-    babylon "7.0.0-beta.36"
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^3.0.0"
+
+"@babel/template@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.44.tgz#f8832f4fdcee5d59bf515e595fc5106c529b394f"
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
+    babylon "7.0.0-beta.44"
     lodash "^4.2.0"
 
-"@babel/traverse@7.0.0-beta.36":
-  version "7.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.36.tgz#1dc6f8750e89b6b979de5fe44aa993b1a2192261"
+"@babel/traverse@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.44.tgz#a970a2c45477ad18017e2e465a0606feee0d2966"
   dependencies:
-    "@babel/code-frame" "7.0.0-beta.36"
-    "@babel/helper-function-name" "7.0.0-beta.36"
-    "@babel/types" "7.0.0-beta.36"
-    babylon "7.0.0-beta.36"
-    debug "^3.0.1"
+    "@babel/code-frame" "7.0.0-beta.44"
+    "@babel/generator" "7.0.0-beta.44"
+    "@babel/helper-function-name" "7.0.0-beta.44"
+    "@babel/helper-split-export-declaration" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
+    babylon "7.0.0-beta.44"
+    debug "^3.1.0"
     globals "^11.1.0"
     invariant "^2.2.0"
     lodash "^4.2.0"
 
-"@babel/types@7.0.0-beta.36":
-  version "7.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.36.tgz#64f2004353de42adb72f9ebb4665fc35b5499d23"
+"@babel/types@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.44.tgz#6b1b164591f77dec0a0342aca995f2d046b3a757"
   dependencies:
     esutils "^2.0.2"
     lodash "^4.2.0"
@@ -114,18 +138,40 @@
     git-url-parse "^6.0.2"
     shelljs "^0.7.0"
 
-"@metascraper/helpers@^3.9.2":
-  version "3.9.2"
-  resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-3.9.2.tgz#c96588de5c6352d7ed9bf7245e35ac0c82333c59"
+"@metascraper/helpers@^3.11.5":
+  version "3.11.5"
+  resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-3.11.5.tgz#6e12ca12c66620032ea4ab87c30f0ed66603f0f2"
   dependencies:
     condense-whitespace "~1.0.0"
     is-relative-url "~2.0.0"
-    lodash "~4.17.4"
-    normalize-url "~2.0.0"
+    lodash "~4.17.10"
+    normalize-url "~3.0.0"
     smartquotes "~2.3.1"
     to-title-case "~1.0.0"
     url-regex "~4.1.1"
 
+"@samverschueren/stream-to-observable@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f"
+  dependencies:
+    any-observable "^0.3.0"
+
+"@sinonjs/formatio@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-2.0.0.tgz#84db7e9eb5531df18a8c5e0bfb6e449e55e654b2"
+  dependencies:
+    samsam "1.3.0"
+
+"@types/babel-types@*", "@types/babel-types@^7.0.0":
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/@types/babel-types/-/babel-types-7.0.2.tgz#63dc3e5e7f6367e1819d2bba5213783cd926c5d5"
+
+"@types/babylon@^6.16.2":
+  version "6.16.2"
+  resolved "https://registry.yarnpkg.com/@types/babylon/-/babylon-6.16.2.tgz#062ce63b693d9af1c246f5aedf928bc9c30589c8"
+  dependencies:
+    "@types/babel-types" "*"
+
 "@types/graphql@0.10.2":
   version "0.10.2"
   resolved "https://registry.yarnpkg.com/@types/graphql/-/graphql-0.10.2.tgz#d7c79acbaa17453b6681c80c34b38fcb10c4c08c"
@@ -139,18 +185,18 @@
   resolved "https://registry.yarnpkg.com/@types/graphql/-/graphql-0.9.4.tgz#cdeb6bcbef9b6c584374b81aa7f48ecf3da404fa"
 
 "@types/node@*":
-  version "8.0.53"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.53.tgz#396b35af826fa66aad472c8cb7b8d5e277f4e6d8"
+  version "10.3.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.3.1.tgz#51092fbacaed768a122a293814474fbf6e5e8b6d"
 
 "@types/ws@^3.0.0":
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-3.2.0.tgz#988ff690e6ed10068a86aa0e9f842d0a03c09e21"
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-3.2.1.tgz#b0c1579e58e686f83ce0a97bb9463d29705827fb"
   dependencies:
     "@types/node" "*"
 
 JSONStream@^1.0.7:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.2.tgz#c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea"
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.3.tgz#27b4b8fbbfeab4e71bcf551e7f27be8d952239bf"
   dependencies:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
@@ -159,7 +205,7 @@ a-sync-waterfall@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/a-sync-waterfall/-/a-sync-waterfall-1.0.0.tgz#38e8319d79379e24628845b53b96722b29e0e47c"
 
-abab@^1.0.0, abab@^1.0.4:
+abab@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
 
@@ -167,11 +213,11 @@ abbrev@1, abbrev@^1.0.7:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
 
-accepts@~1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.4.tgz#86246758c7dd6d21a6474ff084a4740ec05eb21f"
+accepts@~1.3.4, accepts@~1.3.5:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
   dependencies:
-    mime-types "~2.1.16"
+    mime-types "~2.1.18"
     negotiator "0.6.1"
 
 acorn-dynamic-import@^2.0.0:
@@ -180,12 +226,6 @@ acorn-dynamic-import@^2.0.0:
   dependencies:
     acorn "^4.0.3"
 
-acorn-globals@^1.0.4:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-1.0.9.tgz#55bb5e98691507b74579d0513413217c380c54cf"
-  dependencies:
-    acorn "^2.1.0"
-
 acorn-globals@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
@@ -204,11 +244,7 @@ acorn-jsx@^3.0.0:
   dependencies:
     acorn "^3.0.4"
 
-acorn@^2.1.0, acorn@^2.4.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-2.7.0.tgz#ab6e7d9d886aaca8b085bc3312b79a198433f0e7"
-
-acorn@^3.0.4, acorn@^3.1.0, acorn@~3.3.0:
+acorn@^3.0.4, acorn@^3.1.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
 
@@ -216,17 +252,9 @@ acorn@^4.0.3, acorn@^4.0.4, acorn@~4.0.2:
   version "4.0.13"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
 
-acorn@^5.0.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.3.0.tgz#7446d39459c54fb49a80e6ee6478149b940ec822"
-
-acorn@^5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.2.1.tgz#317ac7821826c22c702d66189ab8359675f135d7"
-
-acorn@^5.3.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.4.1.tgz#fdc58d9d17f4a4e98d102ded826a9b9759125102"
+acorn@^5.0.0, acorn@^5.3.0, acorn@^5.5.0:
+  version "5.6.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.6.1.tgz#c9e50c3e3717cf897f1b071ceadbb543bbc0a8d4"
 
 addressparser@1.0.1:
   version "1.0.1"
@@ -245,27 +273,22 @@ agent-base@^4.1.0:
   dependencies:
     es6-promisify "^5.0.0"
 
-ajv-keywords@^2.0.0, ajv-keywords@^2.1.0:
+ajv-keywords@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
 
-ajv@^4.9.1, ajv@^4.9.2:
+ajv-keywords@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
+
+ajv@^4.9.2:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
   dependencies:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
-ajv@^5.0.0:
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.3.tgz#c06f598778c44c6b161abafe3466b81ad1814ed2"
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    json-schema-traverse "^0.3.0"
-    json-stable-stringify "^1.0.1"
-
-ajv@^5.1.0, ajv@^5.1.5, ajv@^5.2.3, ajv@^5.3.0:
+ajv@^5.0.0, ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
   dependencies:
@@ -274,9 +297,18 @@ ajv@^5.1.0, ajv@^5.1.5, ajv@^5.2.3, ajv@^5.3.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
+ajv@^6.1.0:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.0.tgz#4c8affdf80887d8f132c9c52ab8a2dc4d0b7b24c"
+  dependencies:
+    fast-deep-equal "^2.0.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.3.0"
+    uri-js "^4.2.1"
+
 akismet-api@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/akismet-api/-/akismet-api-4.0.1.tgz#1c771442f09316847132aa16171bb4fb708b6519"
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/akismet-api/-/akismet-api-4.1.0.tgz#549e492bcbed3eb1c1cbfce1271e5a8dfd7c6f04"
   dependencies:
     bluebird "^3.1.1"
     superagent "^3.8.0"
@@ -312,8 +344,8 @@ ansi-escapes@^2.0.0:
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-2.0.0.tgz#5bae52be424878dd9783e8910e3fc2922e83c81b"
 
 ansi-escapes@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.0.0.tgz#ec3e8b4e9f8064fc02c3ac9b65f1c275bda8ef92"
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
 
 ansi-regex@^2.0.0:
   version "2.1.1"
@@ -327,21 +359,15 @@ ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
-ansi-styles@^3.1.0, ansi-styles@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
-  dependencies:
-    color-convert "^1.9.0"
-
-ansi-styles@^3.2.1:
+ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   dependencies:
     color-convert "^1.9.0"
 
-any-observable@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.2.0.tgz#c67870058003579009083f54ac0abafb5c33d242"
+any-observable@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b"
 
 any-promise@^0.1.0, any-promise@~0.1.0:
   version "0.1.0"
@@ -361,9 +387,9 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-apollo-cache-control@^0.0.x:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.0.7.tgz#ffef56413a429a1ce204be5b78d248c4fe3b67ac"
+apollo-cache-control@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.1.1.tgz#173d14ceb3eb9e7cb53de7eb8b61bee6159d4171"
   dependencies:
     graphql-extensions "^0.0.x"
 
@@ -381,28 +407,28 @@ apollo-client@^1.4.0, apollo-client@^1.9.1:
   optionalDependencies:
     "@types/graphql" "0.10.2"
 
-apollo-engine-binary-darwin@0.2017.12-45-g12ba029f9:
-  version "0.2017.12-45-g12ba029f9"
-  resolved "https://registry.yarnpkg.com/apollo-engine-binary-darwin/-/apollo-engine-binary-darwin-0.2017.12-45-g12ba029f9.tgz#a1c646179337fa58093decc4fd278b6518d2734a"
+apollo-engine-binary-darwin@0.2018.2-37-g678cbb68b:
+  version "0.2018.2-37-g678cbb68b"
+  resolved "https://registry.yarnpkg.com/apollo-engine-binary-darwin/-/apollo-engine-binary-darwin-0.2018.2-37-g678cbb68b.tgz#a7dbf5fd56d5090ebe955e28f9574228a10500fe"
 
-apollo-engine-binary-linux@0.2017.12-45-g12ba029f9:
-  version "0.2017.12-45-g12ba029f9"
-  resolved "https://registry.yarnpkg.com/apollo-engine-binary-linux/-/apollo-engine-binary-linux-0.2017.12-45-g12ba029f9.tgz#4a3948fb887a16f302ed9eb8466df7bf70c23e80"
+apollo-engine-binary-linux@0.2018.2-37-g678cbb68b:
+  version "0.2018.2-37-g678cbb68b"
+  resolved "https://registry.yarnpkg.com/apollo-engine-binary-linux/-/apollo-engine-binary-linux-0.2018.2-37-g678cbb68b.tgz#c348a89e0c3164f08687fa1701e71f378e862e57"
 
-apollo-engine-binary-windows@0.2017.12-45-g12ba029f9:
-  version "0.2017.12-45-g12ba029f9"
-  resolved "https://registry.yarnpkg.com/apollo-engine-binary-windows/-/apollo-engine-binary-windows-0.2017.12-45-g12ba029f9.tgz#4a8985ae2e024e6b0c4b229f5fb6cf4b0baacf69"
+apollo-engine-binary-windows@0.2018.2-37-g678cbb68b:
+  version "0.2018.2-37-g678cbb68b"
+  resolved "https://registry.yarnpkg.com/apollo-engine-binary-windows/-/apollo-engine-binary-windows-0.2018.2-37-g678cbb68b.tgz#f6541b7b670b42b54efed4781abc724977009234"
 
 apollo-engine@^0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/apollo-engine/-/apollo-engine-0.8.1.tgz#ff3182061e729d631b4c5c1a49c2e731a430ba9b"
+  version "0.8.10"
+  resolved "https://registry.yarnpkg.com/apollo-engine/-/apollo-engine-0.8.10.tgz#1f57260fee31997eb4abed6bd3b6ac11a5c17340"
   dependencies:
     request "^2.81.0"
     stream-json "^0.5.2"
   optionalDependencies:
-    apollo-engine-binary-darwin "0.2017.12-45-g12ba029f9"
-    apollo-engine-binary-linux "0.2017.12-45-g12ba029f9"
-    apollo-engine-binary-windows "0.2017.12-45-g12ba029f9"
+    apollo-engine-binary-darwin "0.2018.2-37-g678cbb68b"
+    apollo-engine-binary-linux "0.2018.2-37-g678cbb68b"
+    apollo-engine-binary-windows "0.2018.2-37-g678cbb68b"
 
 apollo-link-core@^0.5.0:
   version "0.5.4"
@@ -412,34 +438,34 @@ apollo-link-core@^0.5.0:
     graphql-tag "^2.4.2"
     zen-observable-ts "^0.4.4"
 
-apollo-server-core@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-1.3.2.tgz#f36855a3ebdc2d77b8b9c454380bf1d706105ffc"
+apollo-server-core@^1.3.6:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-1.3.6.tgz#08636243c2de56fa8c267d68dd602cb1fbd323e3"
   dependencies:
-    apollo-cache-control "^0.0.x"
+    apollo-cache-control "^0.1.0"
     apollo-tracing "^0.1.0"
     graphql-extensions "^0.0.x"
 
 apollo-server-express@^1.2.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-1.3.2.tgz#0ff8201c0bf362804a151e1399767dae6ab7e309"
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-1.3.6.tgz#2120b05021a87def44fafd846e8a0e2a32852db7"
   dependencies:
-    apollo-server-core "^1.3.2"
-    apollo-server-module-graphiql "^1.3.0"
+    apollo-server-core "^1.3.6"
+    apollo-server-module-graphiql "^1.3.4"
 
-apollo-server-module-graphiql@^1.3.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/apollo-server-module-graphiql/-/apollo-server-module-graphiql-1.3.2.tgz#0a9e4c48dece3af904fee333f95f7b9817335ca7"
+apollo-server-module-graphiql@^1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/apollo-server-module-graphiql/-/apollo-server-module-graphiql-1.3.4.tgz#50399b7c51b7267d0c841529f5173e5fc7304de4"
 
 apollo-tracing@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.1.1.tgz#7a5707543fc102f81cda7ba45b98331a82a6750b"
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.1.4.tgz#5b8ae1b01526b160ee6e552a7f131923a9aedcc7"
   dependencies:
-    graphql-extensions "^0.0.x"
+    graphql-extensions "~0.0.9"
 
 apollo-utilities@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.0.3.tgz#bf435277609850dd442cf1d5c2e8bc6655eaa943"
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.0.13.tgz#793c858bb42243f7254d3c2961c64a7158e51022"
 
 app-module-path@^2.2.0:
   version "2.2.0"
@@ -450,8 +476,8 @@ app-root-path@^2.0.1:
   resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.0.1.tgz#cd62dcf8e4fd5a417efc664d2e5b10653c651b46"
 
 "apparatus@>= 0.0.9":
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/apparatus/-/apparatus-0.0.9.tgz#37dcd25834ad0b651076596291db823eeb1908bd"
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/apparatus/-/apparatus-0.0.10.tgz#81ea756772ada77863db54ceee8202c109bdca3e"
   dependencies:
     sylvester ">= 0.0.8"
 
@@ -494,15 +520,15 @@ archy@^1.0.0:
   resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
 
 are-we-there-yet@~1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
   dependencies:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
 
 argparse@^1.0.7:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
   dependencies:
     sprintf-js "~1.0.2"
 
@@ -582,8 +608,8 @@ asap@^2.0.3, asap@~2.0.3:
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
 
 asn1.js@^4.0.0:
-  version "4.9.2"
-  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.2.tgz#8117ef4f7ed87cd8f89044b5bff97ac243a16c9a"
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
   dependencies:
     bn.js "^4.0.0"
     inherits "^2.0.1"
@@ -612,16 +638,16 @@ assertion-error@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"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
 
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
 
 ast-types@0.x.x:
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.10.1.tgz#f52fca9715579a14f841d67d7f8d25432ab6a3dd"
+  version "0.11.5"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.11.5.tgz#9890825d660c03c28339f315e9fa0a360e31ec28"
 
 astral-regex@^1.0.0:
   version "1.0.0"
@@ -639,34 +665,16 @@ async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
 
-async@2.1.4:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.1.4.tgz#2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4"
-  dependencies:
-    lodash "^4.14.0"
-
-async@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.4.1.tgz#62a56b279c98a11d0987096a01cc3eeb8eb7bbd7"
-  dependencies:
-    lodash "^4.14.0"
-
-async@^1.4.0, async@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
-
-async@^2.0.0, async@^2.1.2, async@^2.4.1, async@~2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
-  dependencies:
-    lodash "^4.14.0"
-
-async@^2.1.4:
+async@2.6.1, async@^2.0.0, async@^2.1.2, async@^2.1.4, async@^2.4.1, async@~2.6.0:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
   dependencies:
     lodash "^4.17.10"
 
+async@^1.4.0, async@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+
 async@~0.2.6:
   version "0.2.10"
   resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
@@ -679,9 +687,9 @@ asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
 
-atob@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.0.3.tgz#19c7a760473774468f20b2d2d03372ad7d4cbf5d"
+atob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.1.tgz#ae2d5a729477f289d60dd7f96a6314a22dd6c22a"
 
 autoprefixer@^6.3.1, autoprefixer@^6.5.2:
   version "6.7.7"
@@ -702,14 +710,10 @@ aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
 
-aws4@^1.2.1:
+aws4@^1.2.1, aws4@^1.6.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289"
 
-aws4@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
-
 babel-cli@6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.26.0.tgz#502ab54874d7db88ad00b887a06383ce03d002f1"
@@ -731,7 +735,7 @@ babel-cli@6.26.0:
   optionalDependencies:
     chokidar "^1.6.1"
 
-babel-code-frame@^6.11.0, babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
+babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
   dependencies:
@@ -739,7 +743,7 @@ babel-code-frame@^6.11.0, babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
     esutils "^2.0.2"
     js-tokens "^3.0.2"
 
-babel-core@6.26.0, babel-core@^6.0.0, babel-core@^6.26.0:
+babel-core@6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
   dependencies:
@@ -763,6 +767,30 @@ babel-core@6.26.0, babel-core@^6.0.0, babel-core@^6.26.0:
     slash "^1.0.0"
     source-map "^0.5.6"
 
+babel-core@^6.0.0, babel-core@^6.26.0:
+  version "6.26.3"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-generator "^6.26.0"
+    babel-helpers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-register "^6.26.0"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    convert-source-map "^1.5.1"
+    debug "^2.6.9"
+    json5 "^0.5.1"
+    lodash "^4.17.4"
+    minimatch "^3.0.4"
+    path-is-absolute "^1.0.1"
+    private "^0.1.8"
+    slash "^1.0.0"
+    source-map "^0.5.7"
+
 babel-eslint@7.2.3:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-7.2.3.tgz#b2fe2d80126470f5c19442dc757253a897710827"
@@ -773,19 +801,19 @@ babel-eslint@7.2.3:
     babylon "^6.17.0"
 
 babel-eslint@^8.0.1:
-  version "8.2.1"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.2.1.tgz#136888f3c109edc65376c23ebf494f36a3e03951"
+  version "8.2.3"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.2.3.tgz#1a2e6681cc9bc4473c32899e59915e19cd6733cf"
   dependencies:
-    "@babel/code-frame" "7.0.0-beta.36"
-    "@babel/traverse" "7.0.0-beta.36"
-    "@babel/types" "7.0.0-beta.36"
-    babylon "7.0.0-beta.36"
+    "@babel/code-frame" "7.0.0-beta.44"
+    "@babel/traverse" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
+    babylon "7.0.0-beta.44"
     eslint-scope "~3.7.1"
     eslint-visitor-keys "^1.0.0"
 
 babel-generator@^6.18.0, babel-generator@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.0.tgz#ac1ae20070b79f6e3ca1d3269613053774f20dc5"
+  version "6.26.1"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
   dependencies:
     babel-messages "^6.23.0"
     babel-runtime "^6.26.0"
@@ -793,7 +821,7 @@ babel-generator@^6.18.0, babel-generator@^6.26.0:
     detect-indent "^4.0.0"
     jsesc "^1.3.0"
     lodash "^4.17.4"
-    source-map "^0.5.6"
+    source-map "^0.5.7"
     trim-right "^1.0.1"
 
 babel-helper-builder-react-jsx@^6.24.1:
@@ -896,16 +924,16 @@ babel-jest@^21.2.0:
     babel-plugin-istanbul "^4.0.0"
     babel-preset-jest "^21.2.0"
 
-babel-jest@^22.4.3:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-22.4.3.tgz#4b7a0b6041691bbd422ab49b3b73654a49a6627a"
+babel-jest@^22.4.4:
+  version "22.4.4"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-22.4.4.tgz#977259240420e227444ebe49e226a61e49ea659d"
   dependencies:
     babel-plugin-istanbul "^4.1.5"
-    babel-preset-jest "^22.4.3"
+    babel-preset-jest "^22.4.4"
 
 babel-loader@^7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.2.tgz#f6cbe122710f1aa2af4d881c6d5b54358ca24126"
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.4.tgz#e3463938bd4e6d55d1c174c5485d406a188ed015"
   dependencies:
     find-cache-dir "^1.0.0"
     loader-utils "^1.0.2"
@@ -929,15 +957,7 @@ babel-plugin-dynamic-import-node@^1.1.0:
   dependencies:
     babel-plugin-syntax-dynamic-import "^6.18.0"
 
-babel-plugin-istanbul@^4.0.0:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.5.tgz#6760cdd977f411d3e175bb064f2bc327d99b2b6e"
-  dependencies:
-    find-up "^2.1.0"
-    istanbul-lib-instrument "^1.7.5"
-    test-exclude "^4.1.1"
-
-babel-plugin-istanbul@^4.1.5:
+babel-plugin-istanbul@^4.0.0, babel-plugin-istanbul@^4.1.5:
   version "4.1.6"
   resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45"
   dependencies:
@@ -950,9 +970,9 @@ babel-plugin-jest-hoist@^21.2.0:
   version "21.2.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-21.2.0.tgz#2cef637259bd4b628a6cace039de5fcd14dbb006"
 
-babel-plugin-jest-hoist@^22.4.3:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-22.4.3.tgz#7d8bcccadc2667f96a0dcc6afe1891875ee6c14a"
+babel-plugin-jest-hoist@^22.4.4:
+  version "22.4.4"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-22.4.4.tgz#b9851906eab34c7bf6f8c895a2b08bea1a844c0b"
 
 babel-plugin-syntax-async-functions@^6.8.0:
   version "6.13.0"
@@ -1092,8 +1112,8 @@ babel-plugin-transform-es2015-modules-amd@^6.24.1:
     babel-template "^6.24.1"
 
 babel-plugin-transform-es2015-modules-commonjs@^6.24.1, babel-plugin-transform-es2015-modules-commonjs@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz#0d8394029b7dc6abe1a97ef181e00758dd2e5d8a"
+  version "6.26.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3"
   dependencies:
     babel-plugin-transform-strict-mode "^6.24.1"
     babel-runtime "^6.26.0"
@@ -1286,11 +1306,11 @@ babel-preset-jest@^21.2.0:
     babel-plugin-jest-hoist "^21.2.0"
     babel-plugin-syntax-object-rest-spread "^6.13.0"
 
-babel-preset-jest@^22.4.3:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-22.4.3.tgz#e92eef9813b7026ab4ca675799f37419b5a44156"
+babel-preset-jest@^22.4.4:
+  version "22.4.4"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-22.4.4.tgz#ec9fbd8bcd7dfd24b8b5320e0e688013235b7c39"
   dependencies:
-    babel-plugin-jest-hoist "^22.4.3"
+    babel-plugin-jest-hoist "^22.4.4"
     babel-plugin-syntax-object-rest-spread "^6.13.0"
 
 babel-preset-react@^6.23.0:
@@ -1356,9 +1376,9 @@ babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24
     lodash "^4.17.4"
     to-fast-properties "^1.0.3"
 
-babylon@7.0.0-beta.36:
-  version "7.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.36.tgz#3a3683ba6a9a1e02b0aa507c8e63435e39305b9e"
+babylon@7.0.0-beta.44:
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.44.tgz#89159e15e6e30c5096e22d738d8c0af8a0e8ca1d"
 
 babylon@^6.17.0, babylon@^6.18.0:
   version "6.18.0"
@@ -1385,12 +1405,8 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
 
 base64-js@^1.0.2, base64-js@^1.1.2:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.1.tgz#a91947da1f4a516ea38e5b4ec0ec3773675e0886"
-
-base64url@2.0.0, base64url@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/base64url/-/base64url-2.0.0.tgz#eac16e03ea1438eff9423d69baa36262ed1f70bb"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
 
 base@^0.11.1:
   version "0.11.2"
@@ -1445,7 +1461,7 @@ bluebird@3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c"
 
-bluebird@^3.0.6, bluebird@^3.1.1, bluebird@^3.2.2, bluebird@^3.3.4, bluebird@^3.4.0, bluebird@^3.5.0, bluebird@^3.5.1:
+bluebird@^3.0.6, bluebird@^3.1.1, bluebird@^3.2.2, bluebird@^3.3.4, bluebird@^3.4.0, bluebird@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
 
@@ -1453,7 +1469,7 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
 
-body-parser@1.18.2, body-parser@^1.12.2:
+body-parser@1.18.2:
   version "1.18.2"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454"
   dependencies:
@@ -1468,6 +1484,21 @@ body-parser@1.18.2, body-parser@^1.12.2:
     raw-body "2.3.2"
     type-is "~1.6.15"
 
+body-parser@^1.12.2:
+  version "1.18.3"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4"
+  dependencies:
+    bytes "3.0.0"
+    content-type "~1.0.4"
+    debug "2.6.9"
+    depd "~1.1.2"
+    http-errors "~1.6.3"
+    iconv-lite "0.4.23"
+    on-finished "~2.3.0"
+    qs "6.5.2"
+    raw-body "2.3.3"
+    type-is "~1.6.16"
+
 boolbase@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
@@ -1478,21 +1509,9 @@ boom@2.x.x:
   dependencies:
     hoek "2.x.x"
 
-boom@4.x.x:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
-  dependencies:
-    hoek "4.x.x"
-
-boom@5.x.x:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
-  dependencies:
-    hoek "4.x.x"
-
 bowser@^1.7.2:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/bowser/-/bowser-1.9.0.tgz#c5015128dcf155b4e3d11d1ab46b7a4b6ee695b8"
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/bowser/-/bowser-1.9.3.tgz#6643ae4d783f31683f6d23156976b74183862162"
 
 boxen@^1.2.1:
   version "1.3.0"
@@ -1506,14 +1525,7 @@ boxen@^1.2.1:
     term-size "^1.2.0"
     widest-line "^2.0.0"
 
-brace-expansion@^1.0.0:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-brace-expansion@^1.1.7:
+brace-expansion@^1.0.0, brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
   dependencies:
@@ -1529,16 +1541,14 @@ braces@^1.8.2:
     repeat-element "^1.1.2"
 
 braces@^2.3.0, braces@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.1.tgz#7086c913b4e5a08dbe37ac0ee6a2500c4ba691bb"
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
   dependencies:
     arr-flatten "^1.1.0"
     array-unique "^0.3.2"
-    define-property "^1.0.0"
     extend-shallow "^2.0.1"
     fill-range "^4.0.0"
     isobject "^3.0.1"
-    kind-of "^6.0.2"
     repeat-element "^1.1.2"
     snapdragon "^0.8.1"
     snapdragon-node "^2.0.1"
@@ -1584,8 +1594,8 @@ browser-stdout@1.3.0:
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f"
 
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.1.1.tgz#38b7ab55edb806ff2dcda1a7f1620773a477c49f"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
   dependencies:
     buffer-xor "^1.0.3"
     cipher-base "^1.0.0"
@@ -1595,16 +1605,16 @@ browserify-aes@^1.0.0, browserify-aes@^1.0.4:
     safe-buffer "^5.0.1"
 
 browserify-cipher@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.0.tgz#9988244874bf5ed4e28da95666dcd66ac8fc363a"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
   dependencies:
     browserify-aes "^1.0.4"
     browserify-des "^1.0.0"
     evp_bytestokey "^1.0.0"
 
 browserify-des@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.0.tgz#daa277717470922ed2fe18594118a175439721dd"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.1.tgz#3343124db6d7ad53e26a8826318712bdc8450f9c"
   dependencies:
     cipher-base "^1.0.1"
     des.js "^1.0.0"
@@ -1643,10 +1653,10 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
     electron-to-chromium "^1.2.7"
 
 browserstack-local@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/browserstack-local/-/browserstack-local-1.3.0.tgz#fe80ef05ce8954c4d626e3502eb62d60903b4237"
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/browserstack-local/-/browserstack-local-1.3.3.tgz#7500d630f24651e89a8fe9b3f5c166d3b67259af"
   dependencies:
-    https-proxy-agent "^1.0.0"
+    https-proxy-agent "^2.2.1"
     is-running "^2.0.0"
     sinon "^1.17.6"
     temp-fs "^0.9.9"
@@ -1657,24 +1667,20 @@ bser@^2.0.0:
   dependencies:
     node-int64 "^0.4.0"
 
-bson@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/bson/-/bson-1.0.4.tgz#93c10d39eaa5b58415cbc4052f3e53e562b0b72c"
-
-bson@~1.0.5:
+bson@~1.0.4, bson@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/bson/-/bson-1.0.6.tgz#444db59ddd4c24f0cb063aabdc5c8c7b0ceca912"
 
-buffer-alloc-unsafe@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-0.1.1.tgz#ffe1f67551dd055737de253337bfe853dfab1a6a"
+buffer-alloc-unsafe@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
 
 buffer-alloc@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.1.0.tgz#05514d33bf1656d3540c684f65b1202e90eca303"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
   dependencies:
-    buffer-alloc-unsafe "^0.1.0"
-    buffer-fill "^0.1.0"
+    buffer-alloc-unsafe "^1.1.0"
+    buffer-fill "^1.0.0"
 
 buffer-crc32@^0.2.1, buffer-crc32@~0.2.3:
   version "0.2.13"
@@ -1684,9 +1690,13 @@ buffer-equal-constant-time@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
 
-buffer-fill@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-0.1.1.tgz#76d825c4d6e50e06b7a31eb520c04d08cc235071"
+buffer-fill@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
+
+buffer-from@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.0.tgz#87fcaa3a298358e0ade6e442cfce840740d1ad04"
 
 buffer-xor@^1.0.3:
   version "1.0.3"
@@ -1845,8 +1855,14 @@ caniuse-api@^1.5.2:
     lodash.uniq "^4.5.0"
 
 caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000748"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000748.tgz#785d9edfcd645bf795c6ff3ced33c45d580c48a0"
+  version "1.0.30000848"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000848.tgz#e149c981c72aa20439e3bc12c7cf8b3f7e1237c6"
+
+capture-exit@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f"
+  dependencies:
+    rsvp "^3.3.3"
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"
@@ -1903,7 +1919,18 @@ chai-nightwatch@~0.1.x:
     assertion-error "1.0.0"
     deep-eql "0.1.3"
 
-chai@>1.9.0, chai@^3.5.0:
+chai@>1.9.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-4.1.2.tgz#0f64584ba642f0f2ace2806279f4f06ca23ad73c"
+  dependencies:
+    assertion-error "^1.0.1"
+    check-error "^1.0.1"
+    deep-eql "^3.0.0"
+    get-func-name "^2.0.0"
+    pathval "^1.0.0"
+    type-detect "^4.0.0"
+
+chai@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/chai/-/chai-3.5.0.tgz#4d02637b067fe958bdbfdd3a40ec56fef7373247"
   dependencies:
@@ -1925,30 +1952,14 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
-  dependencies:
-    ansi-styles "^3.1.0"
-    escape-string-regexp "^1.0.5"
-    supports-color "^4.0.0"
-
-chalk@^2.3.0, chalk@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65"
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
   dependencies:
     ansi-styles "^3.2.1"
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796"
-  dependencies:
-    ansi-styles "^3.2.0"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.2.0"
-
 change-emitter@^0.1.2:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/change-emitter/-/change-emitter-0.1.6.tgz#e8b2fe3d7f1ab7d69a32199aff91ea6931409515"
@@ -1967,21 +1978,34 @@ charenc@~0.0.1:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
 
-check-error@^1.0.2:
+check-error@^1.0.1, check-error@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
 
-cheerio@^0.20.0:
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.20.0.tgz#5c710f2bab95653272842ba01c6ea61b3545ec35"
+cheerio-advanced-selectors@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/cheerio-advanced-selectors/-/cheerio-advanced-selectors-2.0.1.tgz#fb5ec70a4599e8cec1cf669c6d9b90a3fa969c48"
+
+cheerio@0.22.0:
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e"
   dependencies:
     css-select "~1.2.0"
     dom-serializer "~0.1.0"
     entities "~1.1.1"
-    htmlparser2 "~3.8.1"
-    lodash "^4.1.0"
-  optionalDependencies:
-    jsdom "^7.0.2"
+    htmlparser2 "^3.9.1"
+    lodash.assignin "^4.0.9"
+    lodash.bind "^4.1.4"
+    lodash.defaults "^4.0.1"
+    lodash.filter "^4.4.0"
+    lodash.flatten "^4.2.0"
+    lodash.foreach "^4.3.0"
+    lodash.map "^4.4.0"
+    lodash.merge "^4.4.0"
+    lodash.pick "^4.2.1"
+    lodash.reduce "^4.4.0"
+    lodash.reject "^4.4.0"
+    lodash.some "^4.4.0"
 
 cheerio@^1.0.0-rc.2, cheerio@~1.0.0-rc.2:
   version "1.0.0-rc.2"
@@ -1994,7 +2018,7 @@ cheerio@^1.0.0-rc.2, cheerio@~1.0.0-rc.2:
     lodash "^4.15.0"
     parse5 "^3.0.1"
 
-chokidar@^1.5.2, chokidar@^1.6.0, chokidar@^1.6.1, chokidar@^1.7.0:
+chokidar@^1.5.2, chokidar@^1.6.1:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
   dependencies:
@@ -2009,7 +2033,7 @@ chokidar@^1.5.2, chokidar@^1.6.0, chokidar@^1.6.1, chokidar@^1.7.0:
   optionalDependencies:
     fsevents "^1.0.0"
 
-chokidar@^2.0.0:
+chokidar@^2.0.0, chokidar@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.3.tgz#dcbd4f6cbb2a55b4799ba8a840ac527e5f4b1176"
   dependencies:
@@ -2027,24 +2051,6 @@ chokidar@^2.0.0:
   optionalDependencies:
     fsevents "^1.1.2"
 
-chokidar@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.2.tgz#4dc65139eeb2714977735b6a35d06e97b494dfd7"
-  dependencies:
-    anymatch "^2.0.0"
-    async-each "^1.0.0"
-    braces "^2.3.0"
-    glob-parent "^3.1.0"
-    inherits "^2.0.1"
-    is-binary-path "^1.0.0"
-    is-glob "^4.0.0"
-    normalize-path "^2.1.1"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.0.0"
-    upath "^1.0.0"
-  optionalDependencies:
-    fsevents "^1.0.0"
-
 chownr@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
@@ -2056,8 +2062,8 @@ chrono-node@~1.3.5:
     moment "^2.10.3"
 
 ci-info@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.1.tgz#47b44df118c48d2597b56d342e7e25791060171a"
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.3.tgz#710193264bb05c77b8c90d02f5aaf22216a667b2"
 
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
@@ -2093,12 +2099,11 @@ classnames@^2.2.3, classnames@^2.2.5:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
 
-clean-css@^3.3.0:
-  version "3.4.28"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.28.tgz#bf1945e82fc808f55695e6ddeaec01400efd03ff"
+clean-css@^4.1.11:
+  version "4.1.11"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.11.tgz#2ecdf145aba38f54740f26cefd0ff3e03e125d6a"
   dependencies:
-    commander "2.8.x"
-    source-map "0.4.x"
+    source-map "0.5.x"
 
 cli-boxes@^1.0.0:
   version "1.0.0"
@@ -2165,20 +2170,20 @@ cliui@^3.0.3, cliui@^3.2.0:
     wrap-ansi "^2.0.0"
 
 cliui@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.0.0.tgz#743d4650e05f36d1ed2575b59638d87322bfbbcc"
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
   dependencies:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
     wrap-ansi "^2.0.0"
 
 clone@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
 
 cluster-key-slot@^1.0.6:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.0.8.tgz#7654556085a65330932a2e8b5976f8e2d0b3e414"
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.0.12.tgz#d5deff2a520717bc98313979b687309b2d368e29"
 
 co@^4.6.0:
   version "4.6.0"
@@ -2205,8 +2210,8 @@ codemirror-spell-checker@*:
     typo-js "*"
 
 codemirror@*:
-  version "5.30.0"
-  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.30.0.tgz#86e57dd5ea5535acbcf9c720797b4cefe05b5a70"
+  version "5.38.0"
+  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.38.0.tgz#26a9551446e51dbdde36aabe60f72469724fd332"
 
 collection-visit@^1.0.0:
   version "1.0.0"
@@ -2215,13 +2220,7 @@ collection-visit@^1.0.0:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
 
-color-convert@^1.3.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
-  dependencies:
-    color-name "^1.1.1"
-
-color-convert@^1.9.0:
+color-convert@^1.3.0, color-convert@^1.9.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
   dependencies:
@@ -2261,29 +2260,23 @@ colors@1.0.x:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
 
-colors@^1.0.3:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.2.1.tgz#f4a3d302976aaf042356ba1ade3b1a2c62d9d794"
+colors@^1.0.3, colors@^1.1.2:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.0.tgz#5f20c9fef6945cb1134260aab33bfbdc8295e04e"
 
-colors@^1.1.2, colors@~1.1.2:
+colors@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
 
-combined-stream@^1.0.5, combined-stream@~1.0.5:
+combined-stream@1.0.6, combined-stream@^1.0.5, combined-stream@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
   dependencies:
     delayed-stream "~1.0.0"
 
 command-exists@^1.2.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/command-exists/-/command-exists-1.2.2.tgz#12819c64faf95446ec0ae07fe6cafb6eb3708b22"
-
-commander@2.8.x:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
-  dependencies:
-    graceful-readlink ">= 1.0.0"
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/command-exists/-/command-exists-1.2.6.tgz#577f8e5feb0cb0f159cd557a51a9be1bdd76e09e"
 
 commander@2.9.0:
   version "2.9.0"
@@ -2291,15 +2284,7 @@ commander@2.9.0:
   dependencies:
     graceful-readlink ">= 1.0.0"
 
-commander@^2.11.0:
-  version "2.12.2"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
-
-commander@^2.14.1:
-  version "2.14.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa"
-
-commander@^2.9.0:
+commander@^2.11.0, commander@^2.14.1, commander@^2.9.0:
   version "2.15.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
 
@@ -2307,25 +2292,17 @@ commander@~2.13.0:
   version "2.13.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
 
-common-tags@^1.4.0:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.5.1.tgz#e2e39931a013cd02253defeed89a1ad615a27f07"
-  dependencies:
-    babel-runtime "^6.26.0"
-
-common-tags@^1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.7.2.tgz#24d9768c63d253a56ecff93845b44b4df1d52771"
-  dependencies:
-    babel-runtime "^6.26.0"
+common-tags@^1.4.0, common-tags@^1.7.2:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
 
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
 
 compare-versions@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.1.0.tgz#43310256a5c555aaed4193c04d8f154cf9c6efd5"
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.2.1.tgz#a49eb7689d4caaf0b6db5220173fd279614000f7"
 
 component-emitter@^1.2.0, component-emitter@^1.2.1:
   version "1.2.1"
@@ -2340,25 +2317,19 @@ compress-commons@^1.2.0:
     normalize-path "^2.0.0"
     readable-stream "^2.0.0"
 
-compressible@~2.0.11:
-  version "2.0.11"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.11.tgz#16718a75de283ed8e604041625a2064586797d8a"
-  dependencies:
-    mime-db ">= 1.29.0 < 2"
-
-compressible@~2.0.13:
+compressible@~2.0.11, compressible@~2.0.13:
   version "2.0.13"
   resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.13.tgz#0d1020ab924b2fdb4d6279875c7d6daba6baa7a9"
   dependencies:
     mime-db ">= 1.33.0 < 2"
 
 compression-webpack-plugin@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-1.1.2.tgz#ae80491e3138db7ec168af91a800312594a18943"
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-1.1.11.tgz#8384c7a6ead1d2e2efb190bdfcdcf35878ed8266"
   dependencies:
-    async "2.4.1"
     cacache "^10.0.1"
     find-cache-dir "^1.0.0"
+    neo-async "^2.5.0"
     serialize-javascript "^1.4.0"
     webpack-sources "^1.0.1"
 
@@ -2376,7 +2347,7 @@ compression@1.7.1:
 
 compression@^1.6.0:
   version "1.7.2"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.2.tgz#aaffbcd6aaf854b44ebb280353d5ad1651f59a69"
+  resolved "http://registry.npmjs.org/compression/-/compression-1.7.2.tgz#aaffbcd6aaf854b44ebb280353d5ad1651f59a69"
   dependencies:
     accepts "~1.3.4"
     bytes "3.0.0"
@@ -2390,18 +2361,11 @@ concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
-concat-stream@^1.5.0:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.1.tgz#261b8f518301f1d834e36342b9fea095d2620a26"
-  dependencies:
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
-
-concat-stream@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
+concat-stream@^1.5.0, concat-stream@^1.6.0:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   dependencies:
+    buffer-from "^1.0.0"
     inherits "^2.0.3"
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
@@ -2411,8 +2375,8 @@ condense-whitespace@~1.0.0:
   resolved "https://registry.yarnpkg.com/condense-whitespace/-/condense-whitespace-1.0.0.tgz#8376d98ef028e6cb2cd2468e28ce42c5c65ab1a9"
 
 configstore@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.1.tgz#094ee662ab83fad9917678de114faaea8fcdca90"
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f"
   dependencies:
     dot-prop "^4.1.0"
     graceful-fs "^4.1.2"
@@ -2456,11 +2420,13 @@ consolidate@0.14.0:
     bluebird "^3.1.1"
 
 constantinople@^3.0.1:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-3.1.0.tgz#7569caa8aa3f8d5935d62e1fa96f9f702cd81c79"
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-3.1.2.tgz#d45ed724f57d3d10500017a7d3a889c1381ae647"
   dependencies:
-    acorn "^3.1.0"
-    is-expression "^2.0.1"
+    "@types/babel-types" "^7.0.0"
+    "@types/babylon" "^6.16.2"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
 
 constants-browserify@^1.0.0:
   version "1.0.0"
@@ -2476,22 +2442,14 @@ content-security-policy-builder@1.1.0:
   dependencies:
     dashify "^0.2.0"
 
-content-type-parser@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/content-type-parser/-/content-type-parser-1.0.2.tgz#caabe80623e63638b2502fd4c7f12ff4ce2352e7"
-
 content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
 
-convert-source-map@^1.4.0:
+convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
 
-convert-source-map@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
-
 cookie-parser@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.4.3.tgz#0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5"
@@ -2507,13 +2465,13 @@ 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.x:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.0.6.tgz#0abf356ad00d1c5a219d88d44518046dd026acfe"
 
-cookiejar@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.1.tgz#41ad57b1b555951ec171412a81942b1e8200d34a"
+cookiejar@^2.0.6, cookiejar@^2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c"
 
 copy-concurrently@^1.0.0:
   version "1.0.5"
@@ -2547,13 +2505,9 @@ core-js@^1.0.0, core-js@^1.1.1:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
 
-core-js@^2.4.0, core-js@^2.5.1:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e"
-
-core-js@^2.5.0:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.1.tgz#ae6874dc66937789b80754ff5428df66819ca50b"
+core-js@^2.4.0, core-js@^2.5.0, core-js@^2.5.1, core-js@^2.5.3:
+  version "2.5.7"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -2571,14 +2525,13 @@ cosmiconfig@^2.1.0, cosmiconfig@^2.1.1:
     parse-json "^2.2.0"
     require-from-string "^1.1.0"
 
-cosmiconfig@^4.0.0, cosmiconfig@~4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc"
+cosmiconfig@^5.0.2, cosmiconfig@~5.0.2:
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.5.tgz#a809e3c2306891ce17ab70359dc8bdf661fe2cd0"
   dependencies:
     is-directory "^0.3.1"
     js-yaml "^3.9.0"
     parse-json "^4.0.0"
-    require-from-string "^2.0.1"
 
 crc32-stream@^2.0.0:
   version "2.0.0"
@@ -2592,8 +2545,8 @@ crc@^3.4.4:
   resolved "https://registry.yarnpkg.com/crc/-/crc-3.5.0.tgz#98b8ba7d489665ba3979f59b21381374101a1964"
 
 create-ecdh@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d"
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
   dependencies:
     bn.js "^4.1.0"
     elliptic "^6.0.0"
@@ -2605,17 +2558,18 @@ create-error-class@^3.0.0:
     capture-stack-trace "^1.0.0"
 
 create-hash@^1.1.0, create-hash@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.3.tgz#606042ac8b9262750f483caddab0f5819172d8fd"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
   dependencies:
     cipher-base "^1.0.1"
     inherits "^2.0.1"
-    ripemd160 "^2.0.0"
+    md5.js "^1.3.4"
+    ripemd160 "^2.0.1"
     sha.js "^2.4.0"
 
 create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.6.tgz#acb9e221a4e17bdb076e90657c42b93e3726cf06"
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
   dependencies:
     cipher-base "^1.0.3"
     create-hash "^1.1.0"
@@ -2625,8 +2579,8 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     sha.js "^2.4.8"
 
 create-react-class@^15.5.1, create-react-class@^15.5.2, create-react-class@^15.6.0:
-  version "15.6.2"
-  resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.2.tgz#cf1ed15f12aad7f14ef5f2dfe05e6c42f91ef02a"
+  version "15.6.3"
+  resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.3.tgz#2d73237fb3f970ae6ebe011a9e66f46dbca80036"
   dependencies:
     fbjs "^0.8.9"
     loose-envify "^1.3.1"
@@ -2666,7 +2620,7 @@ cross-spawn@^5.0.1, cross-spawn@^5.1.0:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^6.0.0:
+cross-spawn@^6.0.0, cross-spawn@^6.0.4:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
   dependencies:
@@ -2686,12 +2640,6 @@ cryptiles@2.x.x:
   dependencies:
     boom "2.x.x"
 
-cryptiles@3.x.x:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
-  dependencies:
-    boom "5.x.x"
-
 crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
@@ -2726,21 +2674,21 @@ css-color-names@0.0.4:
   resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
 
 css-loader@^0.28.5:
-  version "0.28.7"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.7.tgz#5f2ee989dd32edd907717f953317656160999c1b"
+  version "0.28.11"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.11.tgz#c3f9864a700be2711bb5a2462b2389b1a392dab7"
   dependencies:
-    babel-code-frame "^6.11.0"
+    babel-code-frame "^6.26.0"
     css-selector-tokenizer "^0.7.0"
-    cssnano ">=2.6.1 <4"
+    cssnano "^3.10.0"
     icss-utils "^2.1.0"
     loader-utils "^1.0.2"
     lodash.camelcase "^4.3.0"
-    object-assign "^4.0.1"
+    object-assign "^4.1.1"
     postcss "^5.0.6"
-    postcss-modules-extract-imports "^1.0.0"
-    postcss-modules-local-by-default "^1.0.1"
-    postcss-modules-scope "^1.0.0"
-    postcss-modules-values "^1.1.0"
+    postcss-modules-extract-imports "^1.2.0"
+    postcss-modules-local-by-default "^1.2.0"
+    postcss-modules-scope "^1.1.0"
+    postcss-modules-values "^1.3.0"
     postcss-value-parser "^3.3.0"
     source-list-map "^2.0.0"
 
@@ -2777,7 +2725,7 @@ cssmin@0.3.x:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/cssmin/-/cssmin-0.3.2.tgz#ddce4c547b510ae0d594a8f1fbf8aaf8e2c5c00d"
 
-"cssnano@>=2.6.1 <4":
+cssnano@^3.10.0:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
   dependencies:
@@ -2821,13 +2769,13 @@ 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.2 < 0.4.0":
+cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
 
-"cssstyle@>= 0.2.29 < 0.3.0", "cssstyle@>= 0.2.37 < 0.3.0":
-  version "0.2.37"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54"
+"cssstyle@>= 0.3.1 < 0.4.0":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.3.1.tgz#6da9b4cff1bc5d716e6e5fe8e04fcb1b50a49adf"
   dependencies:
     cssom "0.3.x"
 
@@ -2883,9 +2831,17 @@ data-uri-to-buffer@1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz#77163ea9c20d8641b4707e8f18abdf9a78f34835"
 
+data-urls@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.0.0.tgz#24802de4e81c298ea8a9388bb0d8e461c774684f"
+  dependencies:
+    abab "^1.0.4"
+    whatwg-mimetype "^2.0.0"
+    whatwg-url "^6.4.0"
+
 dataloader@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/dataloader/-/dataloader-1.3.0.tgz#6fec5be4b30a712e4afd30b86b4334566b97673b"
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/dataloader/-/dataloader-1.4.0.tgz#bca11d867f5d3f1b9ed9f737bd15970c65dff5c8"
 
 date-fns@^1.27.2:
   version "1.29.0"
@@ -2895,13 +2851,13 @@ 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@3.1.0, debug@^3.0.0, debug@^3.0.1, debug@^3.1.0:
+debug@*, debug@3.1.0, debug@^3.0.0, debug@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
   dependencies:
     ms "2.0.0"
 
-debug@2, debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8:
+debug@2, debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
@@ -2927,6 +2883,12 @@ decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
 
+decompress-response@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
+  dependencies:
+    mimic-response "^1.0.0"
+
 dedent@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
@@ -2937,9 +2899,15 @@ deep-eql@0.1.3, deep-eql@^0.1.3:
   dependencies:
     type-detect "0.1.1"
 
-deep-extend@~0.4.0:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
+deep-eql@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df"
+  dependencies:
+    type-detect "^4.0.0"
+
+deep-extend@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
 
 deep-is@~0.1.3:
   version "0.1.3"
@@ -3006,22 +2974,22 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
 
 delegate@^3.1.2:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.1.3.tgz#9a8251a777d7025faa55737bc3b071742127a9fd"
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166"
 
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
 
 denque@^1.1.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/denque/-/denque-1.2.2.tgz#e06cf7cf0da8badc88cbdaabf8fc0a70d659f1d4"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/denque/-/denque-1.3.0.tgz#681092ef44a630246d3f6edb2a199230eae8e76b"
 
-depd@1.1.1, depd@~1.1.1:
+depd@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
 
-depd@~1.1.2:
+depd@~1.1.1, depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
 
@@ -3046,11 +3014,7 @@ detect-indent@^4.0.0:
   dependencies:
     repeating "^2.0.0"
 
-detect-libc@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-0.2.0.tgz#47fdf567348a17ec25fcbf0b9e446348a76f9fb5"
-
-detect-libc@^1.0.2:
+detect-libc@^1.0.2, detect-libc@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
 
@@ -3066,13 +3030,17 @@ diff@1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-1.4.0.tgz#7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"
 
-diff@3.2.0, diff@^3.1.0, diff@^3.2.0:
+diff@3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
 
+diff@^3.1.0, diff@^3.2.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+
 diffie-hellman@^5.0.0:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e"
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
   dependencies:
     bn.js "^4.1.0"
     miller-rabin "^4.0.0"
@@ -3093,25 +3061,19 @@ 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@^2.0.0:
+doctrine@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
   dependencies:
     esutils "^2.0.2"
 
-doctrine@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.2.tgz#68f96ce8efc56cc42651f1faadb4f175273b0075"
-  dependencies:
-    esutils "^2.0.2"
-
 doctypes@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9"
 
 "dom-helpers@^2.4.0 || ^3.0.0", dom-helpers@^3.2.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.2.1.tgz#3203e07fed217bd1f424b019735582fc37b2825a"
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.3.1.tgz#fc1a4e15ffdf60ddde03a480a9c0fece821dd4a6"
 
 dom-serializer@0, dom-serializer@~0.1.0:
   version "0.1.0"
@@ -3121,8 +3083,8 @@ dom-serializer@0, dom-serializer@~0.1.0:
     entities "~1.1.1"
 
 domain-browser@^1.1.1:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
 
 domelementtype@1, domelementtype@^1.3.0:
   version "1.3.0"
@@ -3138,23 +3100,17 @@ domexception@^1.0.0:
   dependencies:
     webidl-conversions "^4.0.2"
 
-domhandler@2.3:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.3.0.tgz#2de59a0822d5027fabff6f032c2b25a2a8abe738"
-  dependencies:
-    domelementtype "1"
-
 domhandler@^2.3.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.1.tgz#892e47000a99be55bbf3774ffea0561d8879c259"
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
   dependencies:
     domelementtype "1"
 
 dompurify@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-1.0.3.tgz#3f2f6ecb6ecd27599a506b410ff47d6eb90fd05d"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-1.0.4.tgz#b0655d07856c1ef76fd27ae18e8ab1174ed18819"
 
-domutils@1.5, domutils@1.5.1:
+domutils@1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
   dependencies:
@@ -3162,8 +3118,8 @@ domutils@1.5, domutils@1.5.1:
     domelementtype "1"
 
 domutils@^1.5.1:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.6.2.tgz#1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
   dependencies:
     dom-serializer "0"
     domelementtype "1"
@@ -3187,10 +3143,10 @@ double-ended-queue@^2.1.0-0:
   resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c"
 
 dtrace-provider@~0.8:
-  version "0.8.6"
-  resolved "https://registry.yarnpkg.com/dtrace-provider/-/dtrace-provider-0.8.6.tgz#428a223afe03425d2cd6d6347fdf40c66903563d"
+  version "0.8.7"
+  resolved "https://registry.yarnpkg.com/dtrace-provider/-/dtrace-provider-0.8.7.tgz#dc939b4d3e0620cfe0c1cd803d0d2d7ed04ffd04"
   dependencies:
-    nan "^2.3.3"
+    nan "^2.10.0"
 
 duplexer3@^0.1.4:
   version "0.1.4"
@@ -3200,9 +3156,9 @@ duplexer@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
 
-duplexify@^3.4.2, duplexify@^3.5.3:
-  version "3.5.4"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.4.tgz#4bb46c1796eabebeec4ca9a2e66b808cb7a3d8b4"
+duplexify@^3.4.2, duplexify@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.0.tgz#592903f5d80b38d037220541264d69a198fb3410"
   dependencies:
     end-of-stream "^1.0.0"
     inherits "^2.0.1"
@@ -3219,24 +3175,27 @@ ecc-jsbn@~0.1.1:
   dependencies:
     jsbn "~0.1.0"
 
-ecdsa-sig-formatter@1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz#4bc926274ec3b5abb5016e7e1d60921ac262b2a1"
+ecdsa-sig-formatter@1.0.10:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.10.tgz#1c595000f04a8897dfb85000892a0f4c33af86c3"
   dependencies:
-    base64url "^2.0.0"
     safe-buffer "^5.0.1"
 
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
-ejs@2.5.7, ejs@^2.5.7:
+ejs@2.5.7:
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a"
 
+ejs@^2.5.7:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
+
 electron-to-chromium@^1.2.7:
-  version "1.3.26"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.26.tgz#996427294861a74d9c7c82b9260ea301e8c02d66"
+  version "1.3.48"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.48.tgz#d3b0d8593814044e092ece2108fc3ac9aea4b900"
 
 elegant-spinner@^1.0.1:
   version "1.0.1"
@@ -3258,11 +3217,7 @@ emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
 
-encodeurl@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20"
-
-encodeurl@~1.0.2:
+encodeurl@~1.0.1, encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
 
@@ -3287,10 +3242,6 @@ enhanced-resolve@^3.4.0:
     object-assign "^4.0.1"
     tapable "^0.2.7"
 
-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"
@@ -3310,81 +3261,61 @@ enzyme-adapter-react-15@^1.0.0:
     prop-types "^15.5.10"
 
 enzyme-adapter-react-16@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.0.2.tgz#8c6f431f17c69e1e9eeb25ca4bd92f31971eb2dd"
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.1.1.tgz#a8f4278b47e082fbca14f5bfb1ee50ee650717b4"
   dependencies:
-    enzyme-adapter-utils "^1.0.0"
+    enzyme-adapter-utils "^1.3.0"
     lodash "^4.17.4"
     object.assign "^4.0.4"
     object.values "^1.0.4"
-    prop-types "^15.5.10"
+    prop-types "^15.6.0"
+    react-reconciler "^0.7.0"
     react-test-renderer "^16.0.0-0"
 
-enzyme-adapter-utils@^1.0.0, enzyme-adapter-utils@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.2.0.tgz#7f4471ee0a70b91169ec8860d2bf0a6b551664b2"
+enzyme-adapter-utils@^1.1.0, enzyme-adapter-utils@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.3.0.tgz#d6c85756826c257a8544d362cc7a67e97ea698c7"
   dependencies:
     lodash "^4.17.4"
     object.assign "^4.0.4"
-    prop-types "^15.5.10"
+    prop-types "^15.6.0"
 
 enzyme@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.2.0.tgz#998bdcda0fc71b8764a0017f7cc692c943f54a7a"
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.3.0.tgz#0971abd167f2d4bf3f5bd508229e1c4b6dc50479"
   dependencies:
     cheerio "^1.0.0-rc.2"
     function.prototype.name "^1.0.3"
     has "^1.0.1"
+    is-boolean-object "^1.0.0"
+    is-callable "^1.1.3"
+    is-number-object "^1.0.3"
+    is-string "^1.0.4"
     is-subset "^0.1.1"
     lodash "^4.17.4"
+    object-inspect "^1.5.0"
     object-is "^1.0.1"
-    object.assign "^4.0.4"
+    object.assign "^4.1.0"
     object.entries "^1.0.4"
     object.values "^1.0.4"
     raf "^3.4.0"
     rst-selector-parser "^2.2.3"
 
-errno@^0.1.3:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.6.tgz#c386ce8a6283f14fc09563b71560908c9bf53026"
+errno@^0.1.3, errno@~0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
   dependencies:
     prr "~1.0.1"
 
-errno@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"
-  dependencies:
-    prr "~0.0.0"
-
 error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.4.3:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.9.0.tgz#690829a07cae36b222e7fd9b75c0d0573eb25227"
-  dependencies:
-    es-to-primitive "^1.1.1"
-    function-bind "^1.1.1"
-    has "^1.0.1"
-    is-callable "^1.1.3"
-    is-regex "^1.0.4"
-
-es-abstract@^1.5.1:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.11.0.tgz#cce87d518f0496893b1a30cd8461835535480681"
-  dependencies:
-    es-to-primitive "^1.1.1"
-    function-bind "^1.1.1"
-    has "^1.0.1"
-    is-callable "^1.1.3"
-    is-regex "^1.0.4"
-
-es-abstract@^1.6.1, es-abstract@^1.7.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.10.0.tgz#1ecb36c197842a00d8ee4c2dfd8646bb97d60864"
+es-abstract@^1.4.3, es-abstract@^1.5.1, es-abstract@^1.6.1, es-abstract@^1.7.0:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165"
   dependencies:
     es-to-primitive "^1.1.1"
     function-bind "^1.1.1"
@@ -3401,11 +3332,12 @@ es-to-primitive@^1.1.1:
     is-symbol "^1.0.1"
 
 es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
-  version "0.10.38"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.38.tgz#fa7d40d65bbc9bb8a67e1d3f9cc656a00530eed3"
+  version "0.10.45"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.45.tgz#0bfdf7b473da5919d5adf3bd25ceb754fccc3653"
   dependencies:
     es6-iterator "~2.0.3"
     es6-symbol "~3.1.1"
+    next-tick "1"
 
 es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3:
   version "2.0.3"
@@ -3426,14 +3358,10 @@ es6-map@^0.1.3:
     es6-symbol "~3.1.1"
     event-emitter "~0.3.5"
 
-es6-promise@^4.0.3:
+es6-promise@^4.0.3, es6-promise@^4.0.5:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29"
 
-es6-promise@^4.0.5:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.1.1.tgz#8811e90915d9a0dba36274f0b242dbda78f9c92a"
-
 es6-promisify@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
@@ -3478,16 +3406,16 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1
   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.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.0.tgz#9811a2f265dc1cd3894420ee3717064b632b8852"
+escodegen@1.x.x, escodegen@^1.9.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2"
   dependencies:
     esprima "^3.1.3"
     estraverse "^4.2.0"
     esutils "^2.0.2"
     optionator "^0.8.1"
   optionalDependencies:
-    source-map "~0.5.6"
+    source-map "~0.6.1"
 
 escope@^3.6.0:
   version "3.6.0"
@@ -3505,34 +3433,34 @@ eslint-config-prettier@^2.9.0:
     get-stdin "^5.0.1"
 
 eslint-plugin-jest@^21.6.1:
-  version "21.7.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-21.7.0.tgz#651f1c6ce999af3ac59ab8bf8a376d742fd0fc23"
+  version "21.17.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-21.17.0.tgz#fdb00e2f9ff16987d6ebcf2c75c7add105760bbb"
 
 eslint-plugin-mocha@^4.11.0:
-  version "4.11.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-mocha/-/eslint-plugin-mocha-4.11.0.tgz#91193a2f55e20a5e35974054a0089d30198ee578"
+  version "4.12.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-mocha/-/eslint-plugin-mocha-4.12.1.tgz#dbacc543b178b4536ec5b19d7f8e8864d85404bf"
   dependencies:
-    ramda "^0.24.1"
+    ramda "^0.25.0"
 
 eslint-plugin-prettier@^2.4.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-2.5.0.tgz#39a91dd7528eaf19cd42c0ee3f2c1f684606a05f"
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-2.6.0.tgz#33e4e228bdb06142d03c560ce04ec23f6c767dd7"
   dependencies:
     fast-diff "^1.1.1"
     jest-docblock "^21.0.0"
 
 eslint-plugin-promise@^3.3.1:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.6.0.tgz#54b7658c8f454813dc2a870aff8152ec4969ba75"
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.8.0.tgz#65ebf27a845e3c1e9d6f6a5622ddd3801694b621"
 
 eslint-plugin-react@^7.5.1:
-  version "7.5.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.5.1.tgz#52e56e8d80c810de158859ef07b880d2f56ee30b"
+  version "7.9.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.9.1.tgz#101aadd15e7c7b431ed025303ac7b421a8e3dc15"
   dependencies:
-    doctrine "^2.0.0"
-    has "^1.0.1"
-    jsx-ast-utils "^2.0.0"
-    prop-types "^15.6.0"
+    doctrine "^2.1.0"
+    has "^1.0.2"
+    jsx-ast-utils "^2.0.1"
+    prop-types "^15.6.1"
 
 eslint-scope@^3.7.1, eslint-scope@~3.7.1:
   version "3.7.1"
@@ -3546,20 +3474,20 @@ eslint-visitor-keys@^1.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
 
 eslint@^4.5.0:
-  version "4.13.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.13.1.tgz#0055e0014464c7eb7878caf549ef2941992b444f"
+  version "4.19.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.19.1.tgz#32d1d653e1d90408854bfb296f076ec7e186a300"
   dependencies:
     ajv "^5.3.0"
     babel-code-frame "^6.22.0"
     chalk "^2.1.0"
     concat-stream "^1.6.0"
     cross-spawn "^5.1.0"
-    debug "^3.0.1"
-    doctrine "^2.0.2"
+    debug "^3.1.0"
+    doctrine "^2.1.0"
     eslint-scope "^3.7.1"
-    espree "^3.5.2"
+    eslint-visitor-keys "^1.0.0"
+    espree "^3.5.4"
     esquery "^1.0.0"
-    estraverse "^4.2.0"
     esutils "^2.0.2"
     file-entry-cache "^2.0.0"
     functional-red-black-tree "^1.0.1"
@@ -3580,18 +3508,19 @@ eslint@^4.5.0:
     path-is-inside "^1.0.2"
     pluralize "^7.0.0"
     progress "^2.0.0"
+    regexpp "^1.0.1"
     require-uncached "^1.0.3"
     semver "^5.3.0"
     strip-ansi "^4.0.0"
     strip-json-comments "~2.0.1"
-    table "^4.0.1"
+    table "4.0.2"
     text-table "~0.2.0"
 
-espree@^3.5.2:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.2.tgz#756ada8b979e9dcfcdb30aad8d1a9304a905e1ca"
+espree@^3.5.4:
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
   dependencies:
-    acorn "^5.2.1"
+    acorn "^5.5.0"
     acorn-jsx "^3.0.0"
 
 esprima@3.x.x, esprima@^3.1.3:
@@ -3607,17 +3536,16 @@ esprima@^4.0.0:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
 
 esquery@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
   dependencies:
     estraverse "^4.0.0"
 
 esrecurse@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.0.tgz#fa9568d98d3823f9a41d91e902dcab9ea6e5b163"
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
   dependencies:
     estraverse "^4.1.0"
-    object-assign "^4.0.1"
 
 estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.2.0"
@@ -3644,7 +3572,7 @@ event-pubsub@4.3.0:
 
 event-stream@~3.3.0:
   version "3.3.4"
-  resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"
+  resolved "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"
   dependencies:
     duplexer "~0.1.1"
     from "~0"
@@ -3742,25 +3670,14 @@ expand-range@^1.8.1:
     fill-range "^2.1.0"
 
 expand-template@^1.0.2:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-1.1.0.tgz#e09efba977bf98f9ee0ed25abd0c692e02aec3fc"
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-1.1.1.tgz#981f188c0c3a87d2e28f559bc541426ff94f21dd"
 
 expect-ct@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/expect-ct/-/expect-ct-0.1.0.tgz#52735678de18530890d8d7b95f0ac63640958094"
 
 expect@^22.4.0:
-  version "22.4.0"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-22.4.0.tgz#371edf1ae15b83b5bf5ec34b42f1584660a36c16"
-  dependencies:
-    ansi-styles "^3.2.0"
-    jest-diff "^22.4.0"
-    jest-get-type "^22.1.0"
-    jest-matcher-utils "^22.4.0"
-    jest-message-util "^22.4.0"
-    jest-regex-util "^22.1.0"
-
-expect@^22.4.3:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/expect/-/expect-22.4.3.tgz#d5a29d0a0e1fb2153557caef2674d4547e914674"
   dependencies:
@@ -3784,7 +3701,7 @@ express-static-gzip@^0.3.1:
   dependencies:
     serve-static "^1.12.3"
 
-express@4.16.0, express@^4.12.2:
+express@4.16.0:
   version "4.16.0"
   resolved "https://registry.yarnpkg.com/express/-/express-4.16.0.tgz#b519638e4eb58e7178c81b498ef22f798cb2e255"
   dependencies:
@@ -3819,6 +3736,41 @@ express@4.16.0, express@^4.12.2:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
+express@^4.12.2:
+  version "4.16.3"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
+  dependencies:
+    accepts "~1.3.5"
+    array-flatten "1.1.1"
+    body-parser "1.18.2"
+    content-disposition "0.5.2"
+    content-type "~1.0.4"
+    cookie "0.3.1"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "~1.1.2"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "1.1.1"
+    fresh "0.5.2"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "~2.3.0"
+    parseurl "~1.3.2"
+    path-to-regexp "0.1.7"
+    proxy-addr "~2.0.3"
+    qs "6.5.1"
+    range-parser "~1.2.0"
+    safe-buffer "5.1.1"
+    send "0.16.2"
+    serve-static "1.13.2"
+    setprototypeof "1.1.0"
+    statuses "~1.4.0"
+    type-is "~1.6.16"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
+
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -3841,8 +3793,8 @@ extend@^1.2.1:
   resolved "https://registry.yarnpkg.com/extend/-/extend-1.3.0.tgz#d1516fb0ff5624d2ebf9123ea1dac5a1994004f8"
 
 external-editor@^2.0.4:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.1.0.tgz#3d026a21b7f95b5726387d4200ac160d372c3b48"
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
   dependencies:
     chardet "^0.4.0"
     iconv-lite "^0.4.17"
@@ -3889,8 +3841,12 @@ eyes@0.1.x:
   resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0"
 
 fast-deep-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
+
+fast-deep-equal@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
 
 fast-diff@^1.1.1:
   version "1.1.2"
@@ -3914,7 +3870,7 @@ fb-watchman@^2.0.0:
   dependencies:
     bser "^2.0.0"
 
-fbjs@^0.8.1, fbjs@^0.8.16, fbjs@^0.8.4, fbjs@^0.8.9:
+fbjs@^0.8.1, fbjs@^0.8.16, fbjs@^0.8.9:
   version "0.8.16"
   resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
   dependencies:
@@ -3926,9 +3882,9 @@ fbjs@^0.8.1, fbjs@^0.8.16, fbjs@^0.8.4, fbjs@^0.8.9:
     setimmediate "^1.0.5"
     ua-parser-js "^0.7.9"
 
-fd-slicer@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"
+fd-slicer@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
   dependencies:
     pend "~1.2.0"
 
@@ -3974,12 +3930,12 @@ fileset@^2.0.2:
     minimatch "^3.0.3"
 
 fill-range@^2.1.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
   dependencies:
     is-number "^2.1.0"
     isobject "^2.0.0"
-    randomatic "^1.1.3"
+    randomatic "^3.0.0"
     repeat-element "^1.1.2"
     repeat-string "^1.5.2"
 
@@ -4016,6 +3972,18 @@ finalhandler@1.1.0:
     statuses "~1.3.1"
     unpipe "~1.0.0"
 
+finalhandler@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
+  dependencies:
+    debug "2.6.9"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    parseurl "~1.3.2"
+    statuses "~1.4.0"
+    unpipe "~1.0.0"
+
 find-cache-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
@@ -4063,8 +4031,8 @@ fluent-langneg@^0.1.0:
   resolved "https://registry.yarnpkg.com/fluent-langneg/-/fluent-langneg-0.1.0.tgz#aa12054fbfa4b728daec38331efc12f01faae93a"
 
 flush-write-stream@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.2.tgz#c81b90d8746766f1a609a46809946c45dd8ae417"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.0.4"
@@ -4096,11 +4064,11 @@ form-data@1.0.0-rc4:
     mime-types "^2.1.10"
 
 form-data@^2.3.1, form-data@~2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.1.tgz#6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
   dependencies:
     asynckit "^0.4.0"
-    combined-stream "^1.0.5"
+    combined-stream "1.0.6"
     mime-types "^2.1.12"
 
 form-data@~2.1.1:
@@ -4117,15 +4085,15 @@ formatio@1.1.1:
   dependencies:
     samsam "~1.1"
 
-formatio@1.2.0, formatio@^1.2.0:
+formatio@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/formatio/-/formatio-1.2.0.tgz#f3b2167d9068c4698a8d51f4f760a39a54d818eb"
   dependencies:
     samsam "1.x"
 
-formidable@^1.0.17, formidable@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.1.1.tgz#96b8886f7c3c3508b932d6bd70c4d3a88f35f1a9"
+formidable@^1.0.17, formidable@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.1.tgz#70fb7ca0290ee6ff961090415f4b3df3d2082659"
 
 forwarded@~0.1.2:
   version "0.1.2"
@@ -4200,8 +4168,8 @@ fs-promise@^0.3.1:
     any-promise "~0.1.0"
 
 fs-readdir-recursive@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.0.0.tgz#8cd1745c8b4f8a29c8caec392476921ba195f560"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
 
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
@@ -4216,29 +4184,14 @@ fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
 
-fsevents@^1.0.0, fsevents@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8"
-  dependencies:
-    nan "^2.3.0"
-    node-pre-gyp "^0.6.39"
-
-fsevents@^1.1.2:
+fsevents@^1.0.0, fsevents@^1.1.2, fsevents@^1.2.3:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
   dependencies:
     nan "^2.9.2"
     node-pre-gyp "^0.10.0"
 
-fstream-ignore@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
-  dependencies:
-    fstream "^1.0.0"
-    inherits "2"
-    minimatch "^3.0.0"
-
-fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
+fstream@^1.0.0, fstream@^1.0.2:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
   dependencies:
@@ -4259,11 +4212,11 @@ function-bind@^1.0.2, function-bind@^1.1.0, function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
 
 function.prototype.name@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.0.3.tgz#0099ae5572e9dd6f03c97d023fd92bcc5e639eac"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.0.tgz#8bd763cc0af860a859cc5d49384d74b932cd2327"
   dependencies:
     define-properties "^1.1.2"
-    function-bind "^1.1.0"
+    function-bind "^1.1.1"
     is-callable "^1.1.3"
 
 functional-red-black-tree@^1.0.1:
@@ -4284,8 +4237,8 @@ gauge@~2.7.3:
     wide-align "^1.1.0"
 
 gaze@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.2.tgz#847224677adb8870d679257ed3388fdb61e40105"
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
   dependencies:
     globule "^1.0.0"
 
@@ -4303,6 +4256,10 @@ get-caller-file@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
 
+get-func-name@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
+
 get-own-enumerable-property-symbols@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-2.0.1.tgz#5c4ad87f2834c4b9b4e84549dc1e0650fb38c24b"
@@ -4320,8 +4277,8 @@ get-stream@^3.0.0:
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
 
 get-uri@2:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-2.0.1.tgz#dbdcacacd8c608a38316869368117697a1631c59"
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-2.0.2.tgz#5c795e71326f6ca1286f2fc82575cd2bab2af578"
   dependencies:
     data-uri-to-buffer "1"
     debug "2"
@@ -4341,8 +4298,8 @@ getpass@^0.1.1:
     assert-plus "^1.0.0"
 
 git-up@^2.0.0:
-  version "2.0.9"
-  resolved "https://registry.yarnpkg.com/git-up/-/git-up-2.0.9.tgz#219bfd27c82daeead8495beb386dc18eae63636d"
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/git-up/-/git-up-2.0.10.tgz#20fe6bafbef4384cae253dc4f463c49a0c3bd2ec"
   dependencies:
     is-ssh "^1.3.0"
     parse-url "^1.3.0"
@@ -4448,8 +4405,8 @@ global-dirs@^0.1.0:
     ini "^1.3.4"
 
 globals@^11.0.1, globals@^11.1.0:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.1.0.tgz#632644457f5f0e3ae711807183700ebf2e4633e4"
+  version "11.5.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.5.0.tgz#6bc840de6771173b191f13d3a9c94d441ee92642"
 
 globals@^9.18.0:
   version "9.18.0"
@@ -4489,11 +4446,11 @@ globby@^7.1.1:
     slash "^1.0.0"
 
 globule@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.0.tgz#1dc49c6822dd9e8a2fa00ba2a295006e8664bd09"
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d"
   dependencies:
     glob "~7.1.1"
-    lodash "~4.17.4"
+    lodash "~4.17.10"
     minimatch "~3.0.2"
 
 good-listener@^1.2.2:
@@ -4551,12 +4508,12 @@ graphql-errors@^2.1.0:
     babel-runtime "^6.6.1"
     uuid "^2.0.2"
 
-graphql-extensions@^0.0.x:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.0.5.tgz#63bc4a3fd31aab12bfadf783cbc038a9a6937cf0"
+graphql-extensions@^0.0.x, graphql-extensions@~0.0.9:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.0.10.tgz#34bdb2546d43f6a5bc89ab23c295ec0466c6843d"
   dependencies:
-    core-js "^2.5.1"
-    source-map-support "^0.5.0"
+    core-js "^2.5.3"
+    source-map-support "^0.5.1"
 
 graphql-fields@^1.0.2:
   version "1.0.2"
@@ -4584,8 +4541,8 @@ graphql-tag@^1.2.3:
   resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-1.3.2.tgz#7abb3a8fd9f3415d07163314ed237061c785b759"
 
 graphql-tag@^2.0.0, graphql-tag@^2.4.2:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.5.0.tgz#b43bfd8b5babcd2c205ad680c03e98b238934e0f"
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.9.2.tgz#2f60a5a981375f430bf1e6e95992427dc18af686"
 
 graphql-tools@^0.10.1:
   version "0.10.1"
@@ -4631,10 +4588,6 @@ handlebars@^4.0.3:
   optionalDependencies:
     uglify-js "^2.6"
 
-har-schema@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
-
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -4648,13 +4601,6 @@ har-validator@~2.0.6:
     is-my-json-valid "^2.12.4"
     pinkie-promise "^2.0.0"
 
-har-validator@~4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
-  dependencies:
-    ajv "^4.9.1"
-    har-schema "^1.0.5"
-
 har-validator@~5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
@@ -4663,8 +4609,8 @@ har-validator@~5.0.3:
     har-schema "^2.0.0"
 
 harmony-reflect@^1.4.6:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.5.1.tgz#b54ca617b00cc8aef559bbb17b3d85431dc7e329"
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.0.tgz#9c28a77386ec225f7b5d370f9861ba09c4eea58f"
 
 has-ansi@^2.0.0:
   version "2.0.0"
@@ -4684,6 +4630,10 @@ has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
 
+has-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
+
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@@ -4715,17 +4665,11 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-has@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
+has@^1.0.1, has@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
   dependencies:
-    function-bind "^1.0.2"
-
-hash-base@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-2.0.2.tgz#66ea1d856db4e8a5470cadf6fce23ae5244ef2e1"
-  dependencies:
-    inherits "^2.0.1"
+    function-bind "^1.1.1"
 
 hash-base@^3.0.0:
   version "3.0.4"
@@ -4741,7 +4685,7 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.0"
 
-hawk@3.1.3, hawk@~3.1.3:
+hawk@~3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
   dependencies:
@@ -4750,15 +4694,6 @@ hawk@3.1.3, hawk@~3.1.3:
     hoek "2.x.x"
     sntp "1.x.x"
 
-hawk@~6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
-  dependencies:
-    boom "4.x.x"
-    cryptiles "3.x.x"
-    hoek "4.x.x"
-    sntp "2.x.x"
-
 he@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
@@ -4822,8 +4757,8 @@ hexo-front-matter@^0.2.2:
     js-yaml "^3.6.1"
 
 hexo-fs@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/hexo-fs/-/hexo-fs-0.2.2.tgz#0b97b79f68df121f765d1291b8e90fae326d000e"
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/hexo-fs/-/hexo-fs-0.2.3.tgz#c3a81b46e457dfafc56d87c78ef114104f4a3e41"
   dependencies:
     bluebird "^3.4.0"
     chokidar "^1.5.2"
@@ -4872,8 +4807,8 @@ hexo-renderer-sass@^0.3.2:
     node-sass "^4.5.3"
 
 hexo-server@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/hexo-server/-/hexo-server-0.3.1.tgz#86956fe7ff6bb9407f99a113666c3f1278a47979"
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/hexo-server/-/hexo-server-0.3.2.tgz#082c1048e53f0ba63292fbcdb40c525613fc32e2"
   dependencies:
     bluebird "^3.0.6"
     chalk "^1.1.1"
@@ -4882,10 +4817,10 @@ hexo-server@^0.3.1:
     mime "^1.3.4"
     morgan "^1.6.1"
     object-assign "^4.0.1"
-    opn "^4.0.0"
+    opn "^5.2.0"
     serve-static "^1.10.0"
 
-hexo-util@^0.6.0, hexo-util@^0.6.2:
+hexo-util@^0.6.0, hexo-util@^0.6.2, hexo-util@^0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/hexo-util/-/hexo-util-0.6.3.tgz#16a2ade457bef955af0dfd22a3fe6f0a49a9137c"
   dependencies:
@@ -4897,20 +4832,20 @@ hexo-util@^0.6.0, hexo-util@^0.6.2:
     striptags "^2.1.1"
 
 hexo@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/hexo/-/hexo-3.6.0.tgz#f978263eb889655269902bc60cd0dfaa29d63c0f"
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/hexo/-/hexo-3.7.1.tgz#0381874e67891b521b9e3023ef4db85a62337f96"
   dependencies:
     abbrev "^1.0.7"
     archy "^1.0.0"
     bluebird "^3.4.0"
     chalk "^2.3.1"
-    cheerio "^0.20.0"
+    cheerio "0.22.0"
     hexo-cli "^1.1.0"
     hexo-front-matter "^0.2.2"
     hexo-fs "^0.2.0"
     hexo-i18n "^0.2.1"
     hexo-log "^0.2.0"
-    hexo-util "^0.6.0"
+    hexo-util "^0.6.3"
     js-yaml "^3.6.1"
     lodash "^4.17.5"
     minimatch "^3.0.4"
@@ -4967,21 +4902,17 @@ hoek@2.x.x:
   version "2.16.3"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
 
-hoek@4.x.x:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
-
 hoek@5.x.x:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-5.0.3.tgz#b71d40d943d0a95da01956b547f83c4a5b4a34ac"
 
-hoist-non-react-statics@^1.0.0, hoist-non-react-statics@^1.0.3, hoist-non-react-statics@^1.2.0:
+hoist-non-react-statics@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"
 
-hoist-non-react-statics@^2.2.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz#343db84c6018c650778898240135a1420ee22ce0"
+hoist-non-react-statics@^2.2.0, hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.0.tgz#d2ca2dfc19c5a91c5a6615ce8e564ef0347e2a40"
 
 home-or-tmp@^2.0.0:
   version "2.0.0"
@@ -4991,8 +4922,8 @@ home-or-tmp@^2.0.0:
     os-tmpdir "^1.0.1"
 
 hosted-git-info@^2.1.4:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c"
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222"
 
 hpkp@2.0.0:
   version "2.0.0"
@@ -5027,17 +4958,7 @@ htmlparser2@^3.9.0, htmlparser2@^3.9.1:
     inherits "^2.0.1"
     readable-stream "^2.0.2"
 
-htmlparser2@~3.8.1:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.8.3.tgz#996c28b191516a8be86501a7d79757e5c70c1068"
-  dependencies:
-    domelementtype "1"
-    domhandler "2.3"
-    domutils "1.5"
-    entities "1.0"
-    readable-stream "1.1"
-
-http-errors@1.6.2, http-errors@~1.6.2:
+http-errors@1.6.2:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736"
   dependencies:
@@ -5046,6 +4967,15 @@ http-errors@1.6.2, http-errors@~1.6.2:
     setprototypeof "1.0.3"
     statuses ">= 1.3.1 < 2"
 
+http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.0"
+    statuses ">= 1.4.0 < 2"
+
 http-proxy-agent@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz#cc1ce38e453bf984a0f7702d2dd59c73d081284a"
@@ -5085,7 +5015,7 @@ https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
 
-https-proxy-agent@1, https-proxy-agent@^1.0.0:
+https-proxy-agent@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz#35f7da6c48ce4ddbfa264891ac593ee5ff8671e6"
   dependencies:
@@ -5093,7 +5023,7 @@ https-proxy-agent@1, https-proxy-agent@^1.0.0:
     debug "2"
     extend "3"
 
-https-proxy-agent@^2.2.0:
+https-proxy-agent@^2.2.0, https-proxy-agent@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
   dependencies:
@@ -5108,19 +5038,15 @@ husky@^0.14.3:
     normalize-path "^1.0.0"
     strip-indent "^2.0.0"
 
-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:
   version "0.4.15"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
 
-iconv-lite@0.4.19, iconv-lite@^0.4.17, iconv-lite@~0.4.13:
+iconv-lite@0.4.19:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
 
-iconv-lite@^0.4.4:
+iconv-lite@0.4.23, iconv-lite@^0.4.17, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.23"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
   dependencies:
@@ -5143,8 +5069,8 @@ identity-obj-proxy@^3.0.0:
     harmony-reflect "^1.4.6"
 
 ieee754@^1.1.4:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.11.tgz#c16384ffe00f5b7835824e67b6f2bd44a5229455"
 
 ienoopen@1.0.0:
   version "1.0.0"
@@ -5165,21 +5091,22 @@ ignore-walk@^3.0.1:
     minimatch "^3.0.4"
 
 ignore@^3.3.3, ignore@^3.3.5:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
+  version "3.3.8"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.8.tgz#3f8e9c35d38708a3a7e0e9abb6c73e7ee7707b2b"
 
 iltorb@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/iltorb/-/iltorb-2.0.2.tgz#3aed6f76397855c70daf7eaef18bfa48f729e6f9"
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/iltorb/-/iltorb-2.3.2.tgz#886b6b406fde6dc5116d8fe431df582328d937a6"
   dependencies:
-    detect-libc "^0.2.0"
-    nan "^2.6.2"
-    node-gyp "^3.6.2"
-    prebuild-install "^2.3.0"
+    detect-libc "^1.0.3"
+    nan "^2.10.0"
+    npmlog "^4.1.2"
+    prebuild-install "^3.0.0"
+    which-pm-runs "^1.0.0"
 
 immutability-helper@^2.2.0:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/immutability-helper/-/immutability-helper-2.6.2.tgz#0df76cd906518cf81f79caecb4e55d2850a11e2d"
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/immutability-helper/-/immutability-helper-2.7.0.tgz#4ea9916cc8f45142ec3e3f0fce75fa5d66fa1b38"
   dependencies:
     invariant "^2.2.0"
 
@@ -5242,17 +5169,13 @@ inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
 
-ini@^1.3.0:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
-
-ini@^1.3.4, ini@~1.3.0:
+ini@^1.3.0, ini@^1.3.4, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
 
 inquirer-autocomplete-prompt@^0.12.1:
-  version "0.12.1"
-  resolved "https://registry.yarnpkg.com/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-0.12.1.tgz#17b20145fcd656634555ad5645727bd0fe816c57"
+  version "0.12.2"
+  resolved "https://registry.yarnpkg.com/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-0.12.2.tgz#693bbd9da586f98b126bd83305bb8d8714dc4155"
   dependencies:
     ansi-escapes "^3.0.0"
     chalk "^2.0.0"
@@ -5303,8 +5226,8 @@ interpret@^1.0.0, interpret@^1.0.1:
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
 
 invariant@^2.0.0, invariant@^2.2.0, invariant@^2.2.1, invariant@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   dependencies:
     loose-envify "^1.0.0"
 
@@ -5312,7 +5235,7 @@ invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
 
-ioredis@3.1.4, ioredis@^3.1.2:
+ioredis@3.1.4:
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-3.1.4.tgz#8688293f5f2f1757e1c812ad17cce49f46d811bc"
   dependencies:
@@ -5340,6 +5263,34 @@ ioredis@3.1.4, ioredis@^3.1.2:
     redis-commands "^1.2.0"
     redis-parser "^2.4.0"
 
+ioredis@^3.1.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-3.2.2.tgz#b7d5ff3afd77bb9718bb2821329b894b9a44c00b"
+  dependencies:
+    bluebird "^3.3.4"
+    cluster-key-slot "^1.0.6"
+    debug "^2.6.9"
+    denque "^1.1.0"
+    flexbuffer "0.0.6"
+    lodash.assign "^4.2.0"
+    lodash.bind "^4.2.1"
+    lodash.clone "^4.5.0"
+    lodash.clonedeep "^4.5.0"
+    lodash.defaults "^4.2.0"
+    lodash.difference "^4.5.0"
+    lodash.flatten "^4.4.0"
+    lodash.foreach "^4.5.0"
+    lodash.isempty "^4.4.0"
+    lodash.keys "^4.2.0"
+    lodash.noop "^3.0.1"
+    lodash.partial "^4.2.1"
+    lodash.pick "^4.4.0"
+    lodash.sample "^4.2.1"
+    lodash.shuffle "^4.2.0"
+    lodash.values "^4.3.0"
+    redis-commands "^1.2.0"
+    redis-parser "^2.4.0"
+
 ip-regex@^1.0.0, ip-regex@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-1.0.3.tgz#dc589076f659f419c222039a33316f1c7387effd"
@@ -5352,9 +5303,9 @@ ip@^1.1.2, ip@^1.1.4, ip@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
 
-ipaddr.js@1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.5.2.tgz#d4b505bde9946987ccf0fc58d9010ff9607e3fa0"
+ipaddr.js@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.6.0.tgz#e3fa357b773da619f26e95f049d055c72796f86b"
 
 is-absolute-url@^2.0.0:
   version "2.1.0"
@@ -5382,14 +5333,14 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
-is-buffer@^1.1.5:
+is-boolean-object@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.0.tgz#98f8b28030684219a95f375cfbd88ce3405dff93"
+
+is-buffer@^1.1.5, is-buffer@~1.1.1:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
 
-is-buffer@~1.1.1:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
-
 is-builtin-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
@@ -5401,8 +5352,8 @@ is-callable@^1.1.1, is-callable@^1.1.3:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
 
 is-ci@^1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5"
   dependencies:
     ci-info "^1.0.0"
 
@@ -5452,13 +5403,6 @@ is-equal-shallow@^0.1.3:
   dependencies:
     is-primitive "^2.0.0"
 
-is-expression@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-2.1.0.tgz#91be9d47debcfef077977e9722be6dcfb4465ef0"
-  dependencies:
-    acorn "~3.3.0"
-    object-assign "^4.0.1"
-
 is-expression@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-3.0.0.tgz#39acaa6be7fd1f3471dc42c7416e61c24317ac9f"
@@ -5553,6 +5497,10 @@ is-npm@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
 
+is-number-object@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.3.tgz#f265ab89a9f445034ef6aff15a8f00b00f551799"
+
 is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
@@ -5573,11 +5521,11 @@ is-obj@^1.0.0, is-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
 
-is-observable@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-0.2.0.tgz#b361311d83c6e5d726cabf5e250b0237106f5ae2"
+is-observable@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz#b3e986c8f44de950867cab5403f5a3465005975e"
   dependencies:
-    symbol-observable "^0.2.2"
+    symbol-observable "^1.1.0"
 
 is-odd@^2.0.0:
   version "2.0.0"
@@ -5590,8 +5538,8 @@ is-path-cwd@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
 
 is-path-in-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
   dependencies:
     is-path-inside "^1.0.0"
 
@@ -5648,8 +5596,8 @@ is-relative-url@~2.0.0:
     is-absolute-url "^2.0.0"
 
 is-resolvable@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.0.1.tgz#acca1cd36dbe44b974b924321555a70ba03b1cf4"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
 
 is-retry-allowed@^1.0.0:
   version "1.1.0"
@@ -5669,6 +5617,10 @@ is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
 
+is-string@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.4.tgz#cc3a9b69857d621e963725a24caeec873b826e64"
+
 is-subset@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
@@ -5695,6 +5647,10 @@ is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
 
+is-wsl@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
+
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
@@ -5708,8 +5664,8 @@ isemail@1.x.x:
   resolved "https://registry.yarnpkg.com/isemail/-/isemail-1.2.0.tgz#be03df8cc3e29de4d2c5df6501263f1fa4595e9a"
 
 isemail@3.x.x:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/isemail/-/isemail-3.1.1.tgz#e8450fe78ff1b48347db599122adcd0668bd92b5"
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/isemail/-/isemail-3.1.2.tgz#937cf919002077999a73ea8b1951d590e84e01dd"
   dependencies:
     punycode "2.x.x"
 
@@ -5759,11 +5715,7 @@ istanbul-api@^1.1.14:
     mkdirp "^0.5.1"
     once "^1.4.0"
 
-istanbul-lib-coverage@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz#73bfb998885299415c93d38a3e9adf784a77a9da"
-
-istanbul-lib-coverage@^1.1.2, istanbul-lib-coverage@^1.2.0:
+istanbul-lib-coverage@^1.1.1, istanbul-lib-coverage@^1.1.2, istanbul-lib-coverage@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz#f7d8f2e42b97e37fe796114cb0f9d68b5e3a4341"
 
@@ -5785,18 +5737,6 @@ istanbul-lib-instrument@^1.10.1, istanbul-lib-instrument@^1.8.0:
     istanbul-lib-coverage "^1.2.0"
     semver "^5.3.0"
 
-istanbul-lib-instrument@^1.7.5:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.8.0.tgz#66f6c9421cc9ec4704f76f2db084ba9078a2b532"
-  dependencies:
-    babel-generator "^6.18.0"
-    babel-template "^6.16.0"
-    babel-traverse "^6.18.0"
-    babel-types "^6.18.0"
-    babylon "^6.18.0"
-    istanbul-lib-coverage "^1.1.1"
-    semver "^5.3.0"
-
 istanbul-lib-report@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.4.tgz#e886cdf505c4ebbd8e099e4396a90d0a28e2acb5"
@@ -5817,8 +5757,8 @@ istanbul-lib-source-maps@^1.2.1:
     source-map "^0.5.3"
 
 istanbul-lib-source-maps@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.4.tgz#cc7ccad61629f4efff8e2f78adb8c522c9976ec7"
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.5.tgz#ffe6be4e7ab86d3603e4290d54990b14506fc9b1"
   dependencies:
     debug "^3.1.0"
     istanbul-lib-coverage "^1.2.0"
@@ -5837,18 +5777,18 @@ iterall@1.0.3:
   resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.0.3.tgz#e0b31958f835013c323ff0b10943829ac69aa4b7"
 
 iterall@^1.1.0, iterall@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.1.3.tgz#1cbbff96204056dde6656e2ed2e2226d0e6d72c9"
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.2.2.tgz#92d70deb8028e0c39ff3164fdbf4d8b088130cd7"
 
-jest-changed-files@^22.4.3:
+jest-changed-files@^22.2.0:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-22.4.3.tgz#8882181e022c38bd46a2e4d18d44d19d90a90fb2"
   dependencies:
     throat "^4.0.0"
 
-jest-cli@^22.4.3:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-22.4.3.tgz#bf16c4a5fb7edc3fa5b9bb7819e34139e88a72c7"
+jest-cli@^22.4.4:
+  version "22.4.4"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-22.4.4.tgz#68cd2a2aae983adb1e6638248ca21082fd6d9e90"
   dependencies:
     ansi-escapes "^3.0.0"
     chalk "^2.0.1"
@@ -5861,20 +5801,20 @@ jest-cli@^22.4.3:
     istanbul-lib-coverage "^1.1.1"
     istanbul-lib-instrument "^1.8.0"
     istanbul-lib-source-maps "^1.2.1"
-    jest-changed-files "^22.4.3"
-    jest-config "^22.4.3"
-    jest-environment-jsdom "^22.4.3"
-    jest-get-type "^22.4.3"
-    jest-haste-map "^22.4.3"
-    jest-message-util "^22.4.3"
-    jest-regex-util "^22.4.3"
-    jest-resolve-dependencies "^22.4.3"
-    jest-runner "^22.4.3"
-    jest-runtime "^22.4.3"
-    jest-snapshot "^22.4.3"
-    jest-util "^22.4.3"
-    jest-validate "^22.4.3"
-    jest-worker "^22.4.3"
+    jest-changed-files "^22.2.0"
+    jest-config "^22.4.4"
+    jest-environment-jsdom "^22.4.1"
+    jest-get-type "^22.1.0"
+    jest-haste-map "^22.4.2"
+    jest-message-util "^22.4.0"
+    jest-regex-util "^22.1.0"
+    jest-resolve-dependencies "^22.1.0"
+    jest-runner "^22.4.4"
+    jest-runtime "^22.4.4"
+    jest-snapshot "^22.4.0"
+    jest-util "^22.4.1"
+    jest-validate "^22.4.4"
+    jest-worker "^22.2.2"
     micromatch "^2.3.11"
     node-notifier "^5.2.1"
     realpath-native "^1.0.0"
@@ -5885,48 +5825,23 @@ jest-cli@^22.4.3:
     which "^1.2.12"
     yargs "^10.0.3"
 
-jest-config@^22.4.2:
-  version "22.4.2"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-22.4.2.tgz#580ba5819bf81a5e48f4fd470e8b81834f45c855"
+jest-config@^22.4.4:
+  version "22.4.4"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-22.4.4.tgz#72a521188720597169cd8b4ff86934ef5752d86a"
   dependencies:
     chalk "^2.0.1"
     glob "^7.1.1"
     jest-environment-jsdom "^22.4.1"
     jest-environment-node "^22.4.1"
     jest-get-type "^22.1.0"
-    jest-jasmine2 "^22.4.2"
+    jest-jasmine2 "^22.4.4"
     jest-regex-util "^22.1.0"
     jest-resolve "^22.4.2"
     jest-util "^22.4.1"
-    jest-validate "^22.4.2"
+    jest-validate "^22.4.4"
     pretty-format "^22.4.0"
 
-jest-config@^22.4.3:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-22.4.3.tgz#0e9d57db267839ea31309119b41dc2fa31b76403"
-  dependencies:
-    chalk "^2.0.1"
-    glob "^7.1.1"
-    jest-environment-jsdom "^22.4.3"
-    jest-environment-node "^22.4.3"
-    jest-get-type "^22.4.3"
-    jest-jasmine2 "^22.4.3"
-    jest-regex-util "^22.4.3"
-    jest-resolve "^22.4.3"
-    jest-util "^22.4.3"
-    jest-validate "^22.4.3"
-    pretty-format "^22.4.3"
-
-jest-diff@^22.4.0:
-  version "22.4.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-22.4.0.tgz#384c2b78519ca44ca126382df53f134289232525"
-  dependencies:
-    chalk "^2.0.1"
-    diff "^3.2.0"
-    jest-get-type "^22.1.0"
-    pretty-format "^22.4.0"
-
-jest-diff@^22.4.3:
+jest-diff@^22.4.0, jest-diff@^22.4.3:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-22.4.3.tgz#e18cc3feff0aeef159d02310f2686d4065378030"
   dependencies:
@@ -5939,21 +5854,13 @@ jest-docblock@^21.0.0:
   version "21.2.0"
   resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-21.2.0.tgz#51529c3b30d5fd159da60c27ceedc195faf8d414"
 
-jest-docblock@^22.4.3:
+jest-docblock@^22.4.0, jest-docblock@^22.4.3:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-22.4.3.tgz#50886f132b42b280c903c592373bb6e93bb68b19"
   dependencies:
     detect-newline "^2.1.0"
 
 jest-environment-jsdom@^22.4.1:
-  version "22.4.1"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-22.4.1.tgz#754f408872441740100d3917e5ec40c74de6447f"
-  dependencies:
-    jest-mock "^22.2.0"
-    jest-util "^22.4.1"
-    jsdom "^11.5.1"
-
-jest-environment-jsdom@^22.4.3:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-22.4.3.tgz#d67daa4155e33516aecdd35afd82d4abf0fa8a1e"
   dependencies:
@@ -5962,28 +5869,17 @@ jest-environment-jsdom@^22.4.3:
     jsdom "^11.5.1"
 
 jest-environment-node@^22.4.1:
-  version "22.4.1"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-22.4.1.tgz#418850eb654596b8d6e36c2021cbedbc23df8e16"
-  dependencies:
-    jest-mock "^22.2.0"
-    jest-util "^22.4.1"
-
-jest-environment-node@^22.4.3:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-22.4.3.tgz#54c4eaa374c83dd52a9da8759be14ebe1d0b9129"
   dependencies:
     jest-mock "^22.4.3"
     jest-util "^22.4.3"
 
-jest-get-type@^22.1.0:
-  version "22.1.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.1.0.tgz#4e90af298ed6181edc85d2da500dbd2753e0d5a9"
-
-jest-get-type@^22.4.3:
+jest-get-type@^22.1.0, jest-get-type@^22.4.3:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4"
 
-jest-haste-map@^22.4.3:
+jest-haste-map@^22.4.2:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-22.4.3.tgz#25842fa2ba350200767ac27f658d58b9d5c2e20b"
   dependencies:
@@ -5995,9 +5891,9 @@ jest-haste-map@^22.4.3:
     micromatch "^2.3.11"
     sane "^2.0.0"
 
-jest-jasmine2@^22.4.2:
-  version "22.4.2"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-22.4.2.tgz#dfd3d259579ed6f52510d8f1ab692808f0d40691"
+jest-jasmine2@^22.4.4:
+  version "22.4.4"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-22.4.4.tgz#c55f92c961a141f693f869f5f081a79a10d24e23"
   dependencies:
     chalk "^2.0.1"
     co "^4.6.0"
@@ -6011,45 +5907,21 @@ jest-jasmine2@^22.4.2:
     jest-util "^22.4.1"
     source-map-support "^0.5.0"
 
-jest-jasmine2@^22.4.3:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-22.4.3.tgz#4daf64cd14c793da9db34a7c7b8dcfe52a745965"
-  dependencies:
-    chalk "^2.0.1"
-    co "^4.6.0"
-    expect "^22.4.3"
-    graceful-fs "^4.1.11"
-    is-generator-fn "^1.0.0"
-    jest-diff "^22.4.3"
-    jest-matcher-utils "^22.4.3"
-    jest-message-util "^22.4.3"
-    jest-snapshot "^22.4.3"
-    jest-util "^22.4.3"
-    source-map-support "^0.5.0"
-
 jest-junit@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/jest-junit/-/jest-junit-3.6.0.tgz#f4c4358e5286364a4324dc14abddd526aadfbd38"
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/jest-junit/-/jest-junit-3.7.0.tgz#34abaed677439eb96557815d18b5ba01364fd897"
   dependencies:
     mkdirp "^0.5.1"
     strip-ansi "^4.0.0"
     xml "^1.0.1"
 
-jest-leak-detector@^22.4.3:
+jest-leak-detector@^22.4.0:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-22.4.3.tgz#2b7b263103afae8c52b6b91241a2de40117e5b35"
   dependencies:
     pretty-format "^22.4.3"
 
-jest-matcher-utils@^22.4.0:
-  version "22.4.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-22.4.0.tgz#d55f5faf2270462736bdf7c7485ee931c9d4b6a1"
-  dependencies:
-    chalk "^2.0.1"
-    jest-get-type "^22.1.0"
-    pretty-format "^22.4.0"
-
-jest-matcher-utils@^22.4.3:
+jest-matcher-utils@^22.4.0, jest-matcher-utils@^22.4.3:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-22.4.3.tgz#4632fe428ebc73ebc194d3c7b65d37b161f710ff"
   dependencies:
@@ -6057,17 +5929,7 @@ jest-matcher-utils@^22.4.3:
     jest-get-type "^22.4.3"
     pretty-format "^22.4.3"
 
-jest-message-util@^22.4.0:
-  version "22.4.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-22.4.0.tgz#e3d861df16d2fee60cb2bc8feac2188a42579642"
-  dependencies:
-    "@babel/code-frame" "^7.0.0-beta.35"
-    chalk "^2.0.1"
-    micromatch "^2.3.11"
-    slash "^1.0.0"
-    stack-utils "^1.0.1"
-
-jest-message-util@^22.4.3:
+jest-message-util@^22.4.0, jest-message-util@^22.4.3:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-22.4.3.tgz#cf3d38aafe4befddbfc455e57d65d5239e399eb7"
   dependencies:
@@ -6077,75 +5939,60 @@ jest-message-util@^22.4.3:
     slash "^1.0.0"
     stack-utils "^1.0.1"
 
-jest-mock@^22.2.0:
-  version "22.2.0"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-22.2.0.tgz#444b3f9488a7473adae09bc8a77294afded397a7"
-
 jest-mock@^22.4.3:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-22.4.3.tgz#f63ba2f07a1511772cdc7979733397df770aabc7"
 
-jest-regex-util@^22.1.0:
-  version "22.1.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-22.1.0.tgz#5daf2fe270074b6da63e5d85f1c9acc866768f53"
-
-jest-regex-util@^22.4.3:
+jest-regex-util@^22.1.0, jest-regex-util@^22.4.3:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-22.4.3.tgz#a826eb191cdf22502198c5401a1fc04de9cef5af"
 
-jest-resolve-dependencies@^22.4.3:
+jest-resolve-dependencies@^22.1.0:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-22.4.3.tgz#e2256a5a846732dc3969cb72f3c9ad7725a8195e"
   dependencies:
     jest-regex-util "^22.4.3"
 
 jest-resolve@^22.4.2:
-  version "22.4.2"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-22.4.2.tgz#25d88aa4147462c9c1c6a1ba16250d3794c24d00"
-  dependencies:
-    browser-resolve "^1.11.2"
-    chalk "^2.0.1"
-
-jest-resolve@^22.4.3:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-22.4.3.tgz#0ce9d438c8438229aa9b916968ec6b05c1abb4ea"
   dependencies:
     browser-resolve "^1.11.2"
     chalk "^2.0.1"
 
-jest-runner@^22.4.3:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-22.4.3.tgz#298ddd6a22b992c64401b4667702b325e50610c3"
+jest-runner@^22.4.4:
+  version "22.4.4"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-22.4.4.tgz#dfca7b7553e0fa617e7b1291aeb7ce83e540a907"
   dependencies:
     exit "^0.1.2"
-    jest-config "^22.4.3"
-    jest-docblock "^22.4.3"
-    jest-haste-map "^22.4.3"
-    jest-jasmine2 "^22.4.3"
-    jest-leak-detector "^22.4.3"
-    jest-message-util "^22.4.3"
-    jest-runtime "^22.4.3"
-    jest-util "^22.4.3"
-    jest-worker "^22.4.3"
+    jest-config "^22.4.4"
+    jest-docblock "^22.4.0"
+    jest-haste-map "^22.4.2"
+    jest-jasmine2 "^22.4.4"
+    jest-leak-detector "^22.4.0"
+    jest-message-util "^22.4.0"
+    jest-runtime "^22.4.4"
+    jest-util "^22.4.1"
+    jest-worker "^22.2.2"
     throat "^4.0.0"
 
-jest-runtime@^22.4.3:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-22.4.3.tgz#b69926c34b851b920f666c93e86ba2912087e3d0"
+jest-runtime@^22.4.4:
+  version "22.4.4"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-22.4.4.tgz#9ba7792fc75582a5be0f79af6f8fe8adea314048"
   dependencies:
     babel-core "^6.0.0"
-    babel-jest "^22.4.3"
+    babel-jest "^22.4.4"
     babel-plugin-istanbul "^4.1.5"
     chalk "^2.0.1"
     convert-source-map "^1.4.0"
     exit "^0.1.2"
     graceful-fs "^4.1.11"
-    jest-config "^22.4.3"
-    jest-haste-map "^22.4.3"
-    jest-regex-util "^22.4.3"
-    jest-resolve "^22.4.3"
-    jest-util "^22.4.3"
-    jest-validate "^22.4.3"
+    jest-config "^22.4.4"
+    jest-haste-map "^22.4.2"
+    jest-regex-util "^22.1.0"
+    jest-resolve "^22.4.2"
+    jest-util "^22.4.1"
+    jest-validate "^22.4.4"
     json-stable-stringify "^1.0.1"
     micromatch "^2.3.11"
     realpath-native "^1.0.0"
@@ -6159,17 +6006,6 @@ jest-serializer@^22.4.3:
   resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-22.4.3.tgz#a679b81a7f111e4766235f4f0c46d230ee0f7436"
 
 jest-snapshot@^22.4.0:
-  version "22.4.0"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-22.4.0.tgz#03d3ce63f8fa7352388afc6a3c8b5ccc3a180ed7"
-  dependencies:
-    chalk "^2.0.1"
-    jest-diff "^22.4.0"
-    jest-matcher-utils "^22.4.0"
-    mkdirp "^0.5.1"
-    natural-compare "^1.4.0"
-    pretty-format "^22.4.0"
-
-jest-snapshot@^22.4.3:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-22.4.3.tgz#b5c9b42846ffb9faccb76b841315ba67887362d2"
   dependencies:
@@ -6180,19 +6016,7 @@ jest-snapshot@^22.4.3:
     natural-compare "^1.4.0"
     pretty-format "^22.4.3"
 
-jest-util@^22.4.1:
-  version "22.4.1"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-22.4.1.tgz#dd17c3bdb067f8e90591563ec0c42bf847dc249f"
-  dependencies:
-    callsites "^2.0.0"
-    chalk "^2.0.1"
-    graceful-fs "^4.1.11"
-    is-ci "^1.0.10"
-    jest-message-util "^22.4.0"
-    mkdirp "^0.5.1"
-    source-map "^0.6.0"
-
-jest-util@^22.4.3:
+jest-util@^22.4.1, jest-util@^22.4.3:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-22.4.3.tgz#c70fec8eec487c37b10b0809dc064a7ecf6aafac"
   dependencies:
@@ -6204,42 +6028,41 @@ jest-util@^22.4.3:
     mkdirp "^0.5.1"
     source-map "^0.6.0"
 
-jest-validate@^22.4.0, jest-validate@^22.4.2:
-  version "22.4.2"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-22.4.2.tgz#e789a4e056173bf97fe797a2df2d52105c57d4f4"
+jest-validate@^22.4.4:
+  version "22.4.4"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-22.4.4.tgz#1dd0b616ef46c995de61810d85f57119dbbcec4d"
   dependencies:
     chalk "^2.0.1"
-    jest-config "^22.4.2"
+    jest-config "^22.4.4"
     jest-get-type "^22.1.0"
     leven "^2.1.0"
     pretty-format "^22.4.0"
 
-jest-validate@^22.4.3:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-22.4.3.tgz#0780954a5a7daaeec8d3c10834b9280865976b30"
+jest-validate@^23.0.0:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.0.1.tgz#cd9f01a89d26bb885f12a8667715e9c865a5754f"
   dependencies:
     chalk "^2.0.1"
-    jest-config "^22.4.3"
-    jest-get-type "^22.4.3"
+    jest-get-type "^22.1.0"
     leven "^2.1.0"
-    pretty-format "^22.4.3"
+    pretty-format "^23.0.1"
 
-jest-worker@^22.4.3:
+jest-worker@^22.2.2, jest-worker@^22.4.3:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-22.4.3.tgz#5c421417cba1c0abf64bf56bd5fb7968d79dd40b"
   dependencies:
     merge-stream "^1.0.1"
 
 jest@^22.4.3:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-22.4.3.tgz#2261f4b117dc46d9a4a1a673d2150958dee92f16"
+  version "22.4.4"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-22.4.4.tgz#ffb36c9654b339a13e10b3d4b338eb3e9d49f6eb"
   dependencies:
     import-local "^1.0.0"
-    jest-cli "^22.4.3"
+    jest-cli "^22.4.4"
 
 joi@^13.0.0:
-  version "13.1.2"
-  resolved "https://registry.yarnpkg.com/joi/-/joi-13.1.2.tgz#b2db260323cc7f919fafa51e09e2275bd089a97e"
+  version "13.3.0"
+  resolved "https://registry.yarnpkg.com/joi/-/joi-13.3.0.tgz#4defd4333b539c5d10e444ab44f5a5583480f17c"
   dependencies:
     hoek "5.x.x"
     isemail "3.x.x"
@@ -6254,17 +6077,13 @@ joi@^6.10.1:
     moment "2.x.x"
     topo "1.x.x"
 
-jquery@>=1.9.0:
+jquery@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
 
-js-base64@^2.1.8:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582"
-
-js-base64@^2.1.9:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.3.2.tgz#a79a923666372b580f8e27f51845c6f7e8fbfbaf"
+js-base64@^2.1.8, js-base64@^2.1.9:
+  version "2.4.5"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.5.tgz#e293cd3c7c82f070d700fc7a1ca0a2e69f101f92"
 
 js-message@1.0.5:
   version "1.0.5"
@@ -6288,16 +6107,9 @@ js-yaml@0.3.x:
   version "0.3.7"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-0.3.7.tgz#d739d8ee86461e54b354d6a7d7d1f2ad9a167f62"
 
-js-yaml@^3.4.3, js-yaml@^3.5.2, js-yaml@^3.6.1, js-yaml@^3.9.0, js-yaml@^3.9.1:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-js-yaml@^3.7.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
+js-yaml@^3.10.0, js-yaml@^3.4.3, js-yaml@^3.5.2, js-yaml@^3.6.1, js-yaml@^3.7.0, js-yaml@^3.9.0, js-yaml@^3.9.1:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -6314,22 +6126,21 @@ jsbn@~0.1.0:
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
 
 jsdom@^11.5.1, jsdom@^11.6.2:
-  version "11.6.2"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.6.2.tgz#25d1ef332d48adf77fc5221fe2619967923f16bb"
+  version "11.11.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.11.0.tgz#df486efad41aee96c59ad7a190e2449c7eb1110e"
   dependencies:
     abab "^1.0.4"
     acorn "^5.3.0"
     acorn-globals "^4.1.0"
     array-equal "^1.0.0"
-    browser-process-hrtime "^0.1.2"
-    content-type-parser "^1.0.2"
     cssom ">= 0.3.2 < 0.4.0"
-    cssstyle ">= 0.2.37 < 0.3.0"
+    cssstyle ">= 0.3.1 < 0.4.0"
+    data-urls "^1.0.0"
     domexception "^1.0.0"
     escodegen "^1.9.0"
     html-encoding-sniffer "^1.0.2"
     left-pad "^1.2.0"
-    nwmatcher "^1.4.3"
+    nwsapi "^2.0.0"
     parse5 "4.0.0"
     pn "^1.1.0"
     request "^2.83.0"
@@ -6340,34 +6151,19 @@ jsdom@^11.5.1, jsdom@^11.6.2:
     w3c-hr-time "^1.0.1"
     webidl-conversions "^4.0.2"
     whatwg-encoding "^1.0.3"
-    whatwg-url "^6.4.0"
+    whatwg-mimetype "^2.1.0"
+    whatwg-url "^6.4.1"
     ws "^4.0.0"
     xml-name-validator "^3.0.0"
 
-jsdom@^7.0.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-7.2.2.tgz#40b402770c2bda23469096bee91ab675e3b1fc6e"
-  dependencies:
-    abab "^1.0.0"
-    acorn "^2.4.0"
-    acorn-globals "^1.0.4"
-    cssom ">= 0.3.0 < 0.4.0"
-    cssstyle ">= 0.2.29 < 0.3.0"
-    escodegen "^1.6.1"
-    nwmatcher ">= 1.3.7 < 2.0.0"
-    parse5 "^1.5.1"
-    request "^2.55.0"
-    sax "^1.1.4"
-    symbol-tree ">= 3.1.0 < 4.0.0"
-    tough-cookie "^2.2.0"
-    webidl-conversions "^2.0.0"
-    whatwg-url-compat "~0.6.5"
-    xml-name-validator ">= 2.0.1 < 3.0.0"
-
 jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
 
+jsesc@^2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
+
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
@@ -6381,8 +6177,8 @@ json-loader@^0.5.4:
   resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
 
 json-parse-better-errors@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz#50183cd1b2d25275de069e9e71b467ac9eab973a"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
 
 json-schema-traverse@^0.3.0:
   version "0.3.1"
@@ -6449,10 +6245,10 @@ jsonwebtoken@^7.0.0:
     xtend "^4.0.1"
 
 jsonwebtoken@^8.0.0:
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.1.1.tgz#b04d8bb2ad847bc93238c3c92170ffdbdd1cb2ea"
+  version "8.2.2"
+  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.2.2.tgz#76d7993fda79660d71bd0f933109e1f133734b20"
   dependencies:
-    jws "^3.1.4"
+    jws "^3.1.5"
     lodash.includes "^4.3.0"
     lodash.isboolean "^3.0.3"
     lodash.isinteger "^4.0.4"
@@ -6479,31 +6275,29 @@ jstransformer@1.0.0:
     is-promise "^2.0.0"
     promise "^7.0.1"
 
-jsx-ast-utils@^2.0.0:
+jsx-ast-utils@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz#e801b1b39985e20fffc87b40e3748080e2dcac7f"
   dependencies:
     array-includes "^3.0.3"
 
-just-extend@^1.1.22:
-  version "1.1.22"
-  resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-1.1.22.tgz#3330af756cab6a542700c64b2e4e4aa062d52fff"
+just-extend@^1.1.27:
+  version "1.1.27"
+  resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-1.1.27.tgz#ec6e79410ff914e472652abfa0e603c03d60e905"
 
-jwa@^1.1.4:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.1.5.tgz#a0552ce0220742cd52e153774a32905c30e756e5"
+jwa@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.1.6.tgz#87240e76c9808dbde18783cf2264ef4929ee50e6"
   dependencies:
-    base64url "2.0.0"
     buffer-equal-constant-time "1.0.1"
-    ecdsa-sig-formatter "1.0.9"
+    ecdsa-sig-formatter "1.0.10"
     safe-buffer "^5.0.1"
 
-jws@^3.1.4:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/jws/-/jws-3.1.4.tgz#f9e8b9338e8a847277d6444b1464f61880e050a2"
+jws@^3.1.4, jws@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/jws/-/jws-3.1.5.tgz#80d12d05b293d1e841e7cb8b4e69e561adcf834f"
   dependencies:
-    base64url "^2.0.0"
-    jwa "^1.1.4"
+    jwa "^1.1.5"
     safe-buffer "^5.0.1"
 
 jwt-decode@^2.2.0:
@@ -6519,9 +6313,9 @@ jxLoader@*:
     promised-io "*"
     walker "1.x"
 
-kareem@2.0.7:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/kareem/-/kareem-2.0.7.tgz#8d260366a4df4236ceccec318fcf10c17c5beb22"
+kareem@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/kareem/-/kareem-2.1.0.tgz#d63197b57311830e4ceb3f34431f22f2de826a03"
 
 keymaster@^1.6.2:
   version "1.6.2"
@@ -6579,12 +6373,6 @@ lazy-cache@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
 
-lazy-cache@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-2.0.2.tgz#b9190a4f913354694840859f8a8f7084d8822264"
-  dependencies:
-    set-getter "^0.1.0"
-
 lazystream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
@@ -6598,8 +6386,8 @@ lcid@^1.0.0:
     invert-kv "^1.0.0"
 
 left-pad@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.2.0.tgz#d30a73c6b8201d8f7d8e7956ba9616087a68e0ee"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
 
 leprechaun@0.0.2:
   version "0.0.2"
@@ -6641,29 +6429,29 @@ linkify-it@^2.0.3:
     uc.micro "^1.0.1"
 
 linkifyjs@^2.1.5:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-2.1.5.tgz#effc9f01e4aeafbbdbef21a45feab38b9516f93e"
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-2.1.6.tgz#f1cc88a86ff8863196615857fd47eb193c0a26cb"
   optionalDependencies:
-    jquery ">=1.9.0"
-    react ">=0.14.0"
-    react-dom ">=0.14.0"
+    jquery "^3.3.1"
+    react "^16.2.0"
+    react-dom "^16.2.0"
 
 lint-staged@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-7.1.0.tgz#1514a5b71b8d9492ca0c3d2a44769cbcbc8bcc79"
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-7.1.3.tgz#0eb77b42131653808e02bc0eba66ad8ff8a8ca1f"
   dependencies:
     app-root-path "^2.0.1"
     chalk "^2.3.1"
     commander "^2.14.1"
-    cosmiconfig "^4.0.0"
+    cosmiconfig "^5.0.2"
     debug "^3.1.0"
     dedent "^0.7.0"
     execa "^0.9.0"
     find-parent-dir "^0.3.0"
     is-glob "^4.0.0"
     is-windows "^1.0.2"
-    jest-validate "^22.4.0"
-    listr "^0.13.0"
+    jest-validate "^23.0.0"
+    listr "^0.14.1"
     lodash "^4.17.5"
     log-symbols "^2.2.0"
     micromatch "^3.1.8"
@@ -6702,15 +6490,15 @@ listr-verbose-renderer@^0.4.0:
     date-fns "^1.27.2"
     figures "^1.7.0"
 
-listr@^0.13.0:
-  version "0.13.0"
-  resolved "https://registry.yarnpkg.com/listr/-/listr-0.13.0.tgz#20bb0ba30bae660ee84cc0503df4be3d5623887d"
+listr@^0.14.1:
+  version "0.14.1"
+  resolved "https://registry.yarnpkg.com/listr/-/listr-0.14.1.tgz#8a7afa4a7135cee4c921d128e0b7dfc6e522d43d"
   dependencies:
-    chalk "^1.1.3"
+    "@samverschueren/stream-to-observable" "^0.3.0"
     cli-truncate "^0.2.1"
     figures "^1.7.0"
     indent-string "^2.1.0"
-    is-observable "^0.2.0"
+    is-observable "^1.1.0"
     is-promise "^2.1.0"
     is-stream "^1.1.0"
     listr-silent-renderer "^1.1.1"
@@ -6720,8 +6508,7 @@ listr@^0.13.0:
     log-update "^1.0.2"
     ora "^0.2.3"
     p-map "^1.1.1"
-    rxjs "^5.4.2"
-    stream-to-observable "^0.2.0"
+    rxjs "^6.1.0"
     strip-ansi "^3.0.1"
 
 load-json-file@^1.0.0:
@@ -6780,14 +6567,10 @@ locate-path@^2.0.0:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
 
-lodash-es@^4.17.10:
+lodash-es@^4.17.10, lodash-es@^4.2.1:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.10.tgz#62cd7104cdf5dd87f235a837f0ede0e8e5117e05"
 
-lodash-es@^4.2.1:
-  version "4.17.4"
-  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.4.tgz#dcc1d7552e150a0640073ba9cb31d70f032950e7"
-
 lodash._arraycopy@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz#76e7b7c1f1fb92547374878a562ed06a3e50f6e1"
@@ -6850,7 +6633,11 @@ lodash.assign@^4.0.3, lodash.assign@^4.0.6, lodash.assign@^4.0.8, lodash.assign@
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
 
-lodash.bind@^4.2.1:
+lodash.assignin@^4.0.9:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"
+
+lodash.bind@^4.1.4, lodash.bind@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/lodash.bind/-/lodash.bind-4.2.1.tgz#7ae3017e939622ac31b7d7d7dcb1b34db1690d35"
 
@@ -6882,7 +6669,7 @@ lodash.create@3.1.1:
     lodash._basecreate "^3.0.0"
     lodash._isiterateecall "^3.0.0"
 
-lodash.defaults@^4.2.0:
+lodash.defaults@^4.0.1, lodash.defaults@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
 
@@ -6901,7 +6688,7 @@ lodash.difference@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c"
 
-lodash.endswith@^4.0.1, lodash.endswith@^4.2.1:
+lodash.endswith@^4.0.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/lodash.endswith/-/lodash.endswith-4.2.1.tgz#fed59ac1738ed3e236edd7064ec456448b37bc09"
 
@@ -6909,6 +6696,10 @@ lodash.escaperegexp@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
 
+lodash.filter@^4.4.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace"
+
 lodash.flatten@^4.2.0, lodash.flatten@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
@@ -6917,7 +6708,7 @@ lodash.flattendeep@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
 
-lodash.foreach@^4.5.0:
+lodash.foreach@^4.3.0, lodash.foreach@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53"
 
@@ -6949,10 +6740,6 @@ lodash.isequal@^4.4.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
 
-lodash.isfunction@^3.0.8:
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051"
-
 lodash.isinteger@^4.0.4:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343"
@@ -6989,19 +6776,19 @@ lodash.keysin@^4.0.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.keysin/-/lodash.keysin-4.2.0.tgz#8cc3fb35c2d94acc443a1863e02fa40799ea6f28"
 
+lodash.map@^4.4.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
+
 lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
 
-lodash.merge@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5"
+lodash.merge@^4.4.0, lodash.merge@^4.6.1:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54"
 
-lodash.mergewith@^4.0.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz#150cf0a16791f5903b8891eab154609274bdea55"
-
-lodash.mergewith@^4.6.0:
+lodash.mergewith@^4.0.0, lodash.mergewith@^4.6.0:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
 
@@ -7017,14 +6804,18 @@ lodash.partial@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/lodash.partial/-/lodash.partial-4.2.1.tgz#49f3d8cfdaa3bff8b3a91d127e923245418961d4"
 
-lodash.pick@^4.4.0:
+lodash.pick@^4.2.1, lodash.pick@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
 
-lodash.reduce@4.6.0:
+lodash.reduce@4.6.0, lodash.reduce@^4.4.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b"
 
+lodash.reject@^4.4.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.reject/-/lodash.reject-4.6.0.tgz#80d6492dc1470864bbf583533b651f42a9f52415"
+
 lodash.rest@^4.0.0:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/lodash.rest/-/lodash.rest-4.0.5.tgz#954ef75049262038c96d1fc98b28fdaf9f0772aa"
@@ -7041,14 +6832,14 @@ lodash.snakecase@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz#39d714a35357147837aefd64b5dcbb16becd8f8d"
 
+lodash.some@^4.4.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
+
 lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
 
-lodash.startswith@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/lodash.startswith/-/lodash.startswith-4.2.1.tgz#c598c4adce188a27e53145731cdc6c0e7177600c"
-
 lodash.toarray@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz#24c4bfcd6b2fba38bfd0594db1179d8e9b656561"
@@ -7061,22 +6852,14 @@ lodash.values@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347"
 
-"lodash@>=3.5 <5", lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.5, lodash@^4.3.0, lodash@^4.8.0, lodash@~4.17.4:
-  version "4.17.5"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
+"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.8.0, lodash@~4.17.10:
+  version "4.17.10"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
 lodash@^3.10.1:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
-lodash@^4.0.0, lodash@^4.1.0, lodash@^4.2.0, lodash@^4.2.1:
-  version "4.17.4"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
-
-lodash@^4.14.0, lodash@^4.17.10, lodash@^4.17.4:
-  version "4.17.10"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
-
 log-symbols@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
@@ -7100,13 +6883,9 @@ lolex@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.3.2.tgz#7c3da62ffcb30f0f5a80a2566ca24e45d8a01f31"
 
-lolex@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.6.0.tgz#3a9a0283452a47d7439e72731b9e07d7386e49f6"
-
-lolex@^2.1.2:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/lolex/-/lolex-2.1.3.tgz#53f893bbe88c80378156240e127126b905c83087"
+lolex@^2.1.2, lolex@^2.3.2:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/lolex/-/lolex-2.7.0.tgz#9c087a69ec440e39d3f796767cf1b2cdc43d5ea5"
 
 longest@^1.0.1:
   version "1.0.1"
@@ -7130,34 +6909,27 @@ lower-case@^1.1.1:
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
 
 lowercase-keys@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
 
-lru-cache@^2.5.0, lru-cache@~2.6.5:
+lru-cache@^2.5.0:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
+
+lru-cache@^4.0.1, lru-cache@^4.1.1:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
+  dependencies:
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
+
+lru-cache@~2.6.5:
   version "2.6.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.6.5.tgz#e56d6354148ede8d7707b58d143220fd08df0fd5"
 
-lru-cache@^4.0.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
-  dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
-
-lru-cache@^4.1.1:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.2.tgz#45234b2e6e2f2b33da125624c4664929a0224c3f"
-  dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
-
 lunr@^2.1.6:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.1.6.tgz#671d2321c4c5bc4c522914953d1c54d612f60aa7"
-
-macaddress@^0.2.8:
-  version "0.2.8"
-  resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.2.1.tgz#62c62947bf83619450e94abf26061f1ce3baaa47"
 
 mailcomposer@4.0.1:
   version "4.0.1"
@@ -7167,8 +6939,8 @@ mailcomposer@4.0.1:
     libmime "3.0.0"
 
 make-dir@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.2.0.tgz#6d6a49eead4aae296c53bbf3a1a008bd6c89469b"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
   dependencies:
     pify "^3.0.0"
 
@@ -7202,17 +6974,13 @@ markdown@~0.5.0:
   dependencies:
     nopt "~2.1.1"
 
-marked@*, marked@^0.3.5:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.6.tgz#b2c6c618fccece4ef86c4fc6cb8a7cbf5aeda8d7"
+marked@*:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-0.4.0.tgz#9ad2c2a7a1791f10a852e0112f77b571dce10c66"
 
-marked@^0.3.6:
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.7.tgz#80ef3bbf1bd00d1c9cfebe42ba1b8c85da258d0d"
-
-marked@^0.3.9:
-  version "0.3.16"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.16.tgz#2f188b7dfcfa6540fe9940adaf0f3b791c9a5cba"
+marked@^0.3.5, marked@^0.3.6, marked@^0.3.9:
+  version "0.3.19"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.19.tgz#5d47f709c4c9fc3c216b6d46127280f40b39d790"
 
 material-design-lite@^1.2.1:
   version "1.3.0"
@@ -7222,6 +6990,10 @@ math-expression-evaluator@^1.2.14:
   version "1.2.17"
   resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
 
+math-random@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
+
 md5.js@^1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
@@ -7291,91 +7063,92 @@ mersenne-twister@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mersenne-twister/-/mersenne-twister-1.1.0.tgz#f916618ee43d7179efcf641bec4531eb9670978a"
 
-metascraper-author@^3.9.2:
-  version "3.9.2"
-  resolved "https://registry.yarnpkg.com/metascraper-author/-/metascraper-author-3.9.2.tgz#ff2020ac428f59a875d655df3b0d4bea171fde19"
+metascraper-author@^3.11.5, metascraper-author@^3.9.2:
+  version "3.11.5"
+  resolved "https://registry.yarnpkg.com/metascraper-author/-/metascraper-author-3.11.5.tgz#2db58ab990c50f45ac651ea2d5d51d1c5a558fb5"
   dependencies:
-    "@metascraper/helpers" "^3.9.2"
-    lodash "~4.17.4"
+    "@metascraper/helpers" "^3.11.5"
+    lodash "~4.17.10"
 
-metascraper-date@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/metascraper-date/-/metascraper-date-3.3.0.tgz#359cc596896286ac06a677508fd66a0ee490fd17"
+metascraper-date@^3.11.4, metascraper-date@^3.3.0:
+  version "3.11.4"
+  resolved "https://registry.yarnpkg.com/metascraper-date/-/metascraper-date-3.11.4.tgz#b4911b5033c466653d1f7c650666caaa7e3d9c82"
   dependencies:
     chrono-node "~1.3.5"
     isostring "0.0.1"
 
-metascraper-description@^3.9.2:
-  version "3.9.2"
-  resolved "https://registry.yarnpkg.com/metascraper-description/-/metascraper-description-3.9.2.tgz#1afc983e7088f05e1a6961fe9772360aa0664bd1"
+metascraper-description@^3.11.5, metascraper-description@^3.9.2:
+  version "3.11.5"
+  resolved "https://registry.yarnpkg.com/metascraper-description/-/metascraper-description-3.11.5.tgz#35d98058bbac53455114e3d5e7a48a763fb69d1b"
   dependencies:
-    "@metascraper/helpers" "^3.9.2"
-    lodash "~4.17.4"
+    "@metascraper/helpers" "^3.11.5"
+    lodash "~4.17.10"
 
-metascraper-image@^3.9.2:
-  version "3.9.2"
-  resolved "https://registry.yarnpkg.com/metascraper-image/-/metascraper-image-3.9.2.tgz#029649356565b92c7685873c36a04f92ccb979e8"
+metascraper-image@^3.11.5, metascraper-image@^3.9.2:
+  version "3.11.5"
+  resolved "https://registry.yarnpkg.com/metascraper-image/-/metascraper-image-3.11.5.tgz#ef19ee5ce7d0f494e28e33c6621eb14237055960"
   dependencies:
-    "@metascraper/helpers" "^3.9.2"
+    "@metascraper/helpers" "^3.11.5"
 
-metascraper-lang@^3.9.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/metascraper-lang/-/metascraper-lang-3.9.0.tgz#b66547c470618416dab89c8e221a29df9ac88f75"
+metascraper-lang@^3.11.4:
+  version "3.11.4"
+  resolved "https://registry.yarnpkg.com/metascraper-lang/-/metascraper-lang-3.11.4.tgz#989e997f17e9b2abeb96dee1255c23e06b32f468"
   dependencies:
-    lodash "~4.17.4"
+    lodash "~4.17.10"
 
-metascraper-logo@^3.9.2:
-  version "3.9.2"
-  resolved "https://registry.yarnpkg.com/metascraper-logo/-/metascraper-logo-3.9.2.tgz#9779c5efda3391a1642bd9b7e590855477644225"
+metascraper-logo@^3.11.5:
+  version "3.11.5"
+  resolved "https://registry.yarnpkg.com/metascraper-logo/-/metascraper-logo-3.11.5.tgz#4c500ae579f54efd173745ed42a0821b8098b011"
   dependencies:
-    "@metascraper/helpers" "^3.9.2"
-    lodash "~4.17.4"
+    "@metascraper/helpers" "^3.11.5"
+    lodash "~4.17.10"
 
-metascraper-publisher@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/metascraper-publisher/-/metascraper-publisher-3.4.0.tgz#b1ecbe6b2300eca97e860ad322f817925dbfffe4"
+metascraper-publisher@^3.11.4:
+  version "3.11.4"
+  resolved "https://registry.yarnpkg.com/metascraper-publisher/-/metascraper-publisher-3.11.4.tgz#e2be0c98d54208cd5a1698e8ecd200130fefe545"
   dependencies:
     condense-whitespace "~1.0.0"
-    lodash "~4.17.4"
+    lodash "~4.17.10"
 
-metascraper-title@^3.9.2:
-  version "3.9.2"
-  resolved "https://registry.yarnpkg.com/metascraper-title/-/metascraper-title-3.9.2.tgz#594bea98e2b364bf808d40720950f6a1e4057a1f"
+metascraper-title@^3.11.5, metascraper-title@^3.9.2:
+  version "3.11.5"
+  resolved "https://registry.yarnpkg.com/metascraper-title/-/metascraper-title-3.11.5.tgz#4dc4d6963a146b57cb286fbe83e5eddf8df39f65"
   dependencies:
-    "@metascraper/helpers" "^3.9.2"
-    lodash "~4.17.4"
+    "@metascraper/helpers" "^3.11.5"
+    lodash "~4.17.10"
 
-metascraper-url@^3.9.2:
-  version "3.9.2"
-  resolved "https://registry.yarnpkg.com/metascraper-url/-/metascraper-url-3.9.2.tgz#e578eb35a13f359dadb57f90d49025a2ed39b43c"
+metascraper-url@^3.11.5:
+  version "3.11.5"
+  resolved "https://registry.yarnpkg.com/metascraper-url/-/metascraper-url-3.11.5.tgz#d2bc188eaea92497dbdb4a612484993f12cf07a6"
   dependencies:
-    "@metascraper/helpers" "^3.9.2"
+    "@metascraper/helpers" "^3.11.5"
 
-metascraper-video@^3.9.2:
-  version "3.9.2"
-  resolved "https://registry.yarnpkg.com/metascraper-video/-/metascraper-video-3.9.2.tgz#027c16cf48a48b636c7611492357ef6898e28577"
+metascraper-video@^3.11.5:
+  version "3.11.5"
+  resolved "https://registry.yarnpkg.com/metascraper-video/-/metascraper-video-3.11.5.tgz#8b510085abc92917b673c531a3e9fe174d1df0a0"
   dependencies:
-    "@metascraper/helpers" "^3.9.2"
+    "@metascraper/helpers" "^3.11.5"
     video-extensions "~1.1.0"
 
 metascraper@^3.9.2:
-  version "3.9.2"
-  resolved "https://registry.yarnpkg.com/metascraper/-/metascraper-3.9.2.tgz#bc2d1705a80be619ddc254716d2bf9d98e92b1c2"
+  version "3.11.6"
+  resolved "https://registry.yarnpkg.com/metascraper/-/metascraper-3.11.6.tgz#d6b1bd4b1104360de029006090f1706a780fc255"
   dependencies:
-    "@metascraper/helpers" "^3.9.2"
+    "@metascraper/helpers" "^3.11.5"
     cheerio "~1.0.0-rc.2"
-    cosmiconfig "~4.0.0"
-    lodash "~4.17.4"
-    metascraper-author "^3.9.2"
-    metascraper-date "^3.3.0"
-    metascraper-description "^3.9.2"
-    metascraper-image "^3.9.2"
-    metascraper-lang "^3.9.0"
-    metascraper-logo "^3.9.2"
-    metascraper-publisher "^3.4.0"
-    metascraper-title "^3.9.2"
-    metascraper-url "^3.9.2"
-    metascraper-video "^3.9.2"
+    cheerio-advanced-selectors "~2.0.1"
+    cosmiconfig "~5.0.2"
+    lodash "~4.17.10"
+    metascraper-author "^3.11.5"
+    metascraper-date "^3.11.4"
+    metascraper-description "^3.11.5"
+    metascraper-image "^3.11.5"
+    metascraper-lang "^3.11.4"
+    metascraper-logo "^3.11.5"
+    metascraper-publisher "^3.11.4"
+    metascraper-title "^3.11.5"
+    metascraper-url "^3.11.5"
+    metascraper-video "^3.11.5"
     p-reduce "~1.0.0"
     resolve-from "~4.0.0"
     sanitize-html "~1.18.2"
@@ -7403,8 +7176,8 @@ micromatch@^2.1.5, micromatch@^2.3.11:
     regex-cache "^0.4.2"
 
 micromatch@^3.1.4, micromatch@^3.1.8:
-  version "3.1.8"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.8.tgz#5c8caa008de588eebb395e8c0ad12c128f25fff1"
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -7418,7 +7191,7 @@ micromatch@^3.1.4, micromatch@^3.1.8:
     object.pick "^1.3.0"
     regex-not "^1.0.0"
     snapdragon "^0.8.1"
-    to-regex "^3.0.1"
+    to-regex "^3.0.2"
 
 miller-rabin@^4.0.0:
   version "4.0.1"
@@ -7427,43 +7200,45 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-"mime-db@>= 1.29.0 < 2", mime-db@~1.30.0:
-  version "1.30.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
+"mime-db@>= 1.33.0 < 2":
+  version "1.34.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.34.0.tgz#452d0ecff5c30346a6dc1e64b1eaee0d3719ff9a"
 
-"mime-db@>= 1.33.0 < 2", mime-db@~1.33.0:
+mime-db@~1.33.0:
   version "1.33.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
 
-mime-types@^2.1.10, mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.17:
-  version "2.1.17"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
-  dependencies:
-    mime-db "~1.30.0"
-
-mime-types@^2.1.12, mime-types@~2.1.7:
+mime-types@^2.1.10, mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.7:
   version "2.1.18"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
   dependencies:
     mime-db "~1.33.0"
 
-mime@1.4.1, mime@^1.3.4, mime@^1.4.1:
+mime@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
 
+mime@^1.3.4, mime@^1.4.1:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+
 mimic-fn@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+
+mimic-response@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.0.tgz#df3d3652a73fded6b9b0b24146e6fd052353458e"
 
 minimalistic-assert@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
 
 minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
+"minimatch@2 || 3", minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
@@ -7533,12 +7308,13 @@ mkpath@1.0.0:
   resolved "https://registry.yarnpkg.com/mkpath/-/mkpath-1.0.0.tgz#ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"
 
 mocha-junit-reporter@^1.12.1:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.15.0.tgz#309f4b7a20fcda26d0ad69c9b7d0808d772302c2"
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.17.0.tgz#2e5149ed40fc5d2e3ca71e42db5ab1fec9c6d85c"
   dependencies:
     debug "^2.2.0"
     md5 "^2.1.0"
     mkdirp "~0.5.1"
+    strip-ansi "^4.0.0"
     xml "^1.0.0"
 
 mocha-nightwatch@3.2.2:
@@ -7575,26 +7351,14 @@ mocha@^3.1.2:
     supports-color "3.1.2"
 
 moment-timezone@^0.5.14, moment-timezone@^0.5.x:
-  version "0.5.14"
-  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.14.tgz#4eb38ff9538b80108ba467a458f3ed4268ccfcb1"
+  version "0.5.17"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.17.tgz#3c8fef32051d84c3af174d91dc52977dcb0ad7e5"
   dependencies:
     moment ">= 2.9.0"
 
-moment@2.x.x:
-  version "2.19.4"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.4.tgz#17e5e2c6ead8819c8ecfad83a0acccb312e94682"
-
-"moment@>= 2.9.0", moment@^2.10.6, moment@^2.18.1, moment@^2.19.4:
-  version "2.20.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd"
-
-moment@^2.10.3:
-  version "2.19.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.1.tgz#56da1a2d1cbf01d38b7e1afc31c10bcfa1929167"
-
-moment@^2.15.2:
-  version "2.22.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.1.tgz#529a2e9bf973f259c9643d237fda84de3a26e8ad"
+moment@2.x.x, "moment@>= 2.9.0", moment@^2.10.3, moment@^2.10.6, moment@^2.15.2, moment@^2.18.1, moment@^2.19.4:
+  version "2.22.2"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
 
 mongodb-core@3.0.8:
   version "3.0.8"
@@ -7603,9 +7367,9 @@ mongodb-core@3.0.8:
     bson "~1.0.4"
     require_optional "^1.0.1"
 
-mongodb@3.0.8:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.0.8.tgz#2c1daecac9a0ec2de2f2aea4dc97d76ae70f8951"
+mongodb@3.0.9:
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.0.9.tgz#742e685e45ac9c3ead02a91c9ebaae7165bb2def"
   dependencies:
     mongodb-core "3.0.8"
 
@@ -7614,14 +7378,14 @@ mongoose-legacy-pluralize@1.0.2:
   resolved "https://registry.yarnpkg.com/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz#3ba9f91fa507b5186d399fb40854bff18fb563e4"
 
 mongoose@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.1.1.tgz#a7e925607e76032e5ef20b3035a357bc8581b45e"
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.1.4.tgz#eda83a5d81149c8114b6cac5e8b419324f92cc4b"
   dependencies:
-    async "2.1.4"
+    async "2.6.1"
     bson "~1.0.5"
-    kareem "2.0.7"
+    kareem "2.1.0"
     lodash.get "4.4.2"
-    mongodb "3.0.8"
+    mongodb "3.0.9"
     mongoose-legacy-pluralize "1.0.2"
     mpath "0.4.1"
     mquery "3.0.0"
@@ -7699,15 +7463,7 @@ name-all-modules-plugin@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/name-all-modules-plugin/-/name-all-modules-plugin-1.0.1.tgz#0abfb6ad835718b9fb4def0674e06657a954375c"
 
-nan@^2.3.0, nan@^2.3.3, nan@^2.6.2:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
-
-nan@^2.3.2:
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.9.2.tgz#f564d75f5f8f36a6d9456cca7a6c4fe488ab7866"
-
-nan@^2.9.2:
+nan@^2.10.0, nan@^2.9.2:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
 
@@ -7744,9 +7500,9 @@ natural@^0.2.0:
     sylvester ">= 0.0.12"
     underscore ">=1.3.1"
 
-nconf@^0.8.4:
-  version "0.8.5"
-  resolved "https://registry.yarnpkg.com/nconf/-/nconf-0.8.5.tgz#f2941e1561952fa906bbb32328cf88d4c635e794"
+nconf@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/nconf/-/nconf-0.10.0.tgz#da1285ee95d0a922ca6cee75adcf861f48205ad2"
   dependencies:
     async "^1.4.0"
     ini "^1.3.0"
@@ -7758,12 +7514,13 @@ ncp@~2.0.0:
   resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
 
 nearley@^2.7.10:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.11.0.tgz#5e626c79a6cd2f6ab9e7e5d5805e7668967757ae"
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.13.0.tgz#6e7b0f4e68bfc3e74c99eaef2eda39e513143439"
   dependencies:
     nomnom "~1.6.2"
     railroad-diagrams "^1.0.0"
-    randexp "^0.4.2"
+    randexp "0.4.6"
+    semver "^5.4.1"
 
 needle@^2.2.0:
   version "2.2.1"
@@ -7777,10 +7534,18 @@ negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
 
+neo-async@^2.5.0:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.1.tgz#acb909e327b1e87ec9ef15f41b8a269512ad41ee"
+
 netmask@~1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35"
 
+next-tick@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
+
 nib@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/nib/-/nib-1.1.2.tgz#6a69ede4081b95c0def8be024a4c8ae0c2cbb6c7"
@@ -7792,8 +7557,8 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.4.tgz#d93962f6c52f2c1558c0fbda6d512819f1efe1c4"
 
 nightwatch@^0.9.16:
-  version "0.9.19"
-  resolved "https://registry.yarnpkg.com/nightwatch/-/nightwatch-0.9.19.tgz#4bd9757273d30b845f04847a98b71be9bb7c4b3b"
+  version "0.9.21"
+  resolved "https://registry.yarnpkg.com/nightwatch/-/nightwatch-0.9.21.tgz#9e794a7514b4fd5f46602d368e50515232ab9e90"
   dependencies:
     chai-nightwatch "~0.1.x"
     ejs "2.5.7"
@@ -7807,12 +7572,12 @@ nightwatch@^0.9.16:
     q "1.4.1"
 
 nise@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/nise/-/nise-1.1.1.tgz#1faa07147f3bf2465d4dbedc0e4a84048f081041"
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/nise/-/nise-1.4.1.tgz#78bc2b343d5ff1031ea9d1bb2c87a94c26db7250"
   dependencies:
-    formatio "^1.2.0"
-    just-extend "^1.1.22"
-    lolex "^1.6.0"
+    "@sinonjs/formatio" "^2.0.0"
+    just-extend "^1.1.27"
+    lolex "^2.3.2"
     path-to-regexp "^1.7.0"
     text-encoding "^0.6.4"
 
@@ -7826,9 +7591,9 @@ nocache@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/nocache/-/nocache-2.0.0.tgz#202b48021a0c4cbde2df80de15a17443c8b43980"
 
-node-abi@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.1.2.tgz#4da6caceb6685fcd31e7dd1994ef6bb7d0a9c0b2"
+node-abi@^2.2.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.4.1.tgz#7628c4d4ec4e9cd3764ceb3652f36b2e7f8d4923"
   dependencies:
     semver "^5.4.1"
 
@@ -7849,7 +7614,7 @@ node-fingerprint@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/node-fingerprint/-/node-fingerprint-0.0.2.tgz#31cbabeb71a67ae7dd5a7dc042e51c3c75868501"
 
-node-gyp@^3.3.1, node-gyp@^3.6.2:
+node-gyp@^3.3.1:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.6.2.tgz#9bfbe54562286284838e750eac05295853fa1c60"
   dependencies:
@@ -7931,22 +7696,6 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
-node-pre-gyp@^0.6.39:
-  version "0.6.39"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649"
-  dependencies:
-    detect-libc "^1.0.2"
-    hawk "3.1.3"
-    mkdirp "^0.5.1"
-    nopt "^4.0.1"
-    npmlog "^4.0.2"
-    rc "^1.1.7"
-    request "2.81.0"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^2.2.1"
-    tar-pack "^3.4.0"
-
 node-redis-scripty@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/node-redis-scripty/-/node-redis-scripty-0.0.5.tgz#4bf2d365ab6dab202cc08b7ac63f8f55aadc9625"
@@ -7962,8 +7711,8 @@ node-redis-warlock@~0.2.0:
     uuid "^2.0.1"
 
 node-sass@^4.5.3:
-  version "4.7.2"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.7.2.tgz#9366778ba1469eb01438a9e8592f4262bcb6794e"
+  version "4.9.0"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.0.tgz#d1b8aa855d98ed684d6848db929a20771cc2ae52"
   dependencies:
     async-foreach "^0.1.3"
     chalk "^1.1.1"
@@ -7977,7 +7726,7 @@ node-sass@^4.5.3:
     lodash.mergewith "^4.6.0"
     meow "^3.7.0"
     mkdirp "^0.5.1"
-    nan "^2.3.2"
+    nan "^2.10.0"
     node-gyp "^3.3.1"
     npmlog "^4.0.0"
     request "~2.79.0"
@@ -8034,31 +7783,19 @@ nodemailer@^2.6.4:
     nodemailer-smtp-transport "2.7.2"
     socks "1.1.9"
 
-nodemon@^1.11.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.14.1.tgz#f43447d99cfacc586316b38b456a3ffb4537914f"
-  dependencies:
-    chokidar "^1.7.0"
-    debug "^2.6.8"
-    ignore-by-default "^1.0.1"
-    minimatch "^3.0.4"
-    pstree.remy "^1.1.0"
-    touch "^3.1.0"
-    undefsafe "0.0.3"
-    update-notifier "^2.3.0"
-
-nodemon@^1.14.12:
-  version "1.15.1"
-  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.15.1.tgz#54daa72443d8d5a548f130866b92e65cded0ed58"
+nodemon@^1.11.0, nodemon@^1.14.12:
+  version "1.17.5"
+  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.17.5.tgz#e6a665c872fdf09d48bf2a81f3e85f8cfb39322a"
   dependencies:
     chokidar "^2.0.2"
     debug "^3.1.0"
     ignore-by-default "^1.0.1"
     minimatch "^3.0.4"
     pstree.remy "^1.1.0"
-    semver "^5.4.1"
+    semver "^5.5.0"
+    supports-color "^5.2.0"
     touch "^3.1.0"
-    undefsafe "^2.0.1"
+    undefsafe "^2.0.2"
     update-notifier "^2.3.0"
 
 nomnom@~1.6.2:
@@ -8129,13 +7866,9 @@ normalize-url@^1.4.0:
     query-string "^4.1.0"
     sort-keys "^1.0.0"
 
-normalize-url@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"
-  dependencies:
-    prepend-http "^2.0.0"
-    query-string "^5.0.1"
-    sort-keys "^2.0.0"
+normalize-url@~3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.0.1.tgz#2cff7f20468c75e0e968552b7caac77a51ebcae6"
 
 npm-bundled@^1.0.1:
   version "1.0.3"
@@ -8155,12 +7888,12 @@ npm-path@^2.0.2:
     which "^1.2.10"
 
 npm-run-all@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.2.tgz#90d62d078792d20669139e718621186656cea056"
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.3.tgz#49f15b55a66bb4101664ce270cb18e7103f8f185"
   dependencies:
     ansi-styles "^3.2.0"
     chalk "^2.1.0"
-    cross-spawn "^5.1.0"
+    cross-spawn "^6.0.4"
     memorystream "^0.3.1"
     minimatch "^3.0.4"
     ps-tree "^1.1.0"
@@ -8182,7 +7915,7 @@ npm-which@^3.0.1:
     npm-path "^2.0.2"
     which "^1.2.10"
 
-"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.1, npmlog@^4.0.2:
+"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.1, npmlog@^4.0.2, npmlog@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   dependencies:
@@ -8205,18 +7938,7 @@ number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
-nunjucks@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/nunjucks/-/nunjucks-3.1.2.tgz#85945a66bb8239bb37ecef83dab4cc1f152aabb9"
-  dependencies:
-    a-sync-waterfall "^1.0.0"
-    asap "^2.0.3"
-    postinstall-build "^5.0.1"
-    yargs "^3.32.0"
-  optionalDependencies:
-    chokidar "^1.6.0"
-
-nunjucks@^3.1.3:
+nunjucks@^3.1.2, nunjucks@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/nunjucks/-/nunjucks-3.1.3.tgz#9a23c844af01c143a0b40f3bdd1212a9d7877260"
   dependencies:
@@ -8227,9 +7949,9 @@ nunjucks@^3.1.3:
   optionalDependencies:
     chokidar "^2.0.0"
 
-"nwmatcher@>= 1.3.7 < 2.0.0", nwmatcher@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.3.tgz#64348e3b3d80f035b40ac11563d278f8b72db89c"
+nwsapi@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.0.1.tgz#a50d59a2dcb14b6931401171713ced2d0eb3468f"
 
 oauth-sign@~0.8.1, oauth-sign@~0.8.2:
   version "0.8.2"
@@ -8251,11 +7973,15 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
+object-inspect@^1.5.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b"
+
 object-is@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"
 
-object-keys@^1.0.10, object-keys@^1.0.8:
+object-keys@^1.0.11, object-keys@^1.0.8:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
 
@@ -8265,13 +7991,14 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.0.4.tgz#b1c9cc044ef1b9fe63606fc141abbb32e14730cc"
+object.assign@^4.0.4, object.assign@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
   dependencies:
     define-properties "^1.1.2"
-    function-bind "^1.1.0"
-    object-keys "^1.0.10"
+    function-bind "^1.1.1"
+    has-symbols "^1.0.0"
+    object-keys "^1.0.11"
 
 object.entries@^1.0.4:
   version "1.0.4"
@@ -8321,7 +8048,7 @@ on-headers@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
 
-once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   dependencies:
@@ -8329,7 +8056,7 @@ once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
 
 onetime@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
+  resolved "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
 
 onetime@^2.0.0:
   version "2.0.1"
@@ -8337,12 +8064,11 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
-opn@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-4.0.2.tgz#7abc22e644dff63b0a96d5ab7f2790c0f01abc95"
+opn@^5.2.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c"
   dependencies:
-    object-assign "^4.0.1"
-    pinkie-promise "^2.0.0"
+    is-wsl "^1.1.0"
 
 optimist@0.6.1, optimist@^0.6.1, optimist@~0.6:
   version "0.6.1"
@@ -8398,8 +8124,8 @@ os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
 osenv@0, osenv@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
@@ -8486,8 +8212,8 @@ parallel-transform@^1.1.0:
     readable-stream "^2.1.5"
 
 parallel-webpack@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parallel-webpack/-/parallel-webpack-2.2.0.tgz#7171440b684444610ba890d32439a33666ab46cb"
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/parallel-webpack/-/parallel-webpack-2.3.0.tgz#a614625e25647cea9655918cb80cf829fa674ff8"
   dependencies:
     ajv "^4.9.2"
     bluebird "^3.0.6"
@@ -8503,8 +8229,8 @@ parallel-webpack@^2.2.0:
     worker-farm "^1.3.1"
 
 parse-asn1@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.0.tgz#37c4f9b7ed3ab65c74817b5f2480937fbf97c712"
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
   dependencies:
     asn1.js "^4.0.0"
     browserify-aes "^1.0.0"
@@ -8545,10 +8271,6 @@ parse5@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
 
-parse5@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
-
 parse5@^3.0.1:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c"
@@ -8676,6 +8398,10 @@ path-type@^3.0.0:
   dependencies:
     pify "^3.0.0"
 
+pathval@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"
+
 pause-stream@0.0.11:
   version "0.0.11"
   resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"
@@ -8687,8 +8413,8 @@ pause@0.0.1:
   resolved "https://registry.yarnpkg.com/pause/-/pause-0.0.1.tgz#1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"
 
 pbkdf2@^3.0.3:
-  version "3.0.14"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.14.tgz#a35e13c64799b06ce15320f459c230e68e73bade"
+  version "3.0.16"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.16.tgz#7404208ec6b01b62d85bf83853a8064f8d9c2a5c"
   dependencies:
     create-hash "^1.1.2"
     create-hmac "^1.1.4"
@@ -8700,10 +8426,6 @@ pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
 
-performance-now@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
-
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
@@ -8871,11 +8593,10 @@ postcss-extend@^1.0.1:
     postcss "^5.0.4"
 
 postcss-filter-plugins@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz#6d85862534d735ac420e4a85806e1f5d4286d84c"
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-filter-plugins/-/postcss-filter-plugins-2.0.3.tgz#82245fdf82337041645e477114d8e593aa18b8ec"
   dependencies:
     postcss "^5.0.4"
-    uniqid "^4.0.0"
 
 postcss-load-config@^1.2.0:
   version "1.2.0"
@@ -8984,27 +8705,27 @@ postcss-mixins@^2.1.0:
     postcss "^5.0.10"
     postcss-simple-vars "^1.0.1"
 
-postcss-modules-extract-imports@^1.0.0:
+postcss-modules-extract-imports@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85"
   dependencies:
     postcss "^6.0.1"
 
-postcss-modules-local-by-default@^1.0.1:
+postcss-modules-local-by-default@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
   dependencies:
     css-selector-tokenizer "^0.7.0"
     postcss "^6.0.1"
 
-postcss-modules-scope@^1.0.0:
+postcss-modules-scope@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
   dependencies:
     css-selector-tokenizer "^0.7.0"
     postcss "^6.0.1"
 
-postcss-modules-values@^1.1.0:
+postcss-modules-values@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
   dependencies:
@@ -9170,44 +8891,37 @@ 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@^6.0.1:
-  version "6.0.13"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.13.tgz#b9ecab4ee00c89db3ec931145bd9590bbf3f125f"
+postcss@^6.0.1, postcss@^6.0.14:
+  version "6.0.22"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.22.tgz#e23b78314905c3b90cbd61702121e7a78848f2a3"
   dependencies:
-    chalk "^2.1.0"
+    chalk "^2.4.1"
     source-map "^0.6.1"
-    supports-color "^4.4.0"
-
-postcss@^6.0.14:
-  version "6.0.21"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.21.tgz#8265662694eddf9e9a5960db6da33c39e4cd069d"
-  dependencies:
-    chalk "^2.3.2"
-    source-map "^0.6.1"
-    supports-color "^5.3.0"
+    supports-color "^5.4.0"
 
 postinstall-build@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/postinstall-build/-/postinstall-build-5.0.1.tgz#b917a9079b26178d9a24af5a5cd8cb4a991d11b9"
 
-prebuild-install@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-2.3.0.tgz#19481247df728b854ab57b187ce234211311b485"
+prebuild-install@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-3.0.0.tgz#0fd5b2c48ffcf4ceefa64d04a4c5a328d79ad66c"
   dependencies:
+    detect-libc "^1.0.3"
     expand-template "^1.0.2"
     github-from-package "0.0.0"
     minimist "^1.2.0"
     mkdirp "^0.5.1"
-    node-abi "^2.1.1"
+    node-abi "^2.2.0"
     noop-logger "^0.1.1"
     npmlog "^4.0.1"
     os-homedir "^1.0.1"
-    pump "^1.0.1"
+    pump "^2.0.1"
     rc "^1.1.6"
-    simple-get "^1.4.2"
+    simple-get "^2.7.0"
     tar-fs "^1.13.0"
     tunnel-agent "^0.6.0"
-    xtend "4.0.1"
+    which-pm-runs "^1.0.0"
 
 precss@1.4.0:
   version "1.4.0"
@@ -9238,28 +8952,24 @@ prepend-http@^1.0.0, prepend-http@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
 
-prepend-http@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
-
 preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
 prettier@^1.10.2:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.10.2.tgz#1af8356d1842276a99a5b5529c82dd9e9ad3cc93"
+  version "1.13.4"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.4.tgz#31bbae6990f13b1093187c731766a14036fa72e6"
 
-pretty-format@^22.4.0:
-  version "22.4.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-22.4.0.tgz#237b1f7e1c50ed03bc65c03ccc29d7c8bb7beb94"
+pretty-format@^22.4.0, pretty-format@^22.4.3:
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-22.4.3.tgz#f873d780839a9c02e9664c8a082e9ee79eaac16f"
   dependencies:
     ansi-regex "^3.0.0"
     ansi-styles "^3.2.0"
 
-pretty-format@^22.4.3:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-22.4.3.tgz#f873d780839a9c02e9664c8a082e9ee79eaac16f"
+pretty-format@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.0.1.tgz#d61d065268e4c759083bccbca27a01ad7c7601f4"
   dependencies:
     ansi-regex "^3.0.0"
     ansi-styles "^3.2.0"
@@ -9268,14 +8978,10 @@ pretty-hrtime@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
 
-private@^0.1.6, private@^0.1.7:
+private@^0.1.6, private@^0.1.7, private@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
 
-process-nextick-args@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
-
 process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
@@ -9308,9 +9014,9 @@ promised-io@*:
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/promised-io/-/promised-io-0.3.5.tgz#4ad217bb3658bcaae9946b17a8668ecd851e1356"
 
-prop-types@^15.5.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.8, prop-types@^15.6.0:
-  version "15.6.0"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
+prop-types@^15.5.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1:
+  version "15.6.1"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca"
   dependencies:
     fbjs "^0.8.16"
     loose-envify "^1.3.1"
@@ -9320,12 +9026,12 @@ protocols@^1.1.0, protocols@^1.4.0:
   version "1.4.6"
   resolved "https://registry.yarnpkg.com/protocols/-/protocols-1.4.6.tgz#f8bb263ea1b5fd7a7604d26b8be39bd77678bf8a"
 
-proxy-addr@~2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.2.tgz#6571504f47bb988ec8180253f85dd7e14952bdec"
+proxy-addr@~2.0.2, proxy-addr@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.3.tgz#355f262505a621646b3130a728eb647e22055341"
   dependencies:
     forwarded "~0.1.2"
-    ipaddr.js "1.5.2"
+    ipaddr.js "1.6.0"
 
 proxy-agent@2.0.0:
   version "2.0.0"
@@ -9340,10 +9046,6 @@ proxy-agent@2.0.0:
     pac-proxy-agent "1"
     socks-proxy-agent "2"
 
-prr@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
-
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
@@ -9358,6 +9060,10 @@ pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
 
+psl@^1.1.24:
+  version "1.1.27"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.27.tgz#2b2c77019db86855170d903532400bf71ee085b6"
+
 pstree.remy@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.0.tgz#f2af27265bd3e5b32bbfcc10e80bac55ba78688b"
@@ -9365,8 +9071,8 @@ pstree.remy@^1.1.0:
     ps-tree "^1.1.0"
 
 public-encrypt@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6"
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.2.tgz#46eb9107206bf73489f8b85b69d91334c6610994"
   dependencies:
     bn.js "^4.1.0"
     browserify-rsa "^4.0.0"
@@ -9374,24 +9080,24 @@ public-encrypt@^4.0.0:
     parse-asn1 "^5.0.0"
     randombytes "^2.0.1"
 
-pug-attrs@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/pug-attrs/-/pug-attrs-2.0.2.tgz#8be2b2225568ffa75d1b866982bff9f4111affcb"
+pug-attrs@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/pug-attrs/-/pug-attrs-2.0.3.tgz#a3095f970e64151f7bdad957eef55fb5d7905d15"
   dependencies:
     constantinople "^3.0.1"
     js-stringify "^1.0.1"
-    pug-runtime "^2.0.3"
+    pug-runtime "^2.0.4"
 
-pug-code-gen@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-2.0.0.tgz#96aea39a9e62f1ec5d2b6a5b42a29d528c70b43d"
+pug-code-gen@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-2.0.1.tgz#0951ec83225d74d8cfc476a7f99a259b5f7d050c"
   dependencies:
     constantinople "^3.0.1"
     doctypes "^1.1.0"
     js-stringify "^1.0.1"
-    pug-attrs "^2.0.2"
+    pug-attrs "^2.0.3"
     pug-error "^1.3.2"
-    pug-runtime "^2.0.3"
+    pug-runtime "^2.0.4"
     void-elements "^2.0.1"
     with "^5.0.0"
 
@@ -9399,75 +9105,75 @@ pug-error@^1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-1.3.2.tgz#53ae7d9d29bb03cf564493a026109f54c47f5f26"
 
-pug-filters@^2.1.5:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/pug-filters/-/pug-filters-2.1.5.tgz#66bf6e80d97fbef829bab0aa35eddff33fc964f3"
+pug-filters@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/pug-filters/-/pug-filters-3.1.0.tgz#27165555bc04c236e4aa2b0366246dfa021b626e"
   dependencies:
-    clean-css "^3.3.0"
+    clean-css "^4.1.11"
     constantinople "^3.0.1"
     jstransformer "1.0.0"
     pug-error "^1.3.2"
-    pug-walk "^1.1.5"
+    pug-walk "^1.1.7"
     resolve "^1.1.6"
     uglify-js "^2.6.1"
 
-pug-lexer@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/pug-lexer/-/pug-lexer-3.1.0.tgz#fd087376d4a675b4f59f8fef422883434e9581a2"
+pug-lexer@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/pug-lexer/-/pug-lexer-4.0.0.tgz#210c18457ef2e1760242740c5e647bd794cec278"
   dependencies:
     character-parser "^2.1.1"
     is-expression "^3.0.0"
     pug-error "^1.3.2"
 
-pug-linker@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/pug-linker/-/pug-linker-3.0.3.tgz#25f59eb750237f0368e59c3379764229c0189c41"
+pug-linker@^3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/pug-linker/-/pug-linker-3.0.5.tgz#9e9a7ae4005682d027deeb96b000f88eeb83a02f"
   dependencies:
     pug-error "^1.3.2"
-    pug-walk "^1.1.5"
+    pug-walk "^1.1.7"
 
-pug-load@^2.0.9:
-  version "2.0.9"
-  resolved "https://registry.yarnpkg.com/pug-load/-/pug-load-2.0.9.tgz#ee217c914cc1d9324d44b86c32d1df241d36de7a"
+pug-load@^2.0.11:
+  version "2.0.11"
+  resolved "https://registry.yarnpkg.com/pug-load/-/pug-load-2.0.11.tgz#e648e57ed113fe2c1f45d57858ea2bad6bc01527"
   dependencies:
     object-assign "^4.1.0"
-    pug-walk "^1.1.5"
+    pug-walk "^1.1.7"
 
-pug-parser@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/pug-parser/-/pug-parser-4.0.0.tgz#c9f52322e4eabe4bf5beeba64ed18373bb627801"
+pug-parser@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/pug-parser/-/pug-parser-5.0.0.tgz#e394ad9b3fca93123940aff885c06e44ab7e68e4"
   dependencies:
     pug-error "^1.3.2"
     token-stream "0.0.1"
 
-pug-runtime@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/pug-runtime/-/pug-runtime-2.0.3.tgz#98162607b0fce9e254d427f33987a5aee7168bda"
+pug-runtime@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pug-runtime/-/pug-runtime-2.0.4.tgz#e178e1bda68ab2e8c0acfc9bced2c54fd88ceb58"
 
-pug-strip-comments@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pug-strip-comments/-/pug-strip-comments-1.0.2.tgz#d313afa01bcc374980e1399e23ebf2eb9bdc8513"
+pug-strip-comments@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/pug-strip-comments/-/pug-strip-comments-1.0.3.tgz#f1559592206edc6f85310dacf4afb48a025af59f"
   dependencies:
     pug-error "^1.3.2"
 
-pug-walk@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/pug-walk/-/pug-walk-1.1.5.tgz#90e943acbcf7021e6454cf1b32245891cba6f851"
+pug-walk@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/pug-walk/-/pug-walk-1.1.7.tgz#c00d5c5128bac5806bec15d2b7e7cdabe42531f3"
 
 pug@^2.0.0-beta3:
-  version "2.0.0-rc.4"
-  resolved "https://registry.yarnpkg.com/pug/-/pug-2.0.0-rc.4.tgz#b7b08f6599bd5302568042b7436984fb28c80a13"
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/pug/-/pug-2.0.3.tgz#71cba82537c95a5eab7ed04696e4221f53aa878e"
   dependencies:
-    pug-code-gen "^2.0.0"
-    pug-filters "^2.1.5"
-    pug-lexer "^3.1.0"
-    pug-linker "^3.0.3"
-    pug-load "^2.0.9"
-    pug-parser "^4.0.0"
-    pug-runtime "^2.0.3"
-    pug-strip-comments "^1.0.2"
+    pug-code-gen "^2.0.1"
+    pug-filters "^3.1.0"
+    pug-lexer "^4.0.0"
+    pug-linker "^3.0.5"
+    pug-load "^2.0.11"
+    pug-parser "^5.0.0"
+    pug-runtime "^2.0.4"
+    pug-strip-comments "^1.0.3"
 
-pump@^1.0.0, pump@^1.0.1:
+pump@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.3.tgz#5dfe8311c33bbf6fc18261f9f34702c47c08a954"
   dependencies:
@@ -9482,10 +9188,10 @@ pump@^2.0.0, pump@^2.0.1:
     once "^1.3.1"
 
 pumpify@^1.3.3:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.4.0.tgz#80b7c5df7e24153d03f0e7ac8a05a5d068bd07fb"
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
   dependencies:
-    duplexify "^3.5.3"
+    duplexify "^3.6.0"
     inherits "^2.0.3"
     pump "^2.0.0"
 
@@ -9498,8 +9204,8 @@ punycode@1.4.1, punycode@^1.2.4, punycode@^1.4.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
 punycode@2.x.x, punycode@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d"
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
 
 pym.js@^1.3.2:
   version "1.3.2"
@@ -9510,21 +9216,21 @@ q@1.4.1:
   resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
 
 q@^1.1.2:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
 
-qs@6.5.1, qs@^6.1.0, qs@^6.2.0, qs@^6.5.1, qs@~6.5.1:
+qs@6.5.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
 
+qs@6.5.2, qs@^6.1.0, qs@^6.2.0, qs@^6.5.1, qs@~6.5.1:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+
 qs@~6.3.0:
   version "6.3.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
 
-qs@~6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
-
 query-string@^4.1.0, query-string@^4.2.2:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
@@ -9533,14 +9239,6 @@ query-string@^4.1.0, query-string@^4.2.2:
     strict-uri-encode "^1.0.0"
 
 query-string@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.0.1.tgz#6e2b86fe0e08aef682ecbe86e85834765402bd88"
-  dependencies:
-    decode-uri-component "^0.2.0"
-    object-assign "^4.1.0"
-    strict-uri-encode "^1.0.0"
-
-query-string@^5.0.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
   dependencies:
@@ -9566,23 +9264,24 @@ railroad-diagrams@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e"
 
-ramda@^0.24.1:
-  version "0.24.1"
-  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.24.1.tgz#c3b7755197f35b8dc3502228262c4c91ddb6b857"
+ramda@^0.25.0:
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.25.0.tgz#8fdf68231cffa90bc2f9460390a0cb74a29b29a9"
 
-randexp@^0.4.2:
+randexp@0.4.6:
   version "0.4.6"
   resolved "https://registry.yarnpkg.com/randexp/-/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3"
   dependencies:
     discontinuous-range "1.0.0"
     ret "~0.1.10"
 
-randomatic@^1.1.3:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
+randomatic@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.0.0.tgz#d35490030eb4f7578de292ce6dfb04a91a128923"
   dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
+    is-number "^4.0.0"
+    kind-of "^6.0.0"
+    math-random "^1.0.1"
 
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
   version "2.0.6"
@@ -9591,8 +9290,8 @@ randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
     safe-buffer "^5.1.0"
 
 randomfill@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.3.tgz#b96b7df587f01dd91726c418f30553b1418e3d62"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
   dependencies:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
@@ -9601,7 +9300,16 @@ range-parser@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
 
-raw-body@2, raw-body@2.3.2:
+raw-body@2, raw-body@2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
+  dependencies:
+    bytes "3.0.0"
+    http-errors "1.6.3"
+    iconv-lite "0.4.23"
+    unpipe "1.0.0"
+
+raw-body@2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89"
   dependencies:
@@ -9610,32 +9318,15 @@ raw-body@2, raw-body@2.3.2:
     iconv-lite "0.4.19"
     unpipe "1.0.0"
 
-rc@^1.0.1, rc@^1.1.6:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.2.tgz#d8ce9cb57e8d64d9c7badd9876c7c34cbe3c7077"
+rc@^1.0.1, rc@^1.1.6, rc@^1.1.7:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   dependencies:
-    deep-extend "~0.4.0"
+    deep-extend "^0.6.0"
     ini "~1.3.0"
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-rc@^1.1.7:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.4.tgz#a0f606caae2a3b862bbd0ef85482c0125b315fa3"
-  dependencies:
-    deep-extend "~0.4.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
-react-addons-create-fragment@^15.0.0:
-  version "15.6.2"
-  resolved "https://registry.yarnpkg.com/react-addons-create-fragment/-/react-addons-create-fragment-15.6.2.tgz#a394de7c2c7becd6b5475ba1b97ac472ce7c74f8"
-  dependencies:
-    fbjs "^0.8.4"
-    loose-envify "^1.3.1"
-    object-assign "^4.1.0"
-
 react-apollo@^1.4.12:
   version "1.4.16"
   resolved "https://registry.yarnpkg.com/react-apollo/-/react-apollo-1.4.16.tgz#62a623458b67a174ff8ef25f64e7b42531518e19"
@@ -9657,17 +9348,8 @@ react-broadcast@^0.6.2:
     prop-types "^15.6.0"
 
 react-contenteditable@^2.0.7:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/react-contenteditable/-/react-contenteditable-2.0.7.tgz#a8d1c1d7b9a393f336c5ecdb74e5e336d786676b"
-
-react-dom@>=0.14.0:
-  version "16.2.0"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044"
-  dependencies:
-    fbjs "^0.8.16"
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    prop-types "^15.6.0"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/react-contenteditable/-/react-contenteditable-2.1.0.tgz#943f1fb0c8d059f400b80d10f1632f24905406a6"
 
 react-dom@^15.3.1, react-dom@^15.4.2:
   version "15.6.2"
@@ -9678,6 +9360,15 @@ react-dom@^15.3.1, react-dom@^15.4.2:
     object-assign "^4.1.0"
     prop-types "^15.5.10"
 
+react-dom@^16.2.0:
+  version "16.4.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.4.0.tgz#099f067dd5827ce36a29eaf9a6cdc7cbf6216b1e"
+  dependencies:
+    fbjs "^0.8.16"
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    prop-types "^15.6.0"
+
 react-input-autosize@^1.1.4:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-1.2.0.tgz#87241071159f742123897691da6796ec33b57d05"
@@ -9685,6 +9376,10 @@ react-input-autosize@^1.1.4:
     create-react-class "^15.5.2"
     prop-types "^15.5.8"
 
+react-is@^16.4.0:
+  version "16.4.0"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.4.0.tgz#cc9fdc855ac34d2e7d9d2eb7059bbc240d35ffcf"
+
 react-linkify@^0.2.1:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/react-linkify/-/react-linkify-0.2.2.tgz#55b99b1cc7244446a0f9bdebbe13b2c30f789e65"
@@ -9694,8 +9389,8 @@ react-linkify@^0.2.1:
     tlds "^1.57.0"
 
 react-loadable@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/react-loadable/-/react-loadable-5.3.1.tgz#9699e9a08fed49bacd69caaa282034b62a76bcdd"
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/react-loadable/-/react-loadable-5.4.0.tgz#3b6b7d51121a7868fd155be848a36e02084742c9"
   dependencies:
     prop-types "^15.5.0"
 
@@ -9719,41 +9414,48 @@ react-mdl@^1.11.0, react-mdl@^1.7.1:
     prop-types "^15.5.0"
 
 react-paginate@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/react-paginate/-/react-paginate-5.0.0.tgz#b5c12191ea81adc6d4d1b339b805e81841eaa8ea"
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/react-paginate/-/react-paginate-5.2.3.tgz#1eea032f760a86736ad61fb64dab37a9e99fa351"
   dependencies:
-    classnames "^2.2.5"
-    prop-types "^15.6.0"
-    react-addons-create-fragment "^15.0.0"
+    prop-types "^15.6.1"
 
 react-portal@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/react-portal/-/react-portal-4.1.2.tgz#7f28f3c8c2ed5c541907c0ed0f24e8996acf627f"
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/react-portal/-/react-portal-4.1.5.tgz#6665d4d2a92d47d6f8b07a6529e26fc52d5cccde"
   dependencies:
     prop-types "^15.5.8"
 
 react-recaptcha@^2.2.6:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/react-recaptcha/-/react-recaptcha-2.3.6.tgz#afe07b5552f3ea4d37ecd22d9881c2776719ec2b"
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/react-recaptcha/-/react-recaptcha-2.3.8.tgz#a0d2303bb3f607f622c67c5b2feb1b1b86f9f814"
+
+react-reconciler@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/react-reconciler/-/react-reconciler-0.7.0.tgz#9614894103e5f138deeeb5eabaf3ee80eb1d026d"
+  dependencies:
+    fbjs "^0.8.16"
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    prop-types "^15.6.0"
 
 react-redux@^4.4.5:
-  version "4.4.8"
-  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-4.4.8.tgz#e7bc1dd100e8b64e96ac8212db113239b9e2e08f"
+  version "4.4.9"
+  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-4.4.9.tgz#8ca6d4670925a454ce67086c2305e9630670909a"
   dependencies:
     create-react-class "^15.5.1"
-    hoist-non-react-statics "^1.0.3"
+    hoist-non-react-statics "^2.5.0"
     invariant "^2.0.0"
     lodash "^4.2.0"
     loose-envify "^1.1.0"
     prop-types "^15.5.4"
 
 react-router@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-3.2.0.tgz#62b6279d589b70b34e265113e4c0a9261a02ed36"
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-3.2.1.tgz#b9a3279962bdfbe684c8bd0482b81ef288f0f244"
   dependencies:
     create-react-class "^15.5.1"
     history "^3.0.0"
-    hoist-non-react-statics "^1.2.0"
+    hoist-non-react-statics "^2.3.1"
     invariant "^2.2.1"
     loose-envify "^1.2.0"
     prop-types "^15.5.6"
@@ -9771,11 +9473,13 @@ react-test-renderer@15.5:
     object-assign "^4.1.0"
 
 react-test-renderer@^16.0.0-0:
-  version "16.0.0"
-  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.0.0.tgz#9fe7b8308f2f71f29fc356d4102086f131c9cb15"
+  version "16.4.0"
+  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.4.0.tgz#0dbe0e24263e94e1830c7afb1f403707fad313a3"
   dependencies:
     fbjs "^0.8.16"
     object-assign "^4.1.1"
+    prop-types "^15.6.0"
+    react-is "^16.4.0"
 
 react-toastify@^1.5.0:
   version "1.7.0"
@@ -9804,15 +9508,6 @@ react-virtualized@9.13.0:
     loose-envify "^1.3.0"
     prop-types "^15.5.4"
 
-react@>=0.14.0:
-  version "16.2.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba"
-  dependencies:
-    fbjs "^0.8.16"
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    prop-types "^15.6.0"
-
 react@^15.3.1, react@^15.4.2:
   version "15.6.2"
   resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72"
@@ -9823,6 +9518,15 @@ react@^15.3.1, react@^15.4.2:
     object-assign "^4.1.0"
     prop-types "^15.5.10"
 
+react@^16.2.0:
+  version "16.4.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.4.0.tgz#402c2db83335336fba1962c08b98c6272617d585"
+  dependencies:
+    fbjs "^0.8.16"
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    prop-types "^15.6.0"
+
 read-cache@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
@@ -9867,49 +9571,7 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.4, readable-stream@^2.1.5, readable-stream@^2.2.2:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.5.tgz#b4f85003a938cbb6ecbce2a124fb1012bd1a838d"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.0.3"
-    util-deprecate "~1.0.1"
-
-readable-stream@1.1:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.13.tgz#f6eef764f514c89e2b9e23146a75ba106756d23e"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
-readable-stream@1.1.x:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
-readable-stream@2, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.0.3"
-    util-deprecate "~1.0.1"
-
-readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.3.0, readable-stream@^2.3.5:
+"readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   dependencies:
@@ -9921,6 +9583,15 @@ readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.3.0, readable
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
+readable-stream@1.1.x:
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
 readdirp@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
@@ -9959,8 +9630,8 @@ redent@^1.0.0:
     strip-indent "^1.0.1"
 
 redis-commands@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.3.1.tgz#81d826f45fa9c8b2011f4cd7a0fe597d241d442b"
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.3.5.tgz#4495889414f1e886261180b1442e7295602d83a2"
 
 redis-parser@^2.0.0, redis-parser@^2.4.0:
   version "2.6.0"
@@ -10000,8 +9671,8 @@ reduce-function-call@^1.0.1:
     balanced-match "^0.4.2"
 
 redux-thunk@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.2.0.tgz#e615a16e16b47a19a515766133d1e3e99b7852e5"
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622"
 
 redux@^3.4.0, redux@^3.6.0:
   version "3.7.2"
@@ -10017,8 +9688,8 @@ referrer-policy@1.1.0:
   resolved "https://registry.yarnpkg.com/referrer-policy/-/referrer-policy-1.1.0.tgz#35774eb735bf50fb6c078e83334b472350207d79"
 
 regenerate@^1.2.1:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f"
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
 
 regenerator-runtime@^0.10.5:
   version "0.10.5"
@@ -10042,7 +9713,7 @@ regex-cache@^0.4.2:
   dependencies:
     is-equal-shallow "^0.1.3"
 
-regex-not@^1.0.0:
+regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
   dependencies:
@@ -10053,6 +9724,10 @@ regexp-clone@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/regexp-clone/-/regexp-clone-0.0.1.tgz#a7c2e09891fdbf38fbb10d376fb73003e68ac589"
 
+regexpp@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab"
+
 regexpu-core@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
@@ -10070,8 +9745,8 @@ regexpu-core@^2.0.0:
     regjsparser "^0.1.4"
 
 registry-auth-token@^3.0.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.1.tgz#fb0d3289ee0d9ada2cbb52af5dfe66cb070d3006"
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"
   dependencies:
     rc "^1.1.6"
     safe-buffer "^5.0.1"
@@ -10124,61 +9799,7 @@ request-promise-native@^1.0.5:
     stealthy-require "^1.1.0"
     tough-cookie ">=2.3.3"
 
-request@2, request@^2.55.0, request@^2.74.0, request@^2.81.0, request@^2.83.0:
-  version "2.83.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.6.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.1"
-    forever-agent "~0.6.1"
-    form-data "~2.3.1"
-    har-validator "~5.0.3"
-    hawk "~6.0.2"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.17"
-    oauth-sign "~0.8.2"
-    performance-now "^2.1.0"
-    qs "~6.5.1"
-    safe-buffer "^5.1.1"
-    stringstream "~0.0.5"
-    tough-cookie "~2.3.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.1.0"
-
-request@2.81.0:
-  version "2.81.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~4.2.1"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    oauth-sign "~0.8.1"
-    performance-now "^0.2.0"
-    qs "~6.4.0"
-    safe-buffer "^5.0.1"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.0.0"
-
-request@2.87.0:
+request@2, request@2.87.0, request@^2.74.0, request@^2.81.0, request@^2.83.0:
   version "2.87.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
   dependencies:
@@ -10236,10 +9857,6 @@ require-from-string@^1.1.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
 
-require-from-string@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.1.tgz#c545233e9d7da6616e9d59adfb39fc9f588676ff"
-
 require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
@@ -10288,15 +9905,9 @@ resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
-resolve@^1.1.6, resolve@^1.4.0, resolve@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
-  dependencies:
-    path-parse "^1.0.5"
-
-resolve@^1.1.7:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.4.0.tgz#a75be01c53da25d934a98ebd0e4c4a7312f92a86"
+resolve@^1.1.6, resolve@^1.1.7, resolve@^1.4.0, resolve@^1.5.0:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
   dependencies:
     path-parse "^1.0.5"
 
@@ -10328,29 +9939,29 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
   dependencies:
     glob "^7.0.5"
 
-rimraf@^2.2.8, rimraf@~2.5.2:
-  version "2.5.4"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04"
-  dependencies:
-    glob "^7.0.5"
-
 rimraf@~2.4.0:
   version "2.4.5"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.4.5.tgz#ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"
   dependencies:
     glob "^6.0.1"
 
-ripemd160@^2.0.0, ripemd160@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.1.tgz#0f4584295c53a3628af7e6d79aca21ce57d1c6e7"
+rimraf@~2.5.2:
+  version "2.5.4"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04"
   dependencies:
-    hash-base "^2.0.0"
+    glob "^7.0.5"
+
+ripemd160@^2.0.0, ripemd160@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
+  dependencies:
+    hash-base "^3.0.0"
     inherits "^2.0.1"
 
 rst-selector-parser@^2.2.3:
@@ -10360,6 +9971,10 @@ rst-selector-parser@^2.2.3:
     lodash.flattendeep "^4.4.0"
     nearley "^2.7.10"
 
+rsvp@^3.3.3:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
+
 run-async@^2.2.0, run-async@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
@@ -10382,23 +9997,23 @@ rx-lite@*, rx-lite@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
 
-rxjs@^5.4.2:
-  version "5.5.6"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.6.tgz#e31fb96d6fd2ff1fd84bcea8ae9c02d007179c02"
+rxjs@^6.1.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.0.tgz#e024d0e180b72756a83c2aaea8f25423751ba978"
   dependencies:
-    symbol-observable "1.0.1"
+    tslib "^1.9.0"
 
-safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1:
+safe-buffer@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
-safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
 
 safe-json-stringify@~1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.1.0.tgz#bd2b6dad1ebafab3c24672a395527f01804b7e19"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz#356e44bc98f1f93ce45df14bcd7c01cda86e0afd"
 
 safe-regex@^1.1.0:
   version "1.1.0"
@@ -10410,19 +10025,24 @@ safe-regex@^1.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
 
-samsam@1.1.2, samsam@~1.1:
+samsam@1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.1.2.tgz#bec11fdc83a9fda063401210e40176c3024d1567"
 
-samsam@1.x, samsam@^1.1.3:
+samsam@1.3.0, samsam@1.x, samsam@^1.1.3:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.3.0.tgz#8d1d9350e25622da30de3e44ba692b5221ab7c50"
 
+samsam@~1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.1.3.tgz#9f5087419b4d091f232571e7fa52e90b0f552621"
+
 sane@^2.0.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/sane/-/sane-2.5.0.tgz#6359cd676f5efd9988b264d8ce3b827dd6b27bec"
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-2.5.2.tgz#b4dc1861c21b427e929507a3e751e2a2cb8ab3fa"
   dependencies:
     anymatch "^2.0.0"
+    capture-exit "^1.2.0"
     exec-sh "^0.2.0"
     fb-watchman "^2.0.0"
     micromatch "^3.1.4"
@@ -10430,7 +10050,7 @@ sane@^2.0.0:
     walker "~1.0.5"
     watch "~0.18.0"
   optionalDependencies:
-    fsevents "^1.1.1"
+    fsevents "^1.2.3"
 
 sanitize-html@~1.18.2:
   version "1.18.2"
@@ -10460,7 +10080,7 @@ 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.4, sax@~1.2.1:
+sax@^1.2.4, sax@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
 
@@ -10470,12 +10090,12 @@ schema-utils@^0.3.0:
   dependencies:
     ajv "^5.0.0"
 
-schema-utils@^0.4.2:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.3.tgz#e2a594d3395834d5e15da22b48be13517859458e"
+schema-utils@^0.4.5:
+  version "0.4.5"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.5.tgz#21836f0608aac17b78f9e3e24daff14a5ca13a3e"
   dependencies:
-    ajv "^5.0.0"
-    ajv-keywords "^2.1.0"
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
 
 scss-tokenizer@^0.2.3:
   version "0.2.3"
@@ -10492,7 +10112,7 @@ select@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
 
-selenium-standalone@^6.11.0:
+selenium-standalone@^6.15.0:
   version "6.15.0"
   resolved "https://registry.yarnpkg.com/selenium-standalone/-/selenium-standalone-6.15.0.tgz#c8dc77bd45154afbda7509ec53dc599809f63ee4"
   dependencies:
@@ -10520,14 +10140,10 @@ semver-diff@^2.0.0:
   dependencies:
     semver "^5.0.3"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0:
+"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
-semver@^5.0.3, semver@^5.1.0, semver@^5.4.1:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
-
 semver@~5.0.1:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.0.3.tgz#77466de589cd5d3c95f138aa78bc569a3cb5d27a"
@@ -10554,24 +10170,6 @@ send@0.16.0:
     range-parser "~1.2.0"
     statuses "~1.3.1"
 
-send@0.16.1:
-  version "0.16.1"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.16.1.tgz#a70e1ca21d1382c11d0d9f6231deb281080d7ab3"
-  dependencies:
-    debug "2.6.9"
-    depd "~1.1.1"
-    destroy "~1.0.4"
-    encodeurl "~1.0.1"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "~1.6.2"
-    mime "1.4.1"
-    ms "2.0.0"
-    on-finished "~2.3.0"
-    range-parser "~1.2.0"
-    statuses "~1.3.1"
-
 send@0.16.2:
   version "0.16.2"
   resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
@@ -10591,8 +10189,8 @@ send@0.16.2:
     statuses "~1.4.0"
 
 serialize-javascript@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.4.0.tgz#7c958514db6ac2443a8abc062dc9f7886a7f6005"
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
 
 serve-static@1.13.0:
   version "1.13.0"
@@ -10603,7 +10201,7 @@ serve-static@1.13.0:
     parseurl "~1.3.2"
     send "0.16.0"
 
-serve-static@^1.10.0:
+serve-static@1.13.2, serve-static@^1.10.0, serve-static@^1.12.3:
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
   dependencies:
@@ -10612,25 +10210,10 @@ serve-static@^1.10.0:
     parseurl "~1.3.2"
     send "0.16.2"
 
-serve-static@^1.12.3:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.1.tgz#4c57d53404a761d8f2e7c1e8a18a47dbf278a719"
-  dependencies:
-    encodeurl "~1.0.1"
-    escape-html "~1.0.3"
-    parseurl "~1.3.2"
-    send "0.16.1"
-
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
 
-set-getter@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/set-getter/-/set-getter-0.1.0.tgz#d769c182c9d5a51f409145f2fba82e5e86e80376"
-  dependencies:
-    to-object-path "^0.3.0"
-
 set-immediate-shim@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
@@ -10666,8 +10249,8 @@ setprototypeof@1.1.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
 
 sha.js@^2.4.0, sha.js@^2.4.8:
-  version "2.4.9"
-  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.9.tgz#98f64880474b74f4a38b8da9d3c0f2d104633e7d"
+  version "2.4.11"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -10707,13 +10290,17 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
-simple-get@^1.4.2:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-1.4.3.tgz#e9755eda407e96da40c5e5158c9ea37b33becbeb"
+simple-concat@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.0.tgz#7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6"
+
+simple-get@^2.7.0:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-2.8.1.tgz#0e22e91d4575d87620620bc91308d57a77f44b5d"
   dependencies:
+    decompress-response "^3.3.0"
     once "^1.3.1"
-    unzip-response "^1.0.0"
-    xtend "^4.0.0"
+    simple-concat "^1.0.0"
 
 simplemde@^1.11.2:
   version "1.11.2"
@@ -10814,8 +10401,8 @@ snapdragon-util@^3.0.1:
     kind-of "^3.2.0"
 
 snapdragon@^0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.1.tgz#e12b5487faded3e3dea0ac91e9400bf75b401370"
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
   dependencies:
     base "^0.11.1"
     debug "^2.2.0"
@@ -10824,7 +10411,7 @@ snapdragon@^0.8.1:
     map-cache "^0.2.2"
     source-map "^0.5.6"
     source-map-resolve "^0.5.0"
-    use "^2.0.0"
+    use "^3.1.0"
 
 sntp@1.x.x:
   version "1.0.9"
@@ -10832,12 +10419,6 @@ sntp@1.x.x:
   dependencies:
     hoek "2.x.x"
 
-sntp@2.x.x:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
-  dependencies:
-    hoek "4.x.x"
-
 socks-proxy-agent@2:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-2.1.1.tgz#86ebb07193258637870e13b7bd99f26c663df3d3"
@@ -10866,21 +10447,15 @@ sort-keys@^1.0.0:
   dependencies:
     is-plain-obj "^1.0.0"
 
-sort-keys@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
-  dependencies:
-    is-plain-obj "^1.0.0"
-
 source-list-map@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
 
 source-map-resolve@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.1.tgz#7ad0f593f2281598e854df80f19aae4b92d7a11a"
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
   dependencies:
-    atob "^2.0.0"
+    atob "^2.1.1"
     decode-uri-component "^0.2.0"
     resolve-url "^0.2.1"
     source-map-url "^0.4.0"
@@ -10892,10 +10467,11 @@ source-map-support@^0.4.15:
   dependencies:
     source-map "^0.5.6"
 
-source-map-support@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.0.tgz#2018a7ad2bdf8faf2691e5fddab26bed5a2bacab"
+source-map-support@^0.5.0, source-map-support@^0.5.1:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.6.tgz#4435cee46b1aab62b8e8610ce60f788091c51c13"
   dependencies:
+    buffer-from "^1.0.0"
     source-map "^0.6.0"
 
 source-map-url@^0.4.0:
@@ -10908,33 +10484,41 @@ source-map@0.1.x:
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@0.4.x, source-map@^0.4.2, source-map@^0.4.4:
+source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+
+source-map@^0.4.2, source-map@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@0.5.x, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.6:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-
 source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
 
-spdx-correct@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
+spdx-correct@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82"
   dependencies:
-    spdx-license-ids "^1.0.2"
+    spdx-expression-parse "^3.0.0"
+    spdx-license-ids "^3.0.0"
 
-spdx-expression-parse@~1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
+spdx-exceptions@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9"
 
-spdx-license-ids@^1.0.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
+spdx-expression-parse@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
+  dependencies:
+    spdx-exceptions "^2.1.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-license-ids@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz#7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87"
 
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
@@ -11002,14 +10586,18 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
-"statuses@>= 1.3.1 < 2", statuses@~1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
+"statuses@>= 1.3.1 < 2", "statuses@>= 1.4.0 < 2":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
 
 statuses@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
 
+statuses@~1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
+
 stdout-stream@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.0.tgz#a2c7c8587e54d9427ea9edb3ac3f2cd522df378b"
@@ -11041,18 +10629,18 @@ stream-each@^1.1.0:
     stream-shift "^1.0.0"
 
 stream-http@^2.7.2:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.0.tgz#fd86546dac9b1c91aff8fc5d287b98fafb41bc10"
+  version "2.8.3"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
   dependencies:
     builtin-status-codes "^3.0.0"
     inherits "^2.0.1"
-    readable-stream "^2.3.3"
+    readable-stream "^2.3.6"
     to-arraybuffer "^1.0.0"
     xtend "^4.0.0"
 
 stream-json@^0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/stream-json/-/stream-json-0.5.2.tgz#f4256c0ef1a905f2ef2d473706b4b3ff827653cf"
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/stream-json/-/stream-json-0.5.3.tgz#119e466c6966ffc63989848184377d2a07c600c8"
   dependencies:
     parser-toolkit ">=0.0.3"
 
@@ -11060,12 +10648,6 @@ stream-shift@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
 
-stream-to-observable@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/stream-to-observable/-/stream-to-observable-0.2.0.tgz#59d6ea393d87c2c0ddac10aa0d561bc6ba6f0e10"
-  dependencies:
-    any-observable "^0.2.0"
-
 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"
@@ -11093,7 +10675,7 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
+"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   dependencies:
@@ -11108,9 +10690,9 @@ string.prototype.padend@^3.0.0:
     es-abstract "^1.4.3"
     function-bind "^1.0.2"
 
-string_decoder@^1.0.0, string_decoder@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
+string_decoder@^1.0.0, string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
   dependencies:
     safe-buffer "~5.1.0"
 
@@ -11118,12 +10700,6 @@ string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
 
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  dependencies:
-    safe-buffer "~5.1.0"
-
 stringify-object@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.2.2.tgz#9853052e5a88fb605a44cd27445aa257ad7ffbcd"
@@ -11136,10 +10712,6 @@ stringstream@~0.0.4:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72"
 
-stringstream@~0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
-
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -11238,19 +10810,19 @@ superagent@^2.0.0:
     readable-stream "^2.0.5"
 
 superagent@^3.8.0:
-  version "3.8.2"
-  resolved "https://registry.yarnpkg.com/superagent/-/superagent-3.8.2.tgz#e4a11b9d047f7d3efeb3bbe536d9ec0021d16403"
+  version "3.8.3"
+  resolved "https://registry.yarnpkg.com/superagent/-/superagent-3.8.3.tgz#460ea0dbdb7d5b11bc4f78deba565f86a178e128"
   dependencies:
     component-emitter "^1.2.0"
     cookiejar "^2.1.0"
     debug "^3.1.0"
     extend "^3.0.0"
     form-data "^2.3.1"
-    formidable "^1.1.1"
+    formidable "^1.2.0"
     methods "^1.1.1"
     mime "^1.4.1"
     qs "^6.5.1"
-    readable-stream "^2.0.5"
+    readable-stream "^2.3.5"
 
 supports-color@3.1.2:
   version "3.1.2"
@@ -11268,21 +10840,15 @@ supports-color@^3.1.2, supports-color@^3.2.3:
   dependencies:
     has-flag "^1.0.0"
 
-supports-color@^4, supports-color@^4.0.0, supports-color@^4.2.1, supports-color@^4.4.0:
+supports-color@^4, supports-color@^4.2.1:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
   dependencies:
     has-flag "^2.0.0"
 
-supports-color@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.2.0.tgz#b0d5333b1184dd3666cbe5aa0b45c5ac7ac17a4a"
-  dependencies:
-    has-flag "^3.0.0"
-
-supports-color@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0"
+supports-color@^5.2.0, supports-color@^5.3.0, supports-color@^5.4.0:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
   dependencies:
     has-flag "^3.0.0"
 
@@ -11315,23 +10881,15 @@ swig-templates@^2.0.2:
   version "0.0.21"
   resolved "https://registry.yarnpkg.com/sylvester/-/sylvester-0.0.21.tgz#2987b1ce2bd2f38b0dce2a34388884bfa4400ea7"
 
-symbol-observable@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
+symbol-observable@^1.0.2, symbol-observable@^1.0.3, symbol-observable@^1.0.4, symbol-observable@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
 
-symbol-observable@^0.2.2:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-0.2.4.tgz#95a83db26186d6af7e7a18dbd9760a2f86d08f40"
-
-symbol-observable@^1.0.2, symbol-observable@^1.0.3, symbol-observable@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
-
-"symbol-tree@>= 3.1.0 < 4.0.0", symbol-tree@^3.2.2:
+symbol-tree@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
 
-table@^4.0.1:
+table@4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
   dependencies:
@@ -11346,29 +10904,20 @@ tapable@^0.2.7:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22"
 
+tapable@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2"
+
 tar-fs@^1.13.0:
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.0.tgz#e877a25acbcc51d8c790da1c57c9cf439817b896"
+  version "1.16.2"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.2.tgz#17e5239747e399f7e77344f5f53365f04af53577"
   dependencies:
     chownr "^1.0.1"
     mkdirp "^0.5.1"
     pump "^1.0.0"
     tar-stream "^1.1.2"
 
-tar-pack@^3.4.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f"
-  dependencies:
-    debug "^2.2.0"
-    fstream "^1.0.10"
-    fstream-ignore "^1.0.5"
-    once "^1.3.3"
-    readable-stream "^2.1.4"
-    rimraf "^2.5.1"
-    tar "^2.2.1"
-    uid-number "^0.0.6"
-
-tar-stream@1.6.1:
+tar-stream@1.6.1, tar-stream@^1.1.2, tar-stream@^1.5.0:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.1.tgz#f84ef1696269d6223ca48f6e1eeede3f7e81f395"
   dependencies:
@@ -11380,25 +10929,7 @@ tar-stream@1.6.1:
     to-buffer "^1.1.0"
     xtend "^4.0.0"
 
-tar-stream@^1.1.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.5.2.tgz#fbc6c6e83c1a19d4cb48c7d96171fc248effc7bf"
-  dependencies:
-    bl "^1.0.0"
-    end-of-stream "^1.0.0"
-    readable-stream "^2.0.0"
-    xtend "^4.0.0"
-
-tar-stream@^1.5.0:
-  version "1.5.5"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.5.5.tgz#5cad84779f45c83b1f2508d96b09d88c7218af55"
-  dependencies:
-    bl "^1.0.0"
-    end-of-stream "^1.0.0"
-    readable-stream "^2.0.0"
-    xtend "^4.0.0"
-
-tar@^2.0.0, tar@^2.2.1:
+tar@^2.0.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
   dependencies:
@@ -11434,16 +10965,6 @@ term-size@^1.2.0:
   dependencies:
     execa "^0.7.0"
 
-test-exclude@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.1.1.tgz#4d84964b0966b0087ecc334a2ce002d3d9341e26"
-  dependencies:
-    arrify "^1.0.1"
-    micromatch "^2.3.11"
-    object-assign "^4.1.0"
-    read-pkg-up "^1.0.1"
-    require-main-filename "^1.0.1"
-
 test-exclude@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.1.tgz#dfa222f03480bca69207ca728b37d74b45f724fa"
@@ -11500,8 +11021,8 @@ timekeeper@^1.0.0:
   resolved "https://registry.yarnpkg.com/timekeeper/-/timekeeper-1.0.0.tgz#2f38aee1e94b11dd66d8580ff1aa9dcc6a2ba0d8"
 
 timers-browserify@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.4.tgz#96ca53f4b794a5e7c0e1bd7cc88a372298fa01e6"
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
   dependencies:
     setimmediate "^1.0.4"
 
@@ -11522,8 +11043,8 @@ titlecase@^1.1.2:
   resolved "https://registry.yarnpkg.com/titlecase/-/titlecase-1.1.2.tgz#78113d1108086b8326331a3247dea8f5a49ea853"
 
 tlds@^1.187.0, tlds@^1.196.0, tlds@^1.57.0:
-  version "1.199.0"
-  resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.199.0.tgz#a4fc8c3058216488a80aaaebb427925007e55217"
+  version "1.203.1"
+  resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.203.1.tgz#4dc9b02f53de3315bc98b80665e13de3edfc1dfc"
 
 tmp@^0.0.33:
   version "0.0.33"
@@ -11574,13 +11095,14 @@ to-regex-range@^2.1.0:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
 
-to-regex@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.1.tgz#15358bee4a2c83bd76377ba1dc049d0f18837aae"
+to-regex@^3.0.1, to-regex@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
   dependencies:
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    regex-not "^1.0.0"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
 
 to-sentence-case@^1.0.0:
   version "1.0.0"
@@ -11625,28 +11147,25 @@ touch@^3.1.0:
   dependencies:
     nopt "~1.0.10"
 
-tough-cookie@>=2.3.3, tough-cookie@^2.2.0, tough-cookie@^2.3.3, tough-cookie@~2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
+tough-cookie@>=2.3.3, tough-cookie@^2.3.3:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.2.tgz#aa9133154518b494efab98a58247bfc38818c00c"
   dependencies:
+    psl "^1.1.24"
     punycode "^1.4.1"
 
-tough-cookie@~2.3.0:
+tough-cookie@~2.3.0, tough-cookie@~2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
   dependencies:
     punycode "^1.4.1"
 
-tr46@^1.0.0:
+tr46@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
   dependencies:
     punycode "^2.1.0"
 
-tr46@~0.0.1:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-
 trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
@@ -11661,6 +11180,10 @@ trim-right@^1.0.1:
   dependencies:
     glob "^6.0.4"
 
+tslib@^1.9.0:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.2.tgz#8be0cc9a1f6dc7727c38deb16c2ebd1a2892988e"
+
 tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
@@ -11694,15 +11217,15 @@ type-detect@^1.0.0:
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2"
 
 type-detect@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.3.tgz#0e3f2670b44099b0b46c284d136a7ef49c74c2ea"
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
 
-type-is@~1.6.15:
-  version "1.6.15"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410"
+type-is@~1.6.15, type-is@~1.6.16:
+  version "1.6.16"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
   dependencies:
     media-typer "0.3.0"
-    mime-types "~2.1.15"
+    mime-types "~2.1.18"
 
 typedarray@^0.0.6:
   version "0.0.6"
@@ -11713,16 +11236,16 @@ typo-js@*:
   resolved "https://registry.yarnpkg.com/typo-js/-/typo-js-1.0.3.tgz#54d8ebc7949f1a7810908b6002c6841526c99d5a"
 
 ua-parser-js@^0.7.9:
-  version "0.7.17"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac"
+  version "0.7.18"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.18.tgz#a7bfd92f56edfb117083b69e31d2aa8882d4b1ed"
 
 uc.micro@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192"
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.5.tgz#0c65f15f815aa08b560a61ce8b4db7ffc3f45376"
 
 uglify-es@^3.3.4:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.7.tgz#d1249af668666aba7cb1163e277455be9eb393cf"
+  version "3.3.9"
+  resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"
   dependencies:
     commander "~2.13.0"
     source-map "~0.6.1"
@@ -11762,43 +11285,35 @@ uglifyjs-webpack-plugin@^0.4.6:
     webpack-sources "^1.0.1"
 
 uglifyjs-webpack-plugin@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.1.6.tgz#f4ba8449edcf17835c18ba6ae99b9d610857fb19"
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.5.tgz#2ef8387c8f1a903ec5e44fa36f9f3cbdcea67641"
   dependencies:
-    cacache "^10.0.1"
+    cacache "^10.0.4"
     find-cache-dir "^1.0.0"
-    schema-utils "^0.4.2"
+    schema-utils "^0.4.5"
     serialize-javascript "^1.4.0"
     source-map "^0.6.1"
     uglify-es "^3.3.4"
     webpack-sources "^1.1.0"
     worker-farm "^1.5.2"
 
-uid-number@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
-
 uid2@0.0.x:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.3.tgz#483126e11774df2f71b8b639dcd799c376162b82"
 
 ultron@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.0.tgz#b07a2e6a541a815fc6a34ccd4533baec307ca864"
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
 
-undefsafe@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-0.0.3.tgz#ecca3a03e56b9af17385baac812ac83b994a962f"
-
-undefsafe@^2.0.1:
+undefsafe@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.2.tgz#225f6b9e0337663e0d8e7cfd686fc2836ccace76"
   dependencies:
     debug "^2.2.0"
 
 underscore@>=1.3.1:
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961"
 
 underscore@~1.4.4:
   version "1.4.4"
@@ -11821,12 +11336,6 @@ uniq@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
 
-uniqid@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/uniqid/-/uniqid-4.1.1.tgz#89220ddf6b751ae52b5f72484863528596bb84c1"
-  dependencies:
-    macaddress "^0.2.8"
-
 uniqs@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
@@ -11864,31 +11373,23 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-unzip-response@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-1.0.2.tgz#b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"
-
 unzip-response@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
 
 upath@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.2.tgz#80aaae5395abc5fd402933ae2f58694f0860204c"
-  dependencies:
-    lodash.endswith "^4.2.1"
-    lodash.isfunction "^3.0.8"
-    lodash.isstring "^4.0.1"
-    lodash.startswith "^4.2.1"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
 
 update-notifier@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.3.0.tgz#4e8827a6bb915140ab093559d7014e3ebb837451"
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6"
   dependencies:
     boxen "^1.2.1"
     chalk "^2.0.1"
     configstore "^3.0.0"
     import-lazy "^2.1.0"
+    is-ci "^1.0.10"
     is-installed-globally "^0.1.0"
     is-npm "^1.0.0"
     latest-version "^3.0.0"
@@ -11899,6 +11400,12 @@ upper-case@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
 
+uri-js@^4.2.1:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
+  dependencies:
+    punycode "^2.1.0"
+
 urijs@^1.18.4:
   version "1.19.1"
   resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.1.tgz#5b0ff530c0cbde8386f6342235ba5ca6e995d25a"
@@ -11908,8 +11415,8 @@ urix@^0.1.0:
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
 
 url-join@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/url-join/-/url-join-2.0.2.tgz#c072756967ad24b8b59e5741551caac78f50b8b7"
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/url-join/-/url-join-2.0.5.tgz#5af22f18c052a000a48d7b82c5e9c2e2feeda728"
 
 url-loader@^0.6.0:
   version "0.6.2"
@@ -11943,13 +11450,11 @@ url@^0.11.0:
     punycode "1.3.2"
     querystring "0.2.0"
 
-use@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/use/-/use-2.0.2.tgz#ae28a0d72f93bf22422a18a2e379993112dec8e8"
+use@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.0.tgz#14716bf03fdfefd03040aef58d8b4b85f3a7c544"
   dependencies:
-    define-property "^0.2.5"
-    isobject "^3.0.0"
-    lazy-cache "^2.0.2"
+    kind-of "^6.0.2"
 
 user-home@^1.1.1:
   version "1.1.1"
@@ -11966,12 +11471,18 @@ util.promisify@^1.0.0:
     define-properties "^1.1.2"
     object.getownpropertydescriptors "^2.0.3"
 
-util@0.10.3, "util@>=0.10.3 <1", 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:
     inherits "2.0.1"
 
+"util@>=0.10.3 <1", util@^0.10.3:
+  version "0.10.4"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
+  dependencies:
+    inherits "2.0.3"
+
 utils-merge@1.0.1, utils-merge@1.x.x, utils-merge@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
@@ -11980,14 +11491,10 @@ uuid@^2.0.1, uuid@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
 
-uuid@^3.0.0:
+uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
 
-uuid@^3.0.1, uuid@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
-
 v8flags@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"
@@ -11995,19 +11502,19 @@ v8flags@^2.1.1:
     user-home "^1.1.1"
 
 validate-npm-package-license@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338"
   dependencies:
-    spdx-correct "~1.0.0"
-    spdx-expression-parse "~1.0.0"
+    spdx-correct "^3.0.0"
+    spdx-expression-parse "^3.0.0"
 
 vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
 
 vendors@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.1.tgz#37ad73c8ee417fb3d580e785312307d274847f22"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.2.tgz#7fcb5eef9f5623b156bcea89ec37d63676f21801"
 
 verror@1.10.0:
   version "1.10.0"
@@ -12068,27 +11575,24 @@ watch@~0.18.0:
     minimist "^1.2.0"
 
 watchpack@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.4.0.tgz#4a1472bcbb952bd0a9bb4036801f954dfb39faac"
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
   dependencies:
-    async "^2.1.2"
-    chokidar "^1.7.0"
+    chokidar "^2.0.2"
     graceful-fs "^4.1.2"
+    neo-async "^2.5.0"
 
-webidl-conversions@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-2.0.1.tgz#3bf8258f7d318c7443c36f2e169402a1a6703506"
-
-webidl-conversions@^4.0.1, webidl-conversions@^4.0.2:
+webidl-conversions@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
 
 webpack-manifest-plugin@^2.0.0-rc.2:
-  version "2.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/webpack-manifest-plugin/-/webpack-manifest-plugin-2.0.0-rc.2.tgz#7e12abb805795fe256b085a214a15d9568f0e692"
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/webpack-manifest-plugin/-/webpack-manifest-plugin-2.0.3.tgz#b42c5b08a0319cedb3ec45d9375a9ecee0acf5eb"
   dependencies:
     fs-extra "^0.30.0"
     lodash ">=3.5 <5"
+    tapable "^1.0.0"
 
 webpack-sources@^1.0.1, webpack-sources@^1.0.2, webpack-sources@^1.1.0:
   version "1.1.0"
@@ -12098,13 +11602,13 @@ webpack-sources@^1.0.1, webpack-sources@^1.0.2, webpack-sources@^1.1.0:
     source-map "~0.6.1"
 
 webpack@^3.10.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.10.0.tgz#5291b875078cf2abf42bdd23afe3f8f96c17d725"
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.12.0.tgz#3f9e34360370602fcf639e97939db486f4ec0d74"
   dependencies:
     acorn "^5.0.0"
     acorn-dynamic-import "^2.0.0"
-    ajv "^5.1.5"
-    ajv-keywords "^2.0.0"
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
     async "^2.1.2"
     enhanced-resolve "^3.4.0"
     escope "^3.6.0"
@@ -12124,35 +11628,27 @@ webpack@^3.10.0:
     webpack-sources "^1.0.1"
     yargs "^8.0.2"
 
-whatwg-encoding@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.1.tgz#3c6c451a198ee7aec55b1ec61d0920c67801a5f4"
-  dependencies:
-    iconv-lite "0.4.13"
-
-whatwg-encoding@^1.0.3:
+whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz#57c235bc8657e914d24e1a397d3c82daee0a6ba3"
   dependencies:
     iconv-lite "0.4.19"
 
 whatwg-fetch@>=0.10.0, whatwg-fetch@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
 
-whatwg-url-compat@~0.6.5:
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/whatwg-url-compat/-/whatwg-url-compat-0.6.5.tgz#00898111af689bb097541cd5a45ca6c8798445bf"
-  dependencies:
-    tr46 "~0.0.1"
+whatwg-mimetype@^2.0.0, whatwg-mimetype@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.1.0.tgz#f0f21d76cbba72362eb609dbed2a30cd17fcc7d4"
 
-whatwg-url@^6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.4.0.tgz#08fdf2b9e872783a7a1f6216260a1d66cc722e08"
+whatwg-url@^6.4.0, whatwg-url@^6.4.1:
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.4.1.tgz#fdb94b440fd4ad836202c16e9737d511f012fd67"
   dependencies:
     lodash.sortby "^4.7.0"
-    tr46 "^1.0.0"
-    webidl-conversions "^4.0.1"
+    tr46 "^1.0.1"
+    webidl-conversions "^4.0.2"
 
 whet.extend@~0.9.9:
   version "0.9.9"
@@ -12166,23 +11662,21 @@ which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
 
-which@1, which@^1.2.10, which@^1.2.9, which@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
-  dependencies:
-    isexe "^2.0.0"
+which-pm-runs@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb"
 
-which@^1.2.12:
+which@1, which@^1.2.10, which@^1.2.12, which@^1.2.9, which@^1.3.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   dependencies:
     isexe "^2.0.0"
 
 wide-align@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710"
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
   dependencies:
-    string-width "^1.0.2"
+    string-width "^1.0.2 || 2"
 
 widest-line@^2.0.0:
   version "2.0.0"
@@ -12203,8 +11697,8 @@ window-size@^0.2.0:
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075"
 
 winston@*:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/winston/-/winston-2.4.0.tgz#808050b93d52661ed9fb6c26b3f0c826708b0aee"
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/winston/-/winston-2.4.2.tgz#3ca01f763116fc48db61053b7544e750431f8db0"
   dependencies:
     async "~1.0.0"
     colors "1.0.x"
@@ -12232,19 +11726,11 @@ wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
 
-worker-farm@^1.3.1:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.0.tgz#adfdf0cd40581465ed0a1f648f9735722afd5c8d"
+worker-farm@^1.3.1, worker-farm@^1.5.2:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
   dependencies:
-    errno "^0.1.4"
-    xtend "^4.0.1"
-
-worker-farm@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.2.tgz#32b312e5dc3d5d45d79ef44acc2587491cd729ae"
-  dependencies:
-    errno "^0.1.4"
-    xtend "^4.0.1"
+    errno "~0.1.7"
 
 wrap-ansi@^2.0.0:
   version "2.1.0"
@@ -12276,8 +11762,8 @@ write@^0.2.1:
     mkdirp "^0.5.1"
 
 ws@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-3.2.0.tgz#d5d3d6b11aff71e73f808f40cc69d52bb6d4a185"
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
   dependencies:
     async-limiter "~1.0.0"
     safe-buffer "~5.1.0"
@@ -12298,10 +11784,6 @@ xdg-basedir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
 
-"xml-name-validator@>= 2.0.1 < 3.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
-
 xml-name-validator@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
@@ -12314,7 +11796,7 @@ xregexp@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
 
-xtend@4.0.1, xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
+xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
 
@@ -12335,16 +11817,15 @@ yallist@^3.0.0, yallist@^3.0.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
 
 yaml-lint@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/yaml-lint/-/yaml-lint-1.0.0.tgz#655068f583263eec7e2a0ded8f5b1895dd667e1c"
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/yaml-lint/-/yaml-lint-1.2.3.tgz#792223c6ba0e47ada414057cb6bc9b77669e1d26"
   dependencies:
-    bluebird "^3.5.0"
     glob "^7.1.2"
-    js-yaml "^3.9.1"
+    js-yaml "^3.10.0"
     leprechaun "0.0.2"
-    lodash.merge "^4.6.0"
+    lodash.merge "^4.6.1"
     lodash.snakecase "^4.1.1"
-    nconf "^0.8.4"
+    nconf "^0.10.0"
 
 yaml-loader@^0.4.0:
   version "0.4.0"
@@ -12504,11 +11985,11 @@ yargs@~3.10.0:
     window-size "0.1.0"
 
 yauzl@^2.5.0:
-  version "2.9.1"
-  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.9.1.tgz#a81981ea70a57946133883f029c5821a89359a7f"
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.9.2.tgz#4fb1bc7ae1fc2f57037b54af6acc8fe1031c5b77"
   dependencies:
     buffer-crc32 "~0.2.3"
-    fd-slicer "~1.0.1"
+    fd-slicer "~1.1.0"
 
 zen-observable-ts@^0.4.4:
   version "0.4.4"

From 2387b46ba1f09b259e94583021ec2e139f78c02e Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 5 Jun 2018 03:32:15 +0200
Subject: [PATCH 136/144] Resolve className and id conflicts

---
 .../Community/components/RejectUsernameDialog.js   | 10 +++++-----
 test/e2e/page_objects/admin.js                     | 14 +++++++-------
 test/e2e/specs/04_userStatus.js                    |  7 ++++---
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/client/coral-admin/src/routes/Community/components/RejectUsernameDialog.js b/client/coral-admin/src/routes/Community/components/RejectUsernameDialog.js
index e25db4a34..0673256e0 100644
--- a/client/coral-admin/src/routes/Community/components/RejectUsernameDialog.js
+++ b/client/coral-admin/src/routes/Community/components/RejectUsernameDialog.js
@@ -71,7 +71,7 @@ class RejectUsernameDialog extends Component {
       <Dialog
         className={cn(
           styles.suspendDialog,
-          'talk-admin-reject-username-dialog'
+          'talk-admin-reject-reported-username-dialog'
         )}
         id="rejectUsernameDialog"
         open={open}
@@ -85,7 +85,7 @@ class RejectUsernameDialog extends Component {
         <div
           className={cn(
             styles.container,
-            `talk-admin-reject-username-dialog-step-${stage}`
+            `talk-admin-reject-reported-username-dialog-step-${stage}`
           )}
         >
           <div className={styles.description}>
@@ -101,7 +101,7 @@ class RejectUsernameDialog extends Component {
                   <div className={styles.emailContainer}>
                     <textarea
                       rows={5}
-                      className={cn(styles.emailInput, 'talk-admin-reject-username-dialog-suspension-message')}
+                      className={cn(styles.emailInput, 'talk-admin-reject-reported-username-dialog-suspension-message')}
                       value={this.state.email}
                       onChange={this.onEmailChange}/>
                   </div>
@@ -110,7 +110,7 @@ class RejectUsernameDialog extends Component {
           <div
             className={cn(
               styles.modalButtons,
-              'talk-admin-reject-username-dialog-buttons'
+              'talk-admin-reject-reported-username-dialog-buttons'
             )}
           >
             {Object.keys(stages[stage].options).map((key, i) => (
@@ -118,7 +118,7 @@ class RejectUsernameDialog extends Component {
                 key={i}
                 className={cn(
                   'talk-admin-username-dialog-button',
-                  `talk-admin-reject-username-dialog-button-${key}`
+                  `talk-admin-reject-reported-username-dialog-button-${key}`
                 )}
                 onClick={this.onActionClick(stage, i)}
               >
diff --git a/test/e2e/page_objects/admin.js b/test/e2e/page_objects/admin.js
index 64d22c97b..d436eddc7 100644
--- a/test/e2e/page_objects/admin.js
+++ b/test/e2e/page_objects/admin.js
@@ -57,15 +57,15 @@ module.exports = {
         sendButton: '.talk-admin-suspend-user-dialog-send',
       },
     },
-    usernameDialog: {
-      selector: '.talk-admin-reject-username-dialog',
+    rejectReportedUsernameDialog: {
+      selector: '.talk-admin-reject-reported-username-dialog',
       elements: {
-        step0: '.talk-admin-reject-username-dialog-step-0',
-        step1: '.talk-admin-reject-username-dialog-step-1',
-        buttons: '.talk-admin-reject-username-dialog-buttons',
-        suspend: '.talk-admin-reject-username-dialog-button-k',
+        step0: '.talk-admin-reject-reported-username-dialog-step-0',
+        step1: '.talk-admin-reject-reported-username-dialog-step-1',
+        buttons: '.talk-admin-reject-reported-username-dialog-buttons',
+        suspend: '.talk-admin-reject-reported-username-dialog-button-k',
         suspensionMessage:
-          '.talk-admin-reject-username-dialog-suspension-message',
+          '.talk-admin-reject-reported-username-dialog-suspension-message',
       },
     },
     moderate: {
diff --git a/test/e2e/specs/04_userStatus.js b/test/e2e/specs/04_userStatus.js
index c54aa308c..dfcb3548c 100644
--- a/test/e2e/specs/04_userStatus.js
+++ b/test/e2e/specs/04_userStatus.js
@@ -64,11 +64,12 @@ module.exports = {
       .waitForElementVisible('@flaggedUserRejectButton')
       .click('@flaggedUserRejectButton');
   },
-  'Admin suspends the user': client => {
+  'Admin continues the dialog and suspends the user': client => {
     const community = client.page.admin().section.community;
-    const usernameDialog = client.page.admin().section.usernameDialog;
+    const rejectReportedUsernameDialog = client.page.admin().section
+      .rejectReportedUsernameDialog;
 
-    usernameDialog
+    rejectReportedUsernameDialog
       .waitForElementVisible('@buttons')
       .waitForElementVisible('@step0')
       .waitForElementVisible('@suspend')

From 05088a7744a4860c4c57be62c76c54db444e069e Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 5 Jun 2018 04:18:55 +0200
Subject: [PATCH 137/144] Set specific parser, as prettier now has no default

---
 .prettierrc | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 .prettierrc

diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 000000000..10041faa8
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,4 @@
+overrides:
+- files: "bin/cli*"
+  options:
+    parser: babylon

From d9a1d739dc47ca9b7b439a215bfb59d06ebb3e78 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 5 Jun 2018 04:28:31 +0200
Subject: [PATCH 138/144] Set React version for linters

---
 .eslintrc.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.eslintrc.json b/.eslintrc.json
index d00d21106..d2356ace2 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -2,5 +2,10 @@
   "env": {
     "jest": true
   },
+  "settings": {
+    "react": {
+      "version": "15.0"
+    }
+  },
   "extends": "@coralproject/eslint-config-talk"
 }

From ccff6ed63b7e4bd941e25fad90a64672d0a4acad Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 5 Jun 2018 04:28:54 +0200
Subject: [PATCH 139/144] Resolve linter issues

---
 bin/cli-plugins                               |  3 +-
 bin/cli-token                                 |  5 +-
 .../src/components/BanUserDialog.js           |  4 +-
 .../src/components/KarmaTooltip.js            |  5 +-
 .../coral-admin/src/components/UserDetail.js  |  2 +-
 .../src/components/UserDetailComment.js       |  1 +
 .../src/components/UserDetailCommentList.js   |  5 +-
 .../src/containers/BanUserDialog.js           |  5 +-
 client/coral-admin/src/containers/Layout.js   |  5 +-
 .../src/containers/RejectUsernameDialog.js    |  5 +-
 client/coral-admin/src/containers/SignIn.js   |  5 +-
 .../src/containers/SuspendUserDialog.js       |  5 +-
 .../coral-admin/src/containers/UserDetail.js  |  5 +-
 client/coral-admin/src/graphql/index.js       | 24 +++++-
 .../Community/containers/FlaggedAccounts.js   | 27 +++++--
 .../routes/Community/containers/Indicator.js  | 26 ++++++-
 .../src/routes/Community/containers/People.js |  5 +-
 .../containers/RejectUsernameDialog.js        |  5 +-
 .../routes/Configure/containers/Configure.js  |  5 +-
 .../containers/ModerationSettings.js          |  5 +-
 .../containers/OrganizationSettings.js        |  5 +-
 .../Configure/containers/StreamSettings.js    |  5 +-
 .../Configure/containers/TechSettings.js      |  5 +-
 .../src/routes/Install/containers/Install.js  |  5 +-
 .../routes/Moderation/components/Comment.js   |  1 +
 .../Moderation/components/StorySearch.js      |  5 +-
 .../routes/Moderation/containers/Indicator.js | 36 +++++++--
 .../Moderation/containers/Moderation.js       | 51 ++++++++++---
 .../Moderation/containers/StorySearch.js      |  5 +-
 .../src/routes/Stories/containers/Stories.js  |  5 +-
 .../src/containers/Embed.js                   | 29 +++++++-
 .../coral-embed-stream/src/graphql/index.js   | 28 ++++++-
 .../src/tabs/configure/containers/Settings.js |  5 +-
 .../tabs/profile/containers/CommentHistory.js | 14 +++-
 .../src/tabs/profile/containers/Profile.js    |  7 +-
 .../src/tabs/profile/containers/TabPanel.js   |  5 +-
 .../src/tabs/stream/components/Comment.js     | 19 ++++-
 .../tabs/stream/components/ModerationLink.js  |  1 +
 .../src/tabs/stream/components/Stream.js      |  5 +-
 .../src/tabs/stream/containers/CommentBox.js  |  5 +-
 .../tabs/stream/containers/CommentNotFound.js |  5 +-
 .../src/tabs/stream/containers/Stream.js      | 20 ++++-
 .../components/AdminCommentContent.js         |  7 +-
 client/coral-framework/components/Slot.js     |  5 +-
 client/coral-framework/hocs/connect.js        |  5 +-
 .../coral-framework/hocs/withSetUsername.js   |  5 +-
 client/coral-framework/hocs/withSignUp.js     |  5 +-
 .../coral-framework/hocs/withSlotElements.js  |  8 +-
 client/coral-framework/services/events.js     |  6 +-
 config.js                                     |  4 +-
 graph/context.js                              |  4 +-
 graph/errorHandler.js                         |  4 +-
 graph/loaders/actions.js                      | 17 ++++-
 graph/loaders/assets.js                       | 22 +++++-
 graph/loaders/users.js                        | 20 ++++-
 graph/mutators/action.js                      | 19 ++++-
 graph/mutators/asset.js                       |  6 +-
 graph/mutators/comment.js                     | 28 +++++--
 graph/mutators/user.js                        | 10 ++-
 graph/resolvers/asset.js                      | 37 ++++++++--
 graph/resolvers/comment.js                    | 56 ++++++++++++--
 graph/resolvers/root_query.js                 | 73 ++++++++++++++++---
 graph/resolvers/settings.js                   |  8 +-
 graph/resolvers/user.js                       | 32 +++++++-
 plugin-api/beta/client/hocs/withReaction.js   |  9 ++-
 plugin-api/beta/client/hocs/withSortOption.js |  5 +-
 plugin-api/beta/client/hocs/withTags.js       |  5 +-
 plugin-api/beta/server/getReactionConfig.js   |  9 ++-
 .../client/containers/CheckSpamHook.js        |  5 +-
 .../client/login/containers/ForgotPassword.js |  5 +-
 .../client/login/containers/Main.js           |  5 +-
 .../containers/ResendEmailConfirmation.js     |  5 +-
 .../client/login/containers/SignIn.js         |  5 +-
 .../client/login/containers/SignUp.js         |  5 +-
 .../stream/containers/SetUsernameDialog.js    |  5 +-
 .../client/stream/containers/SignInButton.js  |  5 +-
 .../client/stream/containers/UserBox.js       |  5 +-
 .../client/containers/AuthorName.js           |  5 +-
 plugins/talk-plugin-deep-reply-count/index.js |  8 +-
 .../client/containers/FacebookButton.js       |  5 +-
 .../server/router.js                          | 10 ++-
 .../client/containers/FeaturedDialog.js       |  5 +-
 .../client/containers/ModActionButton.js      |  5 +-
 .../containers/ModIndicatorSubscription.js    | 16 +++-
 .../client/containers/ModSubscription.js      | 17 ++++-
 .../client/containers/ModTag.js               |  5 +-
 .../client/containers/TabPane.js              |  5 +-
 .../talk-plugin-featured-comments/index.js    | 20 ++++-
 .../client/components/FlagDetails.js          |  7 +-
 .../client/components/UserFlagDetails.js      |  5 +-
 .../client/containers/UserFlagDetails.js      |  5 +-
 .../client/containers/GoogleButton.js         |  5 +-
 .../client/containers/IgnoreUserAction.js     |  5 +-
 .../containers/IgnoreUserConfirmation.js      |  5 +-
 .../client/containers/IgnoredUserSection.js   |  5 +-
 .../components/AddEmailAddressDialog.js       |  4 +-
 .../client/components/ChangePassword.js       |  6 +-
 .../client/components/Profile.js              | 14 +++-
 .../containers/AddEmailAddressDialog.js       |  5 +-
 .../client/containers/ChangePassword.js       |  5 +-
 .../client/containers/Profile.js              |  5 +-
 .../talk-plugin-local-auth/server/mutators.js | 15 +++-
 .../client/containers/BanUserAction.js        | 12 ++-
 .../client/containers/BanUserDialog.js        |  5 +-
 .../client/containers/ModerationActions.js    |  5 +-
 .../client/api/hocs/withSettingsToggle.js     |  6 +-
 .../client/graphql.js                         |  6 +-
 .../server/NotificationManager.js             |  7 +-
 .../server/connect.js                         |  5 +-
 .../server/messages.js                        | 18 ++++-
 .../server/mutators.js                        | 11 ++-
 .../server/resolvers.js                       |  8 +-
 .../server/router.js                          | 11 ++-
 .../talk-plugin-notifications/server/util.js  | 12 ++-
 .../client/containers/OffTopicFilter.js       |  5 +-
 .../AccountDeletionRequestedSign.js           |  4 +-
 .../components/DownloadCommentHistory.js      |  6 +-
 .../AccountDeletionRequestedSign.js           |  5 +-
 .../client/containers/DeleteMyAccount.js      |  5 +-
 .../containers/DownloadCommentHistory.js      |  5 +-
 .../server/connect.js                         |  4 +-
 .../server/mutators.js                        | 22 +++++-
 .../talk-plugin-profile-data/server/router.js | 13 +++-
 .../server/hooks.js                           |  4 +-
 .../client/containers/CheckToxicityHook.js    |  5 +-
 .../client/containers/ViewingOptions.js       |  5 +-
 routes/api/v1/setup.js                        |  5 +-
 services/migration/helpers.js                 |  2 +-
 services/migration/index.js                   |  6 +-
 services/moderation/index.js                  |  4 +-
 services/moderation/phases/commentLength.js   |  6 +-
 services/moderation/phases/karma.js           |  6 +-
 services/moderation/phases/links.js           |  6 +-
 services/moderation/phases/premod.js          | 10 ++-
 services/moderation/phases/wordlist.js        |  6 +-
 services/mongoose.js                          | 13 ++--
 services/setup.js                             |  8 +-
 test/e2e/specs/01_install.js                  |  4 +-
 test/e2e/specs/02_admin.js                    |  4 +-
 test/e2e/specs/03_embedStream.js              |  8 +-
 test/e2e/specs/04_userStatus.js               | 20 +++--
 test/e2e/specs/05_banUser.js                  | 20 +++--
 test/e2e/specs/06_suspendUser.js              | 12 ++-
 test/server/graph/loaders/actions.js          | 12 ++-
 test/server/graph/mutations/createComment.js  |  9 +--
 test/server/routes/api/auth/index.js          |  3 +-
 test/server/services/settings.js              |  3 +-
 test/server/services/tokens.js                | 16 +++-
 148 files changed, 1171 insertions(+), 265 deletions(-)

diff --git a/bin/cli-plugins b/bin/cli-plugins
index f2e76de21..85132c39d 100755
--- a/bin/cli-plugins
+++ b/bin/cli-plugins
@@ -329,8 +329,7 @@ async function createSeedPlugin() {
     if (answers.addPluginsJson) {
       const pluginsJson = path.resolve(__dirname, '..', 'plugins.json');
 
-      fs
-        .readJson(pluginsJson)
+      fs.readJson(pluginsJson)
         .then(j => {
           // This is a client-side plugin, let's push this.
           if (answers.client) {
diff --git a/bin/cli-token b/bin/cli-token
index 0d4dc4e10..2590ec106 100755
--- a/bin/cli-token
+++ b/bin/cli-token
@@ -49,7 +49,10 @@ async function revokeToken(tokenID) {
 
 async function createToken(userID, tokenName) {
   try {
-    let { pat: { id }, jwt } = await TokensService.create(userID, tokenName);
+    let {
+      pat: { id },
+      jwt,
+    } = await TokensService.create(userID, tokenName);
 
     console.log(`Created Token[${id}] for User[${userID}] = ${jwt}`);
 
diff --git a/client/coral-admin/src/components/BanUserDialog.js b/client/coral-admin/src/components/BanUserDialog.js
index f211a9f2c..fd8636320 100644
--- a/client/coral-admin/src/components/BanUserDialog.js
+++ b/client/coral-admin/src/components/BanUserDialog.js
@@ -19,7 +19,9 @@ class BanUserDialog extends React.Component {
   }
 
   handleMessageChange = e => {
-    const { target: { value: message } } = e;
+    const {
+      target: { value: message },
+    } = e;
     this.setState({ message });
   };
 
diff --git a/client/coral-admin/src/components/KarmaTooltip.js b/client/coral-admin/src/components/KarmaTooltip.js
index 9c4184afd..d27597325 100644
--- a/client/coral-admin/src/components/KarmaTooltip.js
+++ b/client/coral-admin/src/components/KarmaTooltip.js
@@ -27,7 +27,9 @@ class KarmaTooltip extends React.Component {
   };
 
   render() {
-    const { thresholds: { unreliable } } = this.props;
+    const {
+      thresholds: { unreliable },
+    } = this.props;
     const { menuVisible } = this.state;
 
     return (
@@ -68,6 +70,7 @@ class KarmaTooltip extends React.Component {
                 className={styles.link}
                 href={t('user_detail.karma_docs_link')}
                 target="_blank"
+                rel="noopener noreferrer"
               >
                 {t('user_detail.learn_more')}
               </a>
diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index 92157f4fd..d8193c121 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -159,7 +159,7 @@ class UserDetail extends React.Component {
     } = this.props;
 
     // if totalComments is 0, you're dividing by zero
-    let rejectedPercent = rejectedComments / totalComments * 100;
+    let rejectedPercent = (rejectedComments / totalComments) * 100;
 
     if (rejectedPercent === Infinity || isNaN(rejectedPercent)) {
       rejectedPercent = 0;
diff --git a/client/coral-admin/src/components/UserDetailComment.js b/client/coral-admin/src/components/UserDetailComment.js
index 41fb87b28..e8472219a 100644
--- a/client/coral-admin/src/components/UserDetailComment.js
+++ b/client/coral-admin/src/components/UserDetailComment.js
@@ -114,6 +114,7 @@ class UserDetailComment extends React.Component {
                   className={styles.external}
                   href={`${comment.asset.url}?commentId=${comment.id}`}
                   target="_blank"
+                  rel="noopener noreferrer"
                 >
                   <Icon name="open_in_new" /> {t('comment.view_context')}
                 </a>
diff --git a/client/coral-admin/src/components/UserDetailCommentList.js b/client/coral-admin/src/components/UserDetailCommentList.js
index 3a31ee3f9..3a5c7462d 100644
--- a/client/coral-admin/src/components/UserDetailCommentList.js
+++ b/client/coral-admin/src/components/UserDetailCommentList.js
@@ -10,7 +10,10 @@ import ApproveButton from './ApproveButton';
 const UserDetailCommentList = props => {
   const {
     root,
-    root: { user, comments: { nodes, hasNextPage } },
+    root: {
+      user,
+      comments: { nodes, hasNextPage },
+    },
     acceptComment,
     rejectComment,
     selectedCommentIds,
diff --git a/client/coral-admin/src/containers/BanUserDialog.js b/client/coral-admin/src/containers/BanUserDialog.js
index c869626c9..e1b053337 100644
--- a/client/coral-admin/src/containers/BanUserDialog.js
+++ b/client/coral-admin/src/containers/BanUserDialog.js
@@ -77,7 +77,10 @@ const mapDispatchToProps = dispatch => ({
 });
 
 export default compose(
-  connect(mapStateToProps, mapDispatchToProps),
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  ),
   withBanUser,
   withSetCommentStatus
 )(BanUserDialogContainer);
diff --git a/client/coral-admin/src/containers/Layout.js b/client/coral-admin/src/containers/Layout.js
index d8ca11732..22c624b7d 100644
--- a/client/coral-admin/src/containers/Layout.js
+++ b/client/coral-admin/src/containers/Layout.js
@@ -81,4 +81,7 @@ const mapDispatchToProps = dispatch =>
     dispatch
   );
 
-export default connect(mapStateToProps, mapDispatchToProps)(LayoutContainer);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(LayoutContainer);
diff --git a/client/coral-admin/src/containers/RejectUsernameDialog.js b/client/coral-admin/src/containers/RejectUsernameDialog.js
index 24d1cd2d3..ec996a9d5 100644
--- a/client/coral-admin/src/containers/RejectUsernameDialog.js
+++ b/client/coral-admin/src/containers/RejectUsernameDialog.js
@@ -83,7 +83,10 @@ const mapDispatchToProps = dispatch => ({
 });
 
 export default compose(
-  connect(mapStateToProps, mapDispatchToProps),
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  ),
   withRejectUsername,
   withPostFlag({ notifyOnError: false })
 )(RejectUsernameDialogContainer);
diff --git a/client/coral-admin/src/containers/SignIn.js b/client/coral-admin/src/containers/SignIn.js
index 1af857294..365b32db3 100644
--- a/client/coral-admin/src/containers/SignIn.js
+++ b/client/coral-admin/src/containers/SignIn.js
@@ -55,4 +55,7 @@ SignInContainer.propTypes = {
   requireRecaptcha: PropTypes.bool.isRequired,
 };
 
-export default compose(withSignIn, withPopupAuthHandler)(SignInContainer);
+export default compose(
+  withSignIn,
+  withPopupAuthHandler
+)(SignInContainer);
diff --git a/client/coral-admin/src/containers/SuspendUserDialog.js b/client/coral-admin/src/containers/SuspendUserDialog.js
index f03d48f52..1d3d5d2c0 100644
--- a/client/coral-admin/src/containers/SuspendUserDialog.js
+++ b/client/coral-admin/src/containers/SuspendUserDialog.js
@@ -86,7 +86,10 @@ const mapDispatchToProps = dispatch => ({
 });
 
 export default compose(
-  connect(mapStateToProps, mapDispatchToProps),
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  ),
   withSuspendUser,
   withSetCommentStatus,
   withOrganizationName
diff --git a/client/coral-admin/src/containers/UserDetail.js b/client/coral-admin/src/containers/UserDetail.js
index 03ffee007..e9ffea4d1 100644
--- a/client/coral-admin/src/containers/UserDetail.js
+++ b/client/coral-admin/src/containers/UserDetail.js
@@ -294,7 +294,10 @@ const mapDispatchToProps = dispatch => ({
 });
 
 export default compose(
-  connect(mapStateToProps, mapDispatchToProps),
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  ),
   withUserDetailQuery,
   withSetCommentStatus,
   withUnbanUser,
diff --git a/client/coral-admin/src/graphql/index.js b/client/coral-admin/src/graphql/index.js
index b51897a4b..9fca9f497 100644
--- a/client/coral-admin/src/graphql/index.js
+++ b/client/coral-admin/src/graphql/index.js
@@ -66,7 +66,11 @@ export default {
         });
       },
     }),
-    SuspendUser: ({ variables: { input: { id, until } } }) => ({
+    SuspendUser: ({
+      variables: {
+        input: { id, until },
+      },
+    }) => ({
       update: proxy => {
         const fragmentId = `User_${id}`;
 
@@ -92,7 +96,11 @@ export default {
         });
       },
     }),
-    UnsuspendUser: ({ variables: { input: { id } } }) => ({
+    UnsuspendUser: ({
+      variables: {
+        input: { id },
+      },
+    }) => ({
       update: proxy => {
         const fragmentId = `User_${id}`;
         const data = proxy.readFragment({
@@ -117,7 +125,11 @@ export default {
         });
       },
     }),
-    BanUser: ({ variables: { input: { id } } }) => ({
+    BanUser: ({
+      variables: {
+        input: { id },
+      },
+    }) => ({
       update: proxy => {
         const fragmentId = `User_${id}`;
         const data = proxy.readFragment({
@@ -142,7 +154,11 @@ export default {
         });
       },
     }),
-    UnbanUser: ({ variables: { input: { id } } }) => ({
+    UnbanUser: ({
+      variables: {
+        input: { id },
+      },
+    }) => ({
       update: proxy => {
         const fragmentId = `User_${id}`;
         const data = proxy.readFragment({
diff --git a/client/coral-admin/src/routes/Community/containers/FlaggedAccounts.js b/client/coral-admin/src/routes/Community/containers/FlaggedAccounts.js
index 60ae4ee99..328030390 100644
--- a/client/coral-admin/src/routes/Community/containers/FlaggedAccounts.js
+++ b/client/coral-admin/src/routes/Community/containers/FlaggedAccounts.js
@@ -46,7 +46,11 @@ class FlaggedAccountsContainer extends Component {
         document: USERNAME_FLAGGED_SUBSCRIPTION,
         updateQuery: (
           prev,
-          { subscriptionData: { data: { usernameFlagged: user } } }
+          {
+            subscriptionData: {
+              data: { usernameFlagged: user },
+            },
+          }
         ) => {
           return handleFlaggedAccountsChange(prev, user, () => {
             const msg = t(
@@ -62,7 +66,11 @@ class FlaggedAccountsContainer extends Component {
         document: USERNAME_APPROVED_SUBSCRIPTION,
         updateQuery: (
           prev,
-          { subscriptionData: { data: { usernameApproved: user } } }
+          {
+            subscriptionData: {
+              data: { usernameApproved: user },
+            },
+          }
         ) => {
           return handleFlaggedAccountsChange(prev, user, () => {
             const msg = t(
@@ -78,7 +86,11 @@ class FlaggedAccountsContainer extends Component {
         document: USERNAME_REJECTED_SUBSCRIPTION,
         updateQuery: (
           prev,
-          { subscriptionData: { data: { usernameRejected: user } } }
+          {
+            subscriptionData: {
+              data: { usernameRejected: user },
+            },
+          }
         ) => {
           return handleFlaggedAccountsChange(prev, user, () => {
             const msg = t(
@@ -96,7 +108,9 @@ class FlaggedAccountsContainer extends Component {
           prev,
           {
             subscriptionData: {
-              data: { usernameChanged: { previousUsername, user } },
+              data: {
+                usernameChanged: { previousUsername, user },
+              },
             },
           }
         ) => {
@@ -297,7 +311,10 @@ const mapDispatchToProps = dispatch =>
   );
 
 export default compose(
-  connect(null, mapDispatchToProps),
+  connect(
+    null,
+    mapDispatchToProps
+  ),
   withApproveUsername,
   withQuery(
     gql`
diff --git a/client/coral-admin/src/routes/Community/containers/Indicator.js b/client/coral-admin/src/routes/Community/containers/Indicator.js
index 3c078a8d7..3db93cdd0 100644
--- a/client/coral-admin/src/routes/Community/containers/Indicator.js
+++ b/client/coral-admin/src/routes/Community/containers/Indicator.js
@@ -15,7 +15,11 @@ class IndicatorContainer extends Component {
         document: USERNAME_FLAGGED_SUBSCRIPTION,
         updateQuery: (
           prev,
-          { subscriptionData: { data: { usernameFlagged: user } } }
+          {
+            subscriptionData: {
+              data: { usernameFlagged: user },
+            },
+          }
         ) => {
           return handleIndicatorChange(prev, user);
         },
@@ -24,7 +28,11 @@ class IndicatorContainer extends Component {
         document: USERNAME_APPROVED_SUBSCRIPTION,
         updateQuery: (
           prev,
-          { subscriptionData: { data: { usernameApproved: user } } }
+          {
+            subscriptionData: {
+              data: { usernameApproved: user },
+            },
+          }
         ) => {
           return handleIndicatorChange(prev, user);
         },
@@ -33,7 +41,11 @@ class IndicatorContainer extends Component {
         document: USERNAME_REJECTED_SUBSCRIPTION,
         updateQuery: (
           prev,
-          { subscriptionData: { data: { usernameRejected: user } } }
+          {
+            subscriptionData: {
+              data: { usernameRejected: user },
+            },
+          }
         ) => {
           return handleIndicatorChange(prev, user);
         },
@@ -42,7 +54,13 @@ class IndicatorContainer extends Component {
         document: USERNAME_CHANGED_SUBSCRIPTION,
         updateQuery: (
           prev,
-          { subscriptionData: { data: { usernameChanged: { user } } } }
+          {
+            subscriptionData: {
+              data: {
+                usernameChanged: { user },
+              },
+            },
+          }
         ) => {
           return handleIndicatorChange(prev, user);
         },
diff --git a/client/coral-admin/src/routes/Community/containers/People.js b/client/coral-admin/src/routes/Community/containers/People.js
index f8271b236..63cd28833 100644
--- a/client/coral-admin/src/routes/Community/containers/People.js
+++ b/client/coral-admin/src/routes/Community/containers/People.js
@@ -200,7 +200,10 @@ const SEARCH_QUERY = gql`
 `;
 
 export default compose(
-  connect(null, mapDispatchToProps),
+  connect(
+    null,
+    mapDispatchToProps
+  ),
   withSetUserRole,
   withUnsuspendUser,
   withUnbanUser,
diff --git a/client/coral-admin/src/routes/Community/containers/RejectUsernameDialog.js b/client/coral-admin/src/routes/Community/containers/RejectUsernameDialog.js
index 325eadfb5..a09bf117e 100644
--- a/client/coral-admin/src/routes/Community/containers/RejectUsernameDialog.js
+++ b/client/coral-admin/src/routes/Community/containers/RejectUsernameDialog.js
@@ -19,6 +19,9 @@ const mapDispatchToProps = dispatch =>
   );
 
 export default compose(
-  connect(mapStateToProps, mapDispatchToProps),
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  ),
   withRejectUsername
 )(RejectUsernameDialog);
diff --git a/client/coral-admin/src/routes/Configure/containers/Configure.js b/client/coral-admin/src/routes/Configure/containers/Configure.js
index 3d2789974..758a78963 100644
--- a/client/coral-admin/src/routes/Configure/containers/Configure.js
+++ b/client/coral-admin/src/routes/Configure/containers/Configure.js
@@ -174,7 +174,10 @@ const mapDispatchToProps = dispatch =>
 
 export default compose(
   withRouter,
-  connect(mapStateToProps, mapDispatchToProps),
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  ),
   withUpdateSettings,
   withConfigureQuery,
   withMergedSettings('root.settings', 'pending', 'mergedSettings')
diff --git a/client/coral-admin/src/routes/Configure/containers/ModerationSettings.js b/client/coral-admin/src/routes/Configure/containers/ModerationSettings.js
index 8882477d1..80f1abe9c 100644
--- a/client/coral-admin/src/routes/Configure/containers/ModerationSettings.js
+++ b/client/coral-admin/src/routes/Configure/containers/ModerationSettings.js
@@ -42,7 +42,10 @@ export default compose(
       }
     `,
   }),
-  connect(mapStateToProps, mapDispatchToProps),
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  ),
   mapProps(({ root, settings, updatePending, errors, ...rest }) => ({
     slotPassthrough: {
       root,
diff --git a/client/coral-admin/src/routes/Configure/containers/OrganizationSettings.js b/client/coral-admin/src/routes/Configure/containers/OrganizationSettings.js
index 79ab70f69..6f3299dea 100644
--- a/client/coral-admin/src/routes/Configure/containers/OrganizationSettings.js
+++ b/client/coral-admin/src/routes/Configure/containers/OrganizationSettings.js
@@ -37,7 +37,10 @@ export default compose(
       }
     `,
   }),
-  connect(mapStateToProps, mapDispatchToProps),
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  ),
   mapProps(({ root, settings, updatePending, errors, ...rest }) => ({
     slotPassthrough: {
       root,
diff --git a/client/coral-admin/src/routes/Configure/containers/StreamSettings.js b/client/coral-admin/src/routes/Configure/containers/StreamSettings.js
index faffb1aec..315640c9d 100644
--- a/client/coral-admin/src/routes/Configure/containers/StreamSettings.js
+++ b/client/coral-admin/src/routes/Configure/containers/StreamSettings.js
@@ -45,7 +45,10 @@ export default compose(
       }
     `,
   }),
-  connect(mapStateToProps, mapDispatchToProps),
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  ),
   mapProps(({ root, settings, updatePending, errors, ...rest }) => ({
     slotPassthrough: {
       root,
diff --git a/client/coral-admin/src/routes/Configure/containers/TechSettings.js b/client/coral-admin/src/routes/Configure/containers/TechSettings.js
index 7fbe81cdb..1460740ef 100644
--- a/client/coral-admin/src/routes/Configure/containers/TechSettings.js
+++ b/client/coral-admin/src/routes/Configure/containers/TechSettings.js
@@ -39,7 +39,10 @@ export default compose(
       }
     `,
   }),
-  connect(mapStateToProps, mapDispatchToProps),
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  ),
   mapProps(({ root, settings, updatePending, errors, ...rest }) => ({
     slotPassthrough: {
       root,
diff --git a/client/coral-admin/src/routes/Install/containers/Install.js b/client/coral-admin/src/routes/Install/containers/Install.js
index d18f914d7..513950659 100644
--- a/client/coral-admin/src/routes/Install/containers/Install.js
+++ b/client/coral-admin/src/routes/Install/containers/Install.js
@@ -83,4 +83,7 @@ const mapDispatchToProps = dispatch =>
     dispatch
   );
 
-export default connect(mapStateToProps, mapDispatchToProps)(InstallContainer);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(InstallContainer);
diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.js b/client/coral-admin/src/routes/Moderation/components/Comment.js
index 97cdf9443..b12a1e616 100644
--- a/client/coral-admin/src/routes/Moderation/components/Comment.js
+++ b/client/coral-admin/src/routes/Moderation/components/Comment.js
@@ -170,6 +170,7 @@ class Comment extends React.Component {
                     className={styles.external}
                     href={`${comment.asset.url}?commentId=${comment.id}`}
                     target="_blank"
+                    rel="noopener noreferrer"
                   >
                     <Icon name="open_in_new" /> {t('comment.view_context')}
                   </a>
diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.js b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
index 011f49d5e..cb233c1e6 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
@@ -5,7 +5,10 @@ import { Button, Spinner, Icon } from 'coral-ui';
 import Story from './Story';
 
 const StorySearch = props => {
-  const { root: { assets }, data: { loading } } = props;
+  const {
+    root: { assets },
+    data: { loading },
+  } = props;
 
   if (!props.moderation.storySearchVisible) {
     return null;
diff --git a/client/coral-admin/src/routes/Moderation/containers/Indicator.js b/client/coral-admin/src/routes/Moderation/containers/Indicator.js
index 93ec2f40f..05bf44f5b 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Indicator.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Indicator.js
@@ -22,7 +22,11 @@ class IndicatorContainer extends Component {
         document: COMMENT_ADDED_SUBSCRIPTION,
         updateQuery: (
           prev,
-          { subscriptionData: { data: { commentAdded: comment } } }
+          {
+            subscriptionData: {
+              data: { commentAdded: comment },
+            },
+          }
         ) => {
           return this.handleCommentChange(prev, comment);
         },
@@ -31,7 +35,11 @@ class IndicatorContainer extends Component {
         document: COMMENT_FLAGGED_SUBSCRIPTION,
         updateQuery: (
           prev,
-          { subscriptionData: { data: { commentFlagged: comment } } }
+          {
+            subscriptionData: {
+              data: { commentFlagged: comment },
+            },
+          }
         ) => {
           return this.handleCommentChange(prev, comment);
         },
@@ -40,7 +48,11 @@ class IndicatorContainer extends Component {
         document: COMMENT_EDITED_SUBSCRIPTION,
         updateQuery: (
           prev,
-          { subscriptionData: { data: { commentEdited: comment } } }
+          {
+            subscriptionData: {
+              data: { commentEdited: comment },
+            },
+          }
         ) => {
           return this.handleCommentChange(prev, comment);
         },
@@ -49,7 +61,11 @@ class IndicatorContainer extends Component {
         document: COMMENT_ACCEPTED_SUBSCRIPTION,
         updateQuery: (
           prev,
-          { subscriptionData: { data: { commentAccepted: comment } } }
+          {
+            subscriptionData: {
+              data: { commentAccepted: comment },
+            },
+          }
         ) => {
           return this.handleCommentChange(prev, comment);
         },
@@ -58,7 +74,11 @@ class IndicatorContainer extends Component {
         document: COMMENT_REJECTED_SUBSCRIPTION,
         updateQuery: (
           prev,
-          { subscriptionData: { data: { commentRejected: comment } } }
+          {
+            subscriptionData: {
+              data: { commentRejected: comment },
+            },
+          }
         ) => {
           return this.handleCommentChange(prev, comment);
         },
@@ -67,7 +87,11 @@ class IndicatorContainer extends Component {
         document: COMMENT_RESET_SUBSCRIPTION,
         updateQuery: (
           prev,
-          { subscriptionData: { data: { commentReset: comment } } }
+          {
+            subscriptionData: {
+              data: { commentReset: comment },
+            },
+          }
         ) => {
           return this.handleCommentChange(prev, comment);
         },
diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index e3f35081c..8bf5ccb79 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -71,7 +71,9 @@ class ModerationContainer extends Component {
   };
 
   get activeTab() {
-    const { root: { asset, settings } } = this.props;
+    const {
+      root: { asset, settings },
+    } = this.props;
     const id = getAssetId(this.props);
     const tab = getTab(this.props);
 
@@ -94,7 +96,11 @@ class ModerationContainer extends Component {
         variables,
         updateQuery: (
           prev,
-          { subscriptionData: { data: { commentAdded: comment } } }
+          {
+            subscriptionData: {
+              data: { commentAdded: comment },
+            },
+          }
         ) => {
           return this.handleCommentChange(prev, comment);
         },
@@ -104,7 +110,11 @@ class ModerationContainer extends Component {
         variables,
         updateQuery: (
           prev,
-          { subscriptionData: { data: { commentAccepted: comment } } }
+          {
+            subscriptionData: {
+              data: { commentAccepted: comment },
+            },
+          }
         ) => {
           const user =
             comment.status_history[comment.status_history.length - 1]
@@ -125,7 +135,11 @@ class ModerationContainer extends Component {
         variables,
         updateQuery: (
           prev,
-          { subscriptionData: { data: { commentRejected: comment } } }
+          {
+            subscriptionData: {
+              data: { commentRejected: comment },
+            },
+          }
         ) => {
           const user =
             comment.status_history[comment.status_history.length - 1]
@@ -146,7 +160,11 @@ class ModerationContainer extends Component {
         variables,
         updateQuery: (
           prev,
-          { subscriptionData: { data: { commentReset: comment } } }
+          {
+            subscriptionData: {
+              data: { commentReset: comment },
+            },
+          }
         ) => {
           const user =
             comment.status_history[comment.status_history.length - 1]
@@ -167,7 +185,11 @@ class ModerationContainer extends Component {
         variables,
         updateQuery: (
           prev,
-          { subscriptionData: { data: { commentEdited: comment } } }
+          {
+            subscriptionData: {
+              data: { commentEdited: comment },
+            },
+          }
         ) => {
           return this.handleCommentChange(prev, comment);
         },
@@ -177,7 +199,11 @@ class ModerationContainer extends Component {
         variables,
         updateQuery: (
           prev,
-          { subscriptionData: { data: { commentFlagged: comment } } }
+          {
+            subscriptionData: {
+              data: { commentFlagged: comment },
+            },
+          }
         ) => {
           return this.handleCommentChange(prev, comment);
         },
@@ -289,7 +315,11 @@ class ModerationContainer extends Component {
   };
 
   render() {
-    const { root, root: { asset, settings }, data } = this.props;
+    const {
+      root,
+      root: { asset, settings },
+      data,
+    } = this.props;
     const assetId = getAssetId(this.props);
 
     if (assetId) {
@@ -546,7 +576,10 @@ const mapDispatchToProps = dispatch => ({
 
 export default compose(
   withQueueConfig(baseQueueConfig),
-  connect(mapStateToProps, mapDispatchToProps),
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  ),
   withSetCommentStatus,
   withModQueueQuery
 )(ModerationContainer);
diff --git a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
index 7f0bd639b..7b538ef6a 100644
--- a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js
@@ -112,4 +112,7 @@ export const withAssetSearchQuery = withQuery(
   }
 );
 
-export default compose(withRouter, withAssetSearchQuery)(StorySearchContainer);
+export default compose(
+  withRouter,
+  withAssetSearchQuery
+)(StorySearchContainer);
diff --git a/client/coral-admin/src/routes/Stories/containers/Stories.js b/client/coral-admin/src/routes/Stories/containers/Stories.js
index 6c54f79d7..144076b41 100644
--- a/client/coral-admin/src/routes/Stories/containers/Stories.js
+++ b/client/coral-admin/src/routes/Stories/containers/Stories.js
@@ -113,4 +113,7 @@ StoriesContainer.propTypes = {
   updateAssetState: PropTypes.func.isRequired,
 };
 
-export default connect(mapStateToProps, mapDispatchToProps)(StoriesContainer);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(StoriesContainer);
diff --git a/client/coral-embed-stream/src/containers/Embed.js b/client/coral-embed-stream/src/containers/Embed.js
index d365af50d..836def259 100644
--- a/client/coral-embed-stream/src/containers/Embed.js
+++ b/client/coral-embed-stream/src/containers/Embed.js
@@ -41,7 +41,13 @@ class EmbedContainer extends React.Component {
           document: USER_BANNED_SUBSCRIPTION,
           updateQuery: (
             _,
-            { subscriptionData: { data: { userBanned: { state } } } }
+            {
+              subscriptionData: {
+                data: {
+                  userBanned: { state },
+                },
+              },
+            }
           ) => {
             notify('info', t('your_account_has_been_banned'));
             props.updateStatus(state.status);
@@ -51,7 +57,13 @@ class EmbedContainer extends React.Component {
           document: USER_SUSPENDED_SUBSCRIPTION,
           updateQuery: (
             _,
-            { subscriptionData: { data: { userSuspended: { state } } } }
+            {
+              subscriptionData: {
+                data: {
+                  userSuspended: { state },
+                },
+              },
+            }
           ) => {
             notify('info', t('your_account_has_been_suspended'));
             props.updateStatus(state.status);
@@ -61,7 +73,13 @@ class EmbedContainer extends React.Component {
           document: USERNAME_REJECTED_SUBSCRIPTION,
           updateQuery: (
             _,
-            { subscriptionData: { data: { usernameRejected: { state } } } }
+            {
+              subscriptionData: {
+                data: {
+                  usernameRejected: { state },
+                },
+              },
+            }
           ) => {
             notify('info', t('your_username_has_been_rejected'));
             props.updateStatus(state.status);
@@ -324,7 +342,10 @@ const mapDispatchToProps = dispatch =>
 
 export default compose(
   withPopupAuthHandler,
-  connect(mapStateToProps, mapDispatchToProps),
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  ),
   branch(props => !props.checkedInitialLogin, renderComponent(Spinner)),
   withEmbedQuery
 )(EmbedContainer);
diff --git a/client/coral-embed-stream/src/graphql/index.js b/client/coral-embed-stream/src/graphql/index.js
index d9f6b4f64..e9f0b094b 100644
--- a/client/coral-embed-stream/src/graphql/index.js
+++ b/client/coral-embed-stream/src/graphql/index.js
@@ -126,7 +126,9 @@ export default {
   },
   mutations: {
     PostComment: ({
-      variables: { input: { asset_id, body, parent_id, tags = [] } },
+      variables: {
+        input: { asset_id, body, parent_id, tags = [] },
+      },
       state: { auth },
     }) => ({
       optimisticResponse: {
@@ -193,7 +195,13 @@ export default {
       updateQueries: {
         CoralEmbedStream_Embed: (
           prev,
-          { mutationResult: { data: { createComment: { comment } } } }
+          {
+            mutationResult: {
+              data: {
+                createComment: { comment },
+              },
+            },
+          }
         ) => {
           if (
             (![ADMIN, MODERATOR].includes(prev.me.role) &&
@@ -208,7 +216,13 @@ export default {
         },
         CoralEmbedStream_Profile: (
           prev,
-          { mutationResult: { data: { createComment: { comment } } } }
+          {
+            mutationResult: {
+              data: {
+                createComment: { comment },
+              },
+            },
+          }
         ) => {
           return update(prev, {
             me: {
@@ -224,7 +238,13 @@ export default {
       updateQueries: {
         CoralEmbedStream_Embed: (
           prev,
-          { mutationResult: { data: { editComment: { comment } } } }
+          {
+            mutationResult: {
+              data: {
+                editComment: { comment },
+              },
+            },
+          }
         ) => {
           if (
             !['PREMOD', 'REJECTED', 'SYSTEM_WITHHELD'].includes(comment.status)
diff --git a/client/coral-embed-stream/src/tabs/configure/containers/Settings.js b/client/coral-embed-stream/src/tabs/configure/containers/Settings.js
index cfb72c0ae..86e8d30b3 100644
--- a/client/coral-embed-stream/src/tabs/configure/containers/Settings.js
+++ b/client/coral-embed-stream/src/tabs/configure/containers/Settings.js
@@ -139,7 +139,10 @@ const mapDispatchToProps = dispatch =>
   );
 
 const enhance = compose(
-  connect(mapStateToProps, mapDispatchToProps),
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  ),
   withSettingsFragments,
   withUpdateAssetSettings,
   withMergedSettings('asset.settings', 'pending', 'mergedSettings')
diff --git a/client/coral-embed-stream/src/tabs/profile/containers/CommentHistory.js b/client/coral-embed-stream/src/tabs/profile/containers/CommentHistory.js
index 27727216e..46b188c12 100644
--- a/client/coral-embed-stream/src/tabs/profile/containers/CommentHistory.js
+++ b/client/coral-embed-stream/src/tabs/profile/containers/CommentHistory.js
@@ -22,7 +22,14 @@ class CommentHistoryContainer extends Component {
         limit: 5,
         cursor: this.props.root.me.comments.endCursor,
       },
-      updateQuery: (previous, { fetchMoreResult: { me: { comments } } }) => {
+      updateQuery: (
+        previous,
+        {
+          fetchMoreResult: {
+            me: { comments },
+          },
+        }
+      ) => {
         const updated = update(previous, {
           me: {
             comments: {
@@ -97,7 +104,10 @@ const mapStateToProps = state => ({
 });
 
 export default compose(
-  connect(mapStateToProps, null),
+  connect(
+    mapStateToProps,
+    null
+  ),
   withCommentHistoryFragments,
   withFetchMore
 )(CommentHistoryContainer);
diff --git a/client/coral-embed-stream/src/tabs/profile/containers/Profile.js b/client/coral-embed-stream/src/tabs/profile/containers/Profile.js
index 4a84f1810..6c73e0eff 100644
--- a/client/coral-embed-stream/src/tabs/profile/containers/Profile.js
+++ b/client/coral-embed-stream/src/tabs/profile/containers/Profile.js
@@ -80,6 +80,7 @@ const mapStateToProps = state => ({
   currentUser: state.auth.user,
 });
 
-export default compose(connect(mapStateToProps), withProfileQuery)(
-  ProfileContainer
-);
+export default compose(
+  connect(mapStateToProps),
+  withProfileQuery
+)(ProfileContainer);
diff --git a/client/coral-embed-stream/src/tabs/profile/containers/TabPanel.js b/client/coral-embed-stream/src/tabs/profile/containers/TabPanel.js
index 46c24227f..4bbe959f7 100644
--- a/client/coral-embed-stream/src/tabs/profile/containers/TabPanel.js
+++ b/client/coral-embed-stream/src/tabs/profile/containers/TabPanel.js
@@ -55,7 +55,10 @@ export default compose(
   ${Settings.fragments.root}
 `,
   }),
-  connect(mapStateToProps, mapDispatchToProps),
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  ),
   withSlotElements({
     slot: 'profileSettings',
     propName: 'profileSettingsSlotElements',
diff --git a/client/coral-embed-stream/src/tabs/stream/components/Comment.js b/client/coral-embed-stream/src/tabs/stream/components/Comment.js
index 63740764f..e5aea7589 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/Comment.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/Comment.js
@@ -117,8 +117,12 @@ export default class Comment extends React.Component {
   }
 
   componentWillReceiveProps(next) {
-    const { comment: { replies: prevReplies } } = this.props;
-    const { comment: { replies: nextReplies } } = next;
+    const {
+      comment: { replies: prevReplies },
+    } = this.props;
+    const {
+      comment: { replies: nextReplies },
+    } = next;
     if (
       prevReplies &&
       nextReplies &&
@@ -243,7 +247,10 @@ export default class Comment extends React.Component {
   }
 
   loadNewReplies = () => {
-    const { comment: { replies, replyCount, id }, emit } = this.props;
+    const {
+      comment: { replies, replyCount, id },
+      emit,
+    } = this.props;
     if (replyCount > replies.nodes.length) {
       this.setState({ loadingState: 'loading' });
       this.props
@@ -292,7 +299,11 @@ export default class Comment extends React.Component {
   // getVisibileReplies returns a list containing comments
   // which were authored by current user or comes before the `idCursor`.
   getVisibileReplies() {
-    const { comment: { replies }, currentUser, liveUpdates } = this.props;
+    const {
+      comment: { replies },
+      currentUser,
+      liveUpdates,
+    } = this.props;
     const idCursor = this.state.idCursors[0];
     const userId = currentUser ? currentUser.id : null;
 
diff --git a/client/coral-embed-stream/src/tabs/stream/components/ModerationLink.js b/client/coral-embed-stream/src/tabs/stream/components/ModerationLink.js
index d33f18a5e..73ec2935e 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/ModerationLink.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/ModerationLink.js
@@ -18,6 +18,7 @@ const ModerationLink = props =>
         className="talk-embed-stream-moderation-link"
         href={`${BASE_PATH}admin/moderate/${props.assetId}`}
         target="_blank"
+        rel="noopener noreferrer"
       >
         {t('moderate_this_stream')}
       </a>
diff --git a/client/coral-embed-stream/src/tabs/stream/components/Stream.js b/client/coral-embed-stream/src/tabs/stream/components/Stream.js
index 4ecb0a8bd..b097f3d57 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/Stream.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/Stream.js
@@ -211,7 +211,10 @@ class Stream extends React.Component {
       root,
       appendItemArray,
       asset,
-      asset: { comment: highlightedComment, settings: { questionBoxEnable } },
+      asset: {
+        comment: highlightedComment,
+        settings: { questionBoxEnable },
+      },
       postComment,
       notify,
       updateItem,
diff --git a/client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js b/client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js
index 57b5a2f17..d77b72992 100644
--- a/client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js
+++ b/client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js
@@ -215,7 +215,10 @@ const mapStateToProps = state => ({
 
 const enhance = compose(
   withHooks(['preSubmit', 'postSubmit']),
-  connect(mapStateToProps, null)
+  connect(
+    mapStateToProps,
+    null
+  )
 );
 
 export default enhance(CommentBox);
diff --git a/client/coral-embed-stream/src/tabs/stream/containers/CommentNotFound.js b/client/coral-embed-stream/src/tabs/stream/containers/CommentNotFound.js
index 91537aac4..963cfff0f 100644
--- a/client/coral-embed-stream/src/tabs/stream/containers/CommentNotFound.js
+++ b/client/coral-embed-stream/src/tabs/stream/containers/CommentNotFound.js
@@ -33,4 +33,7 @@ const mapDispatchToProps = dispatch =>
     dispatch
   );
 
-export default connect(null, mapDispatchToProps)(CommentNotFound);
+export default connect(
+  null,
+  mapDispatchToProps
+)(CommentNotFound);
diff --git a/client/coral-embed-stream/src/tabs/stream/containers/Stream.js b/client/coral-embed-stream/src/tabs/stream/containers/Stream.js
index d6ca27558..1f32fcedf 100644
--- a/client/coral-embed-stream/src/tabs/stream/containers/Stream.js
+++ b/client/coral-embed-stream/src/tabs/stream/containers/Stream.js
@@ -54,7 +54,11 @@ class StreamContainer extends React.Component {
       },
       updateQuery: (
         prev,
-        { subscriptionData: { data: { commentEdited } } }
+        {
+          subscriptionData: {
+            data: { commentEdited },
+          },
+        }
       ) => {
         // Ignore mutations from me.
         // TODO: need way to detect mutations created by this client, and allow mutations from other clients.
@@ -87,7 +91,14 @@ class StreamContainer extends React.Component {
       variables: {
         assetId: this.props.asset.id,
       },
-      updateQuery: (prev, { subscriptionData: { data: { commentAdded } } }) => {
+      updateQuery: (
+        prev,
+        {
+          subscriptionData: {
+            data: { commentAdded },
+          },
+        }
+      ) => {
         // Ignore mutations from me.
         // TODO: need way to detect mutations created by this client, and allow mutations from other clients.
         if (
@@ -488,7 +499,10 @@ const mapDispatchToProps = dispatch =>
 export default compose(
   withFragments(fragments),
   withEmit,
-  connect(mapStateToProps, mapDispatchToProps),
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  ),
   withPostComment,
   // `talk-plugin-flags` has a custom error handling logic.
   withPostFlag({ notifyOnError: false }),
diff --git a/client/coral-framework/components/AdminCommentContent.js b/client/coral-framework/components/AdminCommentContent.js
index b3110e822..2cbedb338 100644
--- a/client/coral-framework/components/AdminCommentContent.js
+++ b/client/coral-framework/components/AdminCommentContent.js
@@ -78,7 +78,12 @@ function markLinks(body, keyPrefix) {
     matches.forEach((match, i) => {
       content.push(body.substring(index, match.index));
       content.push(
-        <a key={`${keyPrefix}_${i}`} href={match.url} target="_blank">
+        <a
+          key={`${keyPrefix}_${i}`}
+          href={match.url}
+          target="_blank"
+          rel="noopener noreferrer"
+        >
           {match.text}
         </a>
       );
diff --git a/client/coral-framework/components/Slot.js b/client/coral-framework/components/Slot.js
index 048c4da80..75844d8ca 100644
--- a/client/coral-framework/components/Slot.js
+++ b/client/coral-framework/components/Slot.js
@@ -103,5 +103,8 @@ export default compose(
     size: props => props.size,
     defaultComponent: props => props.defaultComponent,
   }),
-  connect(mapStateToProps, null)
+  connect(
+    mapStateToProps,
+    null
+  )
 )(Slot);
diff --git a/client/coral-framework/hocs/connect.js b/client/coral-framework/hocs/connect.js
index 735527fd2..2e78361eb 100644
--- a/client/coral-framework/hocs/connect.js
+++ b/client/coral-framework/hocs/connect.js
@@ -2,5 +2,8 @@ import { connect } from 'react-redux';
 
 export default (mapStateToProps, ...rest) => BaseComponent => {
   BaseComponent.mapStateToProps = mapStateToProps;
-  return connect(mapStateToProps, ...rest)(BaseComponent);
+  return connect(
+    mapStateToProps,
+    ...rest
+  )(BaseComponent);
 };
diff --git a/client/coral-framework/hocs/withSetUsername.js b/client/coral-framework/hocs/withSetUsername.js
index 3a8f65a22..f9290ef99 100644
--- a/client/coral-framework/hocs/withSetUsername.js
+++ b/client/coral-framework/hocs/withSetUsername.js
@@ -95,7 +95,10 @@ const mapDispatchToProps = dispatch =>
   bindActionCreators({ updateUsername, updateStatus }, dispatch);
 
 export default compose(
-  connect(mapStateToProps, mapDispatchToProps),
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  ),
   withSetUsernameMutation,
   withSetUsername
 );
diff --git a/client/coral-framework/hocs/withSignUp.js b/client/coral-framework/hocs/withSignUp.js
index 8c35e1cc9..c2007df9a 100644
--- a/client/coral-framework/hocs/withSignUp.js
+++ b/client/coral-framework/hocs/withSignUp.js
@@ -121,4 +121,7 @@ const withSignUp = hoistStatics(WrappedComponent => {
   return WithSignUp;
 });
 
-export default compose(withSettingsQuery, withSignUp);
+export default compose(
+  withSettingsQuery,
+  withSignUp
+);
diff --git a/client/coral-framework/hocs/withSlotElements.js b/client/coral-framework/hocs/withSlotElements.js
index 9b432ade8..0373a2571 100644
--- a/client/coral-framework/hocs/withSlotElements.js
+++ b/client/coral-framework/hocs/withSlotElements.js
@@ -198,5 +198,11 @@ const mapStateToProps = state => ({
  * })(MyComponent);
  */
 export default settings => {
-  return compose(connect(mapStateToProps, null), createHOC(settings));
+  return compose(
+    connect(
+      mapStateToProps,
+      null
+    ),
+    createHOC(settings)
+  );
 };
diff --git a/client/coral-framework/services/events.js b/client/coral-framework/services/events.js
index e0d1b1354..e1a1577a1 100644
--- a/client/coral-framework/services/events.js
+++ b/client/coral-framework/services/events.js
@@ -9,7 +9,11 @@ export function createReduxEmitter(eventEmitter) {
     // Handle apollo actions.
     if (action.type.startsWith('APOLLO_')) {
       if (action.type === 'APOLLO_SUBSCRIPTION_RESULT') {
-        const { operationName, variables, result: { data } } = action;
+        const {
+          operationName,
+          variables,
+          result: { data },
+        } = action;
         eventEmitter.emit(`subscription.${operationName}.data`, {
           variables,
           data,
diff --git a/config.js b/config.js
index b547636f4..8987f1114 100644
--- a/config.js
+++ b/config.js
@@ -64,7 +64,9 @@ const CONFIG = {
     process.env.TALK_LOGGING_LEVEL
   )
     ? process.env.TALK_LOGGING_LEVEL
-    : process.env.NODE_ENV === 'test' ? 'fatal' : 'info',
+    : process.env.NODE_ENV === 'test'
+      ? 'fatal'
+      : 'info',
 
   // REVISION_HASH when using the docker build will contain the build hash that
   // it was built at.
diff --git a/graph/context.js b/graph/context.js
index 9c356f0e7..ea694f6cf 100644
--- a/graph/context.js
+++ b/graph/context.js
@@ -149,7 +149,9 @@ class Context {
    * operations.
    */
   static forSystem() {
-    const { models: { User } } = connectors;
+    const {
+      models: { User },
+    } = connectors;
 
     // Create the system user.
     const user = new User({ system: true });
diff --git a/graph/errorHandler.js b/graph/errorHandler.js
index 9e8d98f74..8dfd10ec3 100644
--- a/graph/errorHandler.js
+++ b/graph/errorHandler.js
@@ -1,7 +1,9 @@
 const { forEachField } = require('./utils');
 const { maskErrors } = require('graphql-errors');
 const { TalkError } = require('../errors');
-const { Error: { ValidationError } } = require('mongoose');
+const {
+  Error: { ValidationError },
+} = require('mongoose');
 
 // If an APIError happens in a mutation, then respond with `{errors: Array}`
 // according to the schema.
diff --git a/graph/loaders/actions.js b/graph/loaders/actions.js
index 77cc7138d..6ef29cb66 100644
--- a/graph/loaders/actions.js
+++ b/graph/loaders/actions.js
@@ -6,7 +6,11 @@ const { first, get, merge, remove, groupBy, reduce, isNil } = require('lodash');
  * Gets actions based on their item id's.
  */
 const genActionsByItemID = (
-  { connectors: { services: { Actions } } },
+  {
+    connectors: {
+      services: { Actions },
+    },
+  },
   item_ids
 ) => {
   return Actions.findByItemIdArray(item_ids).then(
@@ -21,7 +25,12 @@ const genActionsByItemID = (
  * @param {Array<String>} itemIDs the items that we need to get the actions for
  */
 const genActionsAuthoredWithID = (
-  { user = {}, connectors: { services: { Actions } } },
+  {
+    user = {},
+    connectors: {
+      services: { Actions },
+    },
+  },
   itemIDs
 ) =>
   Actions.getUserActions(user.id, itemIDs).then(
@@ -50,7 +59,9 @@ const iterateActionCounts = action_counts =>
  * @param {Object} item the item that we're getting the actions for
  */
 async function getUserActions(ctx, { action_counts, id }) {
-  const { loaders: { Actions } } = ctx;
+  const {
+    loaders: { Actions },
+  } = ctx;
 
   // Get the total count for all action types.
   const totalActionCount = reduce(
diff --git a/graph/loaders/assets.js b/graph/loaders/assets.js
index 868c8af68..0d55b6b13 100644
--- a/graph/loaders/assets.js
+++ b/graph/loaders/assets.js
@@ -2,7 +2,14 @@ const DataLoader = require('dataloader');
 const { URL } = require('url');
 const { singleJoinBy, SingletonResolver } = require('./util');
 
-const genAssetsByID = ({ connectors: { models: { Asset } } }, ids) =>
+const genAssetsByID = (
+  {
+    connectors: {
+      models: { Asset },
+    },
+  },
+  ids
+) =>
   Asset.find({
     id: {
       $in: ids,
@@ -10,7 +17,11 @@ const genAssetsByID = ({ connectors: { models: { Asset } } }, ids) =>
   }).then(singleJoinBy(ids, 'id'));
 
 const getAssetsByQuery = async (
-  { connectors: { services: { Assets } } },
+  {
+    connectors: {
+      services: { Assets },
+    },
+  },
   query
 ) => {
   // If we are requesting based on a limit, ask for one more than we want.
@@ -126,7 +137,12 @@ const findOrCreateAssetByURL = async (ctx, url) => {
 };
 
 const findByUrl = async (
-  { connectors: { errors, services: { Assets } } },
+  {
+    connectors: {
+      errors,
+      services: { Assets },
+    },
+  },
   asset_url
 ) => {
   // Try to validate that the url is valid. If the URL constructor throws an
diff --git a/graph/loaders/users.js b/graph/loaders/users.js
index 2c1e9fbac..1a886bd25 100644
--- a/graph/loaders/users.js
+++ b/graph/loaders/users.js
@@ -51,7 +51,11 @@ const genUserByIDs = async (ctx, ids) => {
     return [];
   }
 
-  const { connectors: { models: { User } } } = ctx;
+  const {
+    connectors: {
+      models: { User },
+    },
+  } = ctx;
 
   return User.find({ id: { $in: ids } }).then(util.singleJoinBy(ids, 'id'));
 };
@@ -63,7 +67,12 @@ const genUserByIDs = async (ctx, ids) => {
  * @param  {Object} query     query terms to apply to the users query
  */
 const getUsersByQuery = async (
-  { user, connectors: { models: { User } } },
+  {
+    user,
+    connectors: {
+      models: { User },
+    },
+  },
   { limit, cursor, value = '', state, action_type, sortOrder }
 ) => {
   let query = User.find();
@@ -175,7 +184,12 @@ const getUsersByQuery = async (
  *                            query
  */
 const getCountByQuery = async (
-  { user, connectors: { models: { User } } },
+  {
+    user,
+    connectors: {
+      models: { User },
+    },
+  },
   { action_type, state }
 ) => {
   const query = User.find();
diff --git a/graph/mutators/action.js b/graph/mutators/action.js
index 5557e1a9b..62097d0cd 100644
--- a/graph/mutators/action.js
+++ b/graph/mutators/action.js
@@ -11,7 +11,9 @@ const { IGNORE_FLAGS_AGAINST_STAFF } = require('../../config');
  * @return {Promise}      resolves to the referenced item
  */
 const getActionItem = async (ctx, { item_id, item_type }) => {
-  const { loaders: { Comments, Users } } = ctx;
+  const {
+    loaders: { Comments, Users },
+  } = ctx;
 
   switch (item_type) {
     case 'COMMENTS': {
@@ -42,7 +44,13 @@ const createAction = async (
   ctx,
   { item_id, item_type, action_type, group_id, metadata = {} }
 ) => {
-  const { user = {}, pubsub, connectors: { services: { Actions } } } = ctx;
+  const {
+    user = {},
+    pubsub,
+    connectors: {
+      services: { Actions },
+    },
+  } = ctx;
 
   // Gets the item referenced by the action.
   const item = await getActionItem(ctx, { item_id, item_type });
@@ -107,7 +115,12 @@ const createAction = async (
  * @return {Promise}     resolves to the deleted action, or null if not found.
  */
 const deleteAction = (ctx, { id }) => {
-  const { user, connectors: { services: { Actions } } } = ctx;
+  const {
+    user,
+    connectors: {
+      services: { Actions },
+    },
+  } = ctx;
 
   return Actions.delete({ id, user_id: user.id });
 };
diff --git a/graph/mutators/asset.js b/graph/mutators/asset.js
index d5b72102d..d87de133e 100644
--- a/graph/mutators/asset.js
+++ b/graph/mutators/asset.js
@@ -63,7 +63,11 @@ const closeNow = async (ctx, id) =>
  * @param {String} id the asset's id to scrape
  */
 const scrapeAsset = async (ctx, id) => {
-  const { connectors: { services: { Scraper } } } = ctx;
+  const {
+    connectors: {
+      services: { Scraper },
+    },
+  } = ctx;
 
   return Scraper.create(ctx, id);
 };
diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index b57aedeb3..c815dc51e 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -14,7 +14,10 @@ const {
 } = require('../../perms/constants');
 
 const resolveTagsForComment = async (ctx, { asset_id, tags = [] }) => {
-  const { user, loaders: { Tags } } = ctx;
+  const {
+    user,
+    loaders: { Tags },
+  } = ctx;
   const item_type = 'COMMENTS';
 
   // Handle Tags
@@ -156,7 +159,11 @@ const createComment = async (
     metadata = {},
   }
 ) => {
-  const { user, loaders: { Comments }, pubsub } = ctx;
+  const {
+    user,
+    loaders: { Comments },
+    pubsub,
+  } = ctx;
 
   // Resolve the tags for the comment.
   tags = await resolveTagsForComment(ctx, { asset_id, tags });
@@ -202,7 +209,11 @@ const createComment = async (
  * @return {Promise}             resolves to a new comment
  */
 const createPublicComment = async (ctx, comment) => {
-  const { connectors: { services: { Moderation } } } = ctx;
+  const {
+    connectors: {
+      services: { Moderation },
+    },
+  } = ctx;
 
   // We then take the wordlist and the comment into consideration when
   // considering what status to assign the new comment, and resolve the new
@@ -245,7 +256,10 @@ const createActions = async (item_id, actions = []) =>
  * @param {String} status      the new status of the comment
  */
 const setStatus = async (ctx, { id, status }) => {
-  const { user, loaders: { Comments } } = ctx;
+  const {
+    user,
+    loaders: { Comments },
+  } = ctx;
 
   let comment = await CommentsService.pushStatus(
     id,
@@ -281,7 +295,11 @@ const editComment = async (
   ctx,
   { id, asset_id, edit: { body, metadata = {} } }
 ) => {
-  const { connectors: { services: { Moderation } } } = ctx;
+  const {
+    connectors: {
+      services: { Moderation },
+    },
+  } = ctx;
 
   // Build up the new comment we're setting. We need to check this with
   // moderation now.
diff --git a/graph/mutators/user.js b/graph/mutators/user.js
index 7422f2290..fa6a18ee5 100644
--- a/graph/mutators/user.js
+++ b/graph/mutators/user.js
@@ -92,7 +92,11 @@ const actionDecrTransformer = ({ item_id, action_type, group_id }) => {
 
 // delUser will delete a given user with the specified id.
 const delUser = async (ctx, id) => {
-  const { connectors: { models: { User, Action, Comment } } } = ctx;
+  const {
+    connectors: {
+      models: { User, Action, Comment },
+    },
+  } = ctx;
 
   // Find the user we're removing.
   const user = await User.findOne({ id });
@@ -178,7 +182,9 @@ const changeUserPassword = async (ctx, oldPassword, newPassword) => {
   const {
     user,
     loaders: { Settings },
-    connectors: { services: { I18n } },
+    connectors: {
+      services: { I18n },
+    },
   } = ctx;
 
   // Verify the old password.
diff --git a/graph/resolvers/asset.js b/graph/resolvers/asset.js
index 3ed5305b7..13a950464 100644
--- a/graph/resolvers/asset.js
+++ b/graph/resolvers/asset.js
@@ -1,7 +1,13 @@
 const { decorateWithTags, getRequestedFields } = require('./util');
 
 const Asset = {
-  async comment({ id }, { id: commentId }, { loaders: { Comments } }) {
+  async comment(
+    { id },
+    { id: commentId },
+    {
+      loaders: { Comments },
+    }
+  ) {
     // Load the comment from the database.
     const comment = await Comments.get.load(commentId);
     if (!comment) {
@@ -15,7 +21,13 @@ const Asset = {
 
     return comment;
   },
-  comments({ id }, { query, deep }, { loaders: { Comments } }) {
+  comments(
+    { id },
+    { query, deep },
+    {
+      loaders: { Comments },
+    }
+  ) {
     if (!deep) {
       query.parent_id = null;
     }
@@ -25,7 +37,13 @@ const Asset = {
 
     return Comments.getByQuery(query);
   },
-  commentCount({ id, commentCount }, { tags }, { loaders: { Comments } }) {
+  commentCount(
+    { id, commentCount },
+    { tags },
+    {
+      loaders: { Comments },
+    }
+  ) {
     if (commentCount != null) {
       return commentCount;
     }
@@ -46,7 +64,9 @@ const Asset = {
   totalCommentCount(
     { id, totalCommentCount },
     { tags },
-    { loaders: { Comments } }
+    {
+      loaders: { Comments },
+    }
   ) {
     if (totalCommentCount != null) {
       return totalCommentCount;
@@ -64,7 +84,14 @@ const Asset = {
 
     return Comments.countByAssetID.load(id);
   },
-  async settings({ settings = null }, _, { loaders: { Settings } }, info) {
+  async settings(
+    { settings = null },
+    _,
+    {
+      loaders: { Settings },
+    },
+    info
+  ) {
     // Get the fields we want from the settings.
     const fields = getRequestedFields(info);
 
diff --git a/graph/resolvers/comment.js b/graph/resolvers/comment.js
index acd55cb1a..09d930639 100644
--- a/graph/resolvers/comment.js
+++ b/graph/resolvers/comment.js
@@ -16,19 +16,37 @@ const Comment = {
   hasParent({ parent_id }) {
     return !!parent_id;
   },
-  parent({ parent_id }, _, { loaders: { Comments } }) {
+  parent(
+    { parent_id },
+    _,
+    {
+      loaders: { Comments },
+    }
+  ) {
     if (parent_id == null) {
       return null;
     }
 
     return Comments.get.load(parent_id);
   },
-  user({ author_id }, _, { loaders: { Users } }) {
+  user(
+    { author_id },
+    _,
+    {
+      loaders: { Users },
+    }
+  ) {
     if (author_id) {
       return Users.getByID.load(author_id);
     }
   },
-  replies({ id, asset_id, reply_count }, { query }, { loaders: { Comments } }) {
+  replies(
+    { id, asset_id, reply_count },
+    { query },
+    {
+      loaders: { Comments },
+    }
+  ) {
     // Don't bother looking up replies if there aren't any there!
     if (reply_count === 0) {
       return {
@@ -44,17 +62,35 @@ const Comment = {
     return Comments.getByQuery(query);
   },
   replyCount: property('reply_count'),
-  actions({ id }, _, { loaders: { Actions } }) {
+  actions(
+    { id },
+    _,
+    {
+      loaders: { Actions },
+    }
+  ) {
     return Actions.getByID.load(id);
   },
-  action_summaries(comment, _, { loaders: { Actions } }) {
+  action_summaries(
+    comment,
+    _,
+    {
+      loaders: { Actions },
+    }
+  ) {
     if (comment.action_summaries) {
       return comment.action_summaries;
     }
 
     return Actions.getSummariesByItem.load(comment);
   },
-  asset({ asset_id }, _, { loaders: { Assets } }) {
+  asset(
+    { asset_id },
+    _,
+    {
+      loaders: { Assets },
+    }
+  ) {
     return Assets.getByID.load(asset_id);
   },
   editing: async (comment, _, { loaders: { Settings } }) => {
@@ -71,7 +107,13 @@ const Comment = {
       editableUntil: editableUntil,
     };
   },
-  async url(comment, args, { loaders: { Assets } }) {
+  async url(
+    comment,
+    args,
+    {
+      loaders: { Assets },
+    }
+  ) {
     const asset = await Assets.getByID.load(comment.asset_id);
     if (!asset) {
       return null;
diff --git a/graph/resolvers/root_query.js b/graph/resolvers/root_query.js
index 53296a2ca..e9e43f915 100644
--- a/graph/resolvers/root_query.js
+++ b/graph/resolvers/root_query.js
@@ -6,17 +6,36 @@ const {
 } = require('../../perms/constants');
 
 const RootQuery = {
-  assets(_, { query }, { loaders: { Assets } }) {
+  assets(
+    _,
+    { query },
+    {
+      loaders: { Assets },
+    }
+  ) {
     return Assets.getByQuery(query);
   },
-  asset(_, query, { loaders: { Assets } }) {
+  asset(
+    _,
+    query,
+    {
+      loaders: { Assets },
+    }
+  ) {
     if (query.id) {
       return Assets.getByID.load(query.id);
     }
 
     return Assets.getByURL(query.url);
   },
-  settings(_, args, { loaders: { Settings } }, info) {
+  settings(
+    _,
+    args,
+    {
+      loaders: { Settings },
+    },
+    info
+  ) {
     // Get the fields we want from the settings.
     const fields = getRequestedFields(info);
 
@@ -26,15 +45,33 @@ const RootQuery = {
 
   // This endpoint is used for loading moderation queues, so hide it in the
   // event that we aren't an admin.
-  async comments(_, { query }, { loaders: { Comments } }) {
+  async comments(
+    _,
+    { query },
+    {
+      loaders: { Comments },
+    }
+  ) {
     return Comments.getByQuery(query);
   },
 
-  comment(_, { id }, { loaders: { Comments } }) {
+  comment(
+    _,
+    { id },
+    {
+      loaders: { Comments },
+    }
+  ) {
     return Comments.get.load(id);
   },
 
-  async commentCount(_, { query }, { loaders: { Comments, Assets } }) {
+  async commentCount(
+    _,
+    { query },
+    {
+      loaders: { Comments, Assets },
+    }
+  ) {
     const { asset_url, asset_id } = query;
     if (
       (!asset_id || asset_id.length === 0) &&
@@ -50,7 +87,13 @@ const RootQuery = {
     return Comments.getCountByQuery(query);
   },
 
-  async userCount(_, { query }, { loaders: { Users } }) {
+  async userCount(
+    _,
+    { query },
+    {
+      loaders: { Users },
+    }
+  ) {
     return Users.getCountByQuery(query);
   },
 
@@ -65,13 +108,25 @@ const RootQuery = {
   },
 
   // this returns an arbitrary user
-  user(_, { id }, { loaders: { Users } }) {
+  user(
+    _,
+    { id },
+    {
+      loaders: { Users },
+    }
+  ) {
     return Users.getByID.load(id);
   },
 
   // This endpoint is used for loading the user moderation queues (users whose username has been flagged),
   // so hide it in the event that we aren't an admin.
-  users(_, { query }, { loaders: { Users } }) {
+  users(
+    _,
+    { query },
+    {
+      loaders: { Users },
+    }
+  ) {
     return Users.getByQuery(query);
   },
 };
diff --git a/graph/resolvers/settings.js b/graph/resolvers/settings.js
index a299530f2..4676d9eea 100644
--- a/graph/resolvers/settings.js
+++ b/graph/resolvers/settings.js
@@ -5,7 +5,13 @@ const Settings = {
   karmaThresholds: (
     settings,
     args,
-    { connectors: { services: { Karma: { THRESHOLDS } } } }
+    {
+      connectors: {
+        services: {
+          Karma: { THRESHOLDS },
+        },
+      },
+    }
   ) => THRESHOLDS,
 };
 
diff --git a/graph/resolvers/user.js b/graph/resolvers/user.js
index 67478785a..70e10bc4c 100644
--- a/graph/resolvers/user.js
+++ b/graph/resolvers/user.js
@@ -16,20 +16,44 @@ const {
 const { property } = require('lodash');
 
 const User = {
-  action_summaries(user, _, { loaders: { Actions } }) {
+  action_summaries(
+    user,
+    _,
+    {
+      loaders: { Actions },
+    }
+  ) {
     return Actions.getSummariesByItem.load(user);
   },
-  actions({ id }, _, { loaders: { Actions } }) {
+  actions(
+    { id },
+    _,
+    {
+      loaders: { Actions },
+    }
+  ) {
     return Actions.getByID.load(id);
   },
-  comments({ id }, { query }, { loaders: { Comments } }) {
+  comments(
+    { id },
+    { query },
+    {
+      loaders: { Comments },
+    }
+  ) {
     // Set the author id on the query.
     query.author_id = id;
 
     return Comments.getByQuery(query);
   },
 
-  ignoredUsers({ ignoresUsers }, args, { loaders: { Users } }) {
+  ignoredUsers(
+    { ignoresUsers },
+    args,
+    {
+      loaders: { Users },
+    }
+  ) {
     // Return nothing if there is nothing to query for.
     if (!ignoresUsers || ignoresUsers.length <= 0) {
       return [];
diff --git a/plugin-api/beta/client/hocs/withReaction.js b/plugin-api/beta/client/hocs/withReaction.js
index 95d3f5bcf..7181d36ec 100644
--- a/plugin-api/beta/client/hocs/withReaction.js
+++ b/plugin-api/beta/client/hocs/withReaction.js
@@ -413,7 +413,9 @@ export default (reaction, options = {}) =>
               update: (
                 proxy,
                 {
-                  data: { [`create${Reaction}Action`]: { [reaction]: action } },
+                  data: {
+                    [`create${Reaction}Action`]: { [reaction]: action },
+                  },
                 }
               ) => {
                 const a = {
@@ -466,7 +468,10 @@ export default (reaction, options = {}) =>
         ${fragments.comment ? fragments.comment : ''}
       `,
       }),
-      connect(mapStateToProps, mapDispatchToProps),
+      connect(
+        mapStateToProps,
+        mapDispatchToProps
+      ),
       withDeleteReaction,
       withPostReaction
     );
diff --git a/plugin-api/beta/client/hocs/withSortOption.js b/plugin-api/beta/client/hocs/withSortOption.js
index b9d556c32..f7c2bb842 100644
--- a/plugin-api/beta/client/hocs/withSortOption.js
+++ b/plugin-api/beta/client/hocs/withSortOption.js
@@ -52,5 +52,8 @@ export default ({ sortBy = 'created_at', sortOrder = 'DESC', label }) =>
         );
       }
     }
-    return connect(mapStateToProps, mapDispatchToProps)(WithSortOption);
+    return connect(
+      mapStateToProps,
+      mapDispatchToProps
+    )(WithSortOption);
   });
diff --git a/plugin-api/beta/client/hocs/withTags.js b/plugin-api/beta/client/hocs/withTags.js
index 958028a4b..92d417ee3 100644
--- a/plugin-api/beta/client/hocs/withTags.js
+++ b/plugin-api/beta/client/hocs/withTags.js
@@ -139,7 +139,10 @@ export default (tag, options = {}) =>
       }),
       withAddTag,
       withRemoveTag,
-      connect(mapStateToProps, null)
+      connect(
+        mapStateToProps,
+        null
+      )
     );
 
     WithTags.displayName = `WithTags(${getDisplayName(WrappedComponent)})`;
diff --git a/plugin-api/beta/server/getReactionConfig.js b/plugin-api/beta/server/getReactionConfig.js
index f1f25b261..91db0462b 100644
--- a/plugin-api/beta/server/getReactionConfig.js
+++ b/plugin-api/beta/server/getReactionConfig.js
@@ -180,7 +180,14 @@ function getReactionConfig(reaction) {
       [`${Reaction}Action`]: {
         // This will load the user for the specific action. We'll limit this to the
         // admin users only or the current logged in user.
-        user({ user_id }, _, { loaders: { Users }, user }) {
+        user(
+          { user_id },
+          _,
+          {
+            loaders: { Users },
+            user,
+          }
+        ) {
           if (user && (user.can(SEARCH_OTHER_USERS) || user_id === user.id)) {
             return Users.getByID.load(user_id);
           }
diff --git a/plugins/talk-plugin-akismet/client/containers/CheckSpamHook.js b/plugins/talk-plugin-akismet/client/containers/CheckSpamHook.js
index f580b9632..05036eed9 100644
--- a/plugins/talk-plugin-akismet/client/containers/CheckSpamHook.js
+++ b/plugins/talk-plugin-akismet/client/containers/CheckSpamHook.js
@@ -5,4 +5,7 @@ import CheckSpamHook from '../components/CheckSpamHook';
 
 const mapDispatchToProps = dispatch => bindActionCreators({ notify }, dispatch);
 
-export default connect(null, mapDispatchToProps)(CheckSpamHook);
+export default connect(
+  null,
+  mapDispatchToProps
+)(CheckSpamHook);
diff --git a/plugins/talk-plugin-auth/client/login/containers/ForgotPassword.js b/plugins/talk-plugin-auth/client/login/containers/ForgotPassword.js
index c5e2f42da..411ef1869 100644
--- a/plugins/talk-plugin-auth/client/login/containers/ForgotPassword.js
+++ b/plugins/talk-plugin-auth/client/login/containers/ForgotPassword.js
@@ -58,6 +58,9 @@ const mapDispatchToProps = dispatch =>
   );
 
 export default compose(
-  connect(mapStateToProps, mapDispatchToProps),
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  ),
   withForgotPassword
 )(ForgotPasswordContainer);
diff --git a/plugins/talk-plugin-auth/client/login/containers/Main.js b/plugins/talk-plugin-auth/client/login/containers/Main.js
index 235bd6cde..7aaa3b759 100644
--- a/plugins/talk-plugin-auth/client/login/containers/Main.js
+++ b/plugins/talk-plugin-auth/client/login/containers/Main.js
@@ -50,4 +50,7 @@ const mapDispatchToProps = dispatch =>
     dispatch
   );
 
-export default connect(mapStateToProps, mapDispatchToProps)(MainContainer);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(MainContainer);
diff --git a/plugins/talk-plugin-auth/client/login/containers/ResendEmailConfirmation.js b/plugins/talk-plugin-auth/client/login/containers/ResendEmailConfirmation.js
index 6edeb82f2..5005ded43 100644
--- a/plugins/talk-plugin-auth/client/login/containers/ResendEmailConfirmation.js
+++ b/plugins/talk-plugin-auth/client/login/containers/ResendEmailConfirmation.js
@@ -59,6 +59,9 @@ const mapDispatchToProps = dispatch =>
   );
 
 export default compose(
-  connect(mapStateToProps, mapDispatchToProps),
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  ),
   withResendEmailConfirmation
 )(ResendEmailConfirmatonContainer);
diff --git a/plugins/talk-plugin-auth/client/login/containers/SignIn.js b/plugins/talk-plugin-auth/client/login/containers/SignIn.js
index 77c6a8614..a22e64ae7 100644
--- a/plugins/talk-plugin-auth/client/login/containers/SignIn.js
+++ b/plugins/talk-plugin-auth/client/login/containers/SignIn.js
@@ -89,6 +89,9 @@ const mapDispatchToProps = dispatch =>
   );
 
 export default compose(
-  connect(mapStateToProps, mapDispatchToProps),
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  ),
   withSignIn
 )(SignInContainer);
diff --git a/plugins/talk-plugin-auth/client/login/containers/SignUp.js b/plugins/talk-plugin-auth/client/login/containers/SignUp.js
index f7fc6f2d2..d908c42d3 100644
--- a/plugins/talk-plugin-auth/client/login/containers/SignUp.js
+++ b/plugins/talk-plugin-auth/client/login/containers/SignUp.js
@@ -145,6 +145,9 @@ const mapDispatchToProps = dispatch =>
   );
 
 export default compose(
-  connect(mapStateToProps, mapDispatchToProps),
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  ),
   withSignUp
 )(SignUpContainer);
diff --git a/plugins/talk-plugin-auth/client/stream/containers/SetUsernameDialog.js b/plugins/talk-plugin-auth/client/stream/containers/SetUsernameDialog.js
index 93c7ea74b..62f4abc39 100644
--- a/plugins/talk-plugin-auth/client/stream/containers/SetUsernameDialog.js
+++ b/plugins/talk-plugin-auth/client/stream/containers/SetUsernameDialog.js
@@ -58,7 +58,10 @@ const mapStateToProps = state => ({
 });
 
 export default compose(
-  connect(mapStateToProps, null),
+  connect(
+    mapStateToProps,
+    null
+  ),
   withSetUsername,
   branch(props => !props.username, renderNothing)
 )(SetUsernameDialogContainer);
diff --git a/plugins/talk-plugin-auth/client/stream/containers/SignInButton.js b/plugins/talk-plugin-auth/client/stream/containers/SignInButton.js
index 87b2a900f..181e93d32 100644
--- a/plugins/talk-plugin-auth/client/stream/containers/SignInButton.js
+++ b/plugins/talk-plugin-auth/client/stream/containers/SignInButton.js
@@ -11,4 +11,7 @@ const mapStateToProps = state => ({
 const mapDispatchToProps = dispatch =>
   bindActionCreators({ showSignInDialog }, dispatch);
 
-export default connect(mapStateToProps, mapDispatchToProps)(SignInButton);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(SignInButton);
diff --git a/plugins/talk-plugin-auth/client/stream/containers/UserBox.js b/plugins/talk-plugin-auth/client/stream/containers/UserBox.js
index 720a61087..2743a1e70 100644
--- a/plugins/talk-plugin-auth/client/stream/containers/UserBox.js
+++ b/plugins/talk-plugin-auth/client/stream/containers/UserBox.js
@@ -10,4 +10,7 @@ const mapStateToProps = state => ({
 
 const mapDispatchToProps = dispatch => bindActionCreators({ logout }, dispatch);
 
-export default connect(mapStateToProps, mapDispatchToProps)(UserBox);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(UserBox);
diff --git a/plugins/talk-plugin-author-menu/client/containers/AuthorName.js b/plugins/talk-plugin-author-menu/client/containers/AuthorName.js
index e385058c4..83a897ab6 100644
--- a/plugins/talk-plugin-author-menu/client/containers/AuthorName.js
+++ b/plugins/talk-plugin-author-menu/client/containers/AuthorName.js
@@ -122,7 +122,10 @@ const withAuthorNameFragments = withFragments({
 });
 
 const enhance = compose(
-  connect(mapStateToProps, mapDispatchToProps),
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  ),
   withAuthorNameFragments
 );
 
diff --git a/plugins/talk-plugin-deep-reply-count/index.js b/plugins/talk-plugin-deep-reply-count/index.js
index 4c06329a7..1f02d30e0 100644
--- a/plugins/talk-plugin-deep-reply-count/index.js
+++ b/plugins/talk-plugin-deep-reply-count/index.js
@@ -85,7 +85,13 @@ module.exports = {
   }),
   resolvers: {
     Comment: {
-      deepReplyCount({ id }, args, { loaders: { Comments } }) {
+      deepReplyCount(
+        { id },
+        args,
+        {
+          loaders: { Comments },
+        }
+      ) {
         return Comments.getDeepCount.load(id);
       },
     },
diff --git a/plugins/talk-plugin-facebook-auth/client/containers/FacebookButton.js b/plugins/talk-plugin-facebook-auth/client/containers/FacebookButton.js
index 8ae3ff01e..348c6cb61 100644
--- a/plugins/talk-plugin-facebook-auth/client/containers/FacebookButton.js
+++ b/plugins/talk-plugin-facebook-auth/client/containers/FacebookButton.js
@@ -6,4 +6,7 @@ import FacebookButton from '../components/FacebookButton';
 const mapDispatchToProps = dispatch =>
   bindActionCreators({ onClick: loginWithFacebook }, dispatch);
 
-export default connect(null, mapDispatchToProps)(FacebookButton);
+export default connect(
+  null,
+  mapDispatchToProps
+)(FacebookButton);
diff --git a/plugins/talk-plugin-facebook-auth/server/router.js b/plugins/talk-plugin-facebook-auth/server/router.js
index 10d2469da..4d72237d2 100644
--- a/plugins/talk-plugin-facebook-auth/server/router.js
+++ b/plugins/talk-plugin-facebook-auth/server/router.js
@@ -5,7 +5,11 @@ module.exports = router => {
    */
   router.get('/api/v1/auth/facebook', (req, res, next) => {
     const {
-      connectors: { services: { Passport: { passport } } },
+      connectors: {
+        services: {
+          Passport: { passport },
+        },
+      },
     } = req.context;
 
     return passport.authenticate('facebook', {
@@ -22,7 +26,9 @@ module.exports = router => {
   router.get('/api/v1/auth/facebook/callback', (req, res, next) => {
     const {
       connectors: {
-        services: { Passport: { passport, HandleAuthPopupCallback } },
+        services: {
+          Passport: { passport, HandleAuthPopupCallback },
+        },
       },
     } = req.context;
 
diff --git a/plugins/talk-plugin-featured-comments/client/containers/FeaturedDialog.js b/plugins/talk-plugin-featured-comments/client/containers/FeaturedDialog.js
index c3ad0a96d..b988f1a6c 100644
--- a/plugins/talk-plugin-featured-comments/client/containers/FeaturedDialog.js
+++ b/plugins/talk-plugin-featured-comments/client/containers/FeaturedDialog.js
@@ -19,7 +19,10 @@ const mapDispatchToProps = dispatch =>
   );
 
 const enhance = compose(
-  connect(mapStateToProps, mapDispatchToProps),
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  ),
   withTags('featured')
 );
 
diff --git a/plugins/talk-plugin-featured-comments/client/containers/ModActionButton.js b/plugins/talk-plugin-featured-comments/client/containers/ModActionButton.js
index 7c8f94fb3..b5302c73d 100644
--- a/plugins/talk-plugin-featured-comments/client/containers/ModActionButton.js
+++ b/plugins/talk-plugin-featured-comments/client/containers/ModActionButton.js
@@ -13,7 +13,10 @@ const mapDispatchToProps = dispatch =>
   );
 
 const enhance = compose(
-  connect(null, mapDispatchToProps),
+  connect(
+    null,
+    mapDispatchToProps
+  ),
   withTags('featured')
 );
 
diff --git a/plugins/talk-plugin-featured-comments/client/containers/ModIndicatorSubscription.js b/plugins/talk-plugin-featured-comments/client/containers/ModIndicatorSubscription.js
index a8153b49e..5780459dd 100644
--- a/plugins/talk-plugin-featured-comments/client/containers/ModIndicatorSubscription.js
+++ b/plugins/talk-plugin-featured-comments/client/containers/ModIndicatorSubscription.js
@@ -12,7 +12,13 @@ class ModIndicatorSubscription extends React.Component {
         document: COMMENT_FEATURED_SUBSCRIPTION,
         updateQuery: (
           prev,
-          { subscriptionData: { data: { commentFeatured: { comment } } } }
+          {
+            subscriptionData: {
+              data: {
+                commentFeatured: { comment },
+              },
+            },
+          }
         ) => {
           return this.props.handleCommentChange(prev, comment);
         },
@@ -21,7 +27,13 @@ class ModIndicatorSubscription extends React.Component {
         document: COMMENT_UNFEATURED_SUBSCRIPTION,
         updateQuery: (
           prev,
-          { subscriptionData: { data: { commentUnfeatured: { comment } } } }
+          {
+            subscriptionData: {
+              data: {
+                commentUnfeatured: { comment },
+              },
+            },
+          }
         ) => {
           return this.props.handleCommentChange(prev, comment);
         },
diff --git a/plugins/talk-plugin-featured-comments/client/containers/ModSubscription.js b/plugins/talk-plugin-featured-comments/client/containers/ModSubscription.js
index d91d69304..fa7d95ba6 100644
--- a/plugins/talk-plugin-featured-comments/client/containers/ModSubscription.js
+++ b/plugins/talk-plugin-featured-comments/client/containers/ModSubscription.js
@@ -28,7 +28,13 @@ class ModSubscription extends React.Component {
         },
         updateQuery: (
           prev,
-          { subscriptionData: { data: { commentFeatured: { user, comment } } } }
+          {
+            subscriptionData: {
+              data: {
+                commentFeatured: { user, comment },
+              },
+            },
+          }
         ) => {
           const notifyText =
             this.props.user.id === user.id
@@ -50,7 +56,9 @@ class ModSubscription extends React.Component {
           prev,
           {
             subscriptionData: {
-              data: { commentUnfeatured: { user, comment } },
+              data: {
+                commentUnfeatured: { user, comment },
+              },
             },
           }
         ) => {
@@ -117,7 +125,10 @@ const mapStateToProps = state => ({
 });
 
 export default compose(
-  connect(mapStateToProps, null),
+  connect(
+    mapStateToProps,
+    null
+  ),
   withVariables,
   withSubscribeToMore
 )(ModSubscription);
diff --git a/plugins/talk-plugin-featured-comments/client/containers/ModTag.js b/plugins/talk-plugin-featured-comments/client/containers/ModTag.js
index 42c653418..72a035ff4 100644
--- a/plugins/talk-plugin-featured-comments/client/containers/ModTag.js
+++ b/plugins/talk-plugin-featured-comments/client/containers/ModTag.js
@@ -22,7 +22,10 @@ const fragments = {
   `,
 };
 const enhance = compose(
-  connect(null, mapDispatchToProps),
+  connect(
+    null,
+    mapDispatchToProps
+  ),
   withTags('featured', { fragments })
 );
 
diff --git a/plugins/talk-plugin-featured-comments/client/containers/TabPane.js b/plugins/talk-plugin-featured-comments/client/containers/TabPane.js
index b3f44b429..59caa9af9 100644
--- a/plugins/talk-plugin-featured-comments/client/containers/TabPane.js
+++ b/plugins/talk-plugin-featured-comments/client/containers/TabPane.js
@@ -90,7 +90,10 @@ const mapDispatchToProps = dispatch =>
   );
 
 const enhance = compose(
-  connect(null, mapDispatchToProps),
+  connect(
+    null,
+    mapDispatchToProps
+  ),
   withFetchMore,
   withVariables,
   withFragments({
diff --git a/plugins/talk-plugin-featured-comments/index.js b/plugins/talk-plugin-featured-comments/index.js
index 6dd3114e1..27deb9c05 100644
--- a/plugins/talk-plugin-featured-comments/index.js
+++ b/plugins/talk-plugin-featured-comments/index.js
@@ -59,8 +59,14 @@ module.exports = {
       addTag: {
         async post(
           obj,
-          { tag: { name, id, item_type } },
-          { user, mutators: { Comment }, pubsub }
+          {
+            tag: { name, id, item_type },
+          },
+          {
+            user,
+            mutators: { Comment },
+            pubsub,
+          }
         ) {
           if (name === 'FEATURED' && item_type === 'COMMENTS') {
             const comment = await Comment.setStatus({
@@ -76,8 +82,14 @@ module.exports = {
       removeTag: {
         async post(
           obj,
-          { tag: { name, id, item_type } },
-          { user, loaders: { Comments }, pubsub }
+          {
+            tag: { name, id, item_type },
+          },
+          {
+            user,
+            loaders: { Comments },
+            pubsub,
+          }
         ) {
           if (name === 'FEATURED' && item_type === 'COMMENTS') {
             const comment = await Comments.get.load(id);
diff --git a/plugins/talk-plugin-flag-details/client/components/FlagDetails.js b/plugins/talk-plugin-flag-details/client/components/FlagDetails.js
index 7900f5b50..75871fb57 100644
--- a/plugins/talk-plugin-flag-details/client/components/FlagDetails.js
+++ b/plugins/talk-plugin-flag-details/client/components/FlagDetails.js
@@ -10,7 +10,12 @@ import {
 
 class FlagDetails extends Component {
   render() {
-    const { comment: { actions }, more, root, comment } = this.props;
+    const {
+      comment: { actions },
+      more,
+      root,
+      comment,
+    } = this.props;
 
     const flagActions =
       actions && actions.filter(a => a.__typename === 'FlagAction');
diff --git a/plugins/talk-plugin-flag-details/client/components/UserFlagDetails.js b/plugins/talk-plugin-flag-details/client/components/UserFlagDetails.js
index 30f83ad9d..9b9982882 100644
--- a/plugins/talk-plugin-flag-details/client/components/UserFlagDetails.js
+++ b/plugins/talk-plugin-flag-details/client/components/UserFlagDetails.js
@@ -5,7 +5,10 @@ import styles from './UserFlagDetails.css';
 
 class UserFlagDetails extends Component {
   render() {
-    const { comment: { actions }, viewUserDetail } = this.props;
+    const {
+      comment: { actions },
+      viewUserDetail,
+    } = this.props;
 
     const flagActions =
       actions && actions.filter(a => a.__typename === 'FlagAction');
diff --git a/plugins/talk-plugin-flag-details/client/containers/UserFlagDetails.js b/plugins/talk-plugin-flag-details/client/containers/UserFlagDetails.js
index 7dd867456..c52f15192 100644
--- a/plugins/talk-plugin-flag-details/client/containers/UserFlagDetails.js
+++ b/plugins/talk-plugin-flag-details/client/containers/UserFlagDetails.js
@@ -15,7 +15,10 @@ const mapDispatchToProps = dispatch => ({
 });
 
 const enhance = compose(
-  connect(null, mapDispatchToProps),
+  connect(
+    null,
+    mapDispatchToProps
+  ),
   withFragments({
     comment: gql`
       fragment CoralAdmin_UserFlagDetails_comment on Comment {
diff --git a/plugins/talk-plugin-google-auth/client/containers/GoogleButton.js b/plugins/talk-plugin-google-auth/client/containers/GoogleButton.js
index d1982e351..390f1a722 100644
--- a/plugins/talk-plugin-google-auth/client/containers/GoogleButton.js
+++ b/plugins/talk-plugin-google-auth/client/containers/GoogleButton.js
@@ -6,4 +6,7 @@ import GoogleButton from '../components/GoogleButton';
 const mapDispatchToProps = dispatch =>
   bindActionCreators({ onClick: loginWithGoogle }, dispatch);
 
-export default connect(null, mapDispatchToProps)(GoogleButton);
+export default connect(
+  null,
+  mapDispatchToProps
+)(GoogleButton);
diff --git a/plugins/talk-plugin-ignore-user/client/containers/IgnoreUserAction.js b/plugins/talk-plugin-ignore-user/client/containers/IgnoreUserAction.js
index 033be6ed6..b76ba8c3f 100644
--- a/plugins/talk-plugin-ignore-user/client/containers/IgnoreUserAction.js
+++ b/plugins/talk-plugin-ignore-user/client/containers/IgnoreUserAction.js
@@ -45,7 +45,10 @@ const withIgnoreUserActionFragments = withFragments({
 });
 
 const enhance = compose(
-  connect(null, mapDispatchToProps),
+  connect(
+    null,
+    mapDispatchToProps
+  ),
   withIgnoreUserActionFragments,
   excludeIf(({ root: { me }, comment }) => !me || me.id === comment.user.id)
 );
diff --git a/plugins/talk-plugin-ignore-user/client/containers/IgnoreUserConfirmation.js b/plugins/talk-plugin-ignore-user/client/containers/IgnoreUserConfirmation.js
index efd4cd366..a4d39e4df 100644
--- a/plugins/talk-plugin-ignore-user/client/containers/IgnoreUserConfirmation.js
+++ b/plugins/talk-plugin-ignore-user/client/containers/IgnoreUserConfirmation.js
@@ -65,7 +65,10 @@ const withIgnoreUserConfirmationFragments = withFragments({
 });
 
 const enhance = compose(
-  connect(null, mapDispatchToProps),
+  connect(
+    null,
+    mapDispatchToProps
+  ),
   withIgnoreUserConfirmationFragments,
   withIgnoreUser
 );
diff --git a/plugins/talk-plugin-ignore-user/client/containers/IgnoredUserSection.js b/plugins/talk-plugin-ignore-user/client/containers/IgnoredUserSection.js
index 36bb477c4..91075f20a 100644
--- a/plugins/talk-plugin-ignore-user/client/containers/IgnoredUserSection.js
+++ b/plugins/talk-plugin-ignore-user/client/containers/IgnoredUserSection.js
@@ -37,6 +37,9 @@ const withIgnoredUserSectionFragments = withFragments({
   `,
 });
 
-const enhance = compose(withIgnoredUserSectionFragments, withStopIgnoringUser);
+const enhance = compose(
+  withIgnoredUserSectionFragments,
+  withStopIgnoringUser
+);
 
 export default enhance(IgnoredUserSectionContainer);
diff --git a/plugins/talk-plugin-local-auth/client/components/AddEmailAddressDialog.js b/plugins/talk-plugin-local-auth/client/components/AddEmailAddressDialog.js
index a5bfd7096..00912fdfd 100644
--- a/plugins/talk-plugin-local-auth/client/components/AddEmailAddressDialog.js
+++ b/plugins/talk-plugin-local-auth/client/components/AddEmailAddressDialog.js
@@ -142,7 +142,9 @@ class AddEmailAddressDialog extends React.Component {
 
   render() {
     const { errors, formData, showErrors, step } = this.state;
-    const { root: { settings } } = this.props;
+    const {
+      root: { settings },
+    } = this.props;
 
     return (
       <Dialog className={styles.dialog} open={true}>
diff --git a/plugins/talk-plugin-local-auth/client/components/ChangePassword.js b/plugins/talk-plugin-local-auth/client/components/ChangePassword.js
index cae112203..1434543bf 100644
--- a/plugins/talk-plugin-local-auth/client/components/ChangePassword.js
+++ b/plugins/talk-plugin-local-auth/client/components/ChangePassword.js
@@ -135,7 +135,11 @@ class ChangePassword extends React.Component {
   };
 
   onForgotPassword = async () => {
-    const { root: { me: { email } } } = this.props;
+    const {
+      root: {
+        me: { email },
+      },
+    } = this.props;
 
     try {
       await this.props.forgotPassword(email);
diff --git a/plugins/talk-plugin-local-auth/client/components/Profile.js b/plugins/talk-plugin-local-auth/client/components/Profile.js
index caa09543b..139949b99 100644
--- a/plugins/talk-plugin-local-auth/client/components/Profile.js
+++ b/plugins/talk-plugin-local-auth/client/components/Profile.js
@@ -114,7 +114,11 @@ class Profile extends React.Component {
 
   isSaveEnabled = () => {
     const { formData } = this.state;
-    const { root: { me: { username, email } } } = this.props;
+    const {
+      root: {
+        me: { username, email },
+      },
+    } = this.props;
     const formHasErrors = !!Object.keys(this.state.errors).length;
     const validUsername =
       formData.newUsername && formData.newUsername !== username;
@@ -166,7 +170,13 @@ class Profile extends React.Component {
 
   render() {
     const {
-      root: { me: { username, email, state: { status } } },
+      root: {
+        me: {
+          username,
+          email,
+          state: { status },
+        },
+      },
       notify,
     } = this.props;
     const { editing, formData, showDialog } = this.state;
diff --git a/plugins/talk-plugin-local-auth/client/containers/AddEmailAddressDialog.js b/plugins/talk-plugin-local-auth/client/containers/AddEmailAddressDialog.js
index f6de3b39c..695acb8c9 100644
--- a/plugins/talk-plugin-local-auth/client/containers/AddEmailAddressDialog.js
+++ b/plugins/talk-plugin-local-auth/client/containers/AddEmailAddressDialog.js
@@ -36,7 +36,10 @@ const withData = withFragments({
 });
 
 export default compose(
-  connect(mapStateToProps, mapDispatchToProps),
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  ),
   withAttachLocalAuth,
   withData,
   excludeIf(
diff --git a/plugins/talk-plugin-local-auth/client/containers/ChangePassword.js b/plugins/talk-plugin-local-auth/client/containers/ChangePassword.js
index 11bd5c5fb..3c3d5025e 100644
--- a/plugins/talk-plugin-local-auth/client/containers/ChangePassword.js
+++ b/plugins/talk-plugin-local-auth/client/containers/ChangePassword.js
@@ -21,7 +21,10 @@ const withData = withFragments({
 });
 
 export default compose(
-  connect(null, mapDispatchToProps),
+  connect(
+    null,
+    mapDispatchToProps
+  ),
   withChangePassword,
   withForgotPassword,
   withData
diff --git a/plugins/talk-plugin-local-auth/client/containers/Profile.js b/plugins/talk-plugin-local-auth/client/containers/Profile.js
index ccfca72ae..d86d8cc9d 100644
--- a/plugins/talk-plugin-local-auth/client/containers/Profile.js
+++ b/plugins/talk-plugin-local-auth/client/containers/Profile.js
@@ -32,7 +32,10 @@ const withData = withFragments({
 });
 
 export default compose(
-  connect(null, mapDispatchToProps),
+  connect(
+    null,
+    mapDispatchToProps
+  ),
   withSetUsername,
   withUpdateEmailAddress,
   withData
diff --git a/plugins/talk-plugin-local-auth/server/mutators.js b/plugins/talk-plugin-local-auth/server/mutators.js
index 7049cd546..044371688 100644
--- a/plugins/talk-plugin-local-auth/server/mutators.js
+++ b/plugins/talk-plugin-local-auth/server/mutators.js
@@ -18,7 +18,10 @@ async function updateUserEmailAddress(ctx, email, confirmPassword) {
   const {
     user,
     loaders: { Settings },
-    connectors: { models: { User }, services: { Mailer, I18n, Users } },
+    connectors: {
+      models: { User },
+      services: { Mailer, I18n, Users },
+    },
   } = ctx;
 
   // Ensure that the user has a local profile associated with their account.
@@ -27,7 +30,7 @@ async function updateUserEmailAddress(ctx, email, confirmPassword) {
   }
 
   // Ensure that the password provided matches what we have on file.
-  if (!await user.verifyPassword(confirmPassword)) {
+  if (!(await user.verifyPassword(confirmPassword))) {
     throw new ErrIncorrectPassword();
   }
 
@@ -81,7 +84,13 @@ async function updateUserEmailAddress(ctx, email, confirmPassword) {
 
 // attachUserLocalAuth will attach a new local profile to an existing user.
 async function attachUserLocalAuth(ctx, email, password) {
-  const { user, connectors: { models: { User }, services: { Users } } } = ctx;
+  const {
+    user,
+    connectors: {
+      models: { User },
+      services: { Users },
+    },
+  } = ctx;
 
   // Ensure that the current user doesn't already have a local account
   // associated with them.
diff --git a/plugins/talk-plugin-moderation-actions/client/containers/BanUserAction.js b/plugins/talk-plugin-moderation-actions/client/containers/BanUserAction.js
index c5fdb1e32..e91f4dabc 100644
--- a/plugins/talk-plugin-moderation-actions/client/containers/BanUserAction.js
+++ b/plugins/talk-plugin-moderation-actions/client/containers/BanUserAction.js
@@ -15,7 +15,10 @@ class BanUserActionContainer extends React.Component {
   };
 
   render() {
-    const { root: { me }, comment } = this.props;
+    const {
+      root: { me },
+      comment,
+    } = this.props;
     return me.id !== comment.user.id ? (
       <BanUserAction onBanUser={this.onBanUser} comment={this.props.comment} />
     ) : null;
@@ -30,6 +33,11 @@ const mapDispatchToProps = dispatch =>
     dispatch
   );
 
-const enhance = compose(connect(null, mapDispatchToProps));
+const enhance = compose(
+  connect(
+    null,
+    mapDispatchToProps
+  )
+);
 
 export default enhance(BanUserActionContainer);
diff --git a/plugins/talk-plugin-moderation-actions/client/containers/BanUserDialog.js b/plugins/talk-plugin-moderation-actions/client/containers/BanUserDialog.js
index 8dd3cce7d..bb7dc590b 100644
--- a/plugins/talk-plugin-moderation-actions/client/containers/BanUserDialog.js
+++ b/plugins/talk-plugin-moderation-actions/client/containers/BanUserDialog.js
@@ -70,7 +70,10 @@ const mapDispatchToProps = dispatch =>
   );
 
 const enhance = compose(
-  connect(mapStateToProps, mapDispatchToProps),
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  ),
   withSetCommentStatus,
   withBanUser
 );
diff --git a/plugins/talk-plugin-moderation-actions/client/containers/ModerationActions.js b/plugins/talk-plugin-moderation-actions/client/containers/ModerationActions.js
index 891d248ce..f365a8a80 100644
--- a/plugins/talk-plugin-moderation-actions/client/containers/ModerationActions.js
+++ b/plugins/talk-plugin-moderation-actions/client/containers/ModerationActions.js
@@ -68,7 +68,10 @@ const mapDispatchToProps = dispatch =>
   );
 
 const enhance = compose(
-  connect(mapStateToProps, mapDispatchToProps),
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  ),
   withFragments({
     root: gql`
       fragment TalkModerationActions_root on RootQuery {
diff --git a/plugins/talk-plugin-notifications/client/api/hocs/withSettingsToggle.js b/plugins/talk-plugin-notifications/client/api/hocs/withSettingsToggle.js
index fc7b1bac6..95306da99 100644
--- a/plugins/talk-plugin-notifications/client/api/hocs/withSettingsToggle.js
+++ b/plugins/talk-plugin-notifications/client/api/hocs/withSettingsToggle.js
@@ -73,7 +73,11 @@ const withSettingsToggle = settingsName => {
     mutations: {
       UpdateNotificationSettings: ({
         variables: { input },
-        state: { auth: { user: { id } } },
+        state: {
+          auth: {
+            user: { id },
+          },
+        },
       }) => ({
         update: proxy => {
           if (input[settingsName] === undefined) {
diff --git a/plugins/talk-plugin-notifications/client/graphql.js b/plugins/talk-plugin-notifications/client/graphql.js
index e99bc6a83..3759ac99e 100644
--- a/plugins/talk-plugin-notifications/client/graphql.js
+++ b/plugins/talk-plugin-notifications/client/graphql.js
@@ -13,7 +13,11 @@ export default {
   mutations: {
     UpdateNotificationSettings: ({
       variables: { input },
-      state: { auth: { user: { id } } },
+      state: {
+        auth: {
+          user: { id },
+        },
+      },
     }) => ({
       optimisticResponse: {
         updateNotificationSettings: {
diff --git a/plugins/talk-plugin-notifications/server/NotificationManager.js b/plugins/talk-plugin-notifications/server/NotificationManager.js
index 63af8efdb..03358ed42 100644
--- a/plugins/talk-plugin-notifications/server/NotificationManager.js
+++ b/plugins/talk-plugin-notifications/server/NotificationManager.js
@@ -116,7 +116,12 @@ class NotificationManager {
       try {
         // Pull out some useful tools.
         const {
-          connectors: { models: { User }, services: { I18n: { t } } },
+          connectors: {
+            models: { User },
+            services: {
+              I18n: { t },
+            },
+          },
         } = ctx;
 
         const organizationName = await getOrganizationName(ctx);
diff --git a/plugins/talk-plugin-notifications/server/connect.js b/plugins/talk-plugin-notifications/server/connect.js
index 86ed81871..26c5637e9 100644
--- a/plugins/talk-plugin-notifications/server/connect.js
+++ b/plugins/talk-plugin-notifications/server/connect.js
@@ -6,7 +6,10 @@ const { map, reduce } = require('lodash');
 
 module.exports = connectors => {
   const {
-    graph: { subscriptions: { getBroker }, Context },
+    graph: {
+      subscriptions: { getBroker },
+      Context,
+    },
     services: { Mailer, Plugins },
   } = connectors;
 
diff --git a/plugins/talk-plugin-notifications/server/messages.js b/plugins/talk-plugin-notifications/server/messages.js
index 0ba9ee70b..fc7b159ea 100644
--- a/plugins/talk-plugin-notifications/server/messages.js
+++ b/plugins/talk-plugin-notifications/server/messages.js
@@ -37,7 +37,11 @@ const queueNotifications = async (ctx, userID, notifications) => {
   );
 
   // Pull out some useful tools.
-  const { connectors: { models: { User } } } = ctx;
+  const {
+    connectors: {
+      models: { User },
+    },
+  } = ctx;
 
   ctx.log.info(
     { notifications: notifications.length, userID },
@@ -67,7 +71,13 @@ const sendNotificationsBatch = async (ctx, notifications) => {
     map(
       notifications,
       async ({ handler, notification: { userID, context } }) => {
-        const { connectors: { services: { I18n: { t } } } } = ctx;
+        const {
+          connectors: {
+            services: {
+              I18n: { t },
+            },
+          },
+        } = ctx;
         const { category } = handler;
 
         // Compose the subject for the email.
@@ -181,7 +191,9 @@ const USER_CONFIRMATION_QUERY = `
 // returns undefined.
 const filterVerifiedNotification = ctx => async notification => {
   // Grab the user that we're supposed to be sending the notification to.
-  const { notification: { userID } } = notification;
+  const {
+    notification: { userID },
+  } = notification;
 
   // Check their confirmed status. This should have already been hit by the
   // loaders, so we shouldn't make any more database requests.
diff --git a/plugins/talk-plugin-notifications/server/mutators.js b/plugins/talk-plugin-notifications/server/mutators.js
index 46954faa5..f35fe21e4 100644
--- a/plugins/talk-plugin-notifications/server/mutators.js
+++ b/plugins/talk-plugin-notifications/server/mutators.js
@@ -15,7 +15,12 @@ function reduceSettings(newSettings, newValue, key) {
  * Update the user notification settings.
  */
 async function updateNotificationSettings(ctx, settings) {
-  const { connectors: { models: { User } }, user } = ctx;
+  const {
+    connectors: {
+      models: { User },
+    },
+    user,
+  } = ctx;
 
   // Generate the settings set object, and just exit if we haven't changed
   // anything.
@@ -29,7 +34,9 @@ async function updateNotificationSettings(ctx, settings) {
 }
 
 module.exports = ctx => {
-  const { connectors: { errors: ErrNotAuthorized } } = ctx;
+  const {
+    connectors: { errors: ErrNotAuthorized },
+  } = ctx;
 
   let mutators = {
     User: {
diff --git a/plugins/talk-plugin-notifications/server/resolvers.js b/plugins/talk-plugin-notifications/server/resolvers.js
index 58fd8b3e4..0ea33c0ac 100644
--- a/plugins/talk-plugin-notifications/server/resolvers.js
+++ b/plugins/talk-plugin-notifications/server/resolvers.js
@@ -16,7 +16,13 @@ module.exports = {
     digestFrequency: settings => get(settings, 'digestFrequency', 'NONE'),
   },
   RootMutation: {
-    async updateNotificationSettings(obj, { input }, { mutators: { User } }) {
+    async updateNotificationSettings(
+      obj,
+      { input },
+      {
+        mutators: { User },
+      }
+    ) {
       await User.updateNotificationSettings(input);
     },
   },
diff --git a/plugins/talk-plugin-notifications/server/router.js b/plugins/talk-plugin-notifications/server/router.js
index 9185c5aba..dd2a916a0 100644
--- a/plugins/talk-plugin-notifications/server/router.js
+++ b/plugins/talk-plugin-notifications/server/router.js
@@ -12,7 +12,10 @@ module.exports = router => {
    */
   const verifyToken = (req, res, next) => {
     const {
-      connectors: { secrets: { jwt }, config: { JWT_ISSUER, JWT_AUDIENCE } },
+      connectors: {
+        secrets: { jwt },
+        config: { JWT_ISSUER, JWT_AUDIENCE },
+      },
     } = req.context;
     const { token: tokenString = '' } = req.body;
     if (!tokenString) {
@@ -50,7 +53,11 @@ module.exports = router => {
     '/api/v1/account/unsubscribe-notifications',
     verifyToken,
     async (req, res, next) => {
-      const { connectors: { models: { User } } } = req.context;
+      const {
+        connectors: {
+          models: { User },
+        },
+      } = req.context;
       const { user: userID } = req.token;
 
       try {
diff --git a/plugins/talk-plugin-notifications/server/util.js b/plugins/talk-plugin-notifications/server/util.js
index bbebef4b2..31a2034b5 100644
--- a/plugins/talk-plugin-notifications/server/util.js
+++ b/plugins/talk-plugin-notifications/server/util.js
@@ -1,6 +1,8 @@
 const getOrganizationName = async ctx => {
   // Grab some useful tools.
-  const { loaders: { Settings } } = ctx;
+  const {
+    loaders: { Settings },
+  } = ctx;
 
   // Get the settings.
   const { organizationName = null } = await Settings.select('organizationName');
@@ -16,7 +18,13 @@ const getOrganizationName = async ctx => {
  * @param {Mixed} context the notification context
  */
 const getNotificationBody = async (ctx, handler, context) => {
-  const { connectors: { services: { I18n: { t } } } } = ctx;
+  const {
+    connectors: {
+      services: {
+        I18n: { t },
+      },
+    },
+  } = ctx;
   const { category, hydrate = () => [] } = handler;
 
   // Get the body replacement variables for the translation key.
diff --git a/plugins/talk-plugin-offtopic/client/containers/OffTopicFilter.js b/plugins/talk-plugin-offtopic/client/containers/OffTopicFilter.js
index b63cfb13e..9a4870b0b 100644
--- a/plugins/talk-plugin-offtopic/client/containers/OffTopicFilter.js
+++ b/plugins/talk-plugin-offtopic/client/containers/OffTopicFilter.js
@@ -23,4 +23,7 @@ const mapDispatchToProps = dispatch =>
     dispatch
   );
 
-export default connect(mapStateToProps, mapDispatchToProps)(OffTopicFilter);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(OffTopicFilter);
diff --git a/plugins/talk-plugin-profile-data/client/components/AccountDeletionRequestedSign.js b/plugins/talk-plugin-profile-data/client/components/AccountDeletionRequestedSign.js
index f0e7be8f3..1728e8ff9 100644
--- a/plugins/talk-plugin-profile-data/client/components/AccountDeletionRequestedSign.js
+++ b/plugins/talk-plugin-profile-data/client/components/AccountDeletionRequestedSign.js
@@ -20,7 +20,9 @@ class AccountDeletionRequestedSign extends React.Component {
   };
 
   render() {
-    const { me: { scheduledDeletionDate } } = this.props.root;
+    const {
+      me: { scheduledDeletionDate },
+    } = this.props.root;
 
     const deletionScheduledFor = moment(scheduledDeletionDate).format(
       'MMM Do YYYY, h:mm a'
diff --git a/plugins/talk-plugin-profile-data/client/components/DownloadCommentHistory.js b/plugins/talk-plugin-profile-data/client/components/DownloadCommentHistory.js
index 7af15b774..17aa10264 100644
--- a/plugins/talk-plugin-profile-data/client/components/DownloadCommentHistory.js
+++ b/plugins/talk-plugin-profile-data/client/components/DownloadCommentHistory.js
@@ -36,7 +36,11 @@ class DownloadCommentHistory extends Component {
   };
 
   render() {
-    const { root: { me: { lastAccountDownload } } } = this.props;
+    const {
+      root: {
+        me: { lastAccountDownload },
+      },
+    } = this.props;
 
     const now = new Date();
     const lastAccountDownloadDate =
diff --git a/plugins/talk-plugin-profile-data/client/containers/AccountDeletionRequestedSign.js b/plugins/talk-plugin-profile-data/client/containers/AccountDeletionRequestedSign.js
index ff54198dd..4b3c830e1 100644
--- a/plugins/talk-plugin-profile-data/client/containers/AccountDeletionRequestedSign.js
+++ b/plugins/talk-plugin-profile-data/client/containers/AccountDeletionRequestedSign.js
@@ -18,7 +18,10 @@ const withData = withFragments({
 });
 
 export default compose(
-  connect(null, mapDispatchToProps),
+  connect(
+    null,
+    mapDispatchToProps
+  ),
   withCancelAccountDeletion,
   withData,
   excludeIf(({ root: { me } }) => !me || !me.scheduledDeletionDate)
diff --git a/plugins/talk-plugin-profile-data/client/containers/DeleteMyAccount.js b/plugins/talk-plugin-profile-data/client/containers/DeleteMyAccount.js
index ac244d8b8..8e655c298 100644
--- a/plugins/talk-plugin-profile-data/client/containers/DeleteMyAccount.js
+++ b/plugins/talk-plugin-profile-data/client/containers/DeleteMyAccount.js
@@ -21,7 +21,10 @@ const withData = withFragments({
 });
 
 export default compose(
-  connect(null, mapDispatchToProps),
+  connect(
+    null,
+    mapDispatchToProps
+  ),
   withRequestAccountDeletion,
   withCancelAccountDeletion,
   withData
diff --git a/plugins/talk-plugin-profile-data/client/containers/DownloadCommentHistory.js b/plugins/talk-plugin-profile-data/client/containers/DownloadCommentHistory.js
index 1716de983..7d91164d4 100644
--- a/plugins/talk-plugin-profile-data/client/containers/DownloadCommentHistory.js
+++ b/plugins/talk-plugin-profile-data/client/containers/DownloadCommentHistory.js
@@ -28,7 +28,10 @@ class DownloadCommentHistoryContainer extends Component {
 const mapDispatchToProps = dispatch => bindActionCreators({ notify }, dispatch);
 
 const enhance = compose(
-  connect(null, mapDispatchToProps),
+  connect(
+    null,
+    mapDispatchToProps
+  ),
   withFragments({
     root: gql`
       fragment TalkDownloadCommentHistory_DownloadCommentHistorySection_root on RootQuery {
diff --git a/plugins/talk-plugin-profile-data/server/connect.js b/plugins/talk-plugin-profile-data/server/connect.js
index 676d67176..60fe0eabb 100644
--- a/plugins/talk-plugin-profile-data/server/connect.js
+++ b/plugins/talk-plugin-profile-data/server/connect.js
@@ -32,7 +32,9 @@ module.exports = connectors => {
 
       try {
         // Grab some settings.
-        const { loaders: { Settings } } = ctx;
+        const {
+          loaders: { Settings },
+        } = ctx;
         const {
           organizationName,
           organizationContactEmail,
diff --git a/plugins/talk-plugin-profile-data/server/mutators.js b/plugins/talk-plugin-profile-data/server/mutators.js
index 4a1e97791..07cf9a492 100644
--- a/plugins/talk-plugin-profile-data/server/mutators.js
+++ b/plugins/talk-plugin-profile-data/server/mutators.js
@@ -16,7 +16,12 @@ const {
 // generateDownloadLinks will generate a signed set of links for a given user to
 // download an archive of their data.
 async function generateDownloadLinks(ctx, userID) {
-  const { connectors: { url: { BASE_URL }, secrets } } = ctx;
+  const {
+    connectors: {
+      url: { BASE_URL },
+      secrets,
+    },
+  } = ctx;
 
   // Generate a token for the download link.
   const token = await secrets.jwt.sign(
@@ -42,7 +47,10 @@ async function sendDownloadLink(ctx) {
   const {
     user,
     loaders: { Settings },
-    connectors: { services: { Users, I18n, Limit }, models: { User } },
+    connectors: {
+      services: { Users, I18n, Limit },
+      models: { User },
+    },
   } = ctx;
 
   // downloadLinkLimiter can be used to limit downloads for the user's data to
@@ -107,7 +115,10 @@ async function sendDownloadLink(ctx) {
 async function requestDeletion({
   user,
   loaders: { Settings },
-  connectors: { models: { User }, services: { Users, I18n } },
+  connectors: {
+    models: { User },
+    services: { Users, I18n },
+  },
 }) {
   // Ensure the user doesn't already have a deletion scheduled.
   if (get(user, 'metadata.scheduledDeletionDate')) {
@@ -153,7 +164,10 @@ async function requestDeletion({
 async function cancelDeletion({
   user,
   loaders: { Settings },
-  connectors: { models: { User }, services: { I18n, Users } },
+  connectors: {
+    models: { User },
+    services: { I18n, Users },
+  },
 }) {
   // Ensure the user has a deletion scheduled.
   const scheduledDeletionDate = get(
diff --git a/plugins/talk-plugin-profile-data/server/router.js b/plugins/talk-plugin-profile-data/server/router.js
index 6bd165e64..19dd69897 100644
--- a/plugins/talk-plugin-profile-data/server/router.js
+++ b/plugins/talk-plugin-profile-data/server/router.js
@@ -8,7 +8,11 @@ const stringify = require('csv-stringify');
 const { ErrDownloadToken } = require('./errors');
 
 async function verifyDownloadToken(
-  { connectors: { services: { Users } } },
+  {
+    connectors: {
+      services: { Users },
+    },
+  },
   token
 ) {
   const jwt = await Users.verifyToken(token, {
@@ -139,7 +143,12 @@ module.exports = router => {
         return;
       }
 
-      const { connectors: { graph: { Context }, errors } } = req.context;
+      const {
+        connectors: {
+          graph: { Context },
+          errors,
+        },
+      } = req.context;
 
       try {
         // Pull the userID and the date that the token was issued out of the
diff --git a/plugins/talk-plugin-slack-notifications/server/hooks.js b/plugins/talk-plugin-slack-notifications/server/hooks.js
index 4133f795d..57c137e02 100644
--- a/plugins/talk-plugin-slack-notifications/server/hooks.js
+++ b/plugins/talk-plugin-slack-notifications/server/hooks.js
@@ -12,7 +12,9 @@ module.exports = {
     createComment: {
       async post(root, args, context, info, result) {
         debug(`Posting notification to Slack webhook: ${SLACK_WEBHOOK_URL}`);
-        const { comment: { body: text, created_at: createdAt } } = result;
+        const {
+          comment: { body: text, created_at: createdAt },
+        } = result;
         const username = context.user.username;
         process.nextTick(async () => {
           const response = await fetch(SLACK_WEBHOOK_URL, {
diff --git a/plugins/talk-plugin-toxic-comments/client/containers/CheckToxicityHook.js b/plugins/talk-plugin-toxic-comments/client/containers/CheckToxicityHook.js
index 82322b112..dd888a63c 100644
--- a/plugins/talk-plugin-toxic-comments/client/containers/CheckToxicityHook.js
+++ b/plugins/talk-plugin-toxic-comments/client/containers/CheckToxicityHook.js
@@ -5,4 +5,7 @@ import CheckToxicityHook from '../components/CheckToxicityHook';
 
 const mapDispatchToProps = dispatch => bindActionCreators({ notify }, dispatch);
 
-export default connect(null, mapDispatchToProps)(CheckToxicityHook);
+export default connect(
+  null,
+  mapDispatchToProps
+)(CheckToxicityHook);
diff --git a/plugins/talk-plugin-viewing-options/client/containers/ViewingOptions.js b/plugins/talk-plugin-viewing-options/client/containers/ViewingOptions.js
index 0e1919383..9a7069681 100644
--- a/plugins/talk-plugin-viewing-options/client/containers/ViewingOptions.js
+++ b/plugins/talk-plugin-viewing-options/client/containers/ViewingOptions.js
@@ -29,7 +29,10 @@ const withViewingOptionsFragments = withFragments({
 });
 
 const enhance = compose(
-  connect(mapStateToProps, mapDispatchToProps),
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  ),
   withViewingOptionsFragments,
   mapProps(({ root, asset, ...rest }) => ({
     slotPassthrough: {
diff --git a/routes/api/v1/setup.js b/routes/api/v1/setup.js
index 553e42f44..14039f329 100644
--- a/routes/api/v1/setup.js
+++ b/routes/api/v1/setup.js
@@ -18,7 +18,10 @@ router.post('/', async (req, res, next) => {
     return next(e);
   }
 
-  const { settings, user: { email, password, username } } = req.body;
+  const {
+    settings,
+    user: { email, password, username },
+  } = req.body;
 
   try {
     await SetupService.setup(req.context, {
diff --git a/services/migration/helpers.js b/services/migration/helpers.js
index 49acc78aa..35f0db916 100644
--- a/services/migration/helpers.js
+++ b/services/migration/helpers.js
@@ -27,7 +27,7 @@ const processUpdates = async (model, updates) => {
 const debugProcessStatistics = (count, totalCount) => {
   if (totalCount > 0) {
     debug(
-      `processed ${(count / totalCount * 100).toFixed(
+      `processed ${((count / totalCount) * 100).toFixed(
         2
       )}% (${count}/${totalCount}) updates`
     );
diff --git a/services/migration/index.js b/services/migration/index.js
index e0da3cddf..af31c44e2 100644
--- a/services/migration/index.js
+++ b/services/migration/index.js
@@ -7,7 +7,11 @@ const debug = require('debug')('talk:services:migration');
 const sc = require('snake-case');
 const helpers = require('./helpers');
 const { stripIndent } = require('common-tags');
-const { talk: { migration: { minVersion } } } = require('../../package.json');
+const {
+  talk: {
+    migration: { minVersion },
+  },
+} = require('../../package.json');
 
 const migrationTemplate = stripIndent`
   module.exports = {
diff --git a/services/moderation/index.js b/services/moderation/index.js
index cc3a74a73..20412072f 100644
--- a/services/moderation/index.js
+++ b/services/moderation/index.js
@@ -82,7 +82,9 @@ const compose = phases => async (ctx, comment, options) => {
  * @param {Object} comment comment object to use
  */
 const fetchOptions = async (ctx, comment) => {
-  const { loaders: { Settings, Assets } } = ctx;
+  const {
+    loaders: { Settings, Assets },
+  } = ctx;
 
   // Load the settings.
   const settings = await Settings.load();
diff --git a/services/moderation/phases/commentLength.js b/services/moderation/phases/commentLength.js
index e19198ef1..bc199b86a 100644
--- a/services/moderation/phases/commentLength.js
+++ b/services/moderation/phases/commentLength.js
@@ -4,7 +4,11 @@ const { ErrCommentTooShort } = require('../../../errors');
 module.exports = (
   ctx,
   comment,
-  { asset: { settings: { charCountEnable, charCount } } }
+  {
+    asset: {
+      settings: { charCountEnable, charCount },
+    },
+  }
 ) => {
   // Check to see if the body is too short, if it is, then complain about it!
   if (comment.body.length < 2) {
diff --git a/services/moderation/phases/karma.js b/services/moderation/phases/karma.js
index 7a929824b..64f674266 100644
--- a/services/moderation/phases/karma.js
+++ b/services/moderation/phases/karma.js
@@ -3,7 +3,11 @@ const get = require('lodash/get');
 // This phase checks to see if the user making the comment is allowed to do so
 // considering their reliability (Trust) status.
 module.exports = ctx => {
-  const { connectors: { services: { Karma } } } = ctx;
+  const {
+    connectors: {
+      services: { Karma },
+    },
+  } = ctx;
   const trust = get(ctx, 'user.metadata.trust', null);
 
   // If the user is not a reliable commenter (passed the unreliability
diff --git a/services/moderation/phases/links.js b/services/moderation/phases/links.js
index 0aed4ecd9..ec05834b6 100644
--- a/services/moderation/phases/links.js
+++ b/services/moderation/phases/links.js
@@ -5,7 +5,11 @@ const linkify = require('linkify-it')().tlds(require('tlds'));
 module.exports = (
   ctx,
   comment,
-  { asset: { settings: { premodLinksEnable } } }
+  {
+    asset: {
+      settings: { premodLinksEnable },
+    },
+  }
 ) => {
   if (premodLinksEnable && linkify.test(comment.body)) {
     // Add the flag related to Trust to the comment.
diff --git a/services/moderation/phases/premod.js b/services/moderation/phases/premod.js
index cbd3627b1..db1a3fd1b 100644
--- a/services/moderation/phases/premod.js
+++ b/services/moderation/phases/premod.js
@@ -1,6 +1,14 @@
 // This phase checks to see if the settings have premod enabled, if they do,
 // the comment is premod, otherwise, it's just none.
-module.exports = (ctx, comment, { asset: { settings: { moderation } } }) => {
+module.exports = (
+  ctx,
+  comment,
+  {
+    asset: {
+      settings: { moderation },
+    },
+  }
+) => {
   // If the settings say that we're in premod mode, then the comment is in
   // premod status.
   if (moderation === 'PRE') {
diff --git a/services/moderation/phases/wordlist.js b/services/moderation/phases/wordlist.js
index b71e0361e..769e893f1 100644
--- a/services/moderation/phases/wordlist.js
+++ b/services/moderation/phases/wordlist.js
@@ -2,7 +2,11 @@ const { DISABLE_AUTOFLAG_SUSPECT_WORDS } = require('../../../config');
 
 // This phase checks the comment against the wordlist.
 module.exports = async (ctx, comment, { settings }) => {
-  const { connectors: { services: { Wordlist } } } = ctx;
+  const {
+    connectors: {
+      services: { Wordlist },
+    },
+  } = ctx;
 
   // Create a new instance of the Wordlist.
   const wl = new Wordlist();
diff --git a/services/mongoose.js b/services/mongoose.js
index f6615ad39..db72eedec 100644
--- a/services/mongoose.js
+++ b/services/mongoose.js
@@ -44,11 +44,14 @@ if (WEBPACK) {
 
   // Connect to the Mongo instance.
   mongoose
-    .connect(MONGO_URL, {
-      config: {
-        autoIndex: CREATE_MONGO_INDEXES,
-      },
-    })
+    .connect(
+      MONGO_URL,
+      {
+        config: {
+          autoIndex: CREATE_MONGO_INDEXES,
+        },
+      }
+    )
     .catch(err => {
       console.error(err);
       process.exit(1);
diff --git a/services/setup.js b/services/setup.js
index a691550ef..126f31f0f 100644
--- a/services/setup.js
+++ b/services/setup.js
@@ -66,7 +66,13 @@ module.exports = class SetupService {
   /**
    * This will perform the setup.
    */
-  static async setup(ctx, { settings, user: { email, password, username } }) {
+  static async setup(
+    ctx,
+    {
+      settings,
+      user: { email, password, username },
+    }
+  ) {
     // Validate the settings first.
     await SetupService.validate({
       settings,
diff --git a/test/e2e/specs/01_install.js b/test/e2e/specs/01_install.js
index 91f08f7af..5cdfb3380 100644
--- a/test/e2e/specs/01_install.js
+++ b/test/e2e/specs/01_install.js
@@ -57,7 +57,9 @@ module.exports = {
   },
   'User fills step 3': client => {
     const step3 = client.page.install().section.step3;
-    const { testData: { admin } } = client.globals;
+    const {
+      testData: { admin },
+    } = client.globals;
 
     step3
       .setValue('@emailInput', admin.email)
diff --git a/test/e2e/specs/02_admin.js b/test/e2e/specs/02_admin.js
index 844e653fe..5acfd83f6 100644
--- a/test/e2e/specs/02_admin.js
+++ b/test/e2e/specs/02_admin.js
@@ -22,7 +22,9 @@ module.exports = {
 
   'Admin logs in': client => {
     const adminPage = client.page.admin();
-    const { testData: { admin } } = client.globals;
+    const {
+      testData: { admin },
+    } = client.globals;
 
     adminPage.navigateAndLogin(admin);
   },
diff --git a/test/e2e/specs/03_embedStream.js b/test/e2e/specs/03_embedStream.js
index d98c0f9a7..dbc217432 100644
--- a/test/e2e/specs/03_embedStream.js
+++ b/test/e2e/specs/03_embedStream.js
@@ -32,7 +32,9 @@ module.exports = {
   },
 
   'creates an user and user logs in': client => {
-    const { testData: { user } } = client.globals;
+    const {
+      testData: { user },
+    } = client.globals;
     const embedStream = client.page.embedStream();
 
     // Go back to default asset.
@@ -99,7 +101,9 @@ module.exports = {
     comments.logout();
   },
   'admin logs in': client => {
-    const { testData: { admin } } = client.globals;
+    const {
+      testData: { admin },
+    } = client.globals;
     const embedStream = client.page.embedStream();
 
     embedStream
diff --git a/test/e2e/specs/04_userStatus.js b/test/e2e/specs/04_userStatus.js
index dfcb3548c..189c93107 100644
--- a/test/e2e/specs/04_userStatus.js
+++ b/test/e2e/specs/04_userStatus.js
@@ -20,7 +20,9 @@ module.exports = {
 
   'Admin logs in': client => {
     const adminPage = client.page.admin();
-    const { testData: { admin } } = client.globals;
+    const {
+      testData: { admin },
+    } = client.globals;
 
     adminPage.navigateAndLogin(admin);
   },
@@ -84,7 +86,9 @@ module.exports = {
     client.page.admin().logout();
   },
   'user logs in': client => {
-    const { testData: { user } } = client.globals;
+    const {
+      testData: { user },
+    } = client.globals;
     const embedStream = client.page.embedStream();
 
     embedStream
@@ -109,7 +113,9 @@ module.exports = {
   'user picks another username': client => {
     const embedStream = client.page.embedStream();
     const comments = embedStream.section.comments;
-    const { testData: { user } } = client.globals;
+    const {
+      testData: { user },
+    } = client.globals;
 
     comments
       .waitForElementVisible('@changeUsernameInput')
@@ -134,7 +140,9 @@ module.exports = {
   },
   'Admin accepts the user flag': client => {
     const adminPage = client.page.admin();
-    const { testData: { admin } } = client.globals;
+    const {
+      testData: { admin },
+    } = client.globals;
 
     adminPage.navigateAndLogin(admin);
 
@@ -152,7 +160,9 @@ module.exports = {
     client.page.admin().logout();
   },
   'user logs in to check comment': client => {
-    const { testData: { user } } = client.globals;
+    const {
+      testData: { user },
+    } = client.globals;
     const embedStream = client.page.embedStream();
 
     embedStream
diff --git a/test/e2e/specs/05_banUser.js b/test/e2e/specs/05_banUser.js
index 3f6a33cf9..f69a52fc3 100644
--- a/test/e2e/specs/05_banUser.js
+++ b/test/e2e/specs/05_banUser.js
@@ -21,7 +21,9 @@ module.exports = {
 
   'admin logs in': client => {
     const adminPage = client.page.admin();
-    const { testData: { admin } } = client.globals;
+    const {
+      testData: { admin },
+    } = client.globals;
 
     adminPage.navigateAndLogin(admin);
   },
@@ -53,7 +55,9 @@ module.exports = {
     comments.logout();
   },
   'user logs in': client => {
-    const { testData: { user } } = client.globals;
+    const {
+      testData: { user },
+    } = client.globals;
     const comments = client.page.embedStream().section.comments;
 
     comments.openLoginPopup(popup => popup.login(user));
@@ -72,7 +76,9 @@ module.exports = {
   },
   'admin logs in (2)': client => {
     const adminPage = client.page.admin();
-    const { testData: { admin } } = client.globals;
+    const {
+      testData: { admin },
+    } = client.globals;
 
     adminPage.navigateAndLogin(admin);
   },
@@ -100,7 +106,9 @@ module.exports = {
     embedStream.navigate().ready();
   },
   'user logs in 2': client => {
-    const { testData: { user } } = client.globals;
+    const {
+      testData: { user },
+    } = client.globals;
     const comments = client.page.embedStream().section.comments;
 
     comments.openLoginPopup(popup => popup.login(user));
@@ -134,7 +142,9 @@ module.exports = {
   },
   'admin logs in (3)': client => {
     const adminPage = client.page.admin();
-    const { testData: { admin } } = client.globals;
+    const {
+      testData: { admin },
+    } = client.globals;
 
     adminPage.navigateAndLogin(admin);
   },
diff --git a/test/e2e/specs/06_suspendUser.js b/test/e2e/specs/06_suspendUser.js
index 1febe820c..facd63804 100644
--- a/test/e2e/specs/06_suspendUser.js
+++ b/test/e2e/specs/06_suspendUser.js
@@ -19,7 +19,9 @@ module.exports = {
     client.end();
   },
   'user logs in': client => {
-    const { testData: { user } } = client.globals;
+    const {
+      testData: { user },
+    } = client.globals;
     const embedStream = client.page.embedStream();
     const comments = client.page.embedStream().section.comments;
 
@@ -48,7 +50,9 @@ module.exports = {
   },
   'admin logs in': client => {
     const adminPage = client.page.admin();
-    const { testData: { admin } } = client.globals;
+    const {
+      testData: { admin },
+    } = client.globals;
 
     adminPage.navigateAndLogin(admin);
   },
@@ -137,7 +141,9 @@ module.exports = {
     adminPage.logout();
   },
   'user logs in (2)': client => {
-    const { testData: { user } } = client.globals;
+    const {
+      testData: { user },
+    } = client.globals;
     const embedStream = client.page.embedStream();
     const comments = client.page.embedStream().section.comments;
 
diff --git a/test/server/graph/loaders/actions.js b/test/server/graph/loaders/actions.js
index f8e96175b..7f7186fab 100644
--- a/test/server/graph/loaders/actions.js
+++ b/test/server/graph/loaders/actions.js
@@ -12,7 +12,9 @@ describe('graph.loaders.Actions', () => {
         { item_id: 'comment_1' },
         { item_id: 'comment_2' },
       ]);
-      const { Actions: { getAuthoredByID } } = loaders({
+      const {
+        Actions: { getAuthoredByID },
+      } = loaders({
         user: { id: 'user_1' },
         connectors: { services: { Actions: { getUserActions: spy } } },
       });
@@ -34,7 +36,9 @@ describe('graph.loaders.Actions', () => {
   describe('#getSummariesByItem', () => {
     describe('logged out user', () => {
       it('does not include any user data', async () => {
-        const { Actions: { getSummariesByItem } } = loaders({
+        const {
+          Actions: { getSummariesByItem },
+        } = loaders({
           loaders: {
             Actions: {
               getAuthoredByID: {
@@ -72,7 +76,9 @@ describe('graph.loaders.Actions', () => {
 
     describe('logged in user', () => {
       it('does include user', async () => {
-        const { Actions: { getSummariesByItem } } = loaders({
+        const {
+          Actions: { getSummariesByItem },
+        } = loaders({
           loaders: {
             Actions: {
               getAuthoredByID: {
diff --git a/test/server/graph/mutations/createComment.js b/test/server/graph/mutations/createComment.js
index 662404bf2..345f845c5 100644
--- a/test/server/graph/mutations/createComment.js
+++ b/test/server/graph/mutations/createComment.js
@@ -195,8 +195,7 @@ describe('graph.mutations.createComment', () => {
           AssetModel.create({
             id: '123',
             settings: { disableCommenting: disabled },
-          })
-        );
+          }));
 
         it(
           error ? 'does not create the comment' : 'creates the comment',
@@ -234,8 +233,7 @@ describe('graph.mutations.createComment', () => {
     ].forEach(({ moderation, status }) => {
       describe(`moderation=${moderation}`, () => {
         beforeEach(() =>
-          AssetModel.create({ id: '123', settings: { moderation } })
-        );
+          AssetModel.create({ id: '123', settings: { moderation } }));
 
         it(`creates comment with status=${status}`, () => {
           const context = new Context({ user: new UserModel() });
@@ -263,8 +261,7 @@ describe('graph.mutations.createComment', () => {
         SettingsService.update({
           wordlist: { banned: ['WORST'], suspect: ['EH'] },
         }),
-      ])
-    );
+      ]));
 
     [
       {
diff --git a/test/server/routes/api/auth/index.js b/test/server/routes/api/auth/index.js
index f80fbbc37..30d235e5f 100644
--- a/test/server/routes/api/auth/index.js
+++ b/test/server/routes/api/auth/index.js
@@ -75,8 +75,7 @@ describe('/api/v1/auth/local', () => {
 
   describe('email confirmation enabled', () => {
     beforeEach(() =>
-      SettingsService.update({ requireEmailConfirmation: true })
-    );
+      SettingsService.update({ requireEmailConfirmation: true }));
 
     describe('#post', () => {
       it('should not allow a login from a user that is not confirmed', () => {
diff --git a/test/server/services/settings.js b/test/server/services/settings.js
index ca6fdef8d..120a7da3d 100644
--- a/test/server/services/settings.js
+++ b/test/server/services/settings.js
@@ -7,8 +7,7 @@ describe('services.Settings', () => {
     Settings.init({
       moderation: 'PRE',
       wordlist: { banned: ['bannedWord'], suspect: [] },
-    })
-  );
+    }));
 
   describe('#retrieve()', () => {
     it('should have a moderation field defined', () => {
diff --git a/test/server/services/tokens.js b/test/server/services/tokens.js
index a6224eda4..2aa6819f8 100644
--- a/test/server/services/tokens.js
+++ b/test/server/services/tokens.js
@@ -38,7 +38,9 @@ describe('services.TokensService', () => {
 
   describe('#revoke', () => {
     it('can revoke a token', async () => {
-      let { pat: { id } } = await TokensService.create(user.id, 'GitHub Token');
+      let {
+        pat: { id },
+      } = await TokensService.create(user.id, 'GitHub Token');
 
       let tokens = await TokensService.list(user.id);
       expect(tokens).to.have.length(1);
@@ -57,7 +59,9 @@ describe('services.TokensService', () => {
   describe('#validate', () => {
     it('will allow a valid token', async () => {
       // Create a token.
-      let { pat: { id } } = await TokensService.create(user.id, 'GitHub Token');
+      let {
+        pat: { id },
+      } = await TokensService.create(user.id, 'GitHub Token');
 
       // Validate it.
       await TokensService.validate(user.id, id);
@@ -65,7 +69,9 @@ describe('services.TokensService', () => {
 
     it('will not allow an invalid token', async () => {
       // Create a token.
-      let { pat: { id } } = await TokensService.create(user.id, 'GitHub Token');
+      let {
+        pat: { id },
+      } = await TokensService.create(user.id, 'GitHub Token');
 
       // Revoke it.
       await TokensService.revoke(user.id, id);
@@ -81,7 +87,9 @@ describe('services.TokensService', () => {
       expect(tokens).to.have.length(0);
 
       // Create a token.
-      let { pat: { id } } = await TokensService.create(user.id, 'GitHub Token');
+      let {
+        pat: { id },
+      } = await TokensService.create(user.id, 'GitHub Token');
 
       tokens = await TokensService.list(user.id);
       expect(tokens).to.have.length(1);

From 01609a51f5d2d9b8355e085535048c317584aa1e Mon Sep 17 00:00:00 2001
From: Fabian Neumann <neumann@ferret-go.com>
Date: Tue, 5 Jun 2018 13:45:50 +0200
Subject: [PATCH 140/144] Translation fix for DE `common.reply`

---
 locales/de.yml | 2 +-
 locales/en.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/locales/de.yml b/locales/de.yml
index 2bf137991..78cf6be39 100644
--- a/locales/de.yml
+++ b/locales/de.yml
@@ -59,7 +59,7 @@ de:
   common:
     copy: 'Kopieren'
     error: 'Ein Problem ist aufgetreten.'
-    reply: 'antworten'
+    reply: 'Antwort' # noun, singular
     replies: 'Antworten'
     reaction: 'Reaktion'
     reactions: 'Reaktionen'
diff --git a/locales/en.yml b/locales/en.yml
index 083f0dbe2..d4e5a4d64 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -59,7 +59,7 @@ en:
   common:
     copy: 'Copy'
     error: 'An error has occurred.'
-    reply: 'reply'
+    reply: 'reply' # noun, singular
     replies: 'replies'
     reaction: 'reaction'
     reactions: 'reactions'

From d407ac0c4a0b7e27341ef2a53f9a103d82629c6e Mon Sep 17 00:00:00 2001
From: Fabian Neumann <mail@fabianneumann.de>
Date: Tue, 5 Jun 2018 21:22:11 +0200
Subject: [PATCH 141/144] Small grammar fix (#1681)

---
 plugins/talk-plugin-local-auth/translations.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/talk-plugin-local-auth/translations.yml b/plugins/talk-plugin-local-auth/translations.yml
index b1d92f947..d9727a2d3 100644
--- a/plugins/talk-plugin-local-auth/translations.yml
+++ b/plugins/talk-plugin-local-auth/translations.yml
@@ -140,7 +140,7 @@ de:
         item_3: "Kommentar-Benachrichtigungen erhalten, die Sie explizit angefordert haben"
       verify:
         title: "E-Mail-Adresse bestätigen"
-        description:  "Wir haben einen E-Mail an {0} geschickt. Bitte bestätigen Sie Ihre E-Mail-Adresse, um damit Benachrichtigungen über Änderungen am Benutzerkonto zu erhalten."
+        description:  "Wir haben eine E-Mail an {0} geschickt. Bitte bestätigen Sie Ihre E-Mail-Adresse, um damit Benachrichtigungen über Änderungen am Benutzerkonto zu erhalten."
       added:
         title: "E-Mail-Adresse hinzugefügt"
         description: "Ihre E-Mail-Adresse wurde dem Benutzerkonto hinzugefügt."

From 41fab3e11c774b3f9d1e9afffbf592e2e9a23651 Mon Sep 17 00:00:00 2001
From: Kiwi <vinh@wikiwi.io>
Date: Tue, 5 Jun 2018 20:12:30 -0300
Subject: [PATCH 142/144] Introduce final form, i18n helper, validators and
 refactor AddEmailAddress (#1636)

* Introduce final form, validators and refactor AddEmailAddress

* First i18n script

* Sort locales

* Add delete and copy action

* Copy over available validator translations

* Add comments

* Export validations in plugin-api

* Linting

* yarn.lock

* Sort locales

* Drop unused translations

* Add translations for validators

* Add action drop-unused

* Add comments

* Add note about limitation

* Fix desc
---
 client/coral-framework/lib/validation.js      |  91 ++
 locales/ar.yml                                | 569 +++++------
 locales/da.yml                                | 915 +++++++++---------
 locales/de.yml                                | 877 ++++++++---------
 locales/en.yml                                | 914 ++++++++---------
 locales/es.yml                                | 851 ++++++++--------
 locales/fi_FI.yml                             | 777 +++++++--------
 locales/fr.yml                                | 809 ++++++++--------
 locales/nl_NL.yml                             | 795 +++++++--------
 locales/pt_BR.yml                             | 698 ++++++-------
 locales/zh_CN.yml                             | 780 +++++++--------
 locales/zh_TW.yml                             | 650 +++++++------
 package.json                                  |   3 +
 plugin-api/beta/client/lib/validation.js      |   1 +
 .../AddEmailForm.css}                         |  38 +-
 .../AddEmailAddress/AddEmailForm.js           | 127 +++
 .../components/AddEmailAddress/Dialog.css     |  11 +
 .../components/AddEmailAddress/Dialog.js      |   5 +
 .../AddEmailAddress/EmailAddressAdded.css     |  29 +
 .../EmailAddressAdded.js                      |  13 +-
 .../AddEmailAddress/VerifyEmailAddress.css    |  29 +
 .../VerifyEmailAddress.js                     |  13 +-
 .../components/AddEmailAddress/index.js       |   4 +
 .../components/AddEmailAddressDialog.js       | 184 ----
 .../client/components/AddEmailContent.js      | 101 --
 .../client/components/InputField.js           |  14 +-
 .../client/components/Label.js                |   4 +
 .../containers/AddEmailAddressDialog.js       |  81 +-
 .../talk-plugin-local-auth/translations.yml   |   1 +
 scripts/i18n.js                               | 208 ++++
 yarn.lock                                     |  14 +
 31 files changed, 4967 insertions(+), 4639 deletions(-)
 create mode 100644 client/coral-framework/lib/validation.js
 create mode 100644 plugin-api/beta/client/lib/validation.js
 rename plugins/talk-plugin-local-auth/client/components/{AddEmailAddressDialog.css => AddEmailAddress/AddEmailForm.css} (51%)
 create mode 100644 plugins/talk-plugin-local-auth/client/components/AddEmailAddress/AddEmailForm.js
 create mode 100644 plugins/talk-plugin-local-auth/client/components/AddEmailAddress/Dialog.css
 create mode 100644 plugins/talk-plugin-local-auth/client/components/AddEmailAddress/Dialog.js
 create mode 100644 plugins/talk-plugin-local-auth/client/components/AddEmailAddress/EmailAddressAdded.css
 rename plugins/talk-plugin-local-auth/client/components/{ => AddEmailAddress}/EmailAddressAdded.js (73%)
 create mode 100644 plugins/talk-plugin-local-auth/client/components/AddEmailAddress/VerifyEmailAddress.css
 rename plugins/talk-plugin-local-auth/client/components/{ => AddEmailAddress}/VerifyEmailAddress.js (65%)
 create mode 100644 plugins/talk-plugin-local-auth/client/components/AddEmailAddress/index.js
 delete mode 100644 plugins/talk-plugin-local-auth/client/components/AddEmailAddressDialog.js
 delete mode 100644 plugins/talk-plugin-local-auth/client/components/AddEmailContent.js
 create mode 100644 plugins/talk-plugin-local-auth/client/components/Label.js
 create mode 100755 scripts/i18n.js

diff --git a/client/coral-framework/lib/validation.js b/client/coral-framework/lib/validation.js
new file mode 100644
index 000000000..35a4013a5
--- /dev/null
+++ b/client/coral-framework/lib/validation.js
@@ -0,0 +1,91 @@
+import t from 'coral-framework/services/i18n';
+
+/**
+ * createNotificationService returns a notification services based on pym.
+ * @param  {func}    condition   callback that checks that the given argument is valid.
+ * @param  {error}   string      error that is displayed when validation fails.
+ * @return {func}    validator function
+ */
+export function createValidator(condition, error) {
+  return (v, values) => (condition(v, values) ? undefined : error);
+}
+
+/**
+ * composeValidators chains validators and runs them in sequence until
+ * one validator fails and returns an error message.
+ * @param  {func[]}  validators         array of validator functions.
+ * @return {func}    validator fuction
+ */
+export function composeValidators(...validators) {
+  return value =>
+    validators.reduce(
+      (error, validator) => error || validator(value),
+      undefined
+    );
+}
+
+/**
+ * required checks that the value is truthy.
+ * @return {func}    validator fuction
+ */
+export const required = createValidator(v => !!v, t('validators.required'));
+
+/**
+ * Confirm will check that this field has the same value as another.
+ * @param  {string}  key  key of other form field to compare with.
+ * @param  {error}   string      error that is displayed when validation fails.
+ * @return {func}    validator fuction
+ */
+export const confirm = (key, error) =>
+  createValidator((v, data) => v === data[key], error);
+
+/**
+ * Verify email.
+ * @return {func}    validator fuction
+ */
+export const verifyEmail = createValidator(
+  email => /^.+@.+\..+$/.test(email),
+  t('validators.verify_email')
+);
+
+/**
+ * Confirm email.
+ * @param  {string}  key  key of other form field to compare with.
+ * @return {func}    validator fuction
+ */
+export const confirmEmail = key => confirm(key, t('validators.confirm_email'));
+
+/**
+ * Verify password.
+ * @return {func}    validator fuction
+ */
+export const verifyPassword = createValidator(
+  pass => /^(?=.{8,}).*$/.test(pass),
+  t('validators.verify_password')
+);
+
+/**
+ * Confirm password.
+ * @param  {string}  key  key of other form field to compare with.
+ * @return {func}    validator fuction
+ */
+export const confirmPassword = key =>
+  confirm(key, t('validators.confirm_password'));
+
+/**
+ * Verify username.
+ * @return {func}    validator fuction
+ */
+export const verifyUsername = createValidator(
+  username => /^[a-zA-Z0-9_]+$/.test(username),
+  t('validators.verify_username')
+);
+
+/**
+ * Verify organization name.
+ * @return {func}    validator fuction
+ */
+export const verifyOrganizationName = createValidator(
+  org => /^[a-zA-Z0-9_ ]+$/.test(org),
+  t('validators.verify_organization_name')
+);
diff --git a/locales/ar.yml b/locales/ar.yml
index 2b320a621..60ffeb6ae 100644
--- a/locales/ar.yml
+++ b/locales/ar.yml
@@ -1,334 +1,341 @@
 ar:
-  your_account_has_been_suspended: تم تعليق حسابك مؤقتا.
-  your_account_has_been_banned: تم حظر حسابك.
-  your_username_has_been_rejected: تم تعليق حسابك لعدم صلاحية اسم المستخدم الخاصة بك. لاستعادة حسابك رجاء أدخل اسم مستخدم جديدة.
-  embed_comments_tab: تعليقات
+  already_flagged_username: 'لقد سبق لك وضع علامة باسم المستخدم هذا.'
   bandialog:
-    are_you_sure: "أنت متأكد أنك تريد حظر {0}؟"
-    ban_user: "حظر المستخدم؟"
-    banned_user: "مستخدم محظور"
-    cancel: "إلغاء"
-    note: "ملاحظة: {0}"
-    note_reject_comment: "حظر هذا المستخدم سيضع هذا التعليق في قائمة الرفض."
-    note_ban_user: "حظر هذا المستخدم لن يسمح له بالتعليق أو التفاعل أو الإبلاغ عن تعليقات."
-    yes_ban_user: "نعم، احظر المستخدم"
-    write_a_message: "أكتب رسالة"
-    send: "أرسل"
-    notify_ban_headline: "أبلغ المستخدم بالحظر"
-    notify_ban_description: "سيتم إبلاغ المستخدم عن طريق البريد الإلكتروني بأنه قد تم حظره من المجموعة"
+    are_you_sure: 'أنت متأكد أنك تريد حظر {0}؟'
+    ban_user: 'حظر المستخدم؟'
+    banned_user: 'مستخدم محظور'
+    cancel: إلغاء
     email_message_ban: "العزيز {0},\n\nتم الدخول باستخدام حسابك وانتهاك قواعد المجموعة، لذا لقد تم حظر حسابك. لن تستطيع التعليق مجددا، أو الإعجاب أو الإبلاغ عن تعليقات. إذا كنت ترى أن ذلك تم بالخطأ، رجاء إبلاغ أحد أعضاء الفريق الخاص بالمجموعة."
-  bio_offensive: "السيرة الذاتية مسيئة"
-  cancel: "إلغاء"
-  confirm_email:
-    click_to_confirm: "إضغط في الأسفل لتأكيد البريد الألكتروني"
-    confirm: "تأكيد"
-  password_reset:
-    mail_sent: 'إذا كان لديك حساب مسجل، فقد تم إرسال رابط إعادة تعيين كلمة المرور إلى هذا البريد الإلكتروني'
-    set_new_password: "تغيير كلمة السر الخاصة بك"
-    new_password: "كلمة السر الجديدة"
-    new_password_help: "كلمة السر يجب أن تكون 8 أحرف على الأقل"
-    confirm_new_password: "تأكيد كلمة السر الجديدة"
-    change_password: "تغيير كلمة السر"
-  characters_remaining: "هناك أحرف متبقية"
+    note: 'ملاحظة: {0}'
+    note_ban_user: 'حظر هذا المستخدم لن يسمح له بالتعليق أو التفاعل أو الإبلاغ عن تعليقات.'
+    note_reject_comment: 'حظر هذا المستخدم سيضع هذا التعليق في قائمة الرفض.'
+    notify_ban_description: 'سيتم إبلاغ المستخدم عن طريق البريد الإلكتروني بأنه قد تم حظره من المجموعة'
+    notify_ban_headline: 'أبلغ المستخدم بالحظر'
+    send: أرسل
+    write_a_message: 'أكتب رسالة'
+    yes_ban_user: 'نعم، احظر المستخدم'
+  bio_offensive: 'السيرة الذاتية مسيئة'
+  cancel: إلغاء
+  characters_remaining: 'هناك أحرف متبقية'
   comment:
-    anon: "غير معلوم"
-    undo_reject: "ابطال العملية"
-    ban_user: "حظر المستخدم"
-    comment: "نشر تعليق"
+    anon: 'غير معلوم'
+    ban_user: 'حظر المستخدم'
+    comment: 'نشر تعليق'
     edited: محرر
-    flagged: "إشارة"
-    view_context: "عرض السياق"
+    flagged: إشارة
+    undo_reject: 'ابطال العملية'
+    view_context: 'عرض السياق'
   comment_box:
-    post: "نشر"
-    cancel: "إلغاء"
-    reply: "رد"
-    comment: "نشر تعليق"
-    name: "الاسم"
-    comment_post_notif: "تم نشر تعليقك."
-    comment_post_notif_premod: "شكرا لك على النشر. سيراجع فريق الإشراف لدينا تعليقك قريبا."
-    comment_post_banned_word:  "تعليقك يحتوي على كلمة أو أكثر غير مسموح بها، لذا لن يتم نشره. إذا كنت تعتقد أن هذه الرسالة خطأ، رجاء الاتصال بفريق الإشراف لدينا."
-    characters_remaining: "أحرف متبقية"
-  comment_offensive: "هذا التعليق مسيء"
-  comment_singular: تعليق
+    cancel: إلغاء
+    characters_remaining: 'أحرف متبقية'
+    comment: 'نشر تعليق'
+    comment_post_banned_word: 'تعليقك يحتوي على كلمة أو أكثر غير مسموح بها، لذا لن يتم نشره. إذا كنت تعتقد أن هذه الرسالة خطأ، رجاء الاتصال بفريق الإشراف لدينا.'
+    comment_post_notif: 'تم نشر تعليقك.'
+    comment_post_notif_premod: 'شكرا لك على النشر. سيراجع فريق الإشراف لدينا تعليقك قريبا.'
+    name: الاسم
+    post: نشر
+    reply: رد
+  comment_offensive: 'هذا التعليق مسيء'
   comment_plural: تعليقات
-  comment_post_banned_word: "تعليقك يحتوي على كلمة أو أكثر غير مسموح بها، لذا لن يتم نشره. إذا كنت تعتقد أن هذه الرسالة خطأ، رجاء الاتصال بفريق الإشراف لدينا."
-  comment_post_notif: "تم نشر تعليقك."
-  comment_post_notif_premod: "شكرا لك على النشر. سيراجع فريق الإشراف لدينا تعليقك قريبا."
+  comment_post_banned_word: 'تعليقك يحتوي على كلمة أو أكثر غير مسموح بها، لذا لن يتم نشره. إذا كنت تعتقد أن هذه الرسالة خطأ، رجاء الاتصال بفريق الإشراف لدينا.'
+  comment_post_notif: 'تم نشر تعليقك.'
+  comment_post_notif_premod: 'شكرا لك على النشر. سيراجع فريق الإشراف لدينا تعليقك قريبا.'
+  comment_singular: تعليق
   common:
-    copy: 'نسخ'
+    copy: نسخ
     error: 'حدث خطأ.'
-    reply: 'رد'
-    replies: 'ردود'
     reaction: 'رد فعل'
     reactions: 'ردود أفعال'
-    story: 'قصة'
-  flagged_usernames:
-    notify_approved: '{0} وافق على اسم المستخدم {1}'
-    notify_rejected: '{0} رفض اسم المستخدم {1}'
-    notify_flagged: '{0} بلغ عن اسم المستخدم {1}'
-    notify_changed: 'المستخدم {0} غير اسم المستخدم الخاص به إلى {1}'
+    replies: ردود
+    reply: رد
+    story: قصة
   community:
-    account_creation_date: "تاريخ إنشاء الحساب"
+    account_creation_date: 'تاريخ إنشاء الحساب'
     active: فعال
     admin: إداري
-    ads_marketing: "هذا يبدو وكأنه إعلان/تسويق"
-    are_you_sure: "متأكد أنك تريد حظر {0}؟"
-    ban_user: "حظر المستخدم؟"
+    ads_marketing: 'هذا يبدو وكأنه إعلان/تسويق'
+    are_you_sure: 'متأكد أنك تريد حظر {0}؟'
+    ban_user: 'حظر المستخدم؟'
     banned: محظور
-    banned_user: "مستخدم محظور"
+    banned_user: 'مستخدم محظور'
     cancel: إلغاء
-    dont_like_username: "غير معجب باسم المستخدم"
-    flaggedaccounts: "أسماء المستخدمين المبلغ عنها"
+    commenter: معلق
+    dont_like_username: 'غير معجب باسم المستخدم'
+    flaggedaccounts: 'أسماء المستخدمين المبلغ عنها'
     flags: شارات
-    impersonating: "انتحال شخصية"
-    loading: "تحميل النتائج"
+    impersonating: 'انتحال شخصية'
+    loading: 'تحميل النتائج'
     moderator: مشرف
-    newsroom_role: "دور غرفة الأخبار"
-    no_flagged_accounts: "قائمة أسماء المستخدمين المبلغ عنها فارغة حاليا."
-    no_results: "لم يتم العثور على مستخدمين باسم المستخدم أو عنوان البريد الإلكتروني هذا. انهم يختبئون!"
-    offensive: "مسيء"
+    newsroom_role: 'دور غرفة الأخبار'
+    no_flagged_accounts: 'قائمة أسماء المستخدمين المبلغ عنها فارغة حاليا.'
+    no_results: 'لم يتم العثور على مستخدمين باسم المستخدم أو عنوان البريد الإلكتروني هذا. انهم يختبئون!'
+    offensive: مسيء
     other: أخرى
     people: أشخاص
-    role: "اختر الدور..."
-    select_status: "اختر الحالة..."
-    spam_ads: "بريد مؤذي/إعلانات"
-    staff: "فريق العمل"
+    role: 'اختر الدور...'
+    select_status: 'اختر الحالة...'
+    spam_ads: 'بريد مؤذي/إعلانات'
+    staff: 'فريق العمل'
     status: الحالة
-    username_and_email: "اسم المستخدم والبريد الإلكتروني"
-    yes_ban_user: "نعم إحظر المستخدم"
-    commenter: "معلق"
+    username_and_email: 'اسم المستخدم والبريد الإلكتروني'
+    yes_ban_user: 'نعم إحظر المستخدم'
   configure:
     apply: طبق
-    banned_word_text: "التعليقات التي تحتوي على هذه الكلمات أو العبارات سيتم حذفها آليا من جدول التعليقات. اطبع كلمة واضغط Enter أو Tab لزيادة الكلمة. اختياريا الصق قائمة مقسمة بالفصلات."
-    banned_words_title: "قائمة بالكلمات المحظورة"
-    close: "اغلق"
-    close_after: "اغلق التعليقات بعد"
-    close_stream: "اغلق الجدول"
-    close_stream_configuration: "تم إغلاق جدول التعليقات هذا. بفتحك لهذا الجدول سيتم قبول وعرض تعليقات جديدة"
-    closed_comments_desc: "اكتب رسالة ليتم عرضها عندما يتم إغلاق جدول التعليقات ولا يتم قبول أي تعليقات جديدة."
-    closed_comments_label: "اكتب رسالة..."
-    closed_stream_settings: "رسالة الجدول المغلق"
-    comment_count_error: "رجاء كتابة رقم صحيح."
-    comment_count_header: "الحد من طول التعليق"
+    banned_word_text: 'التعليقات التي تحتوي على هذه الكلمات أو العبارات سيتم حذفها آليا من جدول التعليقات. اطبع كلمة واضغط Enter أو Tab لزيادة الكلمة. اختياريا الصق قائمة مقسمة بالفصلات.'
+    banned_words_title: 'قائمة بالكلمات المحظورة'
+    close: اغلق
+    close_after: 'اغلق التعليقات بعد'
+    close_stream: 'اغلق الجدول'
+    close_stream_configuration: 'تم إغلاق جدول التعليقات هذا. بفتحك لهذا الجدول سيتم قبول وعرض تعليقات جديدة'
+    closed_comments_desc: 'اكتب رسالة ليتم عرضها عندما يتم إغلاق جدول التعليقات ولا يتم قبول أي تعليقات جديدة.'
+    closed_comments_label: 'اكتب رسالة...'
+    closed_stream_settings: 'رسالة الجدول المغلق'
+    comment_count_error: 'رجاء كتابة رقم صحيح.'
+    comment_count_header: 'الحد من طول التعليق'
     comment_count_text_post: حروف
-    comment_count_text_pre: "سيتم وضع حد للتعليقات عند"
+    comment_count_text_pre: 'سيتم وضع حد للتعليقات عند'
     comment_settings: إعدادات
-    comment_stream: "جدول التعليقات"
-    comment_stream_will_close: "سيتم إغلاق جدول التعليق"
+    comment_stream: 'جدول التعليقات'
+    comment_stream_will_close: 'سيتم إغلاق جدول التعليق'
     community: المجموعة
     configure: تهيئة
-    copy_and_paste: "انسخ والصق التعليمات البرمجية في الأسفل بنظام إدارة المحتوى لتضمين تعليقك داخل المقالات"
-    custom_css_url: "رابط CSS مخصص"
-    custom_css_url_desc: "رابط CSS الذي سيتجاوز أنماط جدول التعليقات المضمن. يمكن أن يكون داخلي أو خارجي."
+    copy_and_paste: 'انسخ والصق التعليمات البرمجية في الأسفل بنظام إدارة المحتوى لتضمين تعليقك داخل المقالات'
+    custom_css_url: 'رابط CSS مخصص'
+    custom_css_url_desc: 'رابط CSS الذي سيتجاوز أنماط جدول التعليقات المضمن. يمكن أن يكون داخلي أو خارجي.'
     days: أيام
-    description: "كإداري يمكنك تعديل إعدادات جدول التعليقات لهذه القصة:"
-    domain_list_text: "أدخل عناوين النطاقات التي سوف تسمح فيها لTalk.. مثلا بيئات التدريج و الإنتاج (مثلا localhost:3000 staging.domain.com domain.com)."
-    domain_list_title: "النطاقات المسموح بها"
-    edit_comment_timeframe_heading: "عدل الإطار الزمني للتعليق"
-    edit_comment_timeframe_text_pre: "سيكون لدى المعلقين"
-    edit_comment_timeframe_text_post: "ثوان لتحرير تعليقاتهم."
-    embed_comment_stream: "تضمين الجدول"
-    enable_premod_links_text: "يجب على المشرفين الموافقة على أي تعليق يحتوي على رابط قبل نشره."
-    enable_pre_moderation: "تمكين الإشراف المسبق"
-    enable_pre_moderation_text: "يجب على المشرفين الموافقة على أي تعليق قبل نشره."
-    enable_premod_links: "إشراف مسبق على التعليقات التي تحتوي على روابط"
-    enable_premod: "تمكين الإشراف المسبق"
-    enable_premod_description: "يجب على المشرفين الموافقة على أي تعليق قبل نشره."
-    enable_premod_links_description: "يجب على المشرفين الموافقة على أي تعليق يحتوي على رابط قبل نشره."
-    enable_questionbox: "اطرح سؤال على القراء"
-    enable_questionbox_description: "هذا السؤال سيظهر في الجزء العلوي من جدول التعليقات هذا. اسأل القراء عن مسألة معينة في المقال او اطرح أسئلة نقاشية.. الخ."
+    description: 'كإداري يمكنك تعديل إعدادات جدول التعليقات لهذه القصة:'
+    domain_list_text: 'أدخل عناوين النطاقات التي سوف تسمح فيها لTalk.. مثلا بيئات التدريج و الإنتاج (مثلا localhost:3000 staging.domain.com domain.com).'
+    domain_list_title: 'النطاقات المسموح بها'
+    edit_comment_timeframe_heading: 'عدل الإطار الزمني للتعليق'
+    edit_comment_timeframe_text_post: 'ثوان لتحرير تعليقاتهم.'
+    edit_comment_timeframe_text_pre: 'سيكون لدى المعلقين'
+    embed_comment_stream: 'تضمين الجدول'
+    enable_pre_moderation: 'تمكين الإشراف المسبق'
+    enable_pre_moderation_text: 'يجب على المشرفين الموافقة على أي تعليق قبل نشره.'
+    enable_premod: 'تمكين الإشراف المسبق'
+    enable_premod_description: 'يجب على المشرفين الموافقة على أي تعليق قبل نشره.'
+    enable_premod_links: 'إشراف مسبق على التعليقات التي تحتوي على روابط'
+    enable_premod_links_description: 'يجب على المشرفين الموافقة على أي تعليق يحتوي على رابط قبل نشره.'
+    enable_premod_links_text: 'يجب على المشرفين الموافقة على أي تعليق يحتوي على رابط قبل نشره.'
+    enable_questionbox: 'اطرح سؤال على القراء'
+    enable_questionbox_description: 'هذا السؤال سيظهر في الجزء العلوي من جدول التعليقات هذا. اسأل القراء عن مسألة معينة في المقال او اطرح أسئلة نقاشية.. الخ.'
     hours: ساعات
-    include_comment_stream: "ادراج وصف جدول التعليقات للقراء"
-    include_comment_stream_desc: "اكتب رسالة ليتم إضافتها إلى الجزء العلوي من جدول التعليقات. ضع موضوعا، اشمل القواعد الإرشادية للمجموعة .. الخ"
-    include_text: "ادرج النص هنا."
-    include_question_here: "اكتب سؤالك هنا:"
+    include_comment_stream: 'ادراج وصف جدول التعليقات للقراء'
+    include_comment_stream_desc: 'اكتب رسالة ليتم إضافتها إلى الجزء العلوي من جدول التعليقات. ضع موضوعا، اشمل القواعد الإرشادية للمجموعة .. الخ'
+    include_question_here: 'اكتب سؤالك هنا:'
+    include_text: 'ادرج النص هنا.'
     moderate: اشرف
-    moderation_settings: "اعدادات الإشراف"
-    open: "مفتوح"
-    open_stream: "افتح الجدول"
-    open_stream_configuration: "جدول التعليقات هذا مفتوح. بإغلاق هذا الجدول لن يتم قبول تعليقات جديدة، وستبقى التعليقات القديمة ظاهرة."
-    require_email_verification: "يلزم التحقق من البريد الإلكتروني"
-    require_email_verification_text: "يجب على المستخدمين الجدد التحقق من بريدهم الإلكتروني قبل التعليق"
-    save_changes: "احفظ التعديلات"
+    moderation_settings: 'اعدادات الإشراف'
+    open: مفتوح
+    open_stream: 'افتح الجدول'
+    open_stream_configuration: 'جدول التعليقات هذا مفتوح. بإغلاق هذا الجدول لن يتم قبول تعليقات جديدة، وستبقى التعليقات القديمة ظاهرة.'
+    require_email_verification: 'يلزم التحقق من البريد الإلكتروني'
+    require_email_verification_text: 'يجب على المستخدمين الجدد التحقق من بريدهم الإلكتروني قبل التعليق'
+    save_changes: 'احفظ التعديلات'
     shortcuts: اختصارات
-    sign_out: "خروج"
+    sign_out: خروج
     stories: قصص
-    stream_settings: "اعدادات الجدول"
-    suspect_word_title: "قائمة الكلمات المشبوهة"
-    suspect_word_text: "التعليقات التي تحتوي على هذه الكلمات أو العبارات سيتم تمييزها في جدول التعليقات. اطبع كلمة واضغط Enter أو Tab لزيادة الكلمة. اختياريا الصق قائمة مقسمة بالفصلات."
-    tech_settings: "إعدادات تقنية"
-    title: "تهيئة جدول التعليق"
+    stream_settings: 'اعدادات الجدول'
+    suspect_word_text: 'التعليقات التي تحتوي على هذه الكلمات أو العبارات سيتم تمييزها في جدول التعليقات. اطبع كلمة واضغط Enter أو Tab لزيادة الكلمة. اختياريا الصق قائمة مقسمة بالفصلات.'
+    suspect_word_title: 'قائمة الكلمات المشبوهة'
+    tech_settings: 'إعدادات تقنية'
+    title: 'تهيئة جدول التعليق'
     weeks: أسابيع
-    wordlist: "الكلمات المحظورة"
-  continue: "واصل"
+    wordlist: 'الكلمات المحظورة'
+  confirm_email:
+    click_to_confirm: 'إضغط في الأسفل لتأكيد البريد الألكتروني'
+    confirm: تأكيد
+  continue: واصل
   createdisplay:
-    check_the_form: "استمارة غير صالحة. يرجى التحقق من الحقول"
-    continue: "تابع بنفس اسم المستخدم الخاص بفيسبوك"
-    error_create: "حدث خطأ أثناء تغيير اسم المستخدم"
-    fake_comment_body: "هذا مثال للتعليق. يمكن للقراء تبادل الأفكار والآراء مع غرف الأخبار في قسم التعليقات."
-    fake_comment_date: "منذ دقيقة"
-    if_you_dont_change_your_name: "إذا لم تقم بتغيير اسم المستخدم الخاص بك في هذه الخطوة سوف يظهر اسم المستخدم الخاص بفيسبوك جنبا إلى جنب مع كل تعليقاتك."
-    required_field: "حقل مطلوب"
+    check_the_form: 'استمارة غير صالحة. يرجى التحقق من الحقول'
+    continue: 'تابع بنفس اسم المستخدم الخاص بفيسبوك'
+    error_create: 'حدث خطأ أثناء تغيير اسم المستخدم'
+    fake_comment_body: 'هذا مثال للتعليق. يمكن للقراء تبادل الأفكار والآراء مع غرف الأخبار في قسم التعليقات.'
+    fake_comment_date: 'منذ دقيقة'
+    if_you_dont_change_your_name: 'إذا لم تقم بتغيير اسم المستخدم الخاص بك في هذه الخطوة سوف يظهر اسم المستخدم الخاص بفيسبوك جنبا إلى جنب مع كل تعليقاتك.'
+    required_field: 'حقل مطلوب'
     save: حفظ
-    special_characters: "يمكن أن تحتوي أسماء المستخدمين على أحرف وأرقام و _ فقط"
-    username: اسم المستخدم
-    write_your_username: "عدل اسم المستخدم"
-    your_username: "يظهر اسم المستخدم في كل تعليق تنشره."
+    special_characters: 'يمكن أن تحتوي أسماء المستخدمين على أحرف وأرقام و _ فقط'
+    username: 'اسم المستخدم'
+    write_your_username: 'عدل اسم المستخدم'
+    your_username: 'يظهر اسم المستخدم في كل تعليق تنشره.'
   done: تم
   edit_comment:
-    body_input_label: "عدل هذا التعليق"
-    save_button: "حفظ التغييرات"
-    edit_window_expired: "لم يعد بإمكانك تعديل هذا التعليق. انتهت صلاحية نافذة الوقت للقيام بذلك. لماذا لا تنشر آخر؟"
-    edit_window_expired_close: "أغلق"
-    edit_window_timer_prefix: "نافذة التعديل : "
-    second: "ثانية"
-    seconds_plural: "ثوان"
-    minute: "دقيقة"
-    minutes_plural: "دقائق"
+    body_input_label: 'عدل هذا التعليق'
+    edit_window_expired: 'لم يعد بإمكانك تعديل هذا التعليق. انتهت صلاحية نافذة الوقت للقيام بذلك. لماذا لا تنشر آخر؟'
+    edit_window_expired_close: أغلق
+    edit_window_timer_prefix: 'نافذة التعديل : '
+    minute: دقيقة
+    minutes_plural: دقائق
+    save_button: 'حفظ التغييرات'
+    second: ثانية
+    seconds_plural: ثوان
   email:
-    suspended:
-      subject: "تم تعليق حسابك"
     banned:
-      subject: "تم حظر حسابك"
-      body: "وفقا لإرشادات مجتمع كورال بروجيكت، تم حظر حسابك. لم يعد مسموحا لك التعليق أو وضع إشارات أو التفاعل مع مجتمعنا."
+      body: 'وفقا لإرشادات مجتمع كورال بروجيكت، تم حظر حسابك. لم يعد مسموحا لك التعليق أو وضع إشارات أو التفاعل مع مجتمعنا.'
+      subject: 'تم حظر حسابك'
     confirm:
-      has_been_requested: "تم طلب تأكيد بالبريد الإلكتروني للحساب التالي:"
-      to_confirm: "لتأكيد الحساب، يرجى زيارة الرابط التالي:"
-      confirm_email: ".تأكيد عنوان البريد الإلكتروني"
-      if_you_did_not: "إذا لم تطلب ذلك، يمكنك تجاهل هذه الرسالة الإلكترونية."
-      subject: "تأكيد البريد الإلكتروني"
+      confirm_email: '.تأكيد عنوان البريد الإلكتروني'
+      has_been_requested: 'تم طلب تأكيد بالبريد الإلكتروني للحساب التالي:'
+      if_you_did_not: 'إذا لم تطلب ذلك، يمكنك تجاهل هذه الرسالة الإلكترونية.'
+      subject: 'تأكيد البريد الإلكتروني'
+      to_confirm: 'لتأكيد الحساب، يرجى زيارة الرابط التالي:'
     password_reset:
-      we_received_a_request: "لقد تلقينا طلبا لإعادة تعيين كلمة المرور. إذا لم تطلب هذا التغيير، فيمكنك تجاهل هذه الرسالة الإلكترونية."
-      if_you_did: "اذا فعلت،"
-      please_click: "الرجاء النقر هنا لإعادة تعيين كلمة المرور"
+      if_you_did: 'اذا فعلت،'
+      please_click: 'الرجاء النقر هنا لإعادة تعيين كلمة المرور'
+      we_received_a_request: 'لقد تلقينا طلبا لإعادة تعيين كلمة المرور. إذا لم تطلب هذا التغيير، فيمكنك تجاهل هذه الرسالة الإلكترونية.'
+    suspended:
+      subject: 'تم تعليق حسابك'
+  embed_comments_tab: تعليقات
   embedlink:
-    copy: "نسخ إلى الحافظة"
+    copy: 'نسخ إلى الحافظة'
   error:
-    COMMENT_PARENT_NOT_VISIBLE: "التعليق الذي ترد عليه تمت إزالته أو غير موجود."
-    EMAIL_VERIFICATION_TOKEN_INVALID: "رمز التحقق من البريد الإلكتروني غير صالح."
-    PASSWORD_RESET_TOKEN_INVALID: "رابط إعادة تعيين كلمة المرور غير صالح."
-    COMMENT_TOO_SHORT: "يجب أن تكون التعليقات أكثر من حرف واحد، يرجى مراجعة تعليقك وإعادة المحاولة."
-    NOT_AUTHORIZED: "غير مصرح لك بتنفيذ هذا الإجراء."
-    NO_SPECIAL_CHARACTERS: "يمكن أن تحتوي أسماء المستخدمين على أحرف, أرقام و _ فقط"
-    PASSWORD_LENGTH: "كلمة المرور قصيرة جدا"
-    PROFANITY_ERROR: "يجب ألا تحتوي أسماء المستخدمين على الألفاظ النابية. يرجى الاتصال بالإداري إذا كنت تعتقد أن هذا خطأ."
-    RATE_LIMIT_EXCEEDED: "تجاوز حد المعدل"
-    USERNAME_IN_USE: "اسم المستخدم قيد الاستخدام"
-    USERNAME_REQUIRED: "يجب إدخال اسم مستخدم"
-    EMAIL_NOT_VERIFIED: "لم يتم التحقق من عنوان البريد الإلكتروني"
-    EDIT_WINDOW_ENDED: "لم يعد بإمكانك تحرير هذا التعليق. نافذة الوقت للقيام بذلك قد انتهت صلاحيتها."
-    EDIT_USERNAME_NOT_AUTHORIZED: "ليس لديك إذن بتحديث اسم المستخدم الخاص بك."
-    SAME_USERNAME_PROVIDED: "يجب عليك تقديم اسم مستخدم مختلف."
-    EMAIL_IN_USE: "البريد الالكتروني قيد الاستخدام"
-    EMAIL_REQUIRED: "مطلوب عنوان البريد الإلكتروني"
-    LOGIN_MAXIMUM_EXCEEDED: "لقد أجريت العديد من محاولات إدخال كلمة المرور غير الناجحة. أرجو الإنتظار."
-    PASSWORD_REQUIRED: "يجب إدخال كلمة مرور"
-    COMMENTING_CLOSED: "تم إغلاق فاعلية التعليق"
-    NOT_FOUND: "المورد غير موجود"
-    ALREADY_EXISTS: "المورد موجود من قبل"
-    INVALID_ASSET_URL: "رابط المادة غير صالح"
-    CANNOT_IGNORE_STAFF: "لا يمكن تجاهل الموظفين."
-    email: "ليس بريدا إلكترونيا صالحا"
-    confirm_password: "كلمات المرور غير متطابقة. يرجى التحقق مرة أخرى"
-    network_error: "فشل الاتصال بالخادم. تحقق من اتصالك بالإنترنت وحاول مرة أخرى."
-    email_not_verified: "عنوان البريد الإلكتروني {0} لم يتم التحقق منه."
-    email_password: "مجموعة البريد الإلكتروني و / أو كلمة المرور غير صحيحة."
-    organization_name: "يجب أن يحتوي اسم المؤسسة على أحرف أو أرقام فقط."
-    password: "يجب أن تكون كلمة المرور 8 أحرف على الأقل"
-    username: "يمكن أن تحتوي أسماء المستخدمين على أرقام, أحرف و _ فقط"
-    unexpected: "حدث خطأ غير متوقع. آسف!"
-    required_field: "هذه الخانة مطلوبه"
-    temporarily_suspended: "حسابك معلق حاليا. سيتم إعادة تنشيطه {0}. يرجى الاتصال بنا إذا كان لديك أي أسئلة."
-  flag_comment: "الإبلاغ عن تعليق"
-  flag_reason: "سبب الإبلاغ (اختياري)"
-  flag_username: "بلغ عن اسم المستخدم"
-  framework:
-    banned_account_header: "حسابك محظور حاليا."
-    banned_account_body: "هذا يعني أنه لا يمكنك الإعجاب ، أو الإبلاغ ، أو كتابة التعليقات."
-    comment: تعليق
-    comment_is_ignored: "هذا التعليق مخفي لأنك تجاهلت هذا المستخدم."
-    comment_is_rejected: "لقد رفضت هذا التعليق."
-    comment_is_hidden: "هذا التعليق غير متاح."
-    comments: تعليقات
-    configure_stream: "تهيئة"
-    content_not_available: "هذا المحتوى غير متوفر"
-    edit_name:
-      button: أرسل
-      error: "يمكن أن تحتوي أسماء المستخدمين على أحرف, أرقام و _ فقط"
-      label: "اسم مستخدم جديد"
-      msg: "تم تعليق حسابك حاليا نظرا لأن اسم المستخدم قد اعتبر غير لائق. لاستعادة حسابك، يرجى إدخال اسم مستخدم جديد. يرجى الاتصال بنا إذا كان لديك أي أسئلة."
-    changed_name:
-      msg: "يتم مراجعة تغيير اسم المستخدم من قبل فريق الإشراف لدينا."
-    my_comments: "تعليقاتي"
-    my_profile: "ملفي"
-    new_count: "شاهد {0} أكثر {1}"
-    profile: الملف الشخصي
-    show_all_comments: "عرض كل التعليقات"
-    success_bio_update: "تم تحديث السيرة الذاتية"
-    success_name_update: "تم تحديث اسم المستخدم"
-    success_update_settings: "تم تطبيق التغييرات التي أجريتها على جدول التعليقات في هذه المقالة"
-    show_all_replies: عرض جميع الردود
-    show_more_replies: عرض المزيد من الردود
-    view_more_comments: "عرض مزيد من التعليقات"
-    view_reply: "عرض الرد"
-  from_settings_page: "من صفحة الملف الشخصي يمكنك مشاهدة سجل التعليقات."
-  like: إعجاب
-  loading_results: "جار تحميل النتائج"
-  marketing: "هذا يشبه الإعلان / التسويق"
-  moderate_this_stream: "أشرف على هذا الجدول"
+    ALREADY_EXISTS: 'المورد موجود من قبل'
+    CANNOT_IGNORE_STAFF: 'لا يمكن تجاهل الموظفين.'
+    COMMENT_PARENT_NOT_VISIBLE: 'التعليق الذي ترد عليه تمت إزالته أو غير موجود.'
+    COMMENT_TOO_SHORT: 'يجب أن تكون التعليقات أكثر من حرف واحد، يرجى مراجعة تعليقك وإعادة المحاولة.'
+    COMMENTING_CLOSED: 'تم إغلاق فاعلية التعليق'
+    confirm_password: 'كلمات المرور غير متطابقة. يرجى التحقق مرة أخرى'
+    EDIT_USERNAME_NOT_AUTHORIZED: 'ليس لديك إذن بتحديث اسم المستخدم الخاص بك.'
+    EDIT_WINDOW_ENDED: 'لم يعد بإمكانك تحرير هذا التعليق. نافذة الوقت للقيام بذلك قد انتهت صلاحيتها.'
+    email: 'ليس بريدا إلكترونيا صالحا'
+    EMAIL_IN_USE: 'البريد الالكتروني قيد الاستخدام'
+    email_not_verified: 'عنوان البريد الإلكتروني {0} لم يتم التحقق منه.'
+    EMAIL_NOT_VERIFIED: 'لم يتم التحقق من عنوان البريد الإلكتروني'
+    email_password: 'مجموعة البريد الإلكتروني و / أو كلمة المرور غير صحيحة.'
+    EMAIL_REQUIRED: 'مطلوب عنوان البريد الإلكتروني'
+    EMAIL_VERIFICATION_TOKEN_INVALID: 'رمز التحقق من البريد الإلكتروني غير صالح.'
+    INVALID_ASSET_URL: 'رابط المادة غير صالح'
+    LOGIN_MAXIMUM_EXCEEDED: 'لقد أجريت العديد من محاولات إدخال كلمة المرور غير الناجحة. أرجو الإنتظار.'
+    network_error: 'فشل الاتصال بالخادم. تحقق من اتصالك بالإنترنت وحاول مرة أخرى.'
+    NO_SPECIAL_CHARACTERS: 'يمكن أن تحتوي أسماء المستخدمين على أحرف, أرقام و _ فقط'
+    NOT_AUTHORIZED: 'غير مصرح لك بتنفيذ هذا الإجراء.'
+    NOT_FOUND: 'المورد غير موجود'
+    organization_name: 'يجب أن يحتوي اسم المؤسسة على أحرف أو أرقام فقط.'
+    password: 'يجب أن تكون كلمة المرور 8 أحرف على الأقل'
+    PASSWORD_LENGTH: 'كلمة المرور قصيرة جدا'
+    PASSWORD_REQUIRED: 'يجب إدخال كلمة مرور'
+    PASSWORD_RESET_TOKEN_INVALID: 'رابط إعادة تعيين كلمة المرور غير صالح.'
+    PROFANITY_ERROR: 'يجب ألا تحتوي أسماء المستخدمين على الألفاظ النابية. يرجى الاتصال بالإداري إذا كنت تعتقد أن هذا خطأ.'
+    RATE_LIMIT_EXCEEDED: 'تجاوز حد المعدل'
+    required_field: 'هذه الخانة مطلوبه'
+    SAME_USERNAME_PROVIDED: 'يجب عليك تقديم اسم مستخدم مختلف.'
+    temporarily_suspended: 'حسابك معلق حاليا. سيتم إعادة تنشيطه {0}. يرجى الاتصال بنا إذا كان لديك أي أسئلة.'
+    unexpected: 'حدث خطأ غير متوقع. آسف!'
+    username: 'يمكن أن تحتوي أسماء المستخدمين على أرقام, أحرف و _ فقط'
+    USERNAME_IN_USE: 'اسم المستخدم قيد الاستخدام'
+    USERNAME_REQUIRED: 'يجب إدخال اسم مستخدم'
+  flag_comment: 'الإبلاغ عن تعليق'
+  flag_reason: 'سبب الإبلاغ (اختياري)'
+  flag_username: 'بلغ عن اسم المستخدم'
+  flagged_usernames:
+    notify_approved: '{0} وافق على اسم المستخدم {1}'
+    notify_changed: 'المستخدم {0} غير اسم المستخدم الخاص به إلى {1}'
+    notify_flagged: '{0} بلغ عن اسم المستخدم {1}'
+    notify_rejected: '{0} رفض اسم المستخدم {1}'
   flags:
     reasons:
-       user:
-         username_offensive: "مسيء"
-         username_nolike: "لم يعجبنى"
-         username_impersonating: "إنتحال شخصية"
-         username_spam: "غير مرغوب فيه"
-         username_other: "آخر"
-       comment:
-         comment_offensive: "مسيء"
-         comment_spam: "غير مرغوب فيه"
-         comment_noagree: "أعارض"
-         comment_other: "آخر"
-         suspect_word: "كلمة مشتبهة"
-         banned_word: "كلمة محظورة"
-         body_count: "يتجاوز النص الحد الأقصى للطول المسموح"
-         links: "رابط"
-  my_comment_history: "سجل التعليقات"
+      comment:
+        banned_word: 'كلمة محظورة'
+        body_count: 'يتجاوز النص الحد الأقصى للطول المسموح'
+        comment_noagree: أعارض
+        comment_offensive: مسيء
+        comment_other: آخر
+        comment_spam: 'غير مرغوب فيه'
+        links: رابط
+        suspect_word: 'كلمة مشتبهة'
+      user:
+        username_impersonating: 'إنتحال شخصية'
+        username_nolike: 'لم يعجبنى'
+        username_offensive: مسيء
+        username_other: آخر
+        username_spam: 'غير مرغوب فيه'
+  framework:
+    banned_account_body: 'هذا يعني أنه لا يمكنك الإعجاب ، أو الإبلاغ ، أو كتابة التعليقات.'
+    banned_account_header: 'حسابك محظور حاليا.'
+    changed_name:
+      msg: 'يتم مراجعة تغيير اسم المستخدم من قبل فريق الإشراف لدينا.'
+    comment: تعليق
+    comment_is_hidden: 'هذا التعليق غير متاح.'
+    comment_is_ignored: 'هذا التعليق مخفي لأنك تجاهلت هذا المستخدم.'
+    comment_is_rejected: 'لقد رفضت هذا التعليق.'
+    comments: تعليقات
+    configure_stream: تهيئة
+    content_not_available: 'هذا المحتوى غير متوفر'
+    edit_name:
+      button: أرسل
+      error: 'يمكن أن تحتوي أسماء المستخدمين على أحرف, أرقام و _ فقط'
+      label: 'اسم مستخدم جديد'
+      msg: 'تم تعليق حسابك حاليا نظرا لأن اسم المستخدم قد اعتبر غير لائق. لاستعادة حسابك، يرجى إدخال اسم مستخدم جديد. يرجى الاتصال بنا إذا كان لديك أي أسئلة.'
+    my_comments: تعليقاتي
+    my_profile: ملفي
+    new_count: 'شاهد {0} أكثر {1}'
+    profile: 'الملف الشخصي'
+    show_all_comments: 'عرض كل التعليقات'
+    show_all_replies: 'عرض جميع الردود'
+    show_more_replies: 'عرض المزيد من الردود'
+    success_bio_update: 'تم تحديث السيرة الذاتية'
+    success_name_update: 'تم تحديث اسم المستخدم'
+    success_update_settings: 'تم تطبيق التغييرات التي أجريتها على جدول التعليقات في هذه المقالة'
+    view_more_comments: 'عرض مزيد من التعليقات'
+    view_reply: 'عرض الرد'
+  from_settings_page: 'من صفحة الملف الشخصي يمكنك مشاهدة سجل التعليقات.'
+  like: إعجاب
+  loading_results: 'جار تحميل النتائج'
+  marketing: 'هذا يشبه الإعلان / التسويق'
+  moderate_this_stream: 'أشرف على هذا الجدول'
+  my_comment_history: 'سجل التعليقات'
   name: اسم
-  no_agree_comment: "لا أوافق على هذا التعليق"
-  no_like_bio: "أنا لا أحب هذه السيرة الذاتية"
-  no_like_username: "أنا لا أحب اسم المستخدم هذا"
-  already_flagged_username: "لقد سبق لك وضع علامة باسم المستخدم هذا."
+  no_agree_comment: 'لا أوافق على هذا التعليق'
+  no_like_bio: 'أنا لا أحب هذه السيرة الذاتية'
+  no_like_username: 'أنا لا أحب اسم المستخدم هذا'
   other: آخر
+  password_reset:
+    change_password: 'تغيير كلمة السر'
+    confirm_new_password: 'تأكيد كلمة السر الجديدة'
+    mail_sent: 'إذا كان لديك حساب مسجل، فقد تم إرسال رابط إعادة تعيين كلمة المرور إلى هذا البريد الإلكتروني'
+    new_password: 'كلمة السر الجديدة'
+    new_password_help: 'كلمة السر يجب أن تكون 8 أحرف على الأقل'
+    set_new_password: 'تغيير كلمة السر الخاصة بك'
   permalink: شارك
-  personal_info: "هذا التعليق يكشف عن معلومات تعريف شخصية"
+  personal_info: 'هذا التعليق يكشف عن معلومات تعريف شخصية'
   post: نشر
-  profile: الملف الشخصي
-  profile_settings: "إعدادات"
+  profile: 'الملف الشخصي'
+  profile_settings: إعدادات
   reply: رد
   report: أبلغ
-  report_notif: "شكرا على الإبلاغ عن هذا التعليق. تم إبلاغ فريق الإشراف لدينا وسيراجعه قريبًا."
-  report_notif_remove: "لقد تمت إزالة بلاغك."
-  reported: بلغ عنه
+  report_notif: 'شكرا على الإبلاغ عن هذا التعليق. تم إبلاغ فريق الإشراف لدينا وسيراجعه قريبًا.'
+  report_notif_remove: 'لقد تمت إزالة بلاغك.'
+  reported: 'بلغ عنه'
   settings:
-    from_settings_page: "من صفحة الملف الشخصي يمكنك مشاهدة سجل التعليقات."
-    my_comment_history: "سجل التعليقات"
-    profile: الملف الشخصي
-    profile_settings: "إعدادات الملف الشخصي"
-    sign_in: "تسجيل الدخول"
-    to_access: "للوصول إلى الملف الشخصي"
-    user_no_comment: "لم تترك تعليقا مطلقا. إنضم إلى المحادثة!"
+    from_settings_page: 'من صفحة الملف الشخصي يمكنك مشاهدة سجل التعليقات.'
+    my_comment_history: 'سجل التعليقات'
+    profile: 'الملف الشخصي'
+    profile_settings: 'إعدادات الملف الشخصي'
+    sign_in: 'تسجيل الدخول'
+    to_access: 'للوصول إلى الملف الشخصي'
+    user_no_comment: 'لم تترك تعليقا مطلقا. إنضم إلى المحادثة!'
+  step_1_header: 'بلغ عن مشكلة'
+  step_2_header: 'ساعدنا على الفهم'
+  step_3_header: 'شكرا لك على المساهمة الخاصة بك'
   stream:
-    all_comments: "كل التعليقات"
-    temporarily_suspended: "وفقا لإرشادات المجموعة {0}، تم تعليق حسابك مؤقتا. الرجاء إعادة الانضمام إلى المحادثة {1}."
-    comment_not_found: "تمت إزالة هذا التعليق أو أنه غير موجود."
-    no_comments: "لا توجد تعليقات حتى الآن، لماذا لا تكتب واحد؟"
-    no_comments_and_closed: "لم تكن هناك تعليقات على هذه المقالة."
-  step_1_header: "بلغ عن مشكلة"
-  step_2_header: "ساعدنا على الفهم"
-  step_3_header: "شكرا لك على المساهمة الخاصة بك"
-  thank_you: "نحن نقدر سلامتك وردود الفعل. سيراجع المشرف التقرير الخاص بك"
-  user_impersonating: "هذا المستخدم ينتحل شخصية"
-  user_no_comment: "لم تترك تعليقا مطلقا. إنضم إلى المحادثة!"
-  username_offensive: "اسم المستخدم هذا مسيء"
-  view_conversation: "عرض المحادثة"
\ No newline at end of file
+    all_comments: 'كل التعليقات'
+    comment_not_found: 'تمت إزالة هذا التعليق أو أنه غير موجود.'
+    no_comments: 'لا توجد تعليقات حتى الآن، لماذا لا تكتب واحد؟'
+    no_comments_and_closed: 'لم تكن هناك تعليقات على هذه المقالة.'
+    temporarily_suspended: 'وفقا لإرشادات المجموعة {0}، تم تعليق حسابك مؤقتا. الرجاء إعادة الانضمام إلى المحادثة {1}.'
+  thank_you: 'نحن نقدر سلامتك وردود الفعل. سيراجع المشرف التقرير الخاص بك'
+  user_impersonating: 'هذا المستخدم ينتحل شخصية'
+  user_no_comment: 'لم تترك تعليقا مطلقا. إنضم إلى المحادثة!'
+  username_offensive: 'اسم المستخدم هذا مسيء'
+  validators:
+    confirm_password: 'ﻚﻠﻣﺎﺗ ﺎﻠﻣﺭﻭﺭ ﻎﻳﺭ ﻢﺘﻃﺎﺒﻗﺓ. ﻱﺮﺟﻯ ﺎﻠﺘﺤﻘﻗ ﻡﺭﺓ ﺄﺧﺭﻯ'
+    required: 'ﻩﺬﻫ ﺎﻠﺧﺎﻧﺓ ﻢﻄﻟﻮﺒﻫ'
+    verify_email: 'ﻞﻴﺳ ﺏﺮﻳﺩﺍ ﺈﻠﻜﺗﺭﻮﻨﻳﺍ ﺹﺎﻠﺣﺍ'
+    verify_organization_name: 'ﻲﺠﺑ ﺄﻧ ﻲﺤﺗﻮﻳ ﺎﺴﻣ ﺎﻠﻣﺆﺴﺳﺓ ﻊﻟﻯ ﺄﺣﺮﻓ ﺃﻭ ﺃﺮﻗﺎﻣ ﻒﻘﻃ.'
+    verify_password: 'ﻲﺠﺑ ﺄﻧ ﺖﻛﻮﻧ ﻚﻠﻣﺓ ﺎﻠﻣﺭﻭﺭ 8 ﺄﺣﺮﻓ ﻊﻟﻯ ﺍﻸﻘﻟ'
+    verify_username: 'ﻲﻤﻜﻧ ﺄﻧ ﺖﺤﺗﻮﻳ ﺄﺴﻣﺍﺀ ﺎﻠﻤﺴﺘﺧﺪﻤﻴﻧ ﻊﻟﻯ ﺃﺮﻗﺎﻣ, ﺄﺣﺮﻓ ﻭ _ ﻒﻘﻃ'
+  view_conversation: 'عرض المحادثة'
+  your_account_has_been_banned: 'تم حظر حسابك.'
+  your_account_has_been_suspended: 'تم تعليق حسابك مؤقتا.'
+  your_username_has_been_rejected: 'تم تعليق حسابك لعدم صلاحية اسم المستخدم الخاصة بك. لاستعادة حسابك رجاء أدخل اسم مستخدم جديدة.'
diff --git a/locales/da.yml b/locales/da.yml
index d21a1aee6..14c19b860 100644
--- a/locales/da.yml
+++ b/locales/da.yml
@@ -1,471 +1,476 @@
 da:
-  your_account_has_been_suspended: "Din konto er midlertidigt suspenderet"
-  your_account_has_been_banned: "Din konto er blevet banned."
-  your_username_has_been_rejected: "Din konto er blevet suspenderet fordi dit brugernavn er blevet anset for upassende. For at gendanne din konto, venligst indtast et nyt brugernavn."
-  embed_comments_tab: "Kommentarer"
+  admin_sidebar:
+    sort_comments: 'Sorter kommentarer'
+    view_options: 'Vis mulingheder'
+  already_flagged_username: 'Du har allerede markeret dette brugernavn.'
   bandialog:
-    are_you_sure: "Er du sikker på du vil banne {0}?"
-    ban_user: "Ban Bruger?"
-    banned_user: "Bannet Bruger"
-    cancel: "Afbryd"
-    note: "Note: {0}"
-    note_reject_comment: "Hvis du banner denne bruger vil det også placere denne kommentar i den afviste kø"
-    note_ban_user: "Hvis du banner denne bruger vil det forhindre dem i at redigere kommentarer eller fjerne noget"
-    yes_ban_user: "Ja, Ban Bruger"
-    write_a_message: "Write a message"
-    send: "Send"
-    notify_ban_headline: "Underret brugeren om bannet"
-    notify_ban_description: "Dette meddeler brugeren via e-mail, at der er blevet bandlyst fra fællesskabet"
+    are_you_sure: 'Er du sikker på du vil banne {0}?'
+    ban_user: 'Ban Bruger?'
+    banned_user: 'Bannet Bruger'
+    cancel: Afbryd
     email_message_ban: "Kære {0},\n\nEn person med adgang til din konto har overtrådt vores retningslinjer for fællesskabet. Som følge heraf er din konto blevet forbudt. Du vil ikke længere kunne kommentere, like eller rapportere kommentarer. Hvis du mener at dette er sket ved en fejl, bedes du kontakte vores fællesskabsteam."
-  bio_offensive: "Denne biografi er stødende"
-  cancel: "Afbryd"
-  confirm_email:
-    click_to_confirm: "Klik nedenfor for at bekræfte din e-mail-adresse"
-    confirm: "Bekræft"
-  password_reset:
-    set_new_password: "Skift dit kodeord"
-    new_password: "Nyt kodeord"
-    new_password_help: "Kodeordet skal være mindst 8 tegn"
-    confirm_new_password: "Bekræft ny kodeord"
-    change_password: "Skift kodeord"
-  characters_remaining: "tegn tilbage"
+    note: 'Note: {0}'
+    note_ban_user: 'Hvis du banner denne bruger vil det forhindre dem i at redigere kommentarer eller fjerne noget'
+    note_reject_comment: 'Hvis du banner denne bruger vil det også placere denne kommentar i den afviste kø'
+    notify_ban_description: 'Dette meddeler brugeren via e-mail, at der er blevet bandlyst fra fællesskabet'
+    notify_ban_headline: 'Underret brugeren om bannet'
+    send: Send
+    write_a_message: 'Write a message'
+    yes_ban_user: 'Ja, Ban Bruger'
+  bio_offensive: 'Denne biografi er stødende'
+  cancel: Afbryd
+  characters_remaining: 'tegn tilbage'
   comment:
-    anon: "Anonym"
-    undo_reject: "Fortryde"
-    ban_user: "Ban Bruger"
-    comment: "Skriv en kommentar"
-    edited: "Redigeret"
-    flagged: "markeret"
-    view_context: "Vis kontekst"
+    anon: Anonym
+    ban_user: 'Ban Bruger'
+    comment: 'Skriv en kommentar'
+    edited: Redigeret
+    flagged: markeret
+    undo_reject: Fortryde
+    view_context: 'Vis kontekst'
   comment_box:
-    post: "Send"
-    cancel: "Afbryd"
-    reply: "Svar"
-    comment: "Skriv en kommentar"
-    name: "Navn"
-    comment_post_notif: "Din kommentar er blevet sendt"
-    comment_post_notif_premod: "Tak for at skrive en kommentar. Vores moderatorer vil gennemgå din kommentar inden for kort tid."
-    comment_post_banned_word: "Din kommentar indeholder et eller flere ord, der ikke er tilladt, derfor vil den ikke bliver offentliggjort. Hvis du mener, at denne besked er forkert, bedes du kontakte vores moderatorer"
-    characters_remaining: "tegn tilbage"
-  comment_offensive: "Denne kommentar er stødende"
-  comment_singular: "Kommentar"
-  comment_plural: "Kommentarer"
-  comment_post_banned_word: "Din kommentyar indeholder et eller flere ord, der ikke er tilladt, derfor vil den ikke bliver offentliggjort. Hvis du mener, at denne besked er forkert, bedes du kontakte vores moderatorer"
-  comment_post_notif: "Din kommentar er blevet offentliggjort"
-  comment_post_notif_premod: "Tak for at skrive en kommentar. Vores moderatorer vil gennemgå din kommentar inden for kort tid."
+    cancel: Afbryd
+    characters_remaining: 'tegn tilbage'
+    comment: 'Skriv en kommentar'
+    comment_post_banned_word: 'Din kommentar indeholder et eller flere ord, der ikke er tilladt, derfor vil den ikke bliver offentliggjort. Hvis du mener, at denne besked er forkert, bedes du kontakte vores moderatorer'
+    comment_post_notif: 'Din kommentar er blevet sendt'
+    comment_post_notif_premod: 'Tak for at skrive en kommentar. Vores moderatorer vil gennemgå din kommentar inden for kort tid.'
+    name: Navn
+    post: Send
+    reply: Svar
+  comment_offensive: 'Denne kommentar er stødende'
+  comment_plural: Kommentarer
+  comment_post_banned_word: 'Din kommentyar indeholder et eller flere ord, der ikke er tilladt, derfor vil den ikke bliver offentliggjort. Hvis du mener, at denne besked er forkert, bedes du kontakte vores moderatorer'
+  comment_post_notif: 'Din kommentar er blevet offentliggjort'
+  comment_post_notif_premod: 'Tak for at skrive en kommentar. Vores moderatorer vil gennemgå din kommentar inden for kort tid.'
+  comment_singular: Kommentar
   common:
-    copy: "Kopier"
-    error: "Der er sket en fejl."
-    reply: "svar"
-    replies: "svar"
-    reaction: "reaktion"
-    reactions: "reaktioner"
-    story: "Historie"
+    copy: Kopier
+    error: 'Der er sket en fejl.'
+    reaction: reaktion
+    reactions: reaktioner
+    replies: svar
+    reply: svar
+    story: Historie
+  community:
+    account_creation_date: 'Oprettelsedato for konto'
+    active: Aktive
+    admin: Administrator
+    ads_marketing: 'Dette ligner en annonce/markedsføring'
+    are_you_sure: 'Er du sikker på at du vil banne {0}?'
+    ban_user: 'Ban Bruger?'
+    banned: Bannet
+    banned_user: 'Bannet Bruger'
+    cancel: Afbryd
+    commenter: Commenter
+    dont_like_username: 'Synses ikke om brugernavnet'
+    flaggedaccounts: 'Flagged Brugernavne'
+    flags: Flags
+    impersonating: Personefterligning
+    loading: 'Indlæser resultater'
+    moderator: Moderator
+    newsroom_role: 'Nyhedsrum Rolle'
+    no_flagged_accounts: 'Køen for flagget kontoer er tom i øjeblikket'
+    no_results: 'Igen brugere fundet med det brugernavn eller email-adresse. De gemmer sig!'
+    offensive: Offensiv
+    other: Andre
+    people: Mennesker
+    role: 'Vælg rolle...'
+    select_status: 'Vælg status...'
+    spam_ads: Spam/Reklamer
+    staff: Personale
+    status: Status
+    username_and_email: 'Brugernavn eller email-adresse'
+    yes_ban_user: 'Ja Ban Bruger'
+  configure:
+    apply: Anvend
+    banned_word_text: 'Kommentarer, der indeholder disse ord eller sætninger (Ikke følsom over for store eller små bogstaver) fjernes automatisk fra kommentarstrømmen. Indtast et ord og tryk på Enter eller Tab for at tilføje. Indsæt eventuelt en kommasepareret liste.'
+    banned_words_title: 'Bannet ord liste'
+    close: Luk
+    close_after: 'Luk kommentarene efter'
+    close_stream: 'Luk strømmen'
+    close_stream_configuration: 'Denne kommentarstrøm er lukket i øjeblikket. Ved at åbne denne kommentarstrøm kan nye kommentarer indsendes og vises.'
+    closed_comments_desc: 'Skriv en besked, der skal vises når, din kommentarstrøm er lukket og ikke længere accepterer kommentarer.'
+    closed_comments_label: 'Skriv en besked...'
+    closed_stream_settings: 'Lukket strøm besked'
+    comment_count_error: 'Indtæst venligst et gyldigt numemr.'
+    comment_count_header: 'Begræns kommentar længde'
+    comment_count_text_post: tegn
+    comment_count_text_pre: 'Kommentarer vil være begrænset til'
+    comment_settings: Indstillinger
+    comment_stream: Kommentarstrøm
+    comment_stream_will_close: 'Denne kommentarstrøm vil blive lukkes'
+    community: Fællesskab
+    configure: Konfigurer
+    copy_and_paste: 'Kopier og indsæt kode nedenfor i dit CMS system for at indlejre din kommentarboks i dine artiker.'
+    custom_css_url: 'Brugerdefineret CSS URL'
+    custom_css_url_desc: 'URL til et CSS stylesheet der tilsidesætter den alimdelige strøms stilart. Kan være internt eller externt'
+    days: Dage
+    description: 'Som administrator kan du tilpasse indstillingerne til kommentarstrømmen for denne historie:'
+    domain_list_text: 'Indtast de domæner du gerne vil tillade til Talk. f.eks. Dit lokale udviklings miljø (fx. localhost:3000 staging.domain.com domain.com).'
+    domain_list_title: 'Tilladte domæner.'
+    edit_comment_timeframe_heading: 'Rediger kommentar tidsramme'
+    edit_comment_timeframe_text_post: 'sekunder for at redigere deres kommentarer.'
+    edit_comment_timeframe_text_pre: 'Kommentatorer vil have'
+    embed_comment_stream: 'Indlejre strøm'
+    enable_pre_moderation: 'Aktiver forud moderering'
+    enable_pre_moderation_text: 'Moderatorer skal godkende enhver kommentar før den offentliggøres.'
+    enable_premod: 'Aktiver forud moderering'
+    enable_premod_description: 'Moderatorer skal godkende enhver kommentar før den offentliggøres'
+    enable_premod_links: 'Forud moderer kommentarer der indeholder links'
+    enable_premod_links_description: 'Moderatorer skal godkende enhver kommentar, der indeholder et link før det bliver offentliggjort.'
+    enable_premod_links_text: 'Moderatorer skal godkende enhver kommentar, der indeholder et link før det bliver offentliggjort.'
+    enable_questionbox: 'Stil et spørgsmål til læserne'
+    enable_questionbox_description: 'Dette spørgsmål vises øverst i denne kommentarstrøm. Stil et spørgsmål til læserne om et bestemt problem i artiklen eller stil spørgsmål til diskussion mv.'
+    hours: Timer
+    include_comment_stream: 'Inkluder kommentarstrømmens beskrivelse for læsere'
+    include_comment_stream_desc: 'Skriv en besked, der skal tilføjes øverst i din kommentarstrøm. Indsæt et emne der omfatter fællesskabsretningslinjer mv.'
+    include_question_here: 'Stil dit spørgsmål her:'
+    include_text: 'Medtag din tekst her.'
+    moderate: Moderat
+    moderation_settings: 'Moderator indstillinger'
+    open: Åben
+    open_stream: 'Åben strøm'
+    open_stream_configuration: 'Denne kommentarstrøm er i øjeblikket åben. Ved at lukke denne kommentarstrøm kan der ikke indsendes nye kommentarer, og alle tidligere kommentarer vil stadig blive vist.'
+    require_email_verification: 'Kræv email verifikation'
+    require_email_verification_text: 'Nye brugere skal verificere deres email før de kan kommenterer'
+    save_changes: 'Gem ændringer'
+    shortcuts: Genveje
+    sign_out: 'Log ud'
+    stories: Historier
+    stream_settings: 'Strøm indstillinger'
+    suspect_word_text: 'Kommentarer der indeholder disse ord eller sætninger (Ikke følsom over for store eller små bogstaver) vil blive fremhævet i kommentarstrømmen. Indtast et ord, og tryk på Enter eller Tab for at tilføje. Indsæt eventuelt en kommasepareret liste.'
+    suspect_word_title: 'Mistænkte ord liste'
+    tech_settings: 'Tekniske indstillinger'
+    title: 'Konfigurer kommentarstrøm'
+    weeks: Uger
+    wordlist: 'Forbudte ord'
+  confirm_email:
+    click_to_confirm: 'Klik nedenfor for at bekræfte din e-mail-adresse'
+    confirm: Bekræft
+  continue: Fortsæt
+  createdisplay:
+    check_the_form: 'Ugyldig formular. Tjek venligst felterne'
+    continue: 'Fprtsæt med det samme Facebook brugernavn'
+    error_create: 'Fejl ved ændring af brugernavn'
+    fake_comment_body: 'Dette er et eksempel på en kommentar. Læsere kan dele deres tanker og meninger med nyhedsrummet i kommentarfeltet'
+    fake_comment_date: '1 minut siden'
+    if_you_dont_change_your_name: 'Hvis du ikke ændrer dit brugernavn på dette trin, vil dit Facebook brugernavn vises sammen med alle dine kommentarer'
+    required_field: 'Påkrævet felt'
+    save: Gem
+    special_characters: 'Brugernavne kan kun indeholde bogstaver og _'
+    username: Brugernavn
+    write_your_username: 'Rediger dit brugernavn'
+    your_username: 'Dit brugernavn vises på hver kommentar du sender.'
+  done: Færdig
+  edit_comment:
+    body_input_label: 'Rediger denne kommentar'
+    edit_window_expired: 'Du kan ikke længere redigere denne kommentar. Tidsvinduet for at gøre det er udløbet. Hvorfor skriver du ikke en ny?'
+    edit_window_expired_close: Luk
+    edit_window_timer_prefix: 'Luk vindue: '
+    minute: minut
+    minutes_plural: minutter
+    save_button: 'Gem ændringer'
+    second: sekund
+    seconds_plural: sekunder
+  email:
+    banned:
+      body: 'I overensstemmelse med Coral projektets retningslinjer for fællesskabet er din konto blevet lukket. Du har nu ikke længere tilladelse at kommentere, flagge eller engagere dig i vores fællesskabet.'
+      subject: 'Din konto er blevet lukket'
+    confirm:
+      confirm_email: 'Bekræft Email'
+      has_been_requested: 'Der er anmodet om en e-mail bekræftelse for følgende konto:'
+      if_you_did_not: 'Hvis du ikke har anmodet om dette, kan du med sikkerhed ignorere denne email.'
+      subject: 'Email Bekræftelse'
+      to_confirm: 'For at bekræfte kontoen, skal du besøge følgende link:'
+    password_reset:
+      if_you_did: 'Hvis du gjorde,'
+      please_click: 'venligst klik her for at nulstille adgangskoden'
+      we_received_a_request: 'Vi har modtaget en anmodning om at nulstille din adgangskode. Hvis du ikke har anmodet om denne ændring, kan du ignoere denne email.'
+    suspended:
+      subject: 'Din konto er blevet suspenderet'
+  embed_comments_tab: Kommentarer
+  embedlink:
+    copy: 'Kopier til udklipsholder'
+  error:
+    ALREADY_EXISTS: 'Ressource eksisterer allerede'
+    CANNOT_IGNORE_STAFF: 'Kan ikke ignorere personale.'
+    COMMENT_PARENT_NOT_VISIBLE: 'Den kommentar, du svarer på er blevet fjernet eller eksisterer ikke.'
+    COMMENT_TOO_SHORT: 'Din kommentar skal indeholde noget'
+    COMMENTING_CLOSED: 'Kommentering er allerede lukket'
+    confirm_password: 'Kodeordene matcher ikke. Tjek venligst igen.'
+    EDIT_USERNAME_NOT_AUTHORIZED: 'Du har ikke tilladelse til at opdatere dit brugernavn.'
+    EDIT_WINDOW_ENDED: 'Du kan ikke længere redigere denne kommentar. Tidsvinduet for at gøre det er udløbet.'
+    email: 'Ikke en gylding e-mail'
+    EMAIL_IN_USE: 'Email adressen er allerede i brug'
+    email_not_verified: 'E-mail adresse {0} ikke bekræftet.'
+    EMAIL_NOT_VERIFIED: 'E-mail address not verified'
+    email_password: 'E-mail og/eller kodeord er forkert.'
+    EMAIL_REQUIRED: 'En email adresse er påkrævet'
+    EMAIL_VERIFICATION_TOKEN_INVALID: 'E-mail-verifikationstoken er ugyldig.'
+    INVALID_ASSET_URL: 'Aktivitetswebadresse er ugyldig'
+    LOGIN_MAXIMUM_EXCEEDED: 'Du har lavet for mange mislykkede adgangskodeforsøg. Vent venligst.'
+    network_error: 'Det lykkedes ikke at oprette forbindelse til serveren. Tjek din internetforbindelse og prøv igen.'
+    NO_SPECIAL_CHARACTERS: 'Brugernavne kan kun indeholder bogstaver og _'
+    NOT_AUTHORIZED: 'Du har ikke tilladelse til at udføre denne handling.'
+    NOT_FOUND: 'Ressource ikke fundet'
+    organization_name: 'Organisationsnavn må kun indeholde bogstaver og tal.'
+    password: 'Adgangskoden skal være mindst 8 tegn'
+    PASSWORD_LENGTH: 'Adgangskoden er for kort'
+    PASSWORD_REQUIRED: 'Du skal indtaste et kodeord'
+    PASSWORD_RESET_TOKEN_INVALID: 'Dit kodeord for nulstilling af din adgangskode er ugyldig.'
+    PROFANITY_ERROR: 'Brugernavne må ikke inholde stødende indhold. Kontakt venligst administratoren, hvis du mener at dette er en fejl.'
+    SAME_USERNAME_PROVIDED: 'Du skal indsende et andet brugernavn.'
+    temporarily_suspended: 'Din konto er midlertidigt suspenderet. Det vil blive genaktiveret {0}. Kontakt os venligst hvis du har spørgsmål.'
+    unexpected: 'Der opstod en uventet fejl. Undskyld!'
+    username: 'Brugernavne kan kun indeholde bogstaver og _'
+    USERNAME_IN_USE: 'Brugernavnet er allerede i brug'
+    USERNAME_REQUIRED: 'Du skal indtaste et brugernavn'
+  flag_comment: 'Rapportér kommentar'
+  flag_reason: 'Årsag til rapportering (Valgfrit)'
+  flag_username: 'Rapporter brugernavn'
   flagged_usernames:
     notify_approved: '{0} godkendt brugernavn {1}'
-    notify_rejected: '{0} afvist brugernavn {1}'
-    notify_flagged: '{0} flagget brugernavn {1}'
     notify_changed: 'bruger {0} skiftede deres bruger navn {1}'
-  community:
-    account_creation_date: "Oprettelsedato for konto"
-    active: "Aktive"
-    admin: "Administrator"
-    ads_marketing: "Dette ligner en annonce/markedsføring"
-    are_you_sure: "Er du sikker på at du vil banne {0}?"
-    ban_user: "Ban Bruger?"
-    banned: "Bannet"
-    banned_user: "Bannet Bruger"
-    cancel: "Afbryd"
-    dont_like_username: "Synses ikke om brugernavnet"
-    flaggedaccounts: "Flagged Brugernavne"
-    flags: "Flags"
-    impersonating: "Personefterligning"
-    loading: "Indlæser resultater"
-    moderator: "Moderator"
-    newsroom_role: "Nyhedsrum Rolle"
-    no_flagged_accounts: "Køen for flagget kontoer er tom i øjeblikket"
-    no_results: "Igen brugere fundet med det brugernavn eller email-adresse. De gemmer sig!"
-    offensive: "Offensiv"
-    other: "Andre"
-    people: "Mennesker"
-    role: "Vælg rolle..."
-    select_status: "Vælg status..."
-    spam_ads: "Spam/Reklamer"
-    staff: "Personale"
-    status: "Status"
-    username_and_email: "Brugernavn eller email-adresse"
-    yes_ban_user: "Ja Ban Bruger"
-    commenter: "Commenter"
-  configure:
-    apply: "Anvend"
-    banned_word_text: "Kommentarer, der indeholder disse ord eller sætninger (Ikke følsom over for store eller små bogstaver) fjernes automatisk fra kommentarstrømmen. Indtast et ord og tryk på Enter eller Tab for at tilføje. Indsæt eventuelt en kommasepareret liste."
-    banned_words_title: "Bannet ord liste"
-    close: "Luk"
-    close_after: "Luk kommentarene efter"
-    close_stream: "Luk strømmen"
-    close_stream_configuration: "Denne kommentarstrøm er lukket i øjeblikket. Ved at åbne denne kommentarstrøm kan nye kommentarer indsendes og vises."
-    closed_comments_desc: "Skriv en besked, der skal vises når, din kommentarstrøm er lukket og ikke længere accepterer kommentarer."
-    closed_comments_label: "Skriv en besked..."
-    closed_stream_settings: "Lukket strøm besked"
-    comment_count_error: "Indtæst venligst et gyldigt numemr."
-    comment_count_header: "Begræns kommentar længde"
-    comment_count_text_post: "tegn"
-    comment_count_text_pre: "Kommentarer vil være begrænset til"
-    comment_settings: "Indstillinger"
-    comment_stream: "Kommentarstrøm"
-    comment_stream_will_close: "Denne kommentarstrøm vil blive lukkes"
-    community: "Fællesskab"
-    configure: "Konfigurer"
-    copy_and_paste: "Kopier og indsæt kode nedenfor i dit CMS system for at indlejre din kommentarboks i dine artiker."
-    custom_css_url: "Brugerdefineret CSS URL"
-    custom_css_url_desc: "URL til et CSS stylesheet der tilsidesætter den alimdelige strøms stilart. Kan være internt eller externt"
-    days: "Dage"
-    description: "Som administrator kan du tilpasse indstillingerne til kommentarstrømmen for denne historie:"
-    domain_list_text: "Indtast de domæner du gerne vil tillade til Talk. f.eks. Dit lokale udviklings miljø (fx. localhost:3000 staging.domain.com domain.com)."
-    domain_list_title: "Tilladte domæner."
-    edit_comment_timeframe_heading: "Rediger kommentar tidsramme"
-    edit_comment_timeframe_text_pre: "Kommentatorer vil have"
-    edit_comment_timeframe_text_post: "sekunder for at redigere deres kommentarer."
-    embed_comment_stream: "Indlejre strøm"
-    enable_premod_links_text: "Moderatorer skal godkende enhver kommentar, der indeholder et link før det bliver offentliggjort."
-    enable_pre_moderation: "Aktiver forud moderering"
-    enable_pre_moderation_text: "Moderatorer skal godkende enhver kommentar før den offentliggøres."
-    enable_premod_links: "Forud moderer kommentarer der indeholder links"
-    enable_premod: "Aktiver forud moderering"
-    enable_premod_description: "Moderatorer skal godkende enhver kommentar før den offentliggøres"
-    enable_premod_links_description: "Moderatorer skal godkende enhver kommentar, der indeholder et link før det bliver offentliggjort."
-    enable_questionbox: "Stil et spørgsmål til læserne"
-    enable_questionbox_description: "Dette spørgsmål vises øverst i denne kommentarstrøm. Stil et spørgsmål til læserne om et bestemt problem i artiklen eller stil spørgsmål til diskussion mv."
-    hours: "Timer"
-    include_comment_stream: "Inkluder kommentarstrømmens beskrivelse for læsere"
-    include_comment_stream_desc: "Skriv en besked, der skal tilføjes øverst i din kommentarstrøm. Indsæt et emne der omfatter fællesskabsretningslinjer mv."
-    include_text: "Medtag din tekst her."
-    include_question_here: "Stil dit spørgsmål her:"
-    moderate: "Moderat"
-    moderation_settings: "Moderator indstillinger"
-    open: "Åben"
-    open_stream: "Åben strøm"
-    open_stream_configuration: "Denne kommentarstrøm er i øjeblikket åben. Ved at lukke denne kommentarstrøm kan der ikke indsendes nye kommentarer, og alle tidligere kommentarer vil stadig blive vist."
-    require_email_verification: "Kræv email verifikation"
-    require_email_verification_text: "Nye brugere skal verificere deres email før de kan kommenterer"
-    save_changes: "Gem ændringer"
-    shortcuts: "Genveje"
-    sign_out: "Log ud"
-    stories: "Historier"
-    stream_settings: "Strøm indstillinger"
-    suspect_word_title: "Mistænkte ord liste"
-    suspect_word_text: "Kommentarer der indeholder disse ord eller sætninger (Ikke følsom over for store eller små bogstaver) vil blive fremhævet i kommentarstrømmen. Indtast et ord, og tryk på Enter eller Tab for at tilføje. Indsæt eventuelt en kommasepareret liste."
-    tech_settings: "Tekniske indstillinger"
-    title: "Konfigurer kommentarstrøm"
-    weeks: "Uger"
-    wordlist: "Forbudte ord"
-  continue: "Fortsæt"
-  createdisplay:
-    check_the_form: "Ugyldig formular. Tjek venligst felterne"
-    continue: "Fprtsæt med det samme Facebook brugernavn"
-    error_create: "Fejl ved ændring af brugernavn"
-    fake_comment_body: "Dette er et eksempel på en kommentar. Læsere kan dele deres tanker og meninger med nyhedsrummet i kommentarfeltet"
-    fake_comment_date: "1 minut siden"
-    if_you_dont_change_your_name: "Hvis du ikke ændrer dit brugernavn på dette trin, vil dit Facebook brugernavn vises sammen med alle dine kommentarer"
-    required_field: "Påkrævet felt"
-    save: "Gem"
-    special_characters: "Brugernavne kan kun indeholde bogstaver og _"
-    username: "Brugernavn"
-    write_your_username: "Rediger dit brugernavn"
-    your_username: "Dit brugernavn vises på hver kommentar du sender."
-  done: "Færdig"
-  edit_comment:
-    body_input_label: "Rediger denne kommentar"
-    save_button: "Gem ændringer"
-    edit_window_expired: "Du kan ikke længere redigere denne kommentar. Tidsvinduet for at gøre det er udløbet. Hvorfor skriver du ikke en ny?"
-    edit_window_expired_close: "Luk"
-    edit_window_timer_prefix: "Luk vindue: "
-    second: "sekund"
-    seconds_plural: "sekunder"
-    minute: "minut"
-    minutes_plural: "minutter"
-  email:
-    suspended:
-      subject: "Din konto er blevet suspenderet"
-    banned:
-      subject: "Din konto er blevet lukket"
-      body: "I overensstemmelse med Coral projektets retningslinjer for fællesskabet er din konto blevet lukket. Du har nu ikke længere tilladelse at kommentere, flagge eller engagere dig i vores fællesskabet."
-    confirm:
-      has_been_requested: "Der er anmodet om en e-mail bekræftelse for følgende konto:"
-      to_confirm: "For at bekræfte kontoen, skal du besøge følgende link:"
-      confirm_email: "Bekræft Email"
-      if_you_did_not: "Hvis du ikke har anmodet om dette, kan du med sikkerhed ignorere denne email."
-      subject: "Email Bekræftelse"
-    password_reset:
-      we_received_a_request: "Vi har modtaget en anmodning om at nulstille din adgangskode. Hvis du ikke har anmodet om denne ændring, kan du ignoere denne email."
-      if_you_did: "Hvis du gjorde,"
-      please_click: "venligst klik her for at nulstille adgangskoden"
-  embedlink:
-    copy: "Kopier til udklipsholder"
-  error:
-    COMMENT_PARENT_NOT_VISIBLE: "Den kommentar, du svarer på er blevet fjernet eller eksisterer ikke."
-    EMAIL_VERIFICATION_TOKEN_INVALID: "E-mail-verifikationstoken er ugyldig."
-    PASSWORD_RESET_TOKEN_INVALID: "Dit kodeord for nulstilling af din adgangskode er ugyldig."
-    COMMENT_TOO_SHORT: "Din kommentar skal indeholde noget"
-    NOT_AUTHORIZED: "Du har ikke tilladelse til at udføre denne handling."
-    NO_SPECIAL_CHARACTERS: "Brugernavne kan kun indeholder bogstaver og _"
-    PASSWORD_LENGTH: "Adgangskoden er for kort"
-    PROFANITY_ERROR: "Brugernavne må ikke inholde stødende indhold. Kontakt venligst administratoren, hvis du mener at dette er en fejl."
-    USERNAME_IN_USE: "Brugernavnet er allerede i brug"
-    USERNAME_REQUIRED: "Du skal indtaste et brugernavn"
-    EMAIL_NOT_VERIFIED: "E-mail address not verified"
-    EDIT_WINDOW_ENDED: "Du kan ikke længere redigere denne kommentar. Tidsvinduet for at gøre det er udløbet."
-    EDIT_USERNAME_NOT_AUTHORIZED: "Du har ikke tilladelse til at opdatere dit brugernavn."
-    SAME_USERNAME_PROVIDED: "Du skal indsende et andet brugernavn."
-    EMAIL_IN_USE: "Email adressen er allerede i brug"
-    EMAIL_REQUIRED: "En email adresse er påkrævet"
-    LOGIN_MAXIMUM_EXCEEDED: "Du har lavet for mange mislykkede adgangskodeforsøg. Vent venligst."
-    PASSWORD_REQUIRED: "Du skal indtaste et kodeord"
-    COMMENTING_CLOSED: "Kommentering er allerede lukket"
-    NOT_FOUND: "Ressource ikke fundet"
-    ALREADY_EXISTS: "Ressource eksisterer allerede"
-    INVALID_ASSET_URL: "Aktivitetswebadresse er ugyldig"
-    CANNOT_IGNORE_STAFF: "Kan ikke ignorere personale."
-    email: "Ikke en gylding e-mail"
-    confirm_password: "Kodeordene matcher ikke. Tjek venligst igen."
-    network_error: "Det lykkedes ikke at oprette forbindelse til serveren. Tjek din internetforbindelse og prøv igen."
-    email_not_verified: "E-mail adresse {0} ikke bekræftet."
-    email_password: "E-mail og/eller kodeord er forkert."
-    organization_name: "Organisationsnavn må kun indeholde bogstaver og tal."
-    password: "Adgangskoden skal være mindst 8 tegn"
-    username: "Brugernavne kan kun indeholde bogstaver og _"
-    unexpected: "Der opstod en uventet fejl. Undskyld!"
-    temporarily_suspended: "Din konto er midlertidigt suspenderet. Det vil blive genaktiveret {0}. Kontakt os venligst hvis du har spørgsmål."
-  flag_comment: "Rapportér kommentar"
-  flag_reason: "Årsag til rapportering (Valgfrit)"
-  flag_username: "Rapporter brugernavn"
-  framework:
-    banned_account_header: "Din konto er i øjeblikket bannet"
-    banned_account_body: "Det betyder at du ikke kan synes godt om, rapportere eller skrive kommentarer."
-    comment: "kommentar"
-    comment_is_ignored: "Denne kommentar er skjult, fordi du ignoerede denne bruger."
-    comment_is_rejected: "Du har afvist denne kommentar."
-    comment_is_hidden: "Denne kommentar er ikke tilgængelig"
-    comments: "kommentarer"
-    configure_stream: "Konfigurer"
-    content_not_available: "Dette indhold er ikke tilgængeligt"
-    edit_name:
-      button: "Indsend"
-      error: "Brugernavne kan kun indeholde bogstaver og _"
-      label: "Nyt brugernavn"
-      msg: "Din konto er midlertidigt suspenderet, fordi dit brugernavn er blevet anset for upassende. For at gendanne din konto skal du indtaste et nyt brugernavn. Kontakt os venligst, hvis du har spørgsmål."
-    changed_name:
-      msg: "Dit brugernavn ændring er nuværende under gennemgang af vores modereringsteam."
-    my_comments: "Mine kommentarer"
-    my_profile: "Min profil"
-    new_count: "Se {0} mere {1}"
-    profile: "Profil"
-    show_all_comments: "Vis alle kommentarer"
-    success_bio_update: "Din biografi er blevet opdateret"
-    success_name_update: "Dit brugernavn er blevet opdateret"
-    success_update_settings: "De ændringer du har foretaget, er blevet anvendt til kommentarstrømmen på denne artikel."
-    show_all_replies: "Vis alle svar"
-    show_more_replies: "Vis flere svar"
-    view_more_comments: "se flere kommentarer"
-    view_reply: "vis svar"
-  from_settings_page: "Fra profilsiden kan du se din kommentarhistorie."
-  like: "Synes godt om"
-  loading_results: "Indlæser resultater"
-  marketing: "Dette ligner en annonce/markedsføring"
-  moderate_this_stream: "Moderer denne strøm"
+    notify_flagged: '{0} flagget brugernavn {1}'
+    notify_rejected: '{0} afvist brugernavn {1}'
   flags:
     reasons:
-      user:
-        username_offensive: "Offensiv"
-        username_nolike: "Dislike"
-        username_impersonating: "Personefterligning"
-        username_spam: "Spam"
-        username_other: "Andre"
       comment:
-        comment_offensive: "Offensiv"
-        comment_spam: "Spam"
-        comment_noagree: "Uenig"
-        comment_other: "Andre"
-        banned_word: "Forbudt ord"
-        body_count: "Body overstiger max længde"
-        links: "Link"
-  modqueue:
-    account: "konto flag"
-    actions: "Handlinger"
-    all: "alle"
-    all_streams: "Alle Strømme"
-    notify_edited: "{0} redigeret kommentar {1}"
-    notify_accepted: "{0} accepteret kommentar {1}"
-    notify_rejected: "{0} afvist kommentar {1}"
-    notify_flagged: "{0} flagget kommentar {1}"
-    notify_reset: '{0} reset status of comment "{1}"'
-    approve: "Godkend"
-    approved: "Godkendt"
-    ban_user: "Ban"
-    billion: "M"
-    close: "Close"
-    empty_queue: "Ikke flere kommentarer til at moderer! Du har indhentet det hele. Gå ud og tag noget ☕️"
-    flagged: "flagged"
-    reported: "Rapporteret"
-    jump_to_queue: "Hop til specifik kø"
-    less_detail: "Færre detajler"
-    likes: "Syntes godt om"
-    million: "M"
-    mod_faster: "Moderer hurtigere med tastaturgenveje"
-    moderate: "Moderer →"
-    more_detail: "Flere detaljer"
-    new: "Ny"
-    newest_first: "Nyeste først"
-    navigation: "Navigation"
-    next_comment: "Gå til næste kommentar"
-    next_queue: "Skift kø"
-    oldest_first: "Ældste Først"
-    premod: "pre-mod"
-    prev_comment: "Gå til den forrige kommentar"
-    reject: "Afvis"
-    rejected: "Afvist"
-    reply: "Svar"
-    select_stream: "Vælg strøm"
-    shift_key: "⇧"
-    shortcuts: "Genveje"
-    show_shortcuts: "Vis genveje"
-    singleview: "Zen mode"
-    sort: "Sort"
-    thismenu: "Åben denne menu"
-    thousand: "k"
-    try_these: "Prøv disse"
-    toggle_search: "Åben søgning"
-    view_more_shortcuts: "Se flere genveje"
-  my_comment_history: "Min kommentar Historie"
-  name: "Navn"
-  no_agree_comment: "Jeg er ikke enig med denne kommentar"
-  no_like_bio: "Jeg kan ikke lide denne biografi"
-  no_like_username: "Jeg kan ikke lide dette brugernavn"
-  already_flagged_username: "Du har allerede markeret dette brugernavn."
-  other: "Andet"
-  permalink: "Delen"
-  personal_info: "Denne kommentar afslører personligt identificerbare oplysninger"
-  post: "Post"
-  profile: "Profil"
-  profile_settings: "Indstillinger"
-  reply: "Svar"
-  report: "Rapporter"
-  report_notif: "Tak fordi du rapporterede denne kommentar. Vores modereringsteam har fået besked, og vil gennemgå det inden for kort tid."
-  report_notif_remove: "Din rapport er blevet fjernet"
-  reported: "Rapporteret"
-  settings:
-    from_settings_page: "Fra profilsiden kan du se din kommentarhistorie."
-    my_comment_history: "Min kommentarhistorie"
-    profile: "Profil"
-    profile_settings: "Profilindstillinger"
-    sign_in: "Log ind"
-    to_access: "for at tilgå din profil"
-    user_no_comment: "Du har aldrig efterladt en kommentar. Deltag i samtalen!"
-  stream:
-    all_comments: "Alle kommentarer"
-    temporarily_suspended: "I overensstemmelse med {0}'s retningslinjer for fællesskabet er din konto midlertidigt suspenderet. Venligst tilslut dig samtalen {1}."
-    comment_not_found: "Denne kommentar er blevet fjernet eller findes ikke."
-    no_comments: "Der er ingen kommentarer endnu, hvorfor skriver du ikke en?"
-    no_comments_and_closed: "Der var ingen kommentarer til denne artikel"
-  step_1_header: "Rapportér et problem"
-  step_2_header: "Hjælp os med at forstå"
-  step_3_header: "Tak for din indsats"
-  streams:
-    all: "Alle"
-    article: "Historie"
-    closed: "Lukket"
-    empty_result: "Ingen egenskaber matcher denne søgning. Måske prøv og forsøge at udvide din søgning?"
-    filter_streams: "Filtrer strømme"
-    newest: "Nyeste"
-    oldest: "Ældste"
-    open: "Åben"
-    pubdate: "Udgivelsedato"
-    search: "Søg"
-    sort_by: "Sorter efter"
-    status: "Strøm status"
-    stream_status: "Strøm Status"
-  suspenduser:
-    title_suspend: "Suspendere bruger"
-    description_suspend: "Du suspenderer {0}. Denne kommentar vil gå til den afviste kø, og {0} vil ikke kunne synes godt om, rapportere, svare eller indsende indtil suspenderings tiden er færdig."
-    select_duration: "Vælg suspenderings tid"
-    one_hour: "1 time"
-    hours: "{0} timer"
-    days: "{0} dage"
-    cancel: "Afbryd"
-    suspend_user: "Suspender bruger"
-    email_message_suspend: "Kære {0},\n\nI overensstemmelse med {1}'s retningslinjer for fællesskabet er din konto midlertidigt suspenderet. Under suspensionen vil du ikke kunne kommentere, flagge eller engagere dig med andre kommentarer. Venligst tilslut dig til samtalen{2}.'"
-    title_notify: "Underret bruygeren om deres midlertidige suspension"
-    notify_suspend_until: "Bruger {0} er midlertidigt suspenderet. Denne suspension ophører automatisk om {1}."
-    description_notify: "Suspendering af denne bruger vil midlertidigt deaktivere deres konto."
-    write_message: "Skriv en besked"
-    send: "Send"
-  reject_username:
-    username: "brugernavn"
-    no_cancel: "Nej Afbryd"
-    description_reject: "Vil du midlertidigt forbyde denne bruger på grund af deres {0}? Hvis du gør det vil blive suspenderet indtil de omskriver deres {0}."
-    title_notify: "Underret brugeren om deres midlertidige suspension"
-    description_notify: "Suspendering af denne bruger vil midlertidigt deaktivere deres konto."
-    title_reject: "Vi har bemærket at du afviste et brugernavn."
-    suspend_user: "Suspender bruger"
-    yes_suspend: "Ja suspender"
-    email_message_reject: "Et andet medlem af samfundet har for nylig flagget dit brugernavn til anmeldelse. På grund af indholdet blev din bruger afvist. Det betyder, at du ikke længere kan kommentere, synes godt om eller flagge indhold, før du omskriver dit brugernavn. Venligst send os en e-mail, hvis du har spørgsmål eller bekymringer."
-    write_message: "Skriv en besked"
-    send: "Send"
-  thank_you: "Vi sætter pris på din sikkerhed og feedback. En moderator vil gennemgå din rapport"
-  user:
-    bio_flags: "flag for denne bio"
-    user_bio: "Bruger Biografi"
-    username_flags: "flag for dette brugernavn"
-  user_detail:
-    remove_suspension: "Fjern blokering"
-    suspend: "Bloker bruger"
-    remove_ban: "Fjern ban"
-    ban: "Ban bruger"
-    member_since: "Medlem siden"
-    email: "E-mail"
-    total_comments: "Total kommentarer"
-    reject_rate: "Afvis stats"
-    reports: "Rapporter"
-    all: "Alle"
-    rejected: "Afvist"
-    user_history: "Konto historik"
-  user_history:
-    user_banned: "Bruger bannet"
-    ban_removed: "Ban fjernet"
-    username_status: "Brugernavn {0}"
-    suspended: "Blokering, {0}"
-    suspension_removed: "Blokering fjernet"
-    system: "System"
-    date: "Dato"
-    action: "Handling"
-    taken_by: "Taget af"
-  user_impersonating: "Denne bruger efterligner"
-  user_no_comment: "Du har aldrig efterladt en kommentar. Deltag i samtalen"
-  username_offensive: "Dette brugernavn er stødende"
-  view_conversation: "Vis samtale"
+        banned_word: 'Forbudt ord'
+        body_count: 'Body overstiger max længde'
+        comment_noagree: Uenig
+        comment_offensive: Offensiv
+        comment_other: Andre
+        comment_spam: Spam
+        links: Link
+      user:
+        username_impersonating: Personefterligning
+        username_nolike: Dislike
+        username_offensive: Offensiv
+        username_other: Andre
+        username_spam: Spam
+  framework:
+    banned_account_body: 'Det betyder at du ikke kan synes godt om, rapportere eller skrive kommentarer.'
+    banned_account_header: 'Din konto er i øjeblikket bannet'
+    changed_name:
+      msg: 'Dit brugernavn ændring er nuværende under gennemgang af vores modereringsteam.'
+    comment: kommentar
+    comment_is_hidden: 'Denne kommentar er ikke tilgængelig'
+    comment_is_ignored: 'Denne kommentar er skjult, fordi du ignoerede denne bruger.'
+    comment_is_rejected: 'Du har afvist denne kommentar.'
+    comments: kommentarer
+    configure_stream: Konfigurer
+    content_not_available: 'Dette indhold er ikke tilgængeligt'
+    edit_name:
+      button: Indsend
+      error: 'Brugernavne kan kun indeholde bogstaver og _'
+      label: 'Nyt brugernavn'
+      msg: 'Din konto er midlertidigt suspenderet, fordi dit brugernavn er blevet anset for upassende. For at gendanne din konto skal du indtaste et nyt brugernavn. Kontakt os venligst, hvis du har spørgsmål.'
+    my_comments: 'Mine kommentarer'
+    my_profile: 'Min profil'
+    new_count: 'Se {0} mere {1}'
+    profile: Profil
+    show_all_comments: 'Vis alle kommentarer'
+    show_all_replies: 'Vis alle svar'
+    show_more_replies: 'Vis flere svar'
+    success_bio_update: 'Din biografi er blevet opdateret'
+    success_name_update: 'Dit brugernavn er blevet opdateret'
+    success_update_settings: 'De ændringer du har foretaget, er blevet anvendt til kommentarstrømmen på denne artikel.'
+    view_more_comments: 'se flere kommentarer'
+    view_reply: 'vis svar'
+  from_settings_page: 'Fra profilsiden kan du se din kommentarhistorie.'
   install:
-    initial:
-      description: "Lad os oprette dit Talk-fællesskab på bare nogle få korte trin"
-      submit: "Kom igang"
     add_organization:
-      description: "Fortæl os navnet på din organisation. Dette vises i emails, når du inviterer nye teammedlemmer."
-      label: "Organisationens navn"
-      save: "Gem"
+      description: 'Fortæl os navnet på din organisation. Dette vises i emails, når du inviterer nye teammedlemmer.'
+      label: 'Organisationens navn'
+      save: Gem
     create:
-      email: "Email adresse"
-      username: "Brugernavn"
-      password: "Kodeord"
-      confirm_password: "Bekræft kodeord"
-      organization_contact_email: "Organization Contact Email"
-      save: "Gem"
-    permitted_domains:
-      title: "Tilladte domæner"
-      description: "Indtast de domæner, du gerne vil tillade til Talk. f.eks. dine lokale, og produktionsmiljøer. (fx. localhost:3000, staging.domain.com, domain.com)."
-      submit: "Afslut installationen"
+      confirm_password: 'Bekræft kodeord'
+      email: 'Email adresse'
+      organization_contact_email: 'Organization Contact Email'
+      password: Kodeord
+      save: Gem
+      username: Brugernavn
     final:
-      description: "Tak fordi du installerede Talk! Vi har sendt en email for at bekræfte din e-mail-adresse. Mens du færdigøre oprettelsen af kontoen, kan du begynde at engagere med dine læsere."
-      launch: "Start Talk"
-      close: "Luk dette installations program"
-  admin_sidebar:
-    view_options: "Vis mulingheder"
-    sort_comments: "Sorter kommentarer"
+      close: 'Luk dette installations program'
+      description: 'Tak fordi du installerede Talk! Vi har sendt en email for at bekræfte din e-mail-adresse. Mens du færdigøre oprettelsen af kontoen, kan du begynde at engagere med dine læsere.'
+      launch: 'Start Talk'
+    initial:
+      description: 'Lad os oprette dit Talk-fællesskab på bare nogle få korte trin'
+      submit: 'Kom igang'
+    permitted_domains:
+      description: 'Indtast de domæner, du gerne vil tillade til Talk. f.eks. dine lokale, og produktionsmiljøer. (fx. localhost:3000, staging.domain.com, domain.com).'
+      submit: 'Afslut installationen'
+      title: 'Tilladte domæner'
+  like: 'Synes godt om'
+  loading_results: 'Indlæser resultater'
+  marketing: 'Dette ligner en annonce/markedsføring'
+  moderate_this_stream: 'Moderer denne strøm'
+  modqueue:
+    account: 'konto flag'
+    actions: Handlinger
+    all: alle
+    all_streams: 'Alle Strømme'
+    approve: Godkend
+    approved: Godkendt
+    ban_user: Ban
+    billion: M
+    close: Close
+    empty_queue: 'Ikke flere kommentarer til at moderer! Du har indhentet det hele. Gå ud og tag noget ☕️'
+    flagged: flagged
+    jump_to_queue: 'Hop til specifik kø'
+    less_detail: 'Færre detajler'
+    likes: 'Syntes godt om'
+    million: M
+    mod_faster: 'Moderer hurtigere med tastaturgenveje'
+    moderate: 'Moderer →'
+    more_detail: 'Flere detaljer'
+    navigation: Navigation
+    new: Ny
+    newest_first: 'Nyeste først'
+    next_comment: 'Gå til næste kommentar'
+    next_queue: 'Skift kø'
+    notify_accepted: '{0} accepteret kommentar {1}'
+    notify_edited: '{0} redigeret kommentar {1}'
+    notify_flagged: '{0} flagget kommentar {1}'
+    notify_rejected: '{0} afvist kommentar {1}'
+    notify_reset: '{0} reset status of comment "{1}"'
+    oldest_first: 'Ældste Først'
+    premod: pre-mod
+    prev_comment: 'Gå til den forrige kommentar'
+    reject: Afvis
+    rejected: Afvist
+    reply: Svar
+    reported: Rapporteret
+    select_stream: 'Vælg strøm'
+    shift_key: ⇧
+    shortcuts: Genveje
+    show_shortcuts: 'Vis genveje'
+    singleview: 'Zen mode'
+    sort: Sort
+    thismenu: 'Åben denne menu'
+    thousand: k
+    toggle_search: 'Åben søgning'
+    try_these: 'Prøv disse'
+    view_more_shortcuts: 'Se flere genveje'
+  my_comment_history: 'Min kommentar Historie'
+  name: Navn
+  no_agree_comment: 'Jeg er ikke enig med denne kommentar'
+  no_like_bio: 'Jeg kan ikke lide denne biografi'
+  no_like_username: 'Jeg kan ikke lide dette brugernavn'
+  other: Andet
+  password_reset:
+    change_password: 'Skift kodeord'
+    confirm_new_password: 'Bekræft ny kodeord'
+    new_password: 'Nyt kodeord'
+    new_password_help: 'Kodeordet skal være mindst 8 tegn'
+    set_new_password: 'Skift dit kodeord'
+  permalink: Delen
+  personal_info: 'Denne kommentar afslører personligt identificerbare oplysninger'
+  post: Post
+  profile: Profil
+  profile_settings: Indstillinger
+  reject_username:
+    description_notify: 'Suspendering af denne bruger vil midlertidigt deaktivere deres konto.'
+    description_reject: 'Vil du midlertidigt forbyde denne bruger på grund af deres {0}? Hvis du gør det vil blive suspenderet indtil de omskriver deres {0}.'
+    email_message_reject: 'Et andet medlem af samfundet har for nylig flagget dit brugernavn til anmeldelse. På grund af indholdet blev din bruger afvist. Det betyder, at du ikke længere kan kommentere, synes godt om eller flagge indhold, før du omskriver dit brugernavn. Venligst send os en e-mail, hvis du har spørgsmål eller bekymringer.'
+    no_cancel: 'Nej Afbryd'
+    send: Send
+    suspend_user: 'Suspender bruger'
+    title_notify: 'Underret brugeren om deres midlertidige suspension'
+    title_reject: 'Vi har bemærket at du afviste et brugernavn.'
+    username: brugernavn
+    write_message: 'Skriv en besked'
+    yes_suspend: 'Ja suspender'
+  reply: Svar
+  report: Rapporter
+  report_notif: 'Tak fordi du rapporterede denne kommentar. Vores modereringsteam har fået besked, og vil gennemgå det inden for kort tid.'
+  report_notif_remove: 'Din rapport er blevet fjernet'
+  reported: Rapporteret
+  settings:
+    from_settings_page: 'Fra profilsiden kan du se din kommentarhistorie.'
+    my_comment_history: 'Min kommentarhistorie'
+    profile: Profil
+    profile_settings: Profilindstillinger
+    sign_in: 'Log ind'
+    to_access: 'for at tilgå din profil'
+    user_no_comment: 'Du har aldrig efterladt en kommentar. Deltag i samtalen!'
+  step_1_header: 'Rapportér et problem'
+  step_2_header: 'Hjælp os med at forstå'
+  step_3_header: 'Tak for din indsats'
+  stream:
+    all_comments: 'Alle kommentarer'
+    comment_not_found: 'Denne kommentar er blevet fjernet eller findes ikke.'
+    no_comments: 'Der er ingen kommentarer endnu, hvorfor skriver du ikke en?'
+    no_comments_and_closed: 'Der var ingen kommentarer til denne artikel'
+    temporarily_suspended: 'I overensstemmelse med {0}''s retningslinjer for fællesskabet er din konto midlertidigt suspenderet. Venligst tilslut dig samtalen {1}.'
+  streams:
+    all: Alle
+    article: Historie
+    closed: Lukket
+    empty_result: 'Ingen egenskaber matcher denne søgning. Måske prøv og forsøge at udvide din søgning?'
+    filter_streams: 'Filtrer strømme'
+    newest: Nyeste
+    oldest: Ældste
+    open: Åben
+    pubdate: Udgivelsedato
+    search: Søg
+    sort_by: 'Sorter efter'
+    status: 'Strøm status'
+    stream_status: 'Strøm Status'
+  suspenduser:
+    cancel: Afbryd
+    days: '{0} dage'
+    description_notify: 'Suspendering af denne bruger vil midlertidigt deaktivere deres konto.'
+    description_suspend: 'Du suspenderer {0}. Denne kommentar vil gå til den afviste kø, og {0} vil ikke kunne synes godt om, rapportere, svare eller indsende indtil suspenderings tiden er færdig.'
+    email_message_suspend: "Kære {0},\n\nI overensstemmelse med {1}'s retningslinjer for fællesskabet er din konto midlertidigt suspenderet. Under suspensionen vil du ikke kunne kommentere, flagge eller engagere dig med andre kommentarer. Venligst tilslut dig til samtalen{2}.'"
+    hours: '{0} timer'
+    notify_suspend_until: 'Bruger {0} er midlertidigt suspenderet. Denne suspension ophører automatisk om {1}.'
+    one_hour: '1 time'
+    select_duration: 'Vælg suspenderings tid'
+    send: Send
+    suspend_user: 'Suspender bruger'
+    title_notify: 'Underret bruygeren om deres midlertidige suspension'
+    title_suspend: 'Suspendere bruger'
+    write_message: 'Skriv en besked'
+  thank_you: 'Vi sætter pris på din sikkerhed og feedback. En moderator vil gennemgå din rapport'
+  user:
+    bio_flags: 'flag for denne bio'
+    user_bio: 'Bruger Biografi'
+    username_flags: 'flag for dette brugernavn'
+  user_detail:
+    all: Alle
+    ban: 'Ban bruger'
+    email: E-mail
+    member_since: 'Medlem siden'
+    reject_rate: 'Afvis stats'
+    rejected: Afvist
+    remove_ban: 'Fjern ban'
+    remove_suspension: 'Fjern blokering'
+    suspend: 'Bloker bruger'
+    total_comments: 'Total kommentarer'
+    user_history: 'Konto historik'
+  user_history:
+    action: Handling
+    ban_removed: 'Ban fjernet'
+    date: Dato
+    suspended: 'Blokering, {0}'
+    suspension_removed: 'Blokering fjernet'
+    system: System
+    taken_by: 'Taget af'
+    user_banned: 'Bruger bannet'
+    username_status: 'Brugernavn {0}'
+  user_impersonating: 'Denne bruger efterligner'
+  user_no_comment: 'Du har aldrig efterladt en kommentar. Deltag i samtalen'
+  username_offensive: 'Dette brugernavn er stødende'
+  validators:
+    confirm_password: 'Kodeordene matcher ikke. Tjek venligst igen.'
+    verify_email: 'Ikke en gylding e-mail'
+    verify_organization_name: 'Organisationsnavn må kun indeholde bogstaver og tal.'
+    verify_password: 'Adgangskoden skal være mindst 8 tegn'
+    verify_username: 'Brugernavne kan kun indeholde bogstaver og _'
+  view_conversation: 'Vis samtale'
+  your_account_has_been_banned: 'Din konto er blevet banned.'
+  your_account_has_been_suspended: 'Din konto er midlertidigt suspenderet'
+  your_username_has_been_rejected: 'Din konto er blevet suspenderet fordi dit brugernavn er blevet anset for upassende. For at gendanne din konto, venligst indtast et nyt brugernavn.'
diff --git a/locales/de.yml b/locales/de.yml
index 78cf6be39..1e604038e 100644
--- a/locales/de.yml
+++ b/locales/de.yml
@@ -1,511 +1,518 @@
 de:
-  your_account_has_been_suspended: Ihr Zugang wurde vorübergehend gesperrt.
-  your_account_has_been_banned: Ihr Zugang wurde gesperrt.
-  your_username_has_been_rejected: Ihr Zugang wurde vorübergehend gesperrt, da Ihr Nutzername als unangemessen eingestuft wurde. Um Ihren Zugang wieder herzustellen, geben Sie bitte einen neuen Nutzernamen ein.
-  embed_comments_tab: Kommentare
+  admin_sidebar:
+    sort_comments: 'Kommentare sortieren'
+    view_options: Ansichtsoptionen
+  already_flagged_username: 'Sie haben diesen Nutzernamen schon markiert.'
   bandialog:
-    are_you_sure: "Sind Sie sich sicher, dass Sie {0} sperren möchten?"
-    ban_user: "Nutzer sperren?"
-    banned_user: "Gesperrter Nutzer"
-    cancel: "Beenden"
-    note: "Notiz: {0}"
-    note_reject_comment: "Das Sperren dieses Nutzers wird auch diesen Kommentar in die Abgelehnt-Liste verschieben."
-    note_ban_user: "Nach dem Sperren wird dieser Nutzer weder Kommentare schreiben, noch anderweitig mit der Community interagieren können."
-    yes_ban_user: "Ja, Nutzer sperren"
-    write_a_message: "Nachricht schreiben"
-    send: "Senden"
-    notify_ban_headline: "Nutzer über Sperrung benachrichtigen"
-    notify_ban_description: "Dies wird den Nutzer per E-Mail über den Ausschluss aus der Community informieren"
+    are_you_sure: 'Sind Sie sich sicher, dass Sie {0} sperren möchten?'
+    ban_user: 'Nutzer sperren?'
+    banned_user: 'Gesperrter Nutzer'
+    cancel: Beenden
     email_message_ban: "Sehr geehrte/r {0},\n\nJemand mit Zugriff auf Ihr Konto hat gegen unsere Community-Richtlinien verstoßen. Daraufhin wurde Ihr Konto gesperrt. Sie können nun weder kommentieren noch anderweitig mit der Community interagieren. Falls Sie denken, dass es sich hierbei um einen Fehler handelt, nehmen Sie bitte Kontakt mit unseren Moderatoren auf."
-  bio_offensive: "Diese Biographie ist unangemessen"
-  cancel: "Abbrechen"
-  confirm_email:
-    email_confirmation: "E-Mail-Bestätigung"
-    click_to_confirm: "Unten klicken, um E-Mail-Adresse zu bestätigen"
-    confirm: "Bestätigen"
-  password_reset:
-    mail_sent: 'Falls Sie eine registriertes Konto haben, wurde Ihnen ein Zurücksetzen-Link an diese E-Mail-Adresse geschickt'
-    set_new_password: "Passwort ändern"
-    change_password_help: "Bitte geben Sie ein neues Passwort ein. Benutzen Sie ein sicheres!"
-    new_password: "Neues Passwort"
-    new_password_help: "Das Passwort benötigt mindestens 8 Zeichen"
-    confirm_new_password: "Neues Passwort bestätigen"
-    change_password: "Passwort ändern"
-  characters_remaining: "verbleibende Zeichen"
+    note: 'Notiz: {0}'
+    note_ban_user: 'Nach dem Sperren wird dieser Nutzer weder Kommentare schreiben, noch anderweitig mit der Community interagieren können.'
+    note_reject_comment: 'Das Sperren dieses Nutzers wird auch diesen Kommentar in die Abgelehnt-Liste verschieben.'
+    notify_ban_description: 'Dies wird den Nutzer per E-Mail über den Ausschluss aus der Community informieren'
+    notify_ban_headline: 'Nutzer über Sperrung benachrichtigen'
+    send: Senden
+    write_a_message: 'Nachricht schreiben'
+    yes_ban_user: 'Ja, Nutzer sperren'
+  bio_offensive: 'Diese Biographie ist unangemessen'
+  cancel: Abbrechen
+  characters_remaining: 'verbleibende Zeichen'
   comment:
-    anon: "Anonym"
-    undo_reject: "Rückgängig machen"
-    ban_user: "Nutzer sperren"
-    comment: "Kommentar verfassen…"
+    anon: Anonym
+    ban_user: 'Nutzer sperren'
+    comment: 'Kommentar verfassen…'
     edited: Bearbeitet
-    flagged: "markiert"
-    view_context: "Kontext ansehen"
+    flagged: markiert
+    undo_reject: 'Rückgängig machen'
+    view_context: 'Kontext ansehen'
   comment_box:
-    post: "Senden"
-    cancel: "Abbrechen"
-    reply: "Antworten"
-    comment: "Kommentar verfassen"
-    name: "Name"
-    comment_post_notif: "Ihr Kommentar wurde versandt."
-    comment_post_notif_premod: "Vielen Dank für Ihren Kommentar. Unsere Moderatoren werden ihn in Kürze bearbeiten."
-    comment_post_banned_word:  "Ihr Kommentar enthält ein oder mehrere Wörter, die unzulässig sind, daher wird er nicht veröffentlicht. Falls Sie dies als ungerechtfertigt ansehen, nehmen Sie bitte Kontakt zu unseren Moderatoren auf."
-    characters_remaining: "verbleibende Zeichen"
-  comment_offensive: "Dieser Kommentar ist unangemessen"
-  comment_singular: Kommentar
+    cancel: Abbrechen
+    characters_remaining: 'verbleibende Zeichen'
+    comment: 'Kommentar verfassen'
+    comment_post_banned_word: 'Ihr Kommentar enthält ein oder mehrere Wörter, die unzulässig sind, daher wird er nicht veröffentlicht. Falls Sie dies als ungerechtfertigt ansehen, nehmen Sie bitte Kontakt zu unseren Moderatoren auf.'
+    comment_post_notif: 'Ihr Kommentar wurde versandt.'
+    comment_post_notif_premod: 'Vielen Dank für Ihren Kommentar. Unsere Moderatoren werden ihn in Kürze bearbeiten.'
+    name: Name
+    post: Senden
+    reply: Antworten
+  comment_history_blank:
+    info: 'Hier wird ein Verlauf Ihrer verfassten Kommentare erscheinen'
+    title: 'Sie haben noch keine Kommentare verfasst'
+  comment_offensive: 'Dieser Kommentar ist unangemessen'
   comment_plural: Kommentare
-  comment_post_banned_word: "Ihr Kommentar enthält ein oder mehrere Wörter, die unzulässig sind, daher wird er nicht veröffentlicht. Falls Sie dies als ungerechtfertigt ansehen, nehmen Sie bitte Kontakt zu unseren Moderatoren auf."
-  comment_post_notif: "Ihr Kommentar wurde veröffentlicht."
-  comment_post_notif_premod: "Vielen Dank für Ihren Kommentar. Unsere Moderatoren werden ihn in Kürze bearbeiten."
+  comment_post_banned_word: 'Ihr Kommentar enthält ein oder mehrere Wörter, die unzulässig sind, daher wird er nicht veröffentlicht. Falls Sie dies als ungerechtfertigt ansehen, nehmen Sie bitte Kontakt zu unseren Moderatoren auf.'
+  comment_post_notif: 'Ihr Kommentar wurde veröffentlicht.'
+  comment_post_notif_premod: 'Vielen Dank für Ihren Kommentar. Unsere Moderatoren werden ihn in Kürze bearbeiten.'
+  comment_singular: Kommentar
   common:
-    copy: 'Kopieren'
+    copy: Kopieren
     error: 'Ein Problem ist aufgetreten.'
-    reply: 'Antwort' # noun, singular
-    replies: 'Antworten'
     reaction: 'Reaktion'
     reactions: 'Reaktionen'
+    reply: 'Antwort' # noun, singular
+    replies: 'Antworten'
     story: 'Artikel'
-  flagged_usernames:
-    notify_approved: '{0} hat Nutzername {1} freigegeben'
-    notify_rejected: '{0} hat Nutzername {1} abgelehnt'
-    notify_flagged: '{0} hat Nutzername {1} markiert'
-    notify_changed: 'Nutzer {0} hat Nutzernamen nach {1} geändert'
   community:
-    account_creation_date: "Datum der Kontoerstellung"
+    account_creation_date: 'Datum der Kontoerstellung'
     active: Aktiv
     admin: Administrator
-    ads_marketing: "Dies scheint Werbung zu sein"
-    are_you_sure: "Sind Sie sich sicher, dass Sie {0} sperren möchten?"
-    ban_user: "Nutzer sperren?"
+    ads_marketing: 'Dies scheint Werbung zu sein'
+    are_you_sure: 'Sind Sie sich sicher, dass Sie {0} sperren möchten?'
+    ban_user: 'Nutzer sperren?'
     banned: Gesperrt
-    banned_user: "Gesperrter Nutzer"
+    banned_user: 'Gesperrter Nutzer'
     cancel: Abbrechen
-    dont_like_username: "Unsympathischer Nutzername"
-    flaggedaccounts: "Gemeldete Nutzernamen"
+    commenter: Kommentator
+    dont_like_username: 'Unsympathischer Nutzername'
+    flaggedaccounts: 'Gemeldete Nutzernamen'
     flags: Markierungen
-    impersonating: "Identität unklar"
-    loading: "Lädt Ergebnisse"
+    impersonating: 'Identität unklar'
+    loading: 'Lädt Ergebnisse'
     moderator: Moderator
-    newsroom_role: "Redaktionsrolle"
-    no_flagged_accounts: "Die Liste der gemeldeten Nutzer ist aktuell leer."
-    no_results: "Keine Nutzer mit entsprechendem Namen oder E-Mail-Adresse gefunden."
-    offensive: "Unangemessen"
-    other: Etwas anderes
+    newsroom_role: Redaktionsrolle
+    no_flagged_accounts: 'Die Liste der gemeldeten Nutzer ist aktuell leer.'
+    no_results: 'Keine Nutzer mit entsprechendem Namen oder E-Mail-Adresse gefunden.'
+    offensive: Unangemessen
+    other: 'Etwas anderes'
     people: Nutzer
-    role: "Rolle auswählen..."
-    select_status: "Status wählen..."
-    spam_ads: "Spam/Werbung"
-    staff: "Mitarbeiter"
+    role: 'Rolle auswählen...'
+    select_status: 'Status wählen...'
+    spam_ads: Spam/Werbung
+    staff: Mitarbeiter
     status: Status
-    username_and_email: "Nutzername und E-Mail"
-    yes_ban_user: "Ja, Nutzer sperren"
-    commenter: "Kommentator"
+    username_and_email: 'Nutzername und E-Mail'
+    yes_ban_user: 'Ja, Nutzer sperren'
   configure:
+    access_message: 'Sie müssen Administrator sein, um auf die Einstellungen zuzugreifen. Fragen Sie ggf. einen Administrator, der Ihnen mehr Recht zuweisen kann!'
     apply: Anwenden
-    banned_word_text: "Kommentare, die diese Wörter oder Phrasen enthalten (unabhängig von Groß-/Kleinschreibung), werden automatisch aus dem Kommentarbereich entfernt. Geben Sie ein Wort ein und bestätigen Sie mit Eingabetaste oder Tab. Es ist auch möglich, einen komma-separierten Text einzufügen."
-    banned_words_title: "Liste der unzulässigen Wörter"
-    close: "Schließen"
-    close_after: "Kommentarbereich schließen nach"
-    close_stream: "Kommentarbereich schließen"
-    close_stream_configuration: "Dieser Kommentarbereich ist momentan geschlossen. Durch das Öffnen dieses Kommentarbereichs können neue Kommentare abgegeben und veröffentlicht werden."
-    closed_comments_desc: "Wird angezeigt, wenn der Kommentarbereich für den Artikel geschlossen ist."
-    closed_comments_label: "Nachricht verfassen..."
-    closed_stream_settings: "Mitteilung über Schließung"
-    comment_count_error: "Geben Sie eine gültige Zahl an."
-    comment_count_header: "Zeichenlimit für Kommentare festlegen"
+    banned_word_text: 'Kommentare, die diese Wörter oder Phrasen enthalten (unabhängig von Groß-/Kleinschreibung), werden automatisch aus dem Kommentarbereich entfernt. Geben Sie ein Wort ein und bestätigen Sie mit Eingabetaste oder Tab. Es ist auch möglich, einen komma-separierten Text einzufügen.'
+    banned_words_title: 'Liste der unzulässigen Wörter'
+    close: Schließen
+    close_after: 'Kommentarbereich schließen nach'
+    close_stream: 'Kommentarbereich schließen'
+    close_stream_configuration: 'Dieser Kommentarbereich ist momentan geschlossen. Durch das Öffnen dieses Kommentarbereichs können neue Kommentare abgegeben und veröffentlicht werden.'
+    closed_comments_desc: 'Wird angezeigt, wenn der Kommentarbereich für den Artikel geschlossen ist.'
+    closed_comments_label: 'Nachricht verfassen...'
+    closed_stream_settings: 'Mitteilung über Schließung'
+    comment_count_error: 'Geben Sie eine gültige Zahl an.'
+    comment_count_header: 'Zeichenlimit für Kommentare festlegen'
     comment_count_text_post: Zeichen
-    comment_count_text_pre: "Kommentar wird begrenzt auf"
+    comment_count_text_pre: 'Kommentar wird begrenzt auf'
     comment_settings: Einstellungen
-    comment_stream: "Kommentarbereich"
-    comment_stream_will_close: "Der Kommentarbereich wird geschlossen"
+    comment_stream: Kommentarbereich
+    comment_stream_will_close: 'Der Kommentarbereich wird geschlossen'
     community: Community
     configure: Einstellungen
-    copy_and_paste: "Kopieren Sie diesen Code in Ihr CMS, um die Kommentarfunktion an entsprechender Stelle anzuzeigen."
-    custom_css_url: "Benutzerdefinierte CSS-URL"
-    custom_css_url_desc: "URL eines CSS-Stylesheets zum Überschreiben des Standard-Designs"
+    copy_and_paste: 'Kopieren Sie diesen Code in Ihr CMS, um die Kommentarfunktion an entsprechender Stelle anzuzeigen.'
+    custom_css_url: 'Benutzerdefinierte CSS-URL'
+    custom_css_url_desc: 'URL eines CSS-Stylesheets zum Überschreiben des Standard-Designs'
     days: Tage
-    description: "Ändern Sie die Einstellungen für den Kommentarbereich dieses Artikels."
-    disable_commenting_title: "Kommentieren global deaktivieren"
-    disable_commenting_desc: "Verfassen Sie eine Nachricht, die angezeigt wird, solange das Kommentieren deaktiviert ist."
-    domain_list_text: "Geben Sie Domains an, für die diese Talk-Instanz freigegeben werden soll, z.B. für lokale Test- oder Produktionsumgebungen (Bsp.: localhost:3000 staging.domain.com domain.com)."
-    domain_list_title: "Zugelassene Domains"
-    edit_info: "Information bearbeiten"
-    edit_comment_timeframe_heading: "Zeitlimit zur Bearbeitung von Kommentaren"
-    edit_comment_timeframe_text_pre: "Kommentatoren haben"
-    edit_comment_timeframe_text_post: "Sekunden Zeit, um ihre Kommentare zu bearbeiten."
-    embed_comment_stream: "Kommentarbereich einbinden"
-    enable_premod_links_text: "Moderatoren müssen jeden Kommentar, der einen Link enthält, freigeben, bevor er veröffentlicht wird."
-    enable_pre_moderation: "Vormoderation aktivieren"
-    enable_pre_moderation_text: "Moderatoren müssen jeden Kommentar freigeben, bevor er veröffentlicht wird."
-    enable_premod_links: "Vormoderation für Kommentare mit Links aktivieren"
-    enable_premod: "Vormoderation aktivieren"
-    enable_premod_description: "Moderatoren müssen jeden Kommentar freigeben, bevor er veröffentlicht wird."
-    enable_premod_links_description: "Moderatoren müssen jeden Kommentar, der einen Link enthält, freigeben, bevor er veröffentlicht wird."
-    enable_questionbox: "Stellen Sie den Lesern eine Frage"
-    enable_questionbox_description: "Diese Frage erscheint am Anfang des Kommentarbereichs. Regen Sie eine Diskussion an."
+    description: 'Ändern Sie die Einstellungen für den Kommentarbereich dieses Artikels.'
+    disable_commenting_desc: 'Verfassen Sie eine Nachricht, die angezeigt wird, solange das Kommentieren deaktiviert ist.'
+    disable_commenting_title: 'Kommentieren global deaktivieren'
+    domain_list_text: 'Geben Sie Domains an, für die diese Talk-Instanz freigegeben werden soll, z.B. für lokale Test- oder Produktionsumgebungen (Bsp.: localhost:3000 staging.domain.com domain.com).'
+    domain_list_title: 'Zugelassene Domains'
+    edit_comment_timeframe_heading: 'Zeitlimit zur Bearbeitung von Kommentaren'
+    edit_comment_timeframe_text_post: 'Sekunden Zeit, um ihre Kommentare zu bearbeiten.'
+    edit_comment_timeframe_text_pre: 'Kommentatoren haben'
+    edit_info: 'Information bearbeiten'
+    embed_comment_stream: 'Kommentarbereich einbinden'
+    enable_pre_moderation: 'Vormoderation aktivieren'
+    enable_pre_moderation_text: 'Moderatoren müssen jeden Kommentar freigeben, bevor er veröffentlicht wird.'
+    enable_premod: 'Vormoderation aktivieren'
+    enable_premod_description: 'Moderatoren müssen jeden Kommentar freigeben, bevor er veröffentlicht wird.'
+    enable_premod_links: 'Vormoderation für Kommentare mit Links aktivieren'
+    enable_premod_links_description: 'Moderatoren müssen jeden Kommentar, der einen Link enthält, freigeben, bevor er veröffentlicht wird.'
+    enable_premod_links_text: 'Moderatoren müssen jeden Kommentar, der einen Link enthält, freigeben, bevor er veröffentlicht wird.'
+    enable_questionbox: 'Stellen Sie den Lesern eine Frage'
+    enable_questionbox_description: 'Diese Frage erscheint am Anfang des Kommentarbereichs. Regen Sie eine Diskussion an.'
     hours: Stunden
-    include_comment_stream: "Einleitung zum Kommentarbereich"
-    include_comment_stream_desc: "Verfassen Sie eine Einleitung, die über jedem Kommentarbereich erscheint. Nützlich z.B. für Community-Richtlinien."
-    include_text: "Fügen Sie Ihren Text hier ein."
-    include_question_here: "Stellen Sie Ihre Frage hier:"
+    include_comment_stream: 'Einleitung zum Kommentarbereich'
+    include_comment_stream_desc: 'Verfassen Sie eine Einleitung, die über jedem Kommentarbereich erscheint. Nützlich z.B. für Community-Richtlinien.'
+    include_question_here: 'Stellen Sie Ihre Frage hier:'
+    include_text: 'Fügen Sie Ihren Text hier ein.'
     moderate: Moderieren
-    moderation_settings: "Moderations-Einstellungen"
-    open: "Öffnen"
-    open_stream: "Kommentarbereich öffnen"
-    open_stream_configuration: "Dieser Kommentarbereich ist momentan geöffnet. Nach dem Schließen dieses Kommentarbereich wird es nicht mehr möglich sein, zu kommentieren. Bestehende Kommentare bleiben sichtbar."
-    require_email_verification: "E-Mail-Bestätigung erforderlich"
-    require_email_verification_text: "Neue Nutzer müssen ihre E-Mail-Adresse bestätigen."
-    save: "Speichern"
-    save_changes: "Änderungen speichern"
-    shortcuts: Tastaturkürzel
-    sign_out: "Abmelden"
-    stories: Artikel
-    stream_settings: "Einstellungen Kommentarbereich"
-    access_message: "Sie müssen Administrator sein, um auf die Einstellungen zuzugreifen. Fragen Sie ggf. einen Administrator, der Ihnen mehr Recht zuweisen kann!"
-    suspect_word_title: "Liste verdächtiger Wörter"
-    suspect_word_text: "Kommentare, die diese Wörter oder Phrasen enthalten (unabhängig von Groß-/Kleinschreibung), werden im Kommentarbereich markiert. Geben Sie ein Wort ein und bestätigen Sie mit Eingabetaste oder Tab. Es ist auch möglich, einen komma-separierten Text einzufügen."
-    tech_settings: "Technische Einstellungen"
-    organization_information: "Über die Organisation"
-    organization_info_copy: "Wir verwenden diese Informationen in automatisierten E-Mail-Benachrichtigungen, die Talk versendet. Damit können Nutzer Ihre Organisation identifizieren und sie haben die Möglichkeit bei Problemen in Kontakt mit Ihnen zu treten."
-    organization_info_copy_2: "Wir empfehlen, einee generische E-Mail-Adresse (z.B. community@yournewsroom.com) für diesen Zweck einzurichten. Die kann über die Zeit gleich bleiben, und gibt nach außen keine Namen preis, die von Nutzern im Fall von Konflikten für persönliche Angriffe missbraucht werden könnten."
-    organization_details: "Details zur Organisation"
-    organization_name: "Name der Organisation"
-    organization_contact_email: "E-Mail-Adresse der Organisation"
-    title: "Kommentarbereich konfigurieren"
-    weeks: Wochen
-    wordlist: "Gesperrte Wörter"
-    save_changes_dialog:
-      unsaved_changes: "Ungespeicherte Änderungen"
-      copy: "Sie haben einen oder mehrere Änderungen vorgenommen, ohne zu speichern. Möchten Sie jetzt speichern oder die Änderungen verwerfen?"
-      save_settings: "Einstellungen speichern"
-      discard: "Verwerfen"
-      cancel: "Abbrechen"
-  continue: "Fortfahren"
-  createdisplay:
-    check_the_form: "Ungültige Eingabe. Bitte prüfen Sie die Felder."
-    continue: "Mit diesem Facebook-Nutzernamen fortfahren"
-    error_create: "Fehler beim Ändern des Nutzernamens"
-    fake_comment_body: "Dies ist ein Beispiel-Kommentar. Leser können im Kommentarbereich Meinungen und Gedanken mit der Redaktion austauschen."
-    fake_comment_date: "Vor einer Minute"
-    if_you_dont_change_your_name: "Wenn Sie Ihren Nutzernamen an diesem Punkt nicht ändern, wird Ihr Facebook-Name mit Ihren Kommentaren angezeigt."
-    required_field: "Pflichtfeld"
+    moderation_settings: Moderations-Einstellungen
+    open: Öffnen
+    open_stream: 'Kommentarbereich öffnen'
+    open_stream_configuration: 'Dieser Kommentarbereich ist momentan geöffnet. Nach dem Schließen dieses Kommentarbereich wird es nicht mehr möglich sein, zu kommentieren. Bestehende Kommentare bleiben sichtbar.'
+    organization_contact_email: 'E-Mail-Adresse der Organisation'
+    organization_details: 'Details zur Organisation'
+    organization_info_copy: 'Wir verwenden diese Informationen in automatisierten E-Mail-Benachrichtigungen, die Talk versendet. Damit können Nutzer Ihre Organisation identifizieren und sie haben die Möglichkeit bei Problemen in Kontakt mit Ihnen zu treten.'
+    organization_info_copy_2: 'Wir empfehlen, einee generische E-Mail-Adresse (z.B. community@yournewsroom.com) für diesen Zweck einzurichten. Die kann über die Zeit gleich bleiben, und gibt nach außen keine Namen preis, die von Nutzern im Fall von Konflikten für persönliche Angriffe missbraucht werden könnten.'
+    organization_information: 'Über die Organisation'
+    organization_name: 'Name der Organisation'
+    require_email_verification: 'E-Mail-Bestätigung erforderlich'
+    require_email_verification_text: 'Neue Nutzer müssen ihre E-Mail-Adresse bestätigen.'
     save: Speichern
-    special_characters: "Nutzernamen dürfen nur Buchstaben, Zahlen und _ enthalten"
+    save_changes: 'Änderungen speichern'
+    save_changes_dialog:
+      cancel: Abbrechen
+      copy: 'Sie haben einen oder mehrere Änderungen vorgenommen, ohne zu speichern. Möchten Sie jetzt speichern oder die Änderungen verwerfen?'
+      discard: Verwerfen
+      save_settings: 'Einstellungen speichern'
+      unsaved_changes: 'Ungespeicherte Änderungen'
+    shortcuts: Tastaturkürzel
+    sign_out: Abmelden
+    stories: Artikel
+    stream_settings: 'Einstellungen Kommentarbereich'
+    suspect_word_text: 'Kommentare, die diese Wörter oder Phrasen enthalten (unabhängig von Groß-/Kleinschreibung), werden im Kommentarbereich markiert. Geben Sie ein Wort ein und bestätigen Sie mit Eingabetaste oder Tab. Es ist auch möglich, einen komma-separierten Text einzufügen.'
+    suspect_word_title: 'Liste verdächtiger Wörter'
+    tech_settings: 'Technische Einstellungen'
+    title: 'Kommentarbereich konfigurieren'
+    weeks: Wochen
+    wordlist: 'Gesperrte Wörter'
+  confirm_email:
+    click_to_confirm: 'Unten klicken, um E-Mail-Adresse zu bestätigen'
+    confirm: Bestätigen
+    email_confirmation: E-Mail-Bestätigung
+  continue: Fortfahren
+  createdisplay:
+    check_the_form: 'Ungültige Eingabe. Bitte prüfen Sie die Felder.'
+    continue: 'Mit diesem Facebook-Nutzernamen fortfahren'
+    error_create: 'Fehler beim Ändern des Nutzernamens'
+    fake_comment_body: 'Dies ist ein Beispiel-Kommentar. Leser können im Kommentarbereich Meinungen und Gedanken mit der Redaktion austauschen.'
+    fake_comment_date: 'Vor einer Minute'
+    if_you_dont_change_your_name: 'Wenn Sie Ihren Nutzernamen an diesem Punkt nicht ändern, wird Ihr Facebook-Name mit Ihren Kommentaren angezeigt.'
+    required_field: Pflichtfeld
+    save: Speichern
+    special_characters: 'Nutzernamen dürfen nur Buchstaben, Zahlen und _ enthalten'
     username: Nutzername
-    write_your_username: "Nutzername bearbeiten"
-    your_username: "Ihr Nutzername erscheint an jedem Ihrer veröffentlichten Kommentare."
+    write_your_username: 'Nutzername bearbeiten'
+    your_username: 'Ihr Nutzername erscheint an jedem Ihrer veröffentlichten Kommentare.'
   done: Fertig
   edit_comment:
-    body_input_label: "Kommentar bearbeiten"
-    save_button: "Änderungen speichern"
-    edit_window_expired: "Sie können diesen Kommentar nicht mehr bearbeiten. Das Zeitfenster hierfür ist abgelaufen. Bitte schreiben Sie einen neuen Kommentar."
-    edit_window_expired_close: "Schließen"
-    edit_window_timer_prefix: "Verbleibende Zeit: "
-    second: "Sekunde"
-    seconds_plural: "Sekunden"
-    minute: "Minute"
-    minutes_plural: "Minuten"
+    body_input_label: 'Kommentar bearbeiten'
+    edit_window_expired: 'Sie können diesen Kommentar nicht mehr bearbeiten. Das Zeitfenster hierfür ist abgelaufen. Bitte schreiben Sie einen neuen Kommentar.'
+    edit_window_expired_close: Schließen
+    edit_window_timer_prefix: 'Verbleibende Zeit: '
+    minute: Minute
+    minutes_plural: Minuten
+    save_button: 'Änderungen speichern'
+    second: Sekunde
+    seconds_plural: Sekunden
   email:
-    suspended:
-      subject: "Ihr Benutzerkonto wurde vorübergehend gesperrt"
     banned:
-      subject: "Ihr Benutzerkonto wurde gesperrt"
-      body: "Entsprechend der Community-Richtlinien des Coral Project, wurde Ihr Benutzerkonto gesperrt. Sie dürfen ab sofort weder kommentieren noch an der Community teilnehmen."
+      body: 'Entsprechend der Community-Richtlinien des Coral Project, wurde Ihr Benutzerkonto gesperrt. Sie dürfen ab sofort weder kommentieren noch an der Community teilnehmen.'
+      subject: 'Ihr Benutzerkonto wurde gesperrt'
     confirm:
-      has_been_requested: "Für folgendes Nutzerkonto wurde eine E-Mail-Bestätigung angefordert:"
-      to_confirm: "Um Ihr Nutzerkonto zu bestätigen, öffnen Sie bitte folgenden Link:"
-      confirm_email: "E-Mail-Adresse bestätigen"
-      if_you_did_not: "Sollten Sie diese E-Mail nicht angefordert haben, können Sie diese Nachricht ignorieren."
-      subject: "Bestätigung der E-Mail-Adresse"
-    password_reset:
-      we_received_a_request: "Wir haben eine Anfrage erhalten, Ihr Passwort zurückzusetzen. Sollten Sie dies nicht angefordert haben, können Sie diese Nachricht ignorieren."
-      if_you_did: "Falls doch,"
-      please_click: "klicken Sie bitte hier zum Zurücksetzen"
-      subject: "Passwort zurücksetzen"
+      confirm_email: 'E-Mail-Adresse bestätigen'
+      has_been_requested: 'Für folgendes Nutzerkonto wurde eine E-Mail-Bestätigung angefordert:'
+      if_you_did_not: 'Sollten Sie diese E-Mail nicht angefordert haben, können Sie diese Nachricht ignorieren.'
+      subject: 'Bestätigung der E-Mail-Adresse'
+      to_confirm: 'Um Ihr Nutzerkonto zu bestätigen, öffnen Sie bitte folgenden Link:'
     password_change:
-      subject: "{0} Passwort-Änderung"
       body: "Das Passwort Ihres Benutzerkontos wurde geändert.\n\nFalls Sie diese Änderung nicht angefordert haben, kontaktieren Sie uns bitte unter {0}."
+      subject: '{0} Passwort-Änderung'
+    password_reset:
+      if_you_did: 'Falls doch,'
+      please_click: 'klicken Sie bitte hier zum Zurücksetzen'
+      subject: 'Passwort zurücksetzen'
+      we_received_a_request: 'Wir haben eine Anfrage erhalten, Ihr Passwort zurückzusetzen. Sollten Sie dies nicht angefordert haben, können Sie diese Nachricht ignorieren.'
+    suspended:
+      subject: 'Ihr Benutzerkonto wurde vorübergehend gesperrt'
+  embed_comments_tab: Kommentare
   embedlink:
-    copy: "In die Zwischenablage kopieren"
+    copy: 'In die Zwischenablage kopieren'
   error:
-    PASSWORD_INCORRECT: "Ihr bestehendes Passwort wurde falsch eingegeben"
-    COMMENT_PARENT_NOT_VISIBLE: "Der Kommentar, auf den Sie antworten möchten, wurde entfernt oder existiert nicht."
-    EMAIL_VERIFICATION_TOKEN_INVALID: "Code zur E-Mail-Bestätigung ist ungültig."
-    EMAIL_ALREADY_VERIFIED: "E-Mail-Adresse ist bereits bestätigt."
-    PASSWORD_RESET_TOKEN_INVALID: "Ihr Link zum Passwort zurücksetzen ist ungültig."
-    COMMENT_TOO_SHORT: "Kommentare sollten mehr als ein Zeichen enthalten, bitte überprüfen Sie Ihren Kommentar und probieren Sie es erneut."
-    NOT_AUTHORIZED: "Sie sind nicht berechtigt, diese Aktion auszuführen."
-    NO_SPECIAL_CHARACTERS: "Benutzernamen dürfen nur Buchstaben, Zahlen und _ enthalten"
-    PASSWORD_LENGTH: "Passwort ist zu kurz"
-    PROFANITY_ERROR: "Nutzernamen dürfen nicht anstößig sein. Bei Fragen, wenden Sie sich an einen Administrator."
-    RATE_LIMIT_EXCEEDED: "Ratelimit überschritten"
-    USERNAME_IN_USE: "Nutzername bereits vergeben"
-    USERNAME_REQUIRED: "Nutzername muss angegeben werden"
-    EMAIL_NOT_VERIFIED: "E-Mail-Adresse nicht bestätigt"
-    EDIT_WINDOW_ENDED: "Sie können diesen Kommentar nicht mehr bearbeiten. Das Zeitfenster ist abgelaufen."
-    EDIT_USERNAME_NOT_AUTHORIZED: "Sie haben keine Berechtigung, Ihren Nutzernamen zu ändern."
-    SAME_USERNAME_PROVIDED: "Sie müssen einen anderen Nutzernamen wählen."
-    EMAIL_IN_USE: "E-Mail-Adresse bereits vergeben"
-    EMAIL_REQUIRED: "Eine E-Mail-Adresse ist erforderlich"
-    LOGIN_MAXIMUM_EXCEEDED: "Sie haben zu häufig erfolglos versucht, sich anzumelden. Bitte warten Sie."
-    PASSWORD_REQUIRED: "Passwort ist erforderlich"
-    COMMENTING_CLOSED: "Kommentarbereich ist bereits geschlossen"
-    COMMENTING_DISABLED: "Die Kommentarfunktion ist derzeit abgeschaltet"
-    NOT_FOUND: "Ressource nicht gefunden"
-    ALREADY_EXISTS: "Ressource existiert bereits"
-    INVALID_ASSET_URL: "Asset-URL ist ungültig"
-    CANNOT_IGNORE_STAFF: "Mitarbeiter können nicht ignoriert werden."
-    INCORRECT_PASSWORD: "Falsches Passwort"
-    email: "Bitte geben Sie eine gültige E-Mail-Adresse ein."
-    DELETION_NOT_SCHEDULED: "Löschvorgang wurde nicht geplant"
-    confirm_password: "Passwörter nicht identisch. Bitte erneut überprüfen"
-    network_error: "Server-Verbindung fehlgeschlagen. Bitte überprüfen Sie ihre Internetverbindung und versuchen Sie es erneut."
-    email_not_verified: "E-Mail-Adresse {0} nicht bestätigt."
-    email_password: "E-Mail und/oder Passwort inkorrekt."
-    organization_name: "Namen von Organisationen dürfen nur Buchstaben und Zahlen enthalten."
-    organization_contact_email: "E-Mail-Adresse der Organisation ist ungültig."
-    password: "Passwort muss mindestens 8 Zeichen enthalten"
-    username: "Nutzernamen dürfen nur Buchstaben, Zahlen und _ enthalten"
-    unexpected: "Unerwarteter Fehler aufgetreten. Es tut uns leid!"
-    required_field: "Dieses Feld ist erforderlich"
-    temporarily_suspended: "Ihr Konto ist vorübergehend gesperrt. Es wird wieder aktiviert am {0}. Bei Fragen setzen Sie sich mit uns in Kontakt."
-  flag_comment: "Kommentar melden"
-  flag_reason: "Grund der Meldung (optional)"
-  flag_username: "Nutzername melden"
-  framework:
-    banned_account_header: "Ihr Konto ist aktuell gesperrt."
-    banned_account_body: "Dies bedeutet, dass Sie weder Kommentare schreiben, noch auf andere Weise mit der Community interagieren können."
-    comment: Kommentar
-    comment_is_ignored: "Dieser Kommentar ist nicht sichtbar, da Sie den Nutzer ignorieren."
-    comment_is_rejected: "Sie haben diesen Kommentar abgelehnt."
-    comment_is_deleted: "Der Kommentar wurde vom Nutzer gelöscht."
-    comment_is_hidden: "Dieser Kommentar ist nicht verfügbar."
-    comments: Kommentare
-    configure_stream: "Konfigurieren"
-    content_not_available: "Dieser Inhalt ist nicht verfügbar"
-    edit_name:
-      button: Senden
-      error: "Nutzernamen dürfen nur Buchstaben, Zahlen und _ enthalten"
-      label: "Neuer Nutzername"
-      msg: "Ihr Konto ist vorübergehend gesperrt, da Ihr Nutzername als unangemessen eingestuft wurde. Um Ihr Konto wieder herzustellen, geben Sie bitte einen neuen Nutzernamen ein. Bei Fragen, kontaktieren Sie uns bitte."
-    changed_name:
-      msg: "Die Änderung Ihres Nutzernamens wird von unseren Moderatoren geprüft."
-    my_comments: "Meine Kommentare"
-    my_profile: "Mein Profil"
-    new_count: "{0} {1} mehr anzeigen"
-    profile: Profil
-    show_all_comments: "Alle Kommentare anzeigen"
-    success_bio_update: "Ihre Biographie wurde aktualisiert"
-    success_name_update: "Ihr Nutzername wurde aktualisiert"
-    success_update_settings: "Ihre Änderungen wurden für den Kommentarbereich dieses Artikels angewandt"
-    show_all_replies: Alle Antworten anzeigen
-    show_more_replies: Weitere Antworten anzeigen
-    view_more_comments: "Weitere Kommentare anzeigen"
-    view_reply: "Antwort anzeigen"
-  from_settings_page: "Sie können Ihren Kommentarverlauf auf Ihrer Profilseite sehen."
-  like: Gefällt mir
-  loading_results: "Lädt Ergebnisse"
-  marketing: "Dies scheint Werbung zu sein"
-  moderate_this_stream: "Diesen Kommentarbereich moderieren"
+    ALREADY_EXISTS: 'Ressource existiert bereits'
+    CANNOT_IGNORE_STAFF: 'Mitarbeiter können nicht ignoriert werden.'
+    COMMENT_PARENT_NOT_VISIBLE: 'Der Kommentar, auf den Sie antworten möchten, wurde entfernt oder existiert nicht.'
+    COMMENT_TOO_SHORT: 'Kommentare sollten mehr als ein Zeichen enthalten, bitte überprüfen Sie Ihren Kommentar und probieren Sie es erneut.'
+    COMMENTING_CLOSED: 'Kommentarbereich ist bereits geschlossen'
+    COMMENTING_DISABLED: 'Die Kommentarfunktion ist derzeit abgeschaltet'
+    confirm_password: 'Passwörter nicht identisch. Bitte erneut überprüfen'
+    DELETION_NOT_SCHEDULED: 'Löschvorgang wurde nicht geplant'
+    EDIT_USERNAME_NOT_AUTHORIZED: 'Sie haben keine Berechtigung, Ihren Nutzernamen zu ändern.'
+    EDIT_WINDOW_ENDED: 'Sie können diesen Kommentar nicht mehr bearbeiten. Das Zeitfenster ist abgelaufen.'
+    email: 'Bitte geben Sie eine gültige E-Mail-Adresse ein.'
+    EMAIL_ALREADY_VERIFIED: 'E-Mail-Adresse ist bereits bestätigt.'
+    EMAIL_IN_USE: 'E-Mail-Adresse bereits vergeben'
+    email_not_verified: 'E-Mail-Adresse {0} nicht bestätigt.'
+    EMAIL_NOT_VERIFIED: 'E-Mail-Adresse nicht bestätigt'
+    email_password: 'E-Mail und/oder Passwort inkorrekt.'
+    EMAIL_REQUIRED: 'Eine E-Mail-Adresse ist erforderlich'
+    EMAIL_VERIFICATION_TOKEN_INVALID: 'Code zur E-Mail-Bestätigung ist ungültig.'
+    INCORRECT_PASSWORD: 'Falsches Passwort'
+    INVALID_ASSET_URL: 'Asset-URL ist ungültig'
+    LOGIN_MAXIMUM_EXCEEDED: 'Sie haben zu häufig erfolglos versucht, sich anzumelden. Bitte warten Sie.'
+    network_error: 'Server-Verbindung fehlgeschlagen. Bitte überprüfen Sie ihre Internetverbindung und versuchen Sie es erneut.'
+    NO_SPECIAL_CHARACTERS: 'Benutzernamen dürfen nur Buchstaben, Zahlen und _ enthalten'
+    NOT_AUTHORIZED: 'Sie sind nicht berechtigt, diese Aktion auszuführen.'
+    NOT_FOUND: 'Ressource nicht gefunden'
+    organization_contact_email: 'E-Mail-Adresse der Organisation ist ungültig.'
+    organization_name: 'Namen von Organisationen dürfen nur Buchstaben und Zahlen enthalten.'
+    password: 'Passwort muss mindestens 8 Zeichen enthalten'
+    PASSWORD_INCORRECT: 'Ihr bestehendes Passwort wurde falsch eingegeben'
+    PASSWORD_LENGTH: 'Passwort ist zu kurz'
+    PASSWORD_REQUIRED: 'Passwort ist erforderlich'
+    PASSWORD_RESET_TOKEN_INVALID: 'Ihr Link zum Passwort zurücksetzen ist ungültig.'
+    PROFANITY_ERROR: 'Nutzernamen dürfen nicht anstößig sein. Bei Fragen, wenden Sie sich an einen Administrator.'
+    RATE_LIMIT_EXCEEDED: 'Ratelimit überschritten'
+    required_field: 'Dieses Feld ist erforderlich'
+    SAME_USERNAME_PROVIDED: 'Sie müssen einen anderen Nutzernamen wählen.'
+    temporarily_suspended: 'Ihr Konto ist vorübergehend gesperrt. Es wird wieder aktiviert am {0}. Bei Fragen setzen Sie sich mit uns in Kontakt.'
+    unexpected: 'Unerwarteter Fehler aufgetreten. Es tut uns leid!'
+    username: 'Nutzernamen dürfen nur Buchstaben, Zahlen und _ enthalten'
+    USERNAME_IN_USE: 'Nutzername bereits vergeben'
+    USERNAME_REQUIRED: 'Nutzername muss angegeben werden'
+  flag_comment: 'Kommentar melden'
+  flag_reason: 'Grund der Meldung (optional)'
+  flag_username: 'Nutzername melden'
+  flagged_usernames:
+    notify_approved: '{0} hat Nutzername {1} freigegeben'
+    notify_changed: 'Nutzer {0} hat Nutzernamen nach {1} geändert'
+    notify_flagged: '{0} hat Nutzername {1} markiert'
+    notify_rejected: '{0} hat Nutzername {1} abgelehnt'
   flags:
     reasons:
-       user:
-         username_offensive: "Unangemessen"
-         username_nolike: "Unerwünscht"
-         username_impersonating: "Identität unklar"
-         username_spam: "Spam"
-         username_other: "Anderes"
-       comment:
-         comment_offensive: "Unangemessen"
-         comment_spam: "Spam"
-         comment_noagree: "Andere Meinung"
-         comment_other: "Anderes"
-         suspect_word: "Verdächtiges Wort"
-         banned_word: "Unzulässiges Wort"
-         body_count: "Text überschreitet Zeichenlimit"
-         links: "Link"
+      comment:
+        banned_word: 'Unzulässiges Wort'
+        body_count: 'Text überschreitet Zeichenlimit'
+        comment_noagree: 'Andere Meinung'
+        comment_offensive: Unangemessen
+        comment_other: Anderes
+        comment_spam: Spam
+        links: Link
+        suspect_word: 'Verdächtiges Wort'
+      user:
+        username_impersonating: 'Identität unklar'
+        username_nolike: Unerwünscht
+        username_offensive: Unangemessen
+        username_other: Anderes
+        username_spam: Spam
+  framework:
+    banned_account_body: 'Dies bedeutet, dass Sie weder Kommentare schreiben, noch auf andere Weise mit der Community interagieren können.'
+    banned_account_header: 'Ihr Konto ist aktuell gesperrt.'
+    changed_name:
+      msg: 'Die Änderung Ihres Nutzernamens wird von unseren Moderatoren geprüft.'
+    comment: Kommentar
+    comment_is_deleted: 'Der Kommentar wurde vom Nutzer gelöscht.'
+    comment_is_hidden: 'Dieser Kommentar ist nicht verfügbar.'
+    comment_is_ignored: 'Dieser Kommentar ist nicht sichtbar, da Sie den Nutzer ignorieren.'
+    comment_is_rejected: 'Sie haben diesen Kommentar abgelehnt.'
+    comments: Kommentare
+    configure_stream: Konfigurieren
+    content_not_available: 'Dieser Inhalt ist nicht verfügbar'
+    edit_name:
+      button: Senden
+      error: 'Nutzernamen dürfen nur Buchstaben, Zahlen und _ enthalten'
+      label: 'Neuer Nutzername'
+      msg: 'Ihr Konto ist vorübergehend gesperrt, da Ihr Nutzername als unangemessen eingestuft wurde. Um Ihr Konto wieder herzustellen, geben Sie bitte einen neuen Nutzernamen ein. Bei Fragen, kontaktieren Sie uns bitte.'
+    my_comments: 'Meine Kommentare'
+    my_profile: 'Mein Profil'
+    new_count: '{0} {1} mehr anzeigen'
+    profile: Profil
+    show_all_comments: 'Alle Kommentare anzeigen'
+    show_all_replies: 'Alle Antworten anzeigen'
+    show_more_replies: 'Weitere Antworten anzeigen'
+    success_bio_update: 'Ihre Biographie wurde aktualisiert'
+    success_name_update: 'Ihr Nutzername wurde aktualisiert'
+    success_update_settings: 'Ihre Änderungen wurden für den Kommentarbereich dieses Artikels angewandt'
+    view_more_comments: 'Weitere Kommentare anzeigen'
+    view_reply: 'Antwort anzeigen'
+  from_settings_page: 'Sie können Ihren Kommentarverlauf auf Ihrer Profilseite sehen.'
+  install:
+    add_organization:
+      description: 'Geben Sie den Namen Ihrer Organisation ein. Dieser erscheint in E-Mails, wenn Sie neue Mitglieder einladen.'
+      label: 'Name der Organisation'
+      save: Speichern
+    create:
+      confirm_password: 'Passwort bestätigen'
+      email: E-Mail-Adresse
+      organization_contact_email: 'Kontakt-Adresse der Organisation'
+      password: Passwort
+      save: Speichern
+      username: Nutzername
+    final:
+      close: Schließen
+      description: 'Danke, dass Sie Talk benutzen! Bitte bestätigen Sie Ihre E-Mail-Adresse über den Link, den wir an Sie versandt haben. Während Sie die Einrichtung Ihres Kontos abschließen, können Sie sich schon mit Ihren Lesern beschäftigen.'
+      launch: 'Talk starten'
+    initial:
+      description: 'Erstellen Sie in wenigen Schritten Ihre Talk-Community.'
+      submit: 'Los geht’s!'
+    permitted_domains:
+      description: 'Geben Sie Domains an, für die diese Talk-Instanz freigegeben werden soll. Beispiel: localhost:3000 staging.domain.com domain.com.'
+      submit: 'Installation abschließen'
+      title: 'Zugelassene Domains'
+  like: 'Gefällt mir'
+  loading_results: 'Lädt Ergebnisse'
+  marketing: 'Dies scheint Werbung zu sein'
+  moderate_this_stream: 'Diesen Kommentarbereich moderieren'
   modqueue:
-    account: "Konto-Markierungen"
+    account: Konto-Markierungen
     actions: Aktionen
     all: Alle
-    all_streams: "Alle Kommentarbereiche"
-    notify_edited: '{0} bearbeitete Kommentar "{1}"'
-    notify_accepted: '{0} genehmigte Kommentar "{1}"'
-    notify_rejected: '{0} lehnte Kommentar "{1}" ab'
-    notify_flagged: '{0} markierte Kommentar "{1}"'
-    notify_reset: '{0} setzte Status von "{1}" zurück'
-    approve: "Freigeben"
-    approved: "Freigegeben"
-    ban_user: "Sperren"
+    all_streams: 'Alle Kommentarbereiche'
+    approve: Freigeben
+    approved: Freigegeben
+    ban_user: Sperren
     billion: Mrd
     close: Schließen
-    empty_queue: "Keine weiteren Kommentare zu moderieren! Arbeite nicht zu viel, gönn’ dir eine Pause!"
+    empty_queue: 'Keine weiteren Kommentare zu moderieren! Arbeite nicht zu viel, gönn’ dir eine Pause!'
     flagged: markiert
-    reported: gemeldet
-    less_detail: "Weniger Details"
-    likes: Gefällt mir
+    jump_to_queue: 'Zu bestimmter Liste springen'
+    less_detail: 'Weniger Details'
+    likes: 'Gefällt mir'
     million: Mio
-    mod_faster: "Schneller moderieren mit Tastaturkürzeln"
-    moderate: "Moderieren →"
-    more_detail: "Mehr Details"
-    new: Neu
-    newest_first: "Neueste zuerst"
+    mod_faster: 'Schneller moderieren mit Tastaturkürzeln'
+    moderate: 'Moderieren →'
+    more_detail: 'Mehr Details'
     navigation: Navigation
-    next_comment: "Gehe zum nächsten Kommentar"
-    toggle_search: "Suche öffnen"
-    next_queue: "Nächste Liste"
-    oldest_first: "Älteste zuerst"
+    new: Neu
+    newest_first: 'Neueste zuerst'
+    next_comment: 'Gehe zum nächsten Kommentar'
+    next_queue: 'Nächste Liste'
+    notify_accepted: '{0} genehmigte Kommentar "{1}"'
+    notify_edited: '{0} bearbeitete Kommentar "{1}"'
+    notify_flagged: '{0} markierte Kommentar "{1}"'
+    notify_rejected: '{0} lehnte Kommentar "{1}" ab'
+    notify_reset: '{0} setzte Status von "{1}" zurück'
+    oldest_first: 'Älteste zuerst'
     premod: Unmoderiert
-    prev_comment: " Gehe zum vorherigen Kommentar"
-    reject: "Ablehnen"
-    rejected: "Abgelehnt"
-    reply: "Antworten"
-    select_stream: "Kommentarbereich wählen"
-    shift_key: "⇧"
-    shortcuts: "Tastaturkürzel"
-    sort: "Sortieren"
-    show_shortcuts: "Tastaturkürzel anzeigen"
-    singleview: "Zen-Modus"
-    system_withheld: "System Withheld"
-    thismenu: "Dieses Menü öffnen"
-    jump_to_queue: "Zu bestimmter Liste springen"
+    prev_comment: ' Gehe zum vorherigen Kommentar'
+    reject: Ablehnen
+    rejected: Abgelehnt
+    reply: Antworten
+    reported: gemeldet
+    select_stream: 'Kommentarbereich wählen'
+    shift_key: ⇧
+    shortcuts: Tastaturkürzel
+    show_shortcuts: 'Tastaturkürzel anzeigen'
+    singleview: Zen-Modus
+    sort: Sortieren
+    system_withheld: 'System Withheld'
+    thismenu: 'Dieses Menü öffnen'
     thousand: T
-    try_these: "Versuch’ diese"
-    view_more_shortcuts: "Weitere Tastaturkürzel anzeigen"
-  my_comment_history: "Mein Kommentarverlauf"
+    toggle_search: 'Suche öffnen'
+    try_these: 'Versuch’ diese'
+    view_more_shortcuts: 'Weitere Tastaturkürzel anzeigen'
+  my_comment_history: 'Mein Kommentarverlauf'
   name: Name
-  no_agree_comment: "Ich bin mit diesem Kommentar nicht einverstanden"
-  no_like_bio: "Ich mag diese Biographie nicht"
-  no_like_username: "Ich mag diesen Nutzernamen nicht"
-  already_flagged_username: "Sie haben diesen Nutzernamen schon markiert."
+  no_agree_comment: 'Ich bin mit diesem Kommentar nicht einverstanden'
+  no_like_bio: 'Ich mag diese Biographie nicht'
+  no_like_username: 'Ich mag diesen Nutzernamen nicht'
   other: Sonstiges
+  password_reset:
+    change_password: 'Passwort ändern'
+    change_password_help: 'Bitte geben Sie ein neues Passwort ein. Benutzen Sie ein sicheres!'
+    confirm_new_password: 'Neues Passwort bestätigen'
+    mail_sent: 'Falls Sie eine registriertes Konto haben, wurde Ihnen ein Zurücksetzen-Link an diese E-Mail-Adresse geschickt'
+    new_password: 'Neues Passwort'
+    new_password_help: 'Das Passwort benötigt mindestens 8 Zeichen'
+    set_new_password: 'Passwort ändern'
   permalink: Teilen
-  personal_info: "Dieser Kommentar enthält zu viel personenbezogene Daten"
-  post: Post  # Kontext?
+  personal_info: 'Dieser Kommentar enthält zu viel personenbezogene Daten'
+  post: Post
   profile: Profil
-  profile_settings: "Einstellungen"
+  profile_settings: Einstellungen
+  reject_username:
+    description_notify: 'Die Sperrung wird das Nutzerkonto vorübergehend deaktivieren.'
+    description_reject: 'Möchten Sie diesen Nutzer vorübergehend sperren (Grund: {0})? Der Nutzer kann das Konto erst wieder nach Änderung des {0} nutzen.'
+    email_message_reject: 'Ein Community-Mitglied hat Ihren Nutzernamen zur Überprüfung gemeldet. Er wurde als unangemessen eingestuft und abgelehnt. Sie können Ihr Konto erst wieder voll nutzen, wenn Sie Ihren Namen ändern. Setzen Sie sich bei weiteren Fragen mit uns in Verbindung.'
+    no_cancel: 'Nein, abbrechen'
+    send: Senden
+    suspend_user: 'Nutzer vorübergehend sperren'
+    title_notify: 'Nutzer über die vorübergehende Sperrung benachrichtigen'
+    title_reject: 'Uns ist aufgefallen, dass Sie einen Nutzernamen abgelehnt haben'
+    username: Nutzername
+    write_message: 'Nachricht schreiben'
+    yes_suspend: 'Ja, vorübergehend sperren'
   reply: Antworten
   report: Melden
-  report_notif: "Vielen Dank für Ihre Meldung. Unsere Moderatoren wurden informiert und werden sich in Kürze darum kümmern."
-  report_notif_remove: "Ihre Meldung wurde entfernt."
+  report_notif: 'Vielen Dank für Ihre Meldung. Unsere Moderatoren wurden informiert und werden sich in Kürze darum kümmern.'
+  report_notif_remove: 'Ihre Meldung wurde entfernt.'
   reported: Gemeldet
-  comment_history_blank:
-    title: Sie haben noch keine Kommentare verfasst
-    info: Hier wird ein Verlauf Ihrer verfassten Kommentare erscheinen
   settings:
-    from_settings_page: "Sie können auf Ihrer Profilseite Ihren Kommentarverlauf einsehen."
-    my_comment_history: "Mein Kommentarverlauf"
+    from_settings_page: 'Sie können auf Ihrer Profilseite Ihren Kommentarverlauf einsehen.'
+    my_comment_history: 'Mein Kommentarverlauf'
     profile: Profil
-    profile_settings: "Profil-Einstellungen"
-    sign_in: "Anmelden"
-    to_access: "um auf Profil zuzugreifen"
-    user_no_comment: "Keine Kommentare vorhanden. Nehmen Sie an der Diskussion teil!"
+    profile_settings: Profil-Einstellungen
+    sign_in: Anmelden
+    to_access: 'um auf Profil zuzugreifen'
+    user_no_comment: 'Keine Kommentare vorhanden. Nehmen Sie an der Diskussion teil!'
+  step_1_header: 'Ein Problem melden'
+  step_2_header: Begründung
+  step_3_header: 'Danke für Ihren Hinweis'
   stream:
-    all_comments: "Alle Kommentare"
-    temporarily_suspended: "Entsprechend der Community-Regeln von {0} wurde Ihr Konto vorübergehend gesperrt. Nehmen Sie {1} wieder an der Diskussion teil."
-    comment_not_found: "Dieser Kommentar wurde entfernt oder existiert nicht."
-    no_comments: "Es gibt noch keine Kommentare. Schreiben Sie doch einen..."
-    no_comments_and_closed: "Es gab zu diesem Artikel keine Kommentare."
-  step_1_header: "Ein Problem melden"
-  step_2_header: "Begründung"
-  step_3_header: "Danke für Ihren Hinweis"
+    all_comments: 'Alle Kommentare'
+    comment_not_found: 'Dieser Kommentar wurde entfernt oder existiert nicht.'
+    no_comments: 'Es gibt noch keine Kommentare. Schreiben Sie doch einen...'
+    no_comments_and_closed: 'Es gab zu diesem Artikel keine Kommentare.'
+    temporarily_suspended: 'Entsprechend der Community-Regeln von {0} wurde Ihr Konto vorübergehend gesperrt. Nehmen Sie {1} wieder an der Diskussion teil.'
   streams:
     all: Alle
     article: Artikel
     closed: Geschlossen
-    empty_result: "Ihre Suche war ohne Ergebnisse. Versuchen Sie, Ihre Anfrage weiter zu fassen."
-    filter_streams: "Kommentarbereiche filtern"
+    empty_result: 'Ihre Suche war ohne Ergebnisse. Versuchen Sie, Ihre Anfrage weiter zu fassen.'
+    filter_streams: 'Kommentarbereiche filtern'
     newest: Neueste
     oldest: Älteste
     open: Offen
-    pubdate: "Veröffentlichungsdatum"
+    pubdate: Veröffentlichungsdatum
     search: Suchen
-    sort_by: "Sortieren nach"
-    status: "Status"
-    stream_status: "Status"
+    sort_by: 'Sortieren nach'
+    status: Status
+    stream_status: Status
   suspenduser:
-    title_suspend: "Nutzer vorübergehend sperren"
-    description_suspend: "Sie sperren vorübergehend {0}. Dieser Kommentar wird auf die Abgelehnt-Liste verschoben und der Nutzer wird keine Aktionen ausführen können, bis die Sperrung abgelaufen ist."
-    select_duration: "Sperrdauer festlegen"
-    one_hour: "1 Stunde"
-    hours: "{0} Stunden"
-    days: "{0} Tage"
-    hour: "{0} hours"
-    day: "{0} days"
-    cancel: "Abbrechen"
-    suspend_user: "Nutzer vorübergehend sperren"
-    email_message_suspend: "Sehr geehrte/r {0}, entsprechend der Community-Richtlinien von {1} wurde Ihr Konto vorübergehend gesperrt. Während der Sperrung können Sie weder kommentieren noch andere Aktionen ausführen. Nehmen Sie {2} wieder an der Diskussion teil."
-    title_notify: "Den Nutzer über die vorübergehende Kontosperrung informieren"
-    notify_suspend_until: "Nutzer {0} wurde vorübergehend gesperrt. Diese Sperrung endet automatisch {1}."
-    description_notify: "Während der Sperrung hat der Nutzer keinen Zugriff auf das Konto."
-    write_message: "Nachricht verfassen"
+    cancel: Abbrechen
+    day: '{0} days'
+    days: '{0} Tage'
+    description_notify: 'Während der Sperrung hat der Nutzer keinen Zugriff auf das Konto.'
+    description_suspend: 'Sie sperren vorübergehend {0}. Dieser Kommentar wird auf die Abgelehnt-Liste verschoben und der Nutzer wird keine Aktionen ausführen können, bis die Sperrung abgelaufen ist.'
+    email_message_suspend: 'Sehr geehrte/r {0}, entsprechend der Community-Richtlinien von {1} wurde Ihr Konto vorübergehend gesperrt. Während der Sperrung können Sie weder kommentieren noch andere Aktionen ausführen. Nehmen Sie {2} wieder an der Diskussion teil.'
+    hour: '{0} hours'
+    hours: '{0} Stunden'
+    notify_suspend_until: 'Nutzer {0} wurde vorübergehend gesperrt. Diese Sperrung endet automatisch {1}.'
+    one_hour: '1 Stunde'
+    select_duration: 'Sperrdauer festlegen'
     send: Senden
-  reject_username:
-    username: Nutzername
-    no_cancel: "Nein, abbrechen"
-    description_reject: "Möchten Sie diesen Nutzer vorübergehend sperren (Grund: {0})? Der Nutzer kann das Konto erst wieder nach Änderung des {0} nutzen."
-    title_notify: "Nutzer über die vorübergehende Sperrung benachrichtigen"
-    description_notify: "Die Sperrung wird das Nutzerkonto vorübergehend deaktivieren."
-    title_reject: "Uns ist aufgefallen, dass Sie einen Nutzernamen abgelehnt haben"
-    suspend_user: "Nutzer vorübergehend sperren"
-    yes_suspend: "Ja, vorübergehend sperren"
-    email_message_reject: "Ein Community-Mitglied hat Ihren Nutzernamen zur Überprüfung gemeldet. Er wurde als unangemessen eingestuft und abgelehnt. Sie können Ihr Konto erst wieder voll nutzen, wenn Sie Ihren Namen ändern. Setzen Sie sich bei weiteren Fragen mit uns in Verbindung."
-    write_message: "Nachricht schreiben"
-    send: Senden
-  thank_you: "Vielen Dank für Ihre Nachricht. Wir nehmen Ihre Meldung ernst und ein Moderator wird sie umgehend prüfen."
+    suspend_user: 'Nutzer vorübergehend sperren'
+    title_notify: 'Den Nutzer über die vorübergehende Kontosperrung informieren'
+    title_suspend: 'Nutzer vorübergehend sperren'
+    write_message: 'Nachricht verfassen'
+  thank_you: 'Vielen Dank für Ihre Nachricht. Wir nehmen Ihre Meldung ernst und ein Moderator wird sie umgehend prüfen.'
   user:
-    bio_flags: "Markierungen für diese Biographie"
-    user_bio: "Nutzer-Biographie"
-    username_flags: "Markierungen für diesen Nutzernamen"
+    bio_flags: 'Markierungen für diese Biographie'
+    user_bio: Nutzer-Biographie
+    username_flags: 'Markierungen für diesen Nutzernamen'
   user_detail:
-    remove_suspension: "Vorübergehende Sperrung aufheben"
-    suspend: "Nutzer vorübergehend sperren"
-    remove_ban: "Sperre aufheben"
-    ban: "Nutzer sperren"
-    member_since: "Mitglied seit"
-    email: "E-Mail"
-    total_comments: "Anzahl Kommentare"
-    reject_rate: "Ablehn-Rate"
-    reports: "Meldungen"
-    all: "Alle"
-    rejected: "Abgelehnte"
-    user_history: "Konto-Verlauf"
+    all: Alle
+    ban: 'Nutzer sperren'
+    email: E-Mail
+    member_since: 'Mitglied seit'
+    reject_rate: Ablehn-Rate
+    rejected: Abgelehnte
+    remove_ban: 'Sperre aufheben'
+    remove_suspension: 'Vorübergehende Sperrung aufheben'
+    suspend: 'Nutzer vorübergehend sperren'
+    total_comments: 'Anzahl Kommentare'
+    user_history: Konto-Verlauf
   user_history:
-    user_banned: "Nutzer gesperrt"
-    ban_removed: "Sperrung aufgehoben"
-    username_status: "Nutzername {0}"
-    suspended: "Vorübergehend gesperrt, {0}"
-    suspension_removed: "Vorübergehende Sperrung aufgehoben"
-    system: "System"
-    date: "Datum"
-    action: "Aktion"
-    taken_by: "Durch"
-  user_impersonating: "Gibt sich für jemand anderen aus"
-  user_no_comment: "Sie haben noch keinen Kommentar abgegeben. Teilen Sie Ihre Meinung mit uns!"
-  username_offensive: "Dieser Nutzername ist unangemessen"
-  view_conversation: "Diskussion ansehen"
-  install:
-    initial:
-      description: "Erstellen Sie in wenigen Schritten Ihre Talk-Community."
-      submit: "Los geht’s!"
-    add_organization:
-      description: "Geben Sie den Namen Ihrer Organisation ein. Dieser erscheint in E-Mails, wenn Sie neue Mitglieder einladen."
-      label: "Name der Organisation"
-      save: "Speichern"
-    create:
-      email: "E-Mail-Adresse"
-      username: "Nutzername"
-      password: "Passwort"
-      confirm_password: "Passwort bestätigen"
-      organization_contact_email: "Kontakt-Adresse der Organisation"
-      save: "Speichern"
-    permitted_domains:
-      title: "Zugelassene Domains"
-      description: "Geben Sie Domains an, für die diese Talk-Instanz freigegeben werden soll. Beispiel: localhost:3000 staging.domain.com domain.com."
-      submit: "Installation abschließen"
-    final:
-      description: "Danke, dass Sie Talk benutzen! Bitte bestätigen Sie Ihre E-Mail-Adresse über den Link, den wir an Sie versandt haben. Während Sie die Einrichtung Ihres Kontos abschließen, können Sie sich schon mit Ihren Lesern beschäftigen."
-      launch: "Talk starten"
-      close: "Schließen"
-  admin_sidebar:
-    view_options: "Ansichtsoptionen"
-    sort_comments: "Kommentare sortieren"
+    action: Aktion
+    ban_removed: 'Sperrung aufgehoben'
+    date: Datum
+    suspended: 'Vorübergehend gesperrt, {0}'
+    suspension_removed: 'Vorübergehende Sperrung aufgehoben'
+    system: System
+    taken_by: Durch
+    user_banned: 'Nutzer gesperrt'
+    username_status: 'Nutzername {0}'
+  user_impersonating: 'Gibt sich für jemand anderen aus'
+  user_no_comment: 'Sie haben noch keinen Kommentar abgegeben. Teilen Sie Ihre Meinung mit uns!'
+  username_offensive: 'Dieser Nutzername ist unangemessen'
+  validators:
+    confirm_email: 'Emails nicht identisch. Bitte erneut überprüfen'
+    confirm_password: 'Passwörter nicht identisch. Bitte erneut überprüfen'
+    required: 'Dieses Feld ist erforderlich'
+    verify_email: 'Bitte geben Sie eine gültige E-Mail-Adresse ein.'
+    verify_organization_name: 'Namen von Organisationen dürfen nur Buchstaben und Zahlen enthalten.'
+    verify_password: 'Passwort muss mindestens 8 Zeichen enthalten'
+    verify_username: 'Nutzernamen dürfen nur Buchstaben, Zahlen und _ enthalten'
+  view_conversation: 'Diskussion ansehen'
+  your_account_has_been_banned: 'Ihr Zugang wurde gesperrt.'
+  your_account_has_been_suspended: 'Ihr Zugang wurde vorübergehend gesperrt.'
+  your_username_has_been_rejected: 'Ihr Zugang wurde vorübergehend gesperrt, da Ihr Nutzername als unangemessen eingestuft wurde. Um Ihren Zugang wieder herzustellen, geben Sie bitte einen neuen Nutzernamen ein.'
diff --git a/locales/en.yml b/locales/en.yml
index c34ee3059..48fb74da0 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -1,538 +1,546 @@
 en:
-  your_account_has_been_suspended: Your account has been temporarily suspended.
-  your_account_has_been_banned: Your account has been banned.
-  your_username_has_been_rejected: Your account has been suspended because your username has been deemed inappropriate. To restore your account please enter a new username.
-  embed_comments_tab: Comments
-  reject_username_dialog:
-    title: "Reject Username"
-    description: "Help us understand"
-    reason: "Reason"
-    message: "Reason for reporting (Optional)"
-    cancel: "Cancel"
-    reject_username: "Reject Username" 
-  flag_reasons:
-    username: 
-      offensive: "This username is offensive"
-      nolike: "I don't like this username"
-      impersonating: "This user is impersonating"
-      spam: "This looks like an ad/marketing"
-      other: "Other"
+  admin_sidebar:
+    sort_comments: 'Sort Comments'
+    view_options: 'View Options'
+  already_flagged_username: 'You have already flagged this username.'
   bandialog:
-    are_you_sure: "Are you sure you would like to ban {0}?"
-    ban_user: "Ban User?"
-    banned_user: "Banned User"
-    cancel: "Cancel"
-    note: "Note: {0}"
-    note_reject_comment: "Banning this user will also place this comment in the Rejected queue."
-    note_ban_user: "Banning this user will not let them comment, react to, or report comments."
-    yes_ban_user: "Yes, Ban User"
-    write_a_message: "Write a message"
-    send: "Send"
-    notify_ban_headline: "Notify the user of ban"
-    notify_ban_description: "This will notify the user by email that they have been banned from the community"
+    are_you_sure: 'Are you sure you would like to ban {0}?'
+    ban_user: 'Ban User?'
+    banned_user: 'Banned User'
+    cancel: Cancel
     email_message_ban: "Dear {0},\n\nSomeone with access to your account has violated our community guidelines. As a result, your account has been banned. You will no longer be able to comment, like or report comments. if you think this has been done in error, please contact our community team."
-  bio_offensive: "This bio is offensive"
-  cancel: "Cancel"
-  confirm_email:
-    email_confirmation: "Email Confirmation"
-    click_to_confirm: "Click below to confirm your email address."
-    confirm: "Confirm"
-  password_reset:
-    mail_sent: 'If you have a registered account, a password reset link was sent to that email'
-    set_new_password: "Change Your Password"
-    change_password_help: "Please enter a new password to use to login. Make it secure!"
-    new_password: "New Password"
-    new_password_help: "Password must be at least 8 characters"
-    confirm_new_password: "Confirm New Password"
-    change_password: "Change Password"
-  characters_remaining: "characters remaining"
+    note: 'Note: {0}'
+    note_ban_user: 'Banning this user will not let them comment, react to, or report comments.'
+    note_reject_comment: 'Banning this user will also place this comment in the Rejected queue.'
+    notify_ban_description: 'This will notify the user by email that they have been banned from the community'
+    notify_ban_headline: 'Notify the user of ban'
+    send: Send
+    write_a_message: 'Write a message'
+    yes_ban_user: 'Yes, Ban User'
+  bio_offensive: 'This bio is offensive'
+  cancel: Cancel
+  characters_remaining: 'characters remaining'
   comment:
-    anon: "Anonymous"
-    undo_reject: "Undo"
-    ban_user: "Ban User"
-    comment: "Post a comment"
+    anon: Anonymous
+    ban_user: 'Ban User'
+    comment: 'Post a comment'
     edited: Edited
-    flagged: "flagged"
-    view_context: "View context"
+    flagged: flagged
+    undo_reject: Undo
+    view_context: 'View context'
   comment_box:
-    post: "Post"
-    cancel: "Cancel"
-    reply: "Reply"
-    comment: "Post a comment"
-    name: "Name"
-    comment_post_notif: "Your comment has been posted."
-    comment_post_notif_premod: "Thank you for posting. Our moderation team will review your comment shortly."
-    comment_post_banned_word:  "Your comment contains one or more words that are not permitted, so it will not be published. If you think this message is incorrect, please contact our moderation team."
-    characters_remaining: "characters remaining"
-  comment_offensive: "This comment is offensive"
-  comment_singular: Comment
+    cancel: Cancel
+    characters_remaining: 'characters remaining'
+    comment: 'Post a comment'
+    comment_post_banned_word: 'Your comment contains one or more words that are not permitted, so it will not be published. If you think this message is incorrect, please contact our moderation team.'
+    comment_post_notif: 'Your comment has been posted.'
+    comment_post_notif_premod: 'Thank you for posting. Our moderation team will review your comment shortly.'
+    name: Name
+    post: Post
+    reply: Reply
+  comment_history_blank:
+    info: 'A history of your comments will appear here'
+    title: 'You have not written any comments'
+  comment_offensive: 'This comment is offensive'
   comment_plural: Comments
-  comment_post_banned_word: "Your comment contains one or more words that are not permitted, so it will not be published. If you think this message is incorrect, please contact our moderation team."
-  comment_post_notif: "Your comment has been posted."
-  comment_post_notif_premod: "Thank you for posting. Our moderation team will review your comment shortly."
+  comment_post_banned_word: 'Your comment contains one or more words that are not permitted, so it will not be published. If you think this message is incorrect, please contact our moderation team.'
+  comment_post_notif: 'Your comment has been posted.'
+  comment_post_notif_premod: 'Thank you for posting. Our moderation team will review your comment shortly.'
+  comment_singular: Comment
   common:
-    copy: 'Copy'
+    copy: Copy
     error: 'An error has occurred.'
+    reaction: reaction
+    reactions: reactions
     reply: 'reply' # noun, singular
     replies: 'replies'
-    reaction: 'reaction'
-    reactions: 'reactions'
     story: 'Story'
-  flagged_usernames:
-    notify_approved: '{0} approved username {1}'
-    notify_rejected: '{0} rejected username {1}'
-    notify_flagged: '{0} reported username {1}'
-    notify_changed: 'user {0} changed their username to {1}'
   community:
-    account_creation_date: "Account Creation Date"
+    account_creation_date: 'Account Creation Date'
     active: Active
     admin: Administrator
-    ads_marketing: "This looks like an ad/marketing"
-    are_you_sure: "Are you sure you would like to ban {0}?"
-    ban_user: "Ban User?"
+    ads_marketing: 'This looks like an ad/marketing'
+    are_you_sure: 'Are you sure you would like to ban {0}?'
+    ban_user: 'Ban User?'
     banned: Banned
-    banned_user: "Banned User"
+    banned_user: 'Banned User'
     cancel: Cancel
-    dont_like_username: "Dislike username"
-    flaggedaccounts: "Reported Usernames"
+    commenter: Commenter
+    dont_like_username: 'Dislike username'
+    flaggedaccounts: 'Reported Usernames'
     flags: Flags
-    impersonating: "Impersonation"
-    loading: "Loading results"
+    impersonating: Impersonation
+    loading: 'Loading results'
     moderator: Moderator
-    newsroom_role: "Newsroom Role"
-    no_flagged_accounts: "The Reported Usernames queue is currently empty."
-    no_results: "No users found with that user name or email address. They're hiding!"
-    offensive: "Offensive"
+    newsroom_role: 'Newsroom Role'
+    no_flagged_accounts: 'The Reported Usernames queue is currently empty.'
+    no_results: 'No users found with that user name or email address. They''re hiding!'
+    offensive: Offensive
     other: Other
     people: People
-    role: "Select role..."
-    select_status: "Select status..."
-    spam_ads: "Spam/Ads"
-    staff: "Staff"
+    role: 'Select role...'
+    select_status: 'Select status...'
+    spam_ads: Spam/Ads
+    staff: Staff
     status: Status
-    username_and_email: "Username and Email"
-    yes_ban_user: "Yes Ban User"
-    commenter: "Commenter"
+    username_and_email: 'Username and Email'
+    yes_ban_user: 'Yes Ban User'
   configure:
+    access_message: 'You must be an administrator to access config settings. Please find the nearest Admin and ask them to level you up!'
     apply: Apply
-    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."
-    banned_words_title: "Banned words list"
-    close: "Close"
-    close_after: "Close comments after"
-    close_stream: "Close Stream"
-    close_stream_configuration: "This comment stream is currently closed. By opening this comment stream new comments may be submitted and displayed"
-    closed_comments_desc: "Write a message to be displayed when when your comment stream is closed and no longer accepting comments."
-    closed_comments_label: "Write a message..."
-    closed_stream_settings: "Closed Stream Message"
-    comment_count_error: "Please enter a valid number."
-    comment_count_header: "Limit Comment Length"
+    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.'
+    banned_words_title: 'Banned words list'
+    close: Close
+    close_after: 'Close comments after'
+    close_stream: 'Close Stream'
+    close_stream_configuration: 'This comment stream is currently closed. By opening this comment stream new comments may be submitted and displayed'
+    closed_comments_desc: 'Write a message to be displayed when when your comment stream is closed and no longer accepting comments.'
+    closed_comments_label: 'Write a message...'
+    closed_stream_settings: 'Closed Stream Message'
+    comment_count_error: 'Please enter a valid number.'
+    comment_count_header: 'Limit Comment Length'
     comment_count_text_post: characters
-    comment_count_text_pre: "Comments will be limited to"
+    comment_count_text_pre: 'Comments will be limited to'
     comment_settings: Settings
-    comment_stream: "Comment Stream"
-    comment_stream_will_close: "The comment stream will close"
+    comment_stream: 'Comment Stream'
+    comment_stream_will_close: 'The comment stream will close'
     community: Community
     configure: Configure
-    copy_and_paste: "Copy and paste code below into your CMS to embed your comment box in your articles"
-    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."
+    copy_and_paste: 'Copy and paste code below into your CMS to embed your comment box in your articles'
+    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.'
     days: Days
-    description: "Change the comment settings on this story."
-    disable_commenting_title: "Deactivate commenting site-wide"
-    disable_commenting_desc: "Write a message that will be displayed while commenting is deactivated."
-    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)."
-    domain_list_title: "Permitted Domains"
-    edit_info: "Edit Info"
-    edit_comment_timeframe_heading: "Edit Comment Timeframe"
-    edit_comment_timeframe_text_pre: "Commenters will have"
-    edit_comment_timeframe_text_post: "seconds to edit their comments."
-    embed_comment_stream: "Embed Stream"
-    enable_premod_links_text: "Moderators must approve any comment containing a link before it is published."
-    enable_pre_moderation: "Enable pre-moderation"
-    enable_pre_moderation_text: "Moderators must approve any comment before it is published."
-    enable_premod_links: "Pre-Moderate Comments Containing Links"
-    enable_premod: "Enable Premoderation"
-    enable_premod_description: "Moderators must approve any comment before it is published."
-    enable_premod_links_description: "Moderators must approve any comment containing a link before it is published."
-    enable_questionbox: "Ask Readers a Question"
-    enable_questionbox_description: "This question will appear at the top of this comment stream. Ask readers about a certain issue in the article or pose discussion questions etc."
+    description: 'Change the comment settings on this story.'
+    disable_commenting_desc: 'Write a message that will be displayed while commenting is deactivated.'
+    disable_commenting_title: 'Deactivate commenting site-wide'
+    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).'
+    domain_list_title: 'Permitted Domains'
+    edit_comment_timeframe_heading: 'Edit Comment Timeframe'
+    edit_comment_timeframe_text_post: 'seconds to edit their comments.'
+    edit_comment_timeframe_text_pre: 'Commenters will have'
+    edit_info: 'Edit Info'
+    embed_comment_stream: 'Embed Stream'
+    enable_pre_moderation: 'Enable pre-moderation'
+    enable_pre_moderation_text: 'Moderators must approve any comment before it is published.'
+    enable_premod: 'Enable Premoderation'
+    enable_premod_description: 'Moderators must approve any comment before it is published.'
+    enable_premod_links: 'Pre-Moderate Comments Containing Links'
+    enable_premod_links_description: 'Moderators must approve any comment containing a link before it is published.'
+    enable_premod_links_text: 'Moderators must approve any comment containing a link before it is published.'
+    enable_questionbox: 'Ask Readers a Question'
+    enable_questionbox_description: 'This question will appear at the top of this comment stream. Ask readers about a certain issue in the article or pose discussion questions etc.'
     hours: Hours
-    include_comment_stream: "Include Comment Stream Description for Readers"
-    include_comment_stream_desc: "Write a message to be added to the top of your comment stream. Pose a topic include community guidelines etc."
-    include_text: "Include your text here."
-    include_question_here: "Write your question here:"
+    include_comment_stream: 'Include Comment Stream Description for Readers'
+    include_comment_stream_desc: 'Write a message to be added to the top of your comment stream. Pose a topic include community guidelines etc.'
+    include_question_here: 'Write your question here:'
+    include_text: 'Include your text here.'
     moderate: Moderate
-    moderation_settings: "Moderation Settings"
-    open: "Open"
-    open_stream: "Open Stream"
-    open_stream_configuration: "This comment stream is currently open. By closing this comment stream no new comments may be submitted and all previous comments will still be displayed."
-    require_email_verification: "Require Email Verification"
-    require_email_verification_text: "New Users must verify their email before commenting"
+    moderation_settings: 'Moderation Settings'
+    open: Open
+    open_stream: 'Open Stream'
+    open_stream_configuration: 'This comment stream is currently open. By closing this comment stream no new comments may be submitted and all previous comments will still be displayed.'
+    organization_contact_email: 'Organization Contact Email'
+    organization_details: 'Organization Details'
+    organization_info_copy: 'We use this information in email notifications generated by Talk. This connects the messages to your organization, and provides a way for users to contact you if they have an issue with their account.'
+    organization_info_copy_2: 'We recommend creating a generic email account (eg. community@yournewsroom.com) for this purpose. This means it can remain consistent over time, and doesn''t expose a name that users could target if their account were blocked.'
+    organization_information: 'Organization Information'
+    organization_name: 'Organization Name'
+    require_email_verification: 'Require Email Verification'
+    require_email_verification_text: 'New Users must verify their email before commenting'
     save: Save
-    save_changes: "Save Changes"
-    shortcuts: Shortcuts
-    sign_out: "Sign Out"
-    stories: Stories
-    stream_settings: "Stream Settings"
-    access_message: "You must be an administrator to access config settings. Please find the nearest Admin and ask them to level you up!"
-    suspect_word_title: "Suspect words 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."
-    tech_settings: "Tech Settings"
-    organization_information: "Organization Information"
-    organization_info_copy: "We use this information in email notifications generated by Talk. This connects the messages to your organization, and provides a way for users to contact you if they have an issue with their account."
-    organization_info_copy_2: "We recommend creating a generic email account (eg. community@yournewsroom.com) for this purpose. This means it can remain consistent over time, and doesn't expose a name that users could target if their account were blocked."
-    organization_details: "Organization Details"
-    organization_name: "Organization Name"
-    organization_contact_email: "Organization Contact Email"
-    title: "Configure Comment Stream"
-    weeks: Weeks
-    wordlist: "Banned Words"
+    save_changes: 'Save Changes'
     save_changes_dialog:
-      unsaved_changes: "Unsaved changes"
-      copy: "You have made one or more changes without saving. Would you like to save or discard your changes?"
-      save_settings: "Save Settings"
-      discard: "Discard"
-      cancel: "Cancel"
-  continue: "Continue"
+      cancel: Cancel
+      copy: 'You have made one or more changes without saving. Would you like to save or discard your changes?'
+      discard: Discard
+      save_settings: 'Save Settings'
+      unsaved_changes: 'Unsaved changes'
+    shortcuts: Shortcuts
+    sign_out: 'Sign Out'
+    stories: Stories
+    stream_settings: 'Stream Settings'
+    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.'
+    suspect_word_title: 'Suspect words list'
+    tech_settings: 'Tech Settings'
+    title: 'Configure Comment Stream'
+    weeks: Weeks
+    wordlist: 'Banned Words'
+  confirm_email:
+    click_to_confirm: 'Click below to confirm your email address.'
+    confirm: Confirm
+    email_confirmation: 'Email Confirmation'
+  continue: Continue
   createdisplay:
-    check_the_form: "Invalid Form. Please check the fields"
-    continue: "Continue with the same Facebook username"
-    error_create: "Error when changing username"
-    fake_comment_body: "This is an example comment. Readers can share their thoughts and opinions with newsrooms in the comments section."
-    fake_comment_date: "1 minute ago"
-    if_you_dont_change_your_name: "If you don't change your username at this step your Facebook display name will appear alongside of all your comments."
-    required_field: "Required field"
+    check_the_form: 'Invalid Form. Please check the fields'
+    continue: 'Continue with the same Facebook username'
+    error_create: 'Error when changing username'
+    fake_comment_body: 'This is an example comment. Readers can share their thoughts and opinions with newsrooms in the comments section.'
+    fake_comment_date: '1 minute ago'
+    if_you_dont_change_your_name: 'If you don''t change your username at this step your Facebook display name will appear alongside of all your comments.'
+    required_field: 'Required field'
     save: Save
-    special_characters: "Usernames can contain letters numbers and _ only"
+    special_characters: 'Usernames can contain letters numbers and _ only'
     username: Username
-    write_your_username: "Edit your username"
-    your_username: "Your username appears on every comment you post."
+    write_your_username: 'Edit your username'
+    your_username: 'Your username appears on every comment you post.'
   done: Done
   edit_comment:
-    body_input_label: "Edit this comment"
-    save_button: "Save changes"
-    edit_window_expired: "You can no longer edit this comment. The time window to do so has expired. Why not post another one?"
-    edit_window_expired_close: "Close"
-    edit_window_timer_prefix: "Edit Window: "
-    second: "second"
-    seconds_plural: "seconds"
-    minute: "minute"
-    minutes_plural: "minutes"
+    body_input_label: 'Edit this comment'
+    edit_window_expired: 'You can no longer edit this comment. The time window to do so has expired. Why not post another one?'
+    edit_window_expired_close: Close
+    edit_window_timer_prefix: 'Edit Window: '
+    minute: minute
+    minutes_plural: minutes
+    save_button: 'Save changes'
+    second: second
+    seconds_plural: seconds
   email:
-    suspended:
-      subject: "Your account has been suspended"
     banned:
-      subject: "Your account has been banned"
-      body: "In accordance with The Coral Project’s community guidelines, your account has been banned. You are now longer allowed to comment, flag or engage with our community."
+      body: 'In accordance with The Coral Project’s community guidelines, your account has been banned. You are now longer allowed to comment, flag or engage with our community.'
+      subject: 'Your account has been banned'
     confirm:
-      has_been_requested: "A email confirmation has been requested for the following account:"
-      to_confirm: "To confirm the account, please visit the following link:"
-      confirm_email: "Confirm Email"
-      if_you_did_not: "If you did not request this, you can safely ignore this email."
-      subject: "Email Confirmation"
-    password_reset:
-      we_received_a_request: "We received a request to reset your password. If you did not request this change, you can ignore this email."
-      if_you_did: "If you did,"
-      please_click: "please click here to reset password"
-      subject: "Password reset"
+      confirm_email: 'Confirm Email'
+      has_been_requested: 'A email confirmation has been requested for the following account:'
+      if_you_did_not: 'If you did not request this, you can safely ignore this email.'
+      subject: 'Email Confirmation'
+      to_confirm: 'To confirm the account, please visit the following link:'
     password_change:
-      subject: "{0} password change"
       body: "The password on your account has been changed.\n\nIf you did not request this change, please contact us at {0}."
+      subject: '{0} password change'
+    password_reset:
+      if_you_did: 'If you did,'
+      please_click: 'please click here to reset password'
+      subject: 'Password reset'
+      we_received_a_request: 'We received a request to reset your password. If you did not request this change, you can ignore this email.'
+    suspended:
+      subject: 'Your account has been suspended'
+  embed_comments_tab: Comments
   embedlink:
-    copy: "Copy to Clipboard"
+    copy: 'Copy to Clipboard'
   error:
-    AUTHENTICATION: "An error occurred trying to authenticate your account."
-    PASSWORD_INCORRECT: "Your current password was entered incorrectly"
-    COMMENT_PARENT_NOT_VISIBLE: "The comment that you're replying to has been removed or doesn't exist."
-    EMAIL_VERIFICATION_TOKEN_INVALID: "Email verification token is invalid."
-    EMAIL_ALREADY_VERIFIED: "Email address already verified."
-    PASSWORD_RESET_TOKEN_INVALID: "Your password reset link is invalid."
-    COMMENT_TOO_SHORT: "Comments should be more than one character, please revise your comment and try again."
-    NOT_AUTHORIZED: "You are not authorized to perform this action."
-    NO_SPECIAL_CHARACTERS: "Usernames can contain letters numbers and _ only"
-    PASSWORD_LENGTH: "Password is too short"
-    PROFANITY_ERROR: "Usernames must not contain profanity. Please contact the administrator if you believe this to be in error."
-    RATE_LIMIT_EXCEEDED: "Rate limit exceeded"
-    USERNAME_IN_USE: "Username already in use"
-    USERNAME_REQUIRED: "Must input a username"
-    EMAIL_NOT_VERIFIED: "Email address not verified"
-    EDIT_WINDOW_ENDED: "You can no longer edit this comment. The time window to do so has expired."
-    EDIT_USERNAME_NOT_AUTHORIZED: "You do not have permission to update your username."
-    SAME_USERNAME_PROVIDED: "You must submit a different username."
-    EMAIL_IN_USE: "Email address already in use"
-    EMAIL_REQUIRED: "An email address is required"
-    LOGIN_MAXIMUM_EXCEEDED: "You have made too many unsuccessful password attempts. Please wait."
-    PASSWORD_REQUIRED: "Must input a password"
-    COMMENTING_CLOSED: "Commenting is already closed"
-    COMMENTING_DISABLED: "Commenting is currently disabled on this site"
-    NOT_FOUND: "Resource not found"
-    ALREADY_EXISTS: "Resource already exists"
-    INVALID_ASSET_URL: "Assert URL is invalid"
-    CANNOT_IGNORE_STAFF: "Cannot ignore Staff members."
-    INCORRECT_PASSWORD: "Incorrect Password"
-    email: "Please enter a valid email."
-    DELETION_NOT_SCHEDULED: "Deletion was not scheduled"
-    confirm_password: "Passwords don't match. Please check again"
-    network_error: "Failed to connect to server. Check your internet connection and try again."
-    email_not_verified: "Email address {0} not verified."
-    email_password: "Email and/or password combination incorrect."
-    organization_name: "Organization name must only contain letters or numbers."
-    organization_contact_email: "Organization email is not valid."
-    password: "Password must be at least 8 characters"
-    username: "Usernames can contain letters numbers and _ only"
-    unexpected: "Unexpected error occurred. Sorry!"
-    required_field: "This field is required"
-    temporarily_suspended: "Your account is currently suspended. It will be reactivated {0}. Please contact us if you have any questions."
-  flag_comment: "Report comment"
-  flag_reason: "Reason for reporting (Optional)"
-  flag_username: "Report username"
-  framework:
-    banned_account_header: "Your account is currently banned."
-    banned_account_body: "This means that you cannot Like, Report, or write comments."
-    comment: comment
-    comment_is_ignored: "This comment is hidden because you ignored this user."
-    comment_is_rejected: "You have rejected this comment."
-    comment_is_deleted: "This commenter has deleted their account."
-    comment_is_hidden: "This comment is not available."
-    comments: comments
-    configure_stream: "Configure"
-    content_not_available: "This content is not available"
-    edit_name:
-      button: Submit
-      error: "Usernames can contain letters numbers and _ only"
-      label: "New Username"
-      msg: "Your account is currently suspended because your username has been deemed inappropriate. To restore your account please enter a new username. Please contact us if you have any questions."
-    changed_name:
-      msg: "Your username change is under review by our moderation team."
-    my_comments: "My Comments"
-    my_profile: "My profile"
-    new_count: "View {0} more {1}"
-    profile: Profile
-    show_all_comments: "Show all comments"
-    success_bio_update: "Your biography has been updated"
-    success_name_update: "Your username has been updated"
-    success_update_settings: "The changes you have made have been applied to the comment stream on this article"
-    show_all_replies: Show all replies
-    show_more_replies: Show more replies
-    view_more_comments: "view more comments"
-    view_reply: "view reply"
-  from_settings_page: "From the Profile Page you can see your comment history."
-  like: Like
-  loading_results: "Loading Results"
-  marketing: "This looks like an ad/marketing"
-  moderate_this_stream: "Moderate this stream"
+    ALREADY_EXISTS: 'Resource already exists'
+    AUTHENTICATION: 'An error occurred trying to authenticate your account.'
+    CANNOT_IGNORE_STAFF: 'Cannot ignore Staff members.'
+    COMMENT_PARENT_NOT_VISIBLE: 'The comment that you''re replying to has been removed or doesn''t exist.'
+    COMMENT_TOO_SHORT: 'Comments should be more than one character, please revise your comment and try again.'
+    COMMENTING_CLOSED: 'Commenting is already closed'
+    COMMENTING_DISABLED: 'Commenting is currently disabled on this site'
+    confirm_password: 'Passwords don''t match. Please check again'
+    DELETION_NOT_SCHEDULED: 'Deletion was not scheduled'
+    EDIT_USERNAME_NOT_AUTHORIZED: 'You do not have permission to update your username.'
+    EDIT_WINDOW_ENDED: 'You can no longer edit this comment. The time window to do so has expired.'
+    email: 'Please enter a valid email.'
+    EMAIL_ALREADY_VERIFIED: 'Email address already verified.'
+    EMAIL_IN_USE: 'Email address already in use'
+    email_not_verified: 'Email address {0} not verified.'
+    EMAIL_NOT_VERIFIED: 'Email address not verified'
+    email_password: 'Email and/or password combination incorrect.'
+    EMAIL_REQUIRED: 'An email address is required'
+    EMAIL_VERIFICATION_TOKEN_INVALID: 'Email verification token is invalid.'
+    INCORRECT_PASSWORD: 'Incorrect Password'
+    INVALID_ASSET_URL: 'Assert URL is invalid'
+    LOGIN_MAXIMUM_EXCEEDED: 'You have made too many unsuccessful password attempts. Please wait.'
+    network_error: 'Failed to connect to server. Check your internet connection and try again.'
+    NO_SPECIAL_CHARACTERS: 'Usernames can contain letters numbers and _ only'
+    NOT_AUTHORIZED: 'You are not authorized to perform this action.'
+    NOT_FOUND: 'Resource not found'
+    organization_contact_email: 'Organization email is not valid.'
+    organization_name: 'Organization name must only contain letters or numbers.'
+    password: 'Password must be at least 8 characters'
+    PASSWORD_INCORRECT: 'Your current password was entered incorrectly'
+    PASSWORD_LENGTH: 'Password is too short'
+    PASSWORD_REQUIRED: 'Must input a password'
+    PASSWORD_RESET_TOKEN_INVALID: 'Your password reset link is invalid.'
+    PROFANITY_ERROR: 'Usernames must not contain profanity. Please contact the administrator if you believe this to be in error.'
+    RATE_LIMIT_EXCEEDED: 'Rate limit exceeded'
+    required_field: 'This field is required'
+    SAME_USERNAME_PROVIDED: 'You must submit a different username.'
+    temporarily_suspended: 'Your account is currently suspended. It will be reactivated {0}. Please contact us if you have any questions.'
+    unexpected: 'Unexpected error occurred. Sorry!'
+    username: 'Usernames can contain letters numbers and _ only'
+    USERNAME_IN_USE: 'Username already in use'
+    USERNAME_REQUIRED: 'Must input a username'
+  flag_comment: 'Report comment'
+  flag_reason: 'Reason for reporting (Optional)'
+  flag_reasons:
+    username:
+      impersonating: 'This user is impersonating'
+      nolike: 'I don''t like this username'
+      offensive: 'This username is offensive'
+      other: Other
+      spam: 'This looks like an ad/marketing'
+  flag_username: 'Report username'
+  flagged_usernames:
+    notify_approved: '{0} approved username {1}'
+    notify_changed: 'user {0} changed their username to {1}'
+    notify_flagged: '{0} reported username {1}'
+    notify_rejected: '{0} rejected username {1}'
   flags:
     reasons:
-       user:
-         username_offensive: "Offensive"
-         username_nolike: "Dislike"
-         username_impersonating: "Impersonation"
-         username_spam: "Spam"
-         username_other: "Other"
-       comment:
-         comment_offensive: "Offensive"
-         comment_spam: "Spam"
-         comment_noagree: "Disagree"
-         comment_other: "Other"
-         suspect_word: "Suspect Word"
-         banned_word: "Banned Word"
-         body_count: "Body exceeds max length"
-         trust: "Karma"
-         links: "Link"
+      comment:
+        banned_word: 'Banned Word'
+        body_count: 'Body exceeds max length'
+        comment_noagree: Disagree
+        comment_offensive: Offensive
+        comment_other: Other
+        comment_spam: Spam
+        links: Link
+        suspect_word: 'Suspect Word'
+        trust: Karma
+      user:
+        username_impersonating: Impersonation
+        username_nolike: Dislike
+        username_offensive: Offensive
+        username_other: Other
+        username_spam: Spam
+  framework:
+    banned_account_body: 'This means that you cannot Like, Report, or write comments.'
+    banned_account_header: 'Your account is currently banned.'
+    changed_name:
+      msg: 'Your username change is under review by our moderation team.'
+    comment: comment
+    comment_is_deleted: 'This commenter has deleted their account.'
+    comment_is_hidden: 'This comment is not available.'
+    comment_is_ignored: 'This comment is hidden because you ignored this user.'
+    comment_is_rejected: 'You have rejected this comment.'
+    comments: comments
+    configure_stream: Configure
+    content_not_available: 'This content is not available'
+    edit_name:
+      button: Submit
+      error: 'Usernames can contain letters numbers and _ only'
+      label: 'New Username'
+      msg: 'Your account is currently suspended because your username has been deemed inappropriate. To restore your account please enter a new username. Please contact us if you have any questions.'
+    my_comments: 'My Comments'
+    my_profile: 'My profile'
+    new_count: 'View {0} more {1}'
+    profile: Profile
+    show_all_comments: 'Show all comments'
+    show_all_replies: 'Show all replies'
+    show_more_replies: 'Show more replies'
+    success_bio_update: 'Your biography has been updated'
+    success_name_update: 'Your username has been updated'
+    success_update_settings: 'The changes you have made have been applied to the comment stream on this article'
+    view_more_comments: 'view more comments'
+    view_reply: 'view reply'
+  from_settings_page: 'From the Profile Page you can see your comment history.'
+  install:
+    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
+    create:
+      confirm_password: 'Confirm Password'
+      email: 'Email address'
+      organization_contact_email: 'Organization Contact Email'
+      password: Password
+      save: Save
+      username: Username
+    final:
+      close: 'Close this Installer'
+      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'
+    initial:
+      description: 'Let''s set up your Talk community in just a few short steps.'
+      submit: 'Get Started'
+    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'
+      title: 'Permitted domains'
+  like: Like
+  loading_results: 'Loading Results'
+  marketing: 'This looks like an ad/marketing'
+  moderate_this_stream: 'Moderate this stream'
   modqueue:
-    account: "account flags"
+    account: 'account flags'
     actions: Actions
     all: all
-    all_streams: "All Streams"
-    notify_edited: '{0} edited comment "{1}"'
-    notify_accepted: '{0} accepted comment "{1}"'
-    notify_rejected: '{0} rejected comment "{1}"'
-    notify_flagged: '{0} flagged comment "{1}"'
-    notify_reset: '{0} reset status of comment "{1}"'
-    approve: "Approve"
-    approved: "Approved"
-    ban_user: "Ban"
+    all_streams: 'All Streams'
+    approve: Approve
+    approved: Approved
+    ban_user: Ban
     billion: B
     close: Close
-    empty_queue: "No more comments to moderate! You're all caught up. Go have some ☕️"
+    empty_queue: 'No more comments to moderate! You''re all caught up. Go have some ☕️'
     flagged: flagged
-    reported: reported
-    less_detail: "Less detail"
+    jump_to_queue: 'Jump to specific queue'
+    less_detail: 'Less detail'
     likes: likes
     million: M
-    mod_faster: "Moderate faster with keyboard shortcuts"
-    moderate: "Moderate →"
-    more_detail: "More detail"
-    new: New
-    newest_first: "Newest First"
+    mod_faster: 'Moderate faster with keyboard shortcuts'
+    moderate: 'Moderate →'
+    more_detail: 'More detail'
     navigation: Navigation
-    next_comment: "Go to the next comment"
-    toggle_search: "Open search"
-    next_queue: "Switch queues"
-    oldest_first: "Oldest First"
+    new: New
+    newest_first: 'Newest First'
+    next_comment: 'Go to the next comment'
+    next_queue: 'Switch queues'
+    notify_accepted: '{0} accepted comment "{1}"'
+    notify_edited: '{0} edited comment "{1}"'
+    notify_flagged: '{0} flagged comment "{1}"'
+    notify_rejected: '{0} rejected comment "{1}"'
+    notify_reset: '{0} reset status of comment "{1}"'
+    oldest_first: 'Oldest First'
     premod: pre-mod
-    prev_comment: "Go to the previous comment"
-    reject: "Reject"
-    rejected: "Rejected"
-    reply: "Reply"
-    select_stream: "Select Stream"
-    shift_key: "⇧"
-    shortcuts: "Shortcuts"
-    sort: "Sort"
-    show_shortcuts: "Show Shortcuts"
-    singleview: "Zen mode"
-    system_withheld: "System Withheld"
-    thismenu: "Open this menu"
-    jump_to_queue: "Jump to specific queue"
+    prev_comment: 'Go to the previous comment'
+    reject: Reject
+    rejected: Rejected
+    reply: Reply
+    reported: reported
+    select_stream: 'Select Stream'
+    shift_key: ⇧
+    shortcuts: Shortcuts
+    show_shortcuts: 'Show Shortcuts'
+    singleview: 'Zen mode'
+    sort: Sort
+    system_withheld: 'System Withheld'
+    thismenu: 'Open this menu'
     thousand: k
-    try_these: "Try these"
-    view_more_shortcuts: "View more shortcuts"
-  my_comment_history: "My comment History"
+    toggle_search: 'Open search'
+    try_these: 'Try these'
+    view_more_shortcuts: 'View more shortcuts'
+  my_comment_history: 'My comment History'
   name: Name
-  no_agree_comment: "I don't agree with this comment"
-  no_like_bio: "I don't like this bio"
-  no_like_username: "I don't like this username"
-  already_flagged_username: "You have already flagged this username."
+  no_agree_comment: 'I don''t agree with this comment'
+  no_like_bio: 'I don''t like this bio'
+  no_like_username: 'I don''t like this username'
   other: Other
+  password_reset:
+    change_password: 'Change Password'
+    change_password_help: 'Please enter a new password to use to login. Make it secure!'
+    confirm_new_password: 'Confirm New Password'
+    mail_sent: 'If you have a registered account, a password reset link was sent to that email'
+    new_password: 'New Password'
+    new_password_help: 'Password must be at least 8 characters'
+    set_new_password: 'Change Your Password'
   permalink: Share
-  personal_info: "This comment reveals personally identifiable information"
+  personal_info: 'This comment reveals personally identifiable information'
   post: Post
   profile: Profile
-  profile_settings: "Settings"
+  profile_settings: Settings
+  reject_username:
+    description_notify: 'Suspending this user will temporarily disable their account.'
+    description_reject: 'Would you like to temporarily ban this user because of their {0}? Doing so will temporarily suspend this user until they rewrite their {0}.'
+    email_message_reject: 'Another member of the community recently flagged your username for review. Because of its content your user was rejected. This means you can no longer comment, like, or flag content until you rewrite your username. Please email us if you have any questions or concerns.'
+    no_cancel: 'No cancel'
+    send: Send
+    suspend_user: 'Suspend User'
+    title_notify: 'Notify the user of their temporary suspension'
+    title_reject: 'We noticed you rejected a username'
+    username: username
+    write_message: 'Write a message'
+    yes_suspend: 'Yes suspend'
+  reject_username_dialog:
+    cancel: Cancel
+    description: 'Help us understand'
+    message: 'Reason for reporting (Optional)'
+    reason: Reason
+    reject_username: 'Reject Username'
+    title: 'Reject Username'
   reply: Reply
   report: Report
-  report_notif: "Thank you for reporting this comment. Our moderation team has been notified and will review it shortly."
-  report_notif_remove: "Your report has been removed."
+  report_notif: 'Thank you for reporting this comment. Our moderation team has been notified and will review it shortly.'
+  report_notif_remove: 'Your report has been removed.'
   reported: Reported
-  comment_history_blank:
-    title: You have not written any comments
-    info: A history of your comments will appear here
   settings:
-    from_settings_page: "From the Profile Page you can see your comment history."
-    my_comment_history: "My comment History"
+    from_settings_page: 'From the Profile Page you can see your comment history.'
+    my_comment_history: 'My comment History'
     profile: Profile
-    profile_settings: "Profile Settings"
-    sign_in: "Sign in"
-    to_access: "to access Profile"
-    user_no_comment: "You've never left a comment. Join the conversation!"
+    profile_settings: 'Profile Settings'
+    sign_in: 'Sign in'
+    to_access: 'to access Profile'
+    user_no_comment: 'You''ve never left a comment. Join the conversation!'
+  step_1_header: 'Report an issue'
+  step_2_header: 'Help us understand'
+  step_3_header: 'Thank you for your input'
   stream:
-    all_comments: "All Comments"
-    temporarily_suspended: "In accordance with {0}'s community guidelines, your account has been temporarily suspended. Please rejoin the conversation {1}."
-    comment_not_found: "This comment has been removed or does not exist."
-    no_comments: "There are no comments yet, why don’t you write one?"
-    no_comments_and_closed: "There were no comments on this article."
-  step_1_header: "Report an issue"
-  step_2_header: "Help us understand"
-  step_3_header: "Thank you for your input"
+    all_comments: 'All Comments'
+    comment_not_found: 'This comment has been removed or does not exist.'
+    no_comments: 'There are no comments yet, why don’t you write one?'
+    no_comments_and_closed: 'There were no comments on this article.'
+    temporarily_suspended: 'In accordance with {0}''s community guidelines, your account has been temporarily suspended. Please rejoin the conversation {1}.'
   streams:
     all: All
     article: Story
     closed: Closed
-    empty_result: "No assets match this search. Maybe try widening your search?"
-    filter_streams: "Filter Streams"
+    empty_result: 'No assets match this search. Maybe try widening your search?'
+    filter_streams: 'Filter Streams'
     newest: Newest
     oldest: Oldest
     open: Open
-    pubdate: "Publication Date"
+    pubdate: 'Publication Date'
     search: Search
-    sort_by: "Sort By"
-    status: "Stream Status"
-    stream_status: "Stream Status"
+    sort_by: 'Sort By'
+    status: 'Stream Status'
+    stream_status: 'Stream Status'
   suspenduser:
-    title_suspend: "Suspend User"
-    description_suspend: "You are suspending {0}. This comment will go to the Rejected queue, and {0} will not be allowed to like, report, reply or post until the suspension time is complete."
-    select_duration: "Select suspension duration"
-    one_hour: "1 hour"
-    hours: "{0} hours"
-    days: "{0} days"
-    hour: "{0} hours"
-    day: "{0} days"
-    cancel: "Cancel"
-    suspend_user: "Suspend User"
+    cancel: Cancel
+    day: '{0} days'
+    days: '{0} days'
+    description_notify: 'Suspending this user will temporarily disable their account.'
+    description_suspend: 'You are suspending {0}. This comment will go to the Rejected queue, and {0} will not be allowed to like, report, reply or post until the suspension time is complete.'
     email_message_suspend: "Dear {0},\n\nIn accordance with {1}’s community guidelines, your account has been temporarily suspended. During the suspension, you will be unable to comment, flag or engage with fellow commenters. Please rejoin the conversation {2}."
-    title_notify: "Notify the user of their temporary suspension"
-    notify_suspend_until: "User {0} has been temporarily suspended. This suspension will automatically end {1}."
-    description_notify: "Suspending this user will temporarily disable their account."
-    write_message: "Write a message"
+    hour: '{0} hours'
+    hours: '{0} hours'
+    notify_suspend_until: 'User {0} has been temporarily suspended. This suspension will automatically end {1}.'
+    one_hour: '1 hour'
+    select_duration: 'Select suspension duration'
     send: Send
-  reject_username:
-    username: username
-    no_cancel: "No cancel"
-    description_reject: "Would you like to temporarily ban this user because of their {0}? Doing so will temporarily suspend this user until they rewrite their {0}."
-    title_notify: "Notify the user of their temporary suspension"
-    description_notify: "Suspending this user will temporarily disable their account."
-    title_reject: "We noticed you rejected a username"
-    suspend_user: "Suspend User"
-    yes_suspend: "Yes suspend"
-    email_message_reject: "Another member of the community recently flagged your username for review. Because of its content your user was rejected. This means you can no longer comment, like, or flag content until you rewrite your username. Please email us if you have any questions or concerns."
-    write_message: "Write a message"
-    send: Send
-  thank_you: "We value your safety and feedback. A moderator will review your report."
+    suspend_user: 'Suspend User'
+    title_notify: 'Notify the user of their temporary suspension'
+    title_suspend: 'Suspend User'
+    write_message: 'Write a message'
+  thank_you: 'We value your safety and feedback. A moderator will review your report.'
   user:
-    bio_flags: "flags for this bio"
-    user_bio: "User Bio"
-    username_flags: "flags for this username"
+    bio_flags: 'flags for this bio'
+    user_bio: 'User Bio'
+    username_flags: 'flags for this username'
   user_detail:
-    suspended: 'Suspended'
-    banned: 'Banned'
-    username: 'Username'
+    all: All
+    ban: 'Ban User'
+    banned: Banned
+    email: Email
+    id: ID
+    karma: Karma
+    karma_docs_link: 'https://docs.coralproject.net/talk/trust/#user-karma-score'
+    learn_more: 'Learn More'
+    member_since: 'Member Since'
+    reject_rate: 'Reject Rate'
+    reject_username: 'Reject Username'
+    rejected: Rejected
+    remove_ban: 'Remove Ban'
+    remove_suspension: 'Remove Suspension'
+    suspend: 'Suspend User'
+    suspended: Suspended
+    total_comments: 'Total Comments'
+    unreliable: Unreliable
+    user_history: 'User History'
+    user_karma_score: 'User Karma Score'
+    username: Username
     username_needs_approval: 'Username needs approval'
     username_rejected: 'Username rejected'
-    reject_username: 'Reject Username'
-    remove_suspension: "Remove Suspension"
-    suspend: "Suspend User"
-    remove_ban: "Remove Ban"
-    ban: "Ban User"
-    member_since: "Member Since"
-    email: "Email"
-    total_comments: "Total Comments"
-    reject_rate: "Reject Rate"
-    all: "All"
-    rejected: "Rejected"
-    user_history: "User History"
-    unreliable: "Unreliable"
-    karma: "Karma"
-    learn_more: "Learn More"
-    user_karma_score: "User Karma Score"
-    karma_docs_link: "https://docs.coralproject.net/talk/trust/#user-karma-score"
-    id: "ID"
   user_history:
-    user_banned: "User banned"
-    ban_removed: "Ban removed"
-    username_status: "Username {0}"
-    suspended: "Suspended, {0}"
-    suspension_removed: "Suspension removed"
-    system: "System"
-    date: "Date"
-    action: "Action"
-    taken_by: "Taken By"
-  user_impersonating: "This user is impersonating"
-  user_no_comment: "You've never left a comment. Join the conversation!"
-  username_offensive: "This username is offensive"
-  view_conversation: "View Conversation"
-  install:
-    initial:
-      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."
-      label: "Organization Name"
-      save: "Save"
-    create:
-      email: "Email address"
-      username: "Username"
-      password: "Password"
-      confirm_password: "Confirm Password"
-      organization_contact_email: "Organization Contact Email"
-      save: "Save"
-    permitted_domains:
-      title: "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:
-      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"
-  admin_sidebar:
-    view_options: "View Options"
-    sort_comments: "Sort Comments"
+    action: Action
+    ban_removed: 'Ban removed'
+    date: Date
+    suspended: 'Suspended, {0}'
+    suspension_removed: 'Suspension removed'
+    system: System
+    taken_by: 'Taken By'
+    user_banned: 'User banned'
+    username_status: 'Username {0}'
+  user_impersonating: 'This user is impersonating'
+  user_no_comment: 'You''ve never left a comment. Join the conversation!'
+  username_offensive: 'This username is offensive'
+  validators:
+    confirm_email: 'Emails don''t match. Please check again.'
+    confirm_password: 'Passwords don''t match. Please check again'
+    required: 'This field is required'
+    verify_email: 'Please enter a valid email.'
+    verify_organization_name: 'Organization name must only contain letters or numbers.'
+    verify_password: 'Password must be at least 8 characters'
+    verify_username: 'Usernames can contain letters numbers and _ only'
+  view_conversation: 'View Conversation'
+  your_account_has_been_banned: 'Your account has been banned.'
+  your_account_has_been_suspended: 'Your account has been temporarily suspended.'
+  your_username_has_been_rejected: 'Your account has been suspended because your username has been deemed inappropriate. To restore your account please enter a new username.'
diff --git a/locales/es.yml b/locales/es.yml
index 69760f22a..1c1c45209 100644
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -1,498 +1,505 @@
 es:
-  your_account_has_been_suspended: Su cuenta ha sido temporalmente suspendida.
-  your_account_has_been_banned: Su cuenta ha sido suspendida.
-  your_username_has_been_rejected: Su cuenta ha sido suspendida porque tu nombre de usuario ha sido considerado no apropiado para el espacio. Para recuperar la cuenta, por favor ingresar un nuevo nombre de usuario.
-  embed_comments_tab: Comentarios
+  admin_sidebar:
+    sort_comments: 'Ordenar comentarios'
+    view_options: 'Ver opciones'
+  already_flagged_username: 'Usted ya reportó a este usuario.'
   bandialog:
-    are_you_sure: "¿Estás segura que quieres suspender a {0}?"
-    ban_user: "¿Quieres suspender el Usuario?"
-    banned_user: "Usuario Suspendido"
+    are_you_sure: '¿Estás segura que quieres suspender a {0}?'
+    ban_user: '¿Quieres suspender el Usuario?'
+    banned_user: 'Usuario Suspendido'
     cancel: Cancelar
-    note: "Nota: {0}"
-    note_reject_comment: "Suspender a este usuario también va a colocar este comentario en la cola de Rechazados."
-    note_ban_user: "Suspender a este usuario no le va a permitir (al usuario) borrar ni editar ni comentar."
-    yes_ban_user: "Si, Suspender al usuario"
-    write_a_message: "Escribe un mensaje"
-    send: "Enviar"
-    notify_ban_headline: "Notificar al usuario de la suspensión"
-    notify_ban_description: "Esto notificará al usuario por email que fueron suspendidos de la comunidad"
     email_message_ban: "Estimado/a {0},\n\nUsted o alguien con acceso a su cuenta a violado los lineamientos de nuestra comunidad. Como consecuencia de esto, su cuenta fue bloqueada. No podrá realizar ni reportar más comentarios. Si usted piensa que esto ha sido un error, por favor contáctese con nosotros."
-  bio_offensive: "Esta biografia es ofensiva"
+    note: 'Nota: {0}'
+    note_ban_user: 'Suspender a este usuario no le va a permitir (al usuario) borrar ni editar ni comentar.'
+    note_reject_comment: 'Suspender a este usuario también va a colocar este comentario en la cola de Rechazados.'
+    notify_ban_description: 'Esto notificará al usuario por email que fueron suspendidos de la comunidad'
+    notify_ban_headline: 'Notificar al usuario de la suspensión'
+    send: Enviar
+    write_a_message: 'Escribe un mensaje'
+    yes_ban_user: 'Si, Suspender al usuario'
+  bio_offensive: 'Esta biografia es ofensiva'
   cancel: Cancelar
-  confirm_email:
-    click_to_confirm: "Haga click debajo para confirmar su dirección de email"
-    confirm: "Confirmar"
-  password_reset:
-    mail_sent: 'Si tiene una cuenta registrada, un enlace para resetear su clave ha sido enviado a esa dirección de correo.'
-    set_new_password: "Cambie su contraseña"
-    new_password: "Nueva contraseña"
-    new_password_help: "La contraseña debe tener al menos 8 caracteres"
-    confirm_new_password: "Confirme su nueva contraseña"
-    change_password: "Cambio de contraseña"
-  characters_remaining: "caracteres restantes"
+  characters_remaining: 'caracteres restantes'
   comment:
     anon: Anónimo
-    undo_reject: "Deshacer"
-    ban_user: "Usuario Suspendido"
-    comment: "Publicar un comentario"
+    ban_user: 'Usuario Suspendido'
+    comment: 'Publicar un comentario'
     edited: Editado
     flagged: Reportado
-    view_context: "Ver contexto"
+    undo_reject: Deshacer
+    view_context: 'Ver contexto'
   comment_box:
-    post: "Publicar"
-    cancel: "Cancelar"
-    reply: "Responder"
-    comment: "Publicar un comentario"
-    name: "Nombre"
-    comment_post_notif: "Tu comentario ha sido publicado."
-    comment_post_notif_premod: "Gracias por el comentario. Nuestro equipo de moderación va a revisarlo muy pronto."
-    comment_post_banned_word: "Tu comentario contiene una o más palabras que no están permitidas en nuestro espacio, por lo que no será publicado. Si crees que es un error, por favor contacta a nuestro equipo de moderación."
-    characters_remaining: "carácteres restantes"
-  comment_offensive: "Este comentario es ofensivo"
-  comment_singular: Comentario
+    cancel: Cancelar
+    characters_remaining: 'carácteres restantes'
+    comment: 'Publicar un comentario'
+    comment_post_banned_word: 'Tu comentario contiene una o más palabras que no están permitidas en nuestro espacio, por lo que no será publicado. Si crees que es un error, por favor contacta a nuestro equipo de moderación.'
+    comment_post_notif: 'Tu comentario ha sido publicado.'
+    comment_post_notif_premod: 'Gracias por el comentario. Nuestro equipo de moderación va a revisarlo muy pronto.'
+    name: Nombre
+    post: Publicar
+    reply: Responder
+  comment_offensive: 'Este comentario es ofensivo'
   comment_plural: Comentarios
-  comment_post_banned_word: "Tu comentario contiene una o más palabras que no están permitidas en nuestro espacio, por lo que no será publicado. Si crees que es un error, por favor contacta a nuestro equipo de moderación."
-  comment_post_notif: "Tu comentario ha sido publicado."
-  comment_post_notif_premod: "Gracias por el comentario. Nuestro equipo de moderación va a revisarlo muy pronto."
+  comment_post_banned_word: 'Tu comentario contiene una o más palabras que no están permitidas en nuestro espacio, por lo que no será publicado. Si crees que es un error, por favor contacta a nuestro equipo de moderación.'
+  comment_post_notif: 'Tu comentario ha sido publicado.'
+  comment_post_notif_premod: 'Gracias por el comentario. Nuestro equipo de moderación va a revisarlo muy pronto.'
+  comment_singular: Comentario
   common:
-    copy: 'Copiar'
+    copy: Copiar
     error: 'Ha ocurrido un error.'
-    reply: 'respuesta'
-    replies: 'respuestas'
-    reaction: 'reacción'
-    reactions: 'reacciones'
-    story: 'Artículo'
-  flagged_usernames:
-    notify_approved: '{0} ha aprobado el nombre de usuario {1}'
-    notify_rejected: '{0} ha rechazado el nombre de usuario {1}'
-    notify_flagged: '{0} ha reportado el nombre de usuario {1}'
-    notify_changed: 'El usuario {0} ha modificado su nombre de usuario por {1}'
+    reaction: reacción
+    reactions: reacciones
+    replies: respuestas
+    reply: respuesta
+    story: Artículo
   community:
-    account_creation_date: "Fecha de creación de la cuenta"
+    account_creation_date: 'Fecha de creación de la cuenta'
     active: Activa
     admin: Administrator
-    ads_marketing: "Esto parece ser un ad/marketing"
-    are_you_sure: "¿Estás segura que quieres suspender a {0}?"
-    ban_user: "¿Quieres suspender al Usuario?"
+    ads_marketing: 'Esto parece ser un ad/marketing'
+    are_you_sure: '¿Estás segura que quieres suspender a {0}?'
+    ban_user: '¿Quieres suspender al Usuario?'
     banned: Suspendido
-    banned_user: "Usuario Suspendido"
+    banned_user: 'Usuario Suspendido'
     cancel: Cancelar
-    dont_like_username: "No me gusta este nombre de usuario"
-    flaggedaccounts: "Nombres de Usuario Reportados"
+    commenter: Comentarista
+    dont_like_username: 'No me gusta este nombre de usuario'
+    flaggedaccounts: 'Nombres de Usuario Reportados'
     flags: Reportes
     impersonating: Impersonando
-    loading: "Cargando resultados"
+    loading: 'Cargando resultados'
     moderator: Moderator
-    newsroom_role: "Rol en la redacción"
-    no_flagged_accounts: "No hay ningún nombre de usario reportado en este momento."
-    no_results: "No se encontraron usuarios con ese nombre o correo."
+    newsroom_role: 'Rol en la redacción'
+    no_flagged_accounts: 'No hay ningún nombre de usario reportado en este momento.'
+    no_results: 'No se encontraron usuarios con ese nombre o correo.'
     offensive: Ofensivo
     other: Otro
     people: Gente
-    role: "Seleccionar rol..."
-    select_status: "Seleccionar estado..."
-    spam_ads: "Spam/Publicidad"
-    staff: "Personal"
+    role: 'Seleccionar rol...'
+    select_status: 'Seleccionar estado...'
+    spam_ads: Spam/Publicidad
+    staff: Personal
     status: Estado
-    username_and_email: "Usuario y Correo"
-    yes_ban_user: "Si, Suspendan el usuario"
-    commenter: "Comentarista"
+    username_and_email: 'Usuario y Correo'
+    yes_ban_user: 'Si, Suspendan el usuario'
   configure:
+    access_message: 'Usted debe ser un administrador para acceder a esta página. Encuentre a otro admin y actualice los permisos de su cuenta!'
     apply: Aplicar
-    banned_word_text: "Comentarios que contengan estas palabras o frases,  en mayusculas o minúsculas, serán automáticamente eliminados del hilo de comentario. Escribir una palabra y apretar Enter o Tabulador para agregarla. O pueden pegar una lista de palabras separadas por coma."
-    banned_words_title: "Lista de palabras prohibidas"
-    close: "Cerrar"
-    close_after: "Cerrar comentarios luego de"
-    close_stream: "Cerrar comentarios"
-    close_stream_configuration: "Este hilo de comentario está en este momento cerrado. Al abrirlo, nuevos comentarios serán publicados y mostrados."
-    closed_comments_desc: "Escribe un mensaje que será mostrado cuando los comentarios estén cerrados y no se acepten más comentarios."
-    closed_comments_label: "Escribe un mensaje..."
-    closed_stream_settings: "Mensaje que se muestra cuando no se aceptan más comentarios en el articulo"
-    comment_count_error: "Por favor escribir un número válido"
-    comment_count_header: "Limitar el largo del comentario"
+    banned_word_text: 'Comentarios que contengan estas palabras o frases,  en mayusculas o minúsculas, serán automáticamente eliminados del hilo de comentario. Escribir una palabra y apretar Enter o Tabulador para agregarla. O pueden pegar una lista de palabras separadas por coma.'
+    banned_words_title: 'Lista de palabras prohibidas'
+    close: Cerrar
+    close_after: 'Cerrar comentarios luego de'
+    close_stream: 'Cerrar comentarios'
+    close_stream_configuration: 'Este hilo de comentario está en este momento cerrado. Al abrirlo, nuevos comentarios serán publicados y mostrados.'
+    closed_comments_desc: 'Escribe un mensaje que será mostrado cuando los comentarios estén cerrados y no se acepten más comentarios.'
+    closed_comments_label: 'Escribe un mensaje...'
+    closed_stream_settings: 'Mensaje que se muestra cuando no se aceptan más comentarios en el articulo'
+    comment_count_error: 'Por favor escribir un número válido'
+    comment_count_header: 'Limitar el largo del comentario'
     comment_count_text_post: carácteres
-    comment_count_text_pre: "Los comentarios serán limitados a"
+    comment_count_text_pre: 'Los comentarios serán limitados a'
     comment_settings: Configuración
-    comment_stream: "Hilo de Comentarios"
-    comment_stream_will_close: "El hilo de comentarios se cerrara"
+    comment_stream: 'Hilo de Comentarios'
+    comment_stream_will_close: 'El hilo de comentarios se cerrara'
     community: Comunidad
     configure: Configurar
-    copy_and_paste: "Copiar y pegar el código de más abajo en tu CMS para colocar la caja de comentarios en tus artículos"
-    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 del hilo de comentarios. Puede ser interna o externa."
+    copy_and_paste: 'Copiar y pegar el código de más abajo en tu CMS para colocar la caja de comentarios en tus artículos'
+    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 del hilo de comentarios. Puede ser interna o externa.'
     days: Días
-    description: "Modificar la configuración de los comentarios en este artículo."
-    domain_list_text: "Agrega dominios permitidos a Talk, por ejemplo tu localhost, staging y ambientes de producción (ej. localhost:3000, staging.domain.com, domain.com)."
-    domain_list_title: "Dominios Permitidos"
-    edit_info: "Editar Información"
-    edit_comment_timeframe_heading: "Periodo de Tiempo para Edición del Comentario"
-    edit_comment_timeframe_text_pre: "Los comentaristas tendrán"
-    edit_comment_timeframe_text_post: "segundos para editar sus comentarios."
-    embed_comment_stream: "Colocar Hilo de Comentarios"
-    enable_premod_links_text: "Los moderadores deben aprobar todo comentario que contenga un enlace antes de que sea publicado."
-    enable_pre_moderation: "Permitir pre-moderación"
-    enable_pre_moderation_text: "Los moderadores deben aprobar todo comentario antes que sea publicado."
-    enable_premod_links: "Pre-Moderar Comentarios que contienen Enlaces"
-    enable_premod: "Activar Pre Moderación"
-    enable_premod_description: "Los y las moderadoras deben aprobar cualquier comentario antes de su publicación"
-    enable_premod_links_description: "Los y las moderadoras deben aprobar cualquier comentario que contengan enlaces antes de su publicación."
-    enable_questionbox: "Hacer una pregunta a los y las lectoras."
-    enable_questionbox_description: "Esta pregunta aparecerá en la parte de arriba del hilo de comentarios."
+    description: 'Modificar la configuración de los comentarios en este artículo.'
+    domain_list_text: 'Agrega dominios permitidos a Talk, por ejemplo tu localhost, staging y ambientes de producción (ej. localhost:3000, staging.domain.com, domain.com).'
+    domain_list_title: 'Dominios Permitidos'
+    edit_comment_timeframe_heading: 'Periodo de Tiempo para Edición del Comentario'
+    edit_comment_timeframe_text_post: 'segundos para editar sus comentarios.'
+    edit_comment_timeframe_text_pre: 'Los comentaristas tendrán'
+    edit_info: 'Editar Información'
+    embed_comment_stream: 'Colocar Hilo de Comentarios'
+    enable_pre_moderation: 'Permitir pre-moderación'
+    enable_pre_moderation_text: 'Los moderadores deben aprobar todo comentario antes que sea publicado.'
+    enable_premod: 'Activar Pre Moderación'
+    enable_premod_description: 'Los y las moderadoras deben aprobar cualquier comentario antes de su publicación'
+    enable_premod_links: 'Pre-Moderar Comentarios que contienen Enlaces'
+    enable_premod_links_description: 'Los y las moderadoras deben aprobar cualquier comentario que contengan enlaces antes de su publicación.'
+    enable_premod_links_text: 'Los moderadores deben aprobar todo comentario que contenga un enlace antes de que sea publicado.'
+    enable_questionbox: 'Hacer una pregunta a los y las lectoras.'
+    enable_questionbox_description: 'Esta pregunta aparecerá en la parte de arriba del hilo de comentarios.'
     hours: Horas
-    include_comment_stream: "Incluir Descripción de Hilo de Comentarios para Lectores"
-    include_comment_stream_desc: "Escribir un mensaje para ser incluido al principio del hilo de comentarios. Un tema planteado podría ser la guía de comunidad, etc."
-    include_text: "Agregar tu texto aquí."
-    include_question_here: "Escribir la pregunta aquí."
+    include_comment_stream: 'Incluir Descripción de Hilo de Comentarios para Lectores'
+    include_comment_stream_desc: 'Escribir un mensaje para ser incluido al principio del hilo de comentarios. Un tema planteado podría ser la guía de comunidad, etc.'
+    include_question_here: 'Escribir la pregunta aquí.'
+    include_text: 'Agregar tu texto aquí.'
     moderate: Moderar
-    moderation_settings: "Configuración de la Moderación"
-    open: "Abrir"
-    open_stream: "Abrir Hilo de Comentarios"
-    open_stream_configuration: "Este hilo de comentarios está abierto. Al cerrarlo no se podrán publicar nuevos comentarios pero todos los comentarios anteriores aún serán mostrados."
-    require_email_verification: "Necesita confirmación su correo"
-    require_email_verification_text: "Nuevos usuarios deben confirmar sus correos antes de comentar"
+    moderation_settings: 'Configuración de la Moderación'
+    open: Abrir
+    open_stream: 'Abrir Hilo de Comentarios'
+    open_stream_configuration: 'Este hilo de comentarios está abierto. Al cerrarlo no se podrán publicar nuevos comentarios pero todos los comentarios anteriores aún serán mostrados.'
+    organization_contact_email: 'Email de la Organización'
+    organization_details: 'Detalles de la Organización'
+    organization_info_copy: 'Nosotros usamos esta información en las notificaciones de email generadas por Talk. Esto conecta los mensajes de tu organización, y provee una forma para que los usuarios se comuniquen si tienen un inconveniente con su cuenta.'
+    organization_info_copy_2: 'Recomendamos crear un email genérico (ej: community@yournewsroom.com) for this purpose. Esto significa que puede permanecer consistente con el tiempo y no expone un nombre que los usuarios puedan atacar si su cuenta fue bloqueada.'
+    organization_information: 'Información de la Organización'
+    organization_name: 'Nombre de la Organización'
+    require_email_verification: 'Necesita confirmación su correo'
+    require_email_verification_text: 'Nuevos usuarios deben confirmar sus correos antes de comentar'
     save: Guardar
-    save_changes: "Guardar Cambios"
-    shortcuts: Atajos
-    sign_out: "Desconectar"
-    stories: Artículos
-    stream_settings: "Configuración de Comentarios"
-    access_message: "Usted debe ser un administrador para acceder a esta página. Encuentre a otro admin y actualice los permisos de su cuenta!"
-    suspect_word_title: "Lista de palabras sospechosas"
-    suspect_word_text: "Comentarios que contengan estas palabras o frases, considerando mayusculas y minúsculas, serán automáticamente  destacadas en los comentarios publicados. Escribir una palabra y apretar Enter o Tabulador para agregarla. O pegar una lista de palabras separadas por coma."
-    tech_settings: "Configuración Técnica"
-    organization_information: "Información de la Organización"
-    organization_details: "Detalles de la Organización"
-    organization_info_copy: "Nosotros usamos esta información en las notificaciones de email generadas por Talk. Esto conecta los mensajes de tu organización, y provee una forma para que los usuarios se comuniquen si tienen un inconveniente con su cuenta."
-    organization_info_copy_2: "Recomendamos crear un email genérico (ej: community@yournewsroom.com) for this purpose. Esto significa que puede permanecer consistente con el tiempo y no expone un nombre que los usuarios puedan atacar si su cuenta fue bloqueada."
-    organization_name: "Nombre de la Organización"
-    organization_contact_email: "Email de la Organización"
-    title: "Configurar los comentarios"
-    weeks: Semanas
-    wordlist: "Palabras Suspendidas"
+    save_changes: 'Guardar Cambios'
     save_changes_dialog:
-      unsaved_changes: "Cambios no guardados"
-      copy: Has hecho uno o más cambios sin guardar. Deseas guardar o descartar tus cambios?"
-      save_settings: "Guardar configuración"
-      discard: "Descartar"
-      cancel: "Cancelar"
-  continue: "Continuar"
+      cancel: Cancelar
+      copy: 'Has hecho uno o más cambios sin guardar. Deseas guardar o descartar tus cambios?"'
+      discard: Descartar
+      save_settings: 'Guardar configuración'
+      unsaved_changes: 'Cambios no guardados'
+    shortcuts: Atajos
+    sign_out: Desconectar
+    stories: Artículos
+    stream_settings: 'Configuración de Comentarios'
+    suspect_word_text: 'Comentarios que contengan estas palabras o frases, considerando mayusculas y minúsculas, serán automáticamente  destacadas en los comentarios publicados. Escribir una palabra y apretar Enter o Tabulador para agregarla. O pegar una lista de palabras separadas por coma.'
+    suspect_word_title: 'Lista de palabras sospechosas'
+    tech_settings: 'Configuración Técnica'
+    title: 'Configurar los comentarios'
+    weeks: Semanas
+    wordlist: 'Palabras Suspendidas'
+  confirm_email:
+    click_to_confirm: 'Haga click debajo para confirmar su dirección de email'
+    confirm: Confirmar
+  continue: Continuar
   createdisplay:
-    check_the_form: "Formulario Inválido. Por favor verifica los campos"
-    continue: "Continuar con el mismo nombre que aparece en Facebook"
-    error_create: "Hubo un error al cambiar el nombre de usuario"
-    fake_comment_body: "Este es un comentario de ejemplo. Las lectoras pueden compartir sus ideas  y opiniones con los periodistas en la sección de comentarios."
-    fake_comment_date: "hace un minuto"
-    if_you_dont_change_your_name: "Si no modificas tu nombre de usuario en este paso tu nombre de Facebook aparecerá al lado de cada comentario que publiques."
-    required_field: "Campo requerido"
-    save: "Guardar"
-    special_characters: "Los nombres sólo pueden contener letras números y _"
-    username: "Nombre"
-    write_your_username: "Edita tu nombre"
-    your_username: "Tu nombre aparece en cada comentario que publiques."
-  done: "Hecho"
+    check_the_form: 'Formulario Inválido. Por favor verifica los campos'
+    continue: 'Continuar con el mismo nombre que aparece en Facebook'
+    error_create: 'Hubo un error al cambiar el nombre de usuario'
+    fake_comment_body: 'Este es un comentario de ejemplo. Las lectoras pueden compartir sus ideas  y opiniones con los periodistas en la sección de comentarios.'
+    fake_comment_date: 'hace un minuto'
+    if_you_dont_change_your_name: 'Si no modificas tu nombre de usuario en este paso tu nombre de Facebook aparecerá al lado de cada comentario que publiques.'
+    required_field: 'Campo requerido'
+    save: Guardar
+    special_characters: 'Los nombres sólo pueden contener letras números y _'
+    username: Nombre
+    write_your_username: 'Edita tu nombre'
+    your_username: 'Tu nombre aparece en cada comentario que publiques.'
+  done: Hecho
   edit_comment:
-    body_input_label: "Editar este comentario"
-    save_button: "Guardar cambios"
-    edit_window_expired: "No se puede editar este comentario. El periodo de edición ya ha concluido. Podrías publicar uno nuevo :-)"
-    edit_window_expired_close: "Cerrar"
-    edit_window_timer_prefix: "Ventana Edición:"
-    second: "segundo"
-    seconds_plural: "segundos"
-    minute: "minuto"
-    minutes_plural: "minutos"
+    body_input_label: 'Editar este comentario'
+    edit_window_expired: 'No se puede editar este comentario. El periodo de edición ya ha concluido. Podrías publicar uno nuevo :-)'
+    edit_window_expired_close: Cerrar
+    edit_window_timer_prefix: 'Ventana Edición:'
+    minute: minuto
+    minutes_plural: minutos
+    save_button: 'Guardar cambios'
+    second: segundo
+    seconds_plural: segundos
   email:
-    suspended:
-      subject: "Su cuenta ha sido suspendida"
     banned:
-      subject: "Su cuenta ha sido bloqueada"
-      body: "De acuerdo con las guías de comunidad de The Coral Project, su cuenta a sido bloqueada. No podrá hacer comentarios, reportar o entrar en contacto con nuestra comunidad."
+      body: 'De acuerdo con las guías de comunidad de The Coral Project, su cuenta a sido bloqueada. No podrá hacer comentarios, reportar o entrar en contacto con nuestra comunidad.'
+      subject: 'Su cuenta ha sido bloqueada'
     confirm:
-      has_been_requested: "Un correo de confirmación ha sido pedido para la siguiente cuenta:"
-      to_confirm: "Para confirmar la cuenta, por favor visitar el siguiente enlace:"
-      confirm_email: "Confirmar Correo"
-      if_you_did_not: "Si no has pedido esto, puedes ignorar el correo."
-      subject: "Confirmación de Correo"
+      confirm_email: 'Confirmar Correo'
+      has_been_requested: 'Un correo de confirmación ha sido pedido para la siguiente cuenta:'
+      if_you_did_not: 'Si no has pedido esto, puedes ignorar el correo.'
+      subject: 'Confirmación de Correo'
+      to_confirm: 'Para confirmar la cuenta, por favor visitar el siguiente enlace:'
     password_reset:
-      we_received_a_request: "Recibimos un pedido para resetear su contraseña. Si no ha pedido ese cambio, por favor ignorar el correo. "
-      if_you_did: "Si lo hizo,"
-      please_click: "por favor cliquea aqui para resetear la contraseña."
-      subject: "Recuperar contraseña"
+      if_you_did: 'Si lo hizo,'
+      please_click: 'por favor cliquea aqui para resetear la contraseña.'
+      subject: 'Recuperar contraseña'
+      we_received_a_request: 'Recibimos un pedido para resetear su contraseña. Si no ha pedido ese cambio, por favor ignorar el correo. '
+    suspended:
+      subject: 'Su cuenta ha sido suspendida'
+  embed_comments_tab: Comentarios
   embedlink:
-    copy: "Copiar al portapapeles"
+    copy: 'Copiar al portapapeles'
   error:
-    COMMENT_PARENT_NOT_VISIBLE: "El comentario a la que estás contestando ha sido eliminado o no existe."
-    EMAIL_VERIFICATION_TOKEN_INVALID: "El token de verificación de su cuenta de correo es inválido."
-    PASSWORD_RESET_TOKEN_INVALID: "El enlace para resetear su clave es inválido."
-    COMMENT_TOO_SHORT: "Tu comentario debe tener algo escrito"
-    NOT_AUTHORIZED: "Acción no autorizada."
-    NO_SPECIAL_CHARACTERS: "Los nombres pueden contener letras números y _"
-    PASSWORD_LENGTH: "Contraseña es muy corta"
-    PROFANITY_ERROR: "Los nombres no pueden contener blasfemias. Por favor contacte al o la administradora si cree que esto es un error"
-    RATE_LIMIT_EXCEEDED: "Rate limit exceeded"
-    USERNAME_IN_USE: "Este nombre ya está siendo usado."
-    USERNAME_REQUIRED: "Debe ingresar un nombre"
-    EMAIL_NOT_VERIFIED: "La cuenta de email no ha sido verificada."
-    EDIT_WINDOW_ENDED: "No puedes editar este comentario. El tiempo de edición ha expirado."
-    EDIT_USERNAME_NOT_AUTHORIZED: "No tiene permiso para editar el nombre de usuario."
-    SAME_USERNAME_PROVIDED: "Debe proporcinar un nombre de usuario diferente."
-    EMAIL_IN_USE: "Este correo se encuentra en uso"
-    EMAIL_REQUIRED: "Se requiere un correo"
-    LOGIN_MAXIMUM_EXCEEDED: "Ha realizado demasiados intentos fallidos de usar la contraseña. Por favor espere."
-    PASSWORD_REQUIRED: "Debe ingresar la contraseña"
-    COMMENTING_CLOSED: "Los comentarios ya estan cerrados"
-    NOT_FOUND: "Recurso no encontrado"
-    ALREADY_EXISTS: "El recurso ya existe"
-    INVALID_ASSET_URL: "La URL del articulo no es valida"
-    CANNOT_IGNORE_STAFF: "No puede ignorar a miembros del Staff."
-    INCORRECT_PASSWORD: "Contraseña Incorrecta"
-    email: "No es un correo válido"
-    confirm_password: "Las contraseñas no coinciden. Inténtelo nuevamente"
-    network_error: "Error al conectar con el servidor. Compruebe su conexión a Internet y vuelva a intentarlo."
-    email_not_verified: "Correo {0} no confirmado."
-    email_password: "Correo y/o contraseña incorrecta."
-    organization_name: "El nombre de la organización debe contener letras y/o números."
-    organization_contact_email: "El email de la organización no es válido."
-    password: "La contraseña debe tener por lo menos 8 caracteres"
-    username: "Los nombres pueden contener letras números y _"
-    required_field: "Este campo es requerido"
-    unexpected: "Lo siento. Ha ocurrido un error no previsto."
-    temporarily_suspended: "Su cuenta fue suspendida. Será reactivada {0}. Si tiene preguntas, por favor contáctese con nosotros."
-  flag_comment: "Reportar este comentario"
-  flag_reason: "Razón por la que hacer este reporte (Opcional)"
-  flag_username: "Reportar el nombre de usuario"
-  framework:
-    banned_account_header: "Tu cuenta se encuentra suspendida."
-    banned_account_body: "Esto significa que no puedes gustar, marcar o escribir comentarios."
-    comment: "comentario"
-    comment_is_ignored: "Este comentario está escondido porque has ignorado al usuario."
-    comment_is_rejected: "Has rechazado este comentario."
-    comment_is_hidden: "Este comentario no está disponible."
-    comments: "comentarios"
-    configure_stream: "Configurar Hilo de Comentarios"
-    content_not_available: "Este contenido no se encuentra disponible"
-    edit_name:
-      button: "Enviar"
-      error: "Nombres de usuarios pueden solamente incluir letras, números y _"
-      label: "Nuevo Nombre"
-      msg: "Tu cuenta está suspendida porque tu nombre de usuario ha sido considerado no apropiado para el espacio. Para recuperar la cuenta, por favor ingresar un nuevo nombre de usuario. Contáctanos si tienes alguna pregunta."
-    changed_name:
-      msg: "El cambio en su nombre de usuario está siendo revisado por nuestro equipo de moderación."
-    my_comments: "Mis Comentarios"
-    my_profile: "Mi perfil"
-    new_count: "Ver {0} más {1} "
-    profile: Perfil
-    show_all_comments: "Mostrar todos los comentarios"
-    success_bio_update: "Tu biografia fue actualizada"
-    success_name_update: "Tu nombre de usuario ha sido actualizado"
-    success_update_settings: "La configuración de este articulo fue actualizada"
-    show_all_replies: "Mostrar todas las respuestas"
-    show_more_replies: "Mostrar más respuestas"
-    view_more_comments: "Ver más comentarios"
-    view_reply: "ver respuesta"
-  from_settings_page: "Desde la página de configuración puedes ver tu historia de comentarios."
-  like: Me gusta
-  loading_results: "Cargando Resultados"
-  marketing: "Esto parece una propaganda"
-  moderate_this_stream: "Moderar este hilo de comentarios"
+    ALREADY_EXISTS: 'El recurso ya existe'
+    CANNOT_IGNORE_STAFF: 'No puede ignorar a miembros del Staff.'
+    COMMENT_PARENT_NOT_VISIBLE: 'El comentario a la que estás contestando ha sido eliminado o no existe.'
+    COMMENT_TOO_SHORT: 'Tu comentario debe tener algo escrito'
+    COMMENTING_CLOSED: 'Los comentarios ya estan cerrados'
+    confirm_password: 'Las contraseñas no coinciden. Inténtelo nuevamente'
+    EDIT_USERNAME_NOT_AUTHORIZED: 'No tiene permiso para editar el nombre de usuario.'
+    EDIT_WINDOW_ENDED: 'No puedes editar este comentario. El tiempo de edición ha expirado.'
+    email: 'No es un correo válido'
+    EMAIL_IN_USE: 'Este correo se encuentra en uso'
+    email_not_verified: 'Correo {0} no confirmado.'
+    EMAIL_NOT_VERIFIED: 'La cuenta de email no ha sido verificada.'
+    email_password: 'Correo y/o contraseña incorrecta.'
+    EMAIL_REQUIRED: 'Se requiere un correo'
+    EMAIL_VERIFICATION_TOKEN_INVALID: 'El token de verificación de su cuenta de correo es inválido.'
+    INCORRECT_PASSWORD: 'Contraseña Incorrecta'
+    INVALID_ASSET_URL: 'La URL del articulo no es valida'
+    LOGIN_MAXIMUM_EXCEEDED: 'Ha realizado demasiados intentos fallidos de usar la contraseña. Por favor espere.'
+    network_error: 'Error al conectar con el servidor. Compruebe su conexión a Internet y vuelva a intentarlo.'
+    NO_SPECIAL_CHARACTERS: 'Los nombres pueden contener letras números y _'
+    NOT_AUTHORIZED: 'Acción no autorizada.'
+    NOT_FOUND: 'Recurso no encontrado'
+    organization_contact_email: 'El email de la organización no es válido.'
+    organization_name: 'El nombre de la organización debe contener letras y/o números.'
+    password: 'La contraseña debe tener por lo menos 8 caracteres'
+    PASSWORD_LENGTH: 'Contraseña es muy corta'
+    PASSWORD_REQUIRED: 'Debe ingresar la contraseña'
+    PASSWORD_RESET_TOKEN_INVALID: 'El enlace para resetear su clave es inválido.'
+    PROFANITY_ERROR: 'Los nombres no pueden contener blasfemias. Por favor contacte al o la administradora si cree que esto es un error'
+    RATE_LIMIT_EXCEEDED: 'Rate limit exceeded'
+    required_field: 'Este campo es requerido'
+    SAME_USERNAME_PROVIDED: 'Debe proporcinar un nombre de usuario diferente.'
+    temporarily_suspended: 'Su cuenta fue suspendida. Será reactivada {0}. Si tiene preguntas, por favor contáctese con nosotros.'
+    unexpected: 'Lo siento. Ha ocurrido un error no previsto.'
+    username: 'Los nombres pueden contener letras números y _'
+    USERNAME_IN_USE: 'Este nombre ya está siendo usado.'
+    USERNAME_REQUIRED: 'Debe ingresar un nombre'
+  flag_comment: 'Reportar este comentario'
+  flag_reason: 'Razón por la que hacer este reporte (Opcional)'
+  flag_username: 'Reportar el nombre de usuario'
+  flagged_usernames:
+    notify_approved: '{0} ha aprobado el nombre de usuario {1}'
+    notify_changed: 'El usuario {0} ha modificado su nombre de usuario por {1}'
+    notify_flagged: '{0} ha reportado el nombre de usuario {1}'
+    notify_rejected: '{0} ha rechazado el nombre de usuario {1}'
   flags:
     reasons:
-       user:
-         username_offensive: "Es ofensivo"
-         username_nolike: "No le gusta"
-         username_impersonating: "Está suplantando identidad"
-         username_spam: "Contiene spam"
-         username_other: "Otra razón"
-       comment:
-         comment_offensive: "Es ofensivo"
-         comment_spam: "Contiene spam"
-         comment_noagree: "No está de acuerdo"
-         comment_other: "Otra razón"
-         suspect_word: "Palabra sospechosa"
-         banned_word: "Palabra prohibida"
-         body_count: "El texto exede el límite permitido"
-         links: "Link"
+      comment:
+        banned_word: 'Palabra prohibida'
+        body_count: 'El texto exede el límite permitido'
+        comment_noagree: 'No está de acuerdo'
+        comment_offensive: 'Es ofensivo'
+        comment_other: 'Otra razón'
+        comment_spam: 'Contiene spam'
+        links: Link
+        suspect_word: 'Palabra sospechosa'
+      user:
+        username_impersonating: 'Está suplantando identidad'
+        username_nolike: 'No le gusta'
+        username_offensive: 'Es ofensivo'
+        username_other: 'Otra razón'
+        username_spam: 'Contiene spam'
+  framework:
+    banned_account_body: 'Esto significa que no puedes gustar, marcar o escribir comentarios.'
+    banned_account_header: 'Tu cuenta se encuentra suspendida.'
+    changed_name:
+      msg: 'El cambio en su nombre de usuario está siendo revisado por nuestro equipo de moderación.'
+    comment: comentario
+    comment_is_hidden: 'Este comentario no está disponible.'
+    comment_is_ignored: 'Este comentario está escondido porque has ignorado al usuario.'
+    comment_is_rejected: 'Has rechazado este comentario.'
+    comments: comentarios
+    configure_stream: 'Configurar Hilo de Comentarios'
+    content_not_available: 'Este contenido no se encuentra disponible'
+    edit_name:
+      button: Enviar
+      error: 'Nombres de usuarios pueden solamente incluir letras, números y _'
+      label: 'Nuevo Nombre'
+      msg: 'Tu cuenta está suspendida porque tu nombre de usuario ha sido considerado no apropiado para el espacio. Para recuperar la cuenta, por favor ingresar un nuevo nombre de usuario. Contáctanos si tienes alguna pregunta.'
+    my_comments: 'Mis Comentarios'
+    my_profile: 'Mi perfil'
+    new_count: 'Ver {0} más {1} '
+    profile: Perfil
+    show_all_comments: 'Mostrar todos los comentarios'
+    show_all_replies: 'Mostrar todas las respuestas'
+    show_more_replies: 'Mostrar más respuestas'
+    success_bio_update: 'Tu biografia fue actualizada'
+    success_name_update: 'Tu nombre de usuario ha sido actualizado'
+    success_update_settings: 'La configuración de este articulo fue actualizada'
+    view_more_comments: 'Ver más comentarios'
+    view_reply: 'ver respuesta'
+  from_settings_page: 'Desde la página de configuración puedes ver tu historia de comentarios.'
+  install:
+    add_organization:
+      description: 'Por favor díganos el nombre de su organización. Esta aparecerá en correos cuando se inviten a nuevos miembros del equipo.'
+      label: 'Nombre de la Organización'
+      save: Guardar
+    create:
+      confirm_password: 'Confirmar Contraseña'
+      email: 'Dirección de correo'
+      organization_contact_email: 'Organización: Email de contacto'
+      password: Contraseña
+      save: Guardar
+      username: 'Nombre de Usuario'
+    final:
+      close: 'Cerrar este instalador'
+      description: '¡Gracias por instalar Talk! Enviamos un correo para verificar su dirección de correo. Mientras esta terminando de configurar su cuenta, ya puede comenzar a involucrarse con sus lectores.'
+      launch: 'Iniciar Talk'
+    initial:
+      description: 'Vamos a crear su comunidad Talk en unos pocos pasos.'
+      submit: Empecemos
+    permitted_domains:
+      description: 'Ingresar los dominios en donde estará Talk, por ejemplo sus ambientes locales, de staging y producción (ej. localhost:3000, staging.domain.com, domain.com).'
+      submit: 'Terminar la Instalación'
+      title: 'Dominios permitidos'
+  like: 'Me gusta'
+  loading_results: 'Cargando Resultados'
+  marketing: 'Esto parece una propaganda'
+  moderate_this_stream: 'Moderar este hilo de comentarios'
   modqueue:
-    account: "reportes de cuentas"
+    account: 'reportes de cuentas'
     actions: Acciones
     all: todos
-    all_streams: "Todos los Hilos"
-    notify_edited: '{0} ha editado el comentario "{1}"'
-    notify_accepted: '{0} ha aceptado el comentario "{1}"'
-    notify_rejected: '{0} ha rechazado el comentario "{1}"'
-    notify_flagged: '{0} ha reportado el comentario "{1}"'
-    notify_reset: '{0} ha reseteado el status del comentario "{1}"'
-    approve: "Aprobar"
-    approved: "Aprobado"
-    ban_user: "Bloquear"
+    all_streams: 'Todos los Hilos'
+    approve: Aprobar
+    approved: Aprobado
+    ban_user: Bloquear
     billion: B
     close: Cerrar
-    empty_queue: "¡No hay más comentarios para moderar! Tiempo para un ☕️"
+    empty_queue: '¡No hay más comentarios para moderar! Tiempo para un ☕️'
     flagged: reportado
-    reported: reportado
-    less_detail: "Menos detalles"
+    jump_to_queue: 'Jump to specific queue'
+    less_detail: 'Menos detalles'
     likes: likes
     million: M
-    mod_faster: "Moderar más rápido con atajos de teclado"
-    moderate: "Moderar →"
-    more_detail: "Más detalles"
-    new: Nuevo
-    newest_first: "Primero el más nuevo"
+    mod_faster: 'Moderar más rápido con atajos de teclado'
+    moderate: 'Moderar →'
+    more_detail: 'Más detalles'
     navigation: Navegación
-    next_comment: "Ir al siguiente comentario"
-    toggle_search: "Abrir búsqueda"
-    next_queue: "Próxima cola"
-    oldest_first: "Primero el más antiguo"
+    new: Nuevo
+    newest_first: 'Primero el más nuevo'
+    next_comment: 'Ir al siguiente comentario'
+    next_queue: 'Próxima cola'
+    notify_accepted: '{0} ha aceptado el comentario "{1}"'
+    notify_edited: '{0} ha editado el comentario "{1}"'
+    notify_flagged: '{0} ha reportado el comentario "{1}"'
+    notify_rejected: '{0} ha rechazado el comentario "{1}"'
+    notify_reset: '{0} ha reseteado el status del comentario "{1}"'
+    oldest_first: 'Primero el más antiguo'
     premod: pre-mod
-    prev_comment: "Ir al comentario anterior"
-    reject: "Rechazar"
-    rejected: "rechazado"
-    reply: "Respuesta"
-    select_stream: "Seleccionar hilo de comentarios"
+    prev_comment: 'Ir al comentario anterior'
+    reject: Rechazar
+    rejected: rechazado
+    reply: Respuesta
+    reported: reportado
+    select_stream: 'Seleccionar hilo de comentarios'
     shift_key: ⇧
     shortcuts: Atajos
-    sort: "Ordenar"
-    show_shortcuts: "Mostrar Atajos"
-    singleview: "Modo zen"
-    thismenu: "Abrir este menu"
-    jump_to_queue: "Jump to specific queue"
+    show_shortcuts: 'Mostrar Atajos'
+    singleview: 'Modo zen'
+    sort: Ordenar
+    thismenu: 'Abrir este menu'
     thousand: k
-    try_these: "Intentar estos"
-    view_more_shortcuts: "Ver más atajos"
-  my_comment_history: "Mi historial de comentarios"
+    toggle_search: 'Abrir búsqueda'
+    try_these: 'Intentar estos'
+    view_more_shortcuts: 'Ver más atajos'
+  my_comment_history: 'Mi historial de comentarios'
   name: Nombre
-  no_agree_comment: "No estoy de acuerdo con este comentario"
-  no_like_bio: "No me gusta esta biografia"
-  no_like_username: "No me gusta este nombre de usuario"
-  already_flagged_username: "Usted ya reportó a este usuario."
+  no_agree_comment: 'No estoy de acuerdo con este comentario'
+  no_like_bio: 'No me gusta esta biografia'
+  no_like_username: 'No me gusta este nombre de usuario'
   other: Otro
+  password_reset:
+    change_password: 'Cambio de contraseña'
+    confirm_new_password: 'Confirme su nueva contraseña'
+    mail_sent: 'Si tiene una cuenta registrada, un enlace para resetear su clave ha sido enviado a esa dirección de correo.'
+    new_password: 'Nueva contraseña'
+    new_password_help: 'La contraseña debe tener al menos 8 caracteres'
+    set_new_password: 'Cambie su contraseña'
   permalink: Compartir
-  personal_info: "Este comentario muestra información personal"
+  personal_info: 'Este comentario muestra información personal'
   post: Publicar
   profile: Perfil
-  profile_settings: "Configuración"
+  profile_settings: Configuración
+  reject_username:
+    description_notify: 'Suspender a este usuario va a deshabilitar temporalmente su cuenta.'
+    description_reject: '¿Quiere suspender temporalmente a este usuario por su {0}? El usuario estará temporalmente suspendido hasta que edite su {0}.'
+    email_message_reject: 'Otro miembro de la comunidad hace poco ha marcado su nombre de usuario para revisar. Y este ha sido rechazado por su contenido. Esto significa que no puede comentar, gustar o marcar contenido hasta que edite su nombre de usuario. Envíenos un correo si tiene alguna preocupación o pregunta.'
+    no_cancel: 'No cancelar'
+    send: Enviar
+    suspend_user: 'Suspender Usuario'
+    title_notify: 'Notificar al usuario de su suspensión temporal'
+    title_reject: 'Vimos que ha rechazado un nombre de usuario'
+    username: 'nombre de usuario'
+    write_message: 'Escribir un mensaje'
+    yes_suspend: 'Si, suspender'
   reply: Responder
   report: Reportar
-  report_notif: "Gracias por reportar este comentario. Nuestro equipo de moderación ha sido notificado y muy pronto lo va a revisar."
-  report_notif_remove: "Tu reporte ha sido eliminado."
-  reported: "Reportado"
+  report_notif: 'Gracias por reportar este comentario. Nuestro equipo de moderación ha sido notificado y muy pronto lo va a revisar.'
+  report_notif_remove: 'Tu reporte ha sido eliminado.'
+  reported: Reportado
   settings:
-    from_settings_page: "Desde la página de configuración puedes ver tu historial de comentarios."
-    my_comment_history: "Mi historial de comentarios"
+    from_settings_page: 'Desde la página de configuración puedes ver tu historial de comentarios.'
+    my_comment_history: 'Mi historial de comentarios'
     profile: Perfil
-    profile_settings: "Configuración del perfil"
-    sign_in: "Entrar"
-    to_access: "para acceder al perfil"
-    user_no_comment: "No has dejado aún ningún comentario. ¡Únete a la conversación!"
+    profile_settings: 'Configuración del perfil'
+    sign_in: Entrar
+    to_access: 'para acceder al perfil'
+    user_no_comment: 'No has dejado aún ningún comentario. ¡Únete a la conversación!'
+  step_1_header: 'Reportar un problema'
+  step_2_header: 'Ayúdanos a comprender'
+  step_3_header: 'Gracias por tu participación'
   stream:
-    all_comments: "Todos los comentarios"
-    temporarily_suspended: "De acuerdo con la guía de la comunidad de {0}, su cuenta ha sido temporalmente suspendida. Por favor unirse a la conversación {1}."
-    comment_not_found: "Este comentario ha sido eliminado o no existe."
-    no_comments: "Todavía no hay comentarios. ¿Por qué no escribes uno?"
-    no_comments_and_closed: "No hubo comentarios en este artículo."
-  step_1_header: "Reportar un problema"
-  step_2_header: "Ayúdanos a comprender"
-  step_3_header: "Gracias por tu participación"
+    all_comments: 'Todos los comentarios'
+    comment_not_found: 'Este comentario ha sido eliminado o no existe.'
+    no_comments: 'Todavía no hay comentarios. ¿Por qué no escribes uno?'
+    no_comments_and_closed: 'No hubo comentarios en este artículo.'
+    temporarily_suspended: 'De acuerdo con la guía de la comunidad de {0}, su cuenta ha sido temporalmente suspendida. Por favor unirse a la conversación {1}.'
   streams:
-    all: "Todos"
-    article: "Artículo"
-    closed: "Cerrado"
-    empty_result: "Ningún articulo coincide con esta búsqueda. Intente expandir su búsqueda."
-    filter_streams: "Filtrar Hilos"
-    newest: "Más nuevo"
-    oldest: "Más antiguo"
-    open: "Abierto"
-    pubdate: "Fecha Publicación"
-    search: "Buscar"
-    sort_by: "Ordenar por"
-    status: "Estado del Hilo"
-    stream_status: "Estado del Hilo"
+    all: Todos
+    article: Artículo
+    closed: Cerrado
+    empty_result: 'Ningún articulo coincide con esta búsqueda. Intente expandir su búsqueda.'
+    filter_streams: 'Filtrar Hilos'
+    newest: 'Más nuevo'
+    oldest: 'Más antiguo'
+    open: Abierto
+    pubdate: 'Fecha Publicación'
+    search: Buscar
+    sort_by: 'Ordenar por'
+    status: 'Estado del Hilo'
+    stream_status: 'Estado del Hilo'
   suspenduser:
-    title_suspend: "Suspender Usuario"
-    description_suspend: "Esta suspendiendo a {0}. Este comentario va a ir a la fila de Rechazados, y a {0} no se le va a permitir gustar, marcar, responder o publicar hasta que el tiempo de suspendido halla concluido."
-    select_duration: "Seleccionar la duración de la suspensión"
-    one_hour: "1 hora"
-    hours: "{0} horas"
-    days: "{0} días"
-    cancel: "Cancelar"
-    suspend_user: "Suspender Usuario"
-    email_message_suspend: "Querido/a {0}, De acuerdo a la guía comunitaria de {1}, su cuenta ha sido temporalmente suspendida. Durante este tiempo, no podrá comentar, marcar o involucrarse con otros comentaristas. Por favor unirse a la conversación {2}."
-    title_notify: "Notificar al usuario de su suspensión temporal"
-    notify_suspend_until: "Usuario {0} ha sido temporalmente suspendido. Esta suspension va a terminar automáticamente en {1}."
-    description_notify: "Suspender a este usuario va a deshabilitar temporalmente su cuenta."
-    write_message: "Escribir un mensaje"
-    send: "Enviar"
-  reject_username:
-    username: nombre de usuario
-    no_cancel: "No cancelar"
-    description_reject: "¿Quiere suspender temporalmente a este usuario por su {0}? El usuario estará temporalmente suspendido hasta que edite su {0}."
-    title_notify: "Notificar al usuario de su suspensión temporal"
-    description_notify: "Suspender a este usuario va a deshabilitar temporalmente su cuenta."
-    title_reject: "Vimos que ha rechazado un nombre de usuario"
-    suspend_user: "Suspender Usuario"
-    yes_suspend: "Si, suspender"
-    email_message_reject: "Otro miembro de la comunidad hace poco ha marcado su nombre de usuario para revisar. Y este ha sido rechazado por su contenido. Esto significa que no puede comentar, gustar o marcar contenido hasta que edite su nombre de usuario. Envíenos un correo si tiene alguna preocupación o pregunta."
-    write_message: "Escribir un mensaje"
-    send: "Enviar"
-  thank_you: "Valoramos tanto su seguridad en este espacio como sus comentarios. Un o una moderadora va a leer su reporte."
+    cancel: Cancelar
+    days: '{0} días'
+    description_notify: 'Suspender a este usuario va a deshabilitar temporalmente su cuenta.'
+    description_suspend: 'Esta suspendiendo a {0}. Este comentario va a ir a la fila de Rechazados, y a {0} no se le va a permitir gustar, marcar, responder o publicar hasta que el tiempo de suspendido halla concluido.'
+    email_message_suspend: 'Querido/a {0}, De acuerdo a la guía comunitaria de {1}, su cuenta ha sido temporalmente suspendida. Durante este tiempo, no podrá comentar, marcar o involucrarse con otros comentaristas. Por favor unirse a la conversación {2}.'
+    hours: '{0} horas'
+    notify_suspend_until: 'Usuario {0} ha sido temporalmente suspendido. Esta suspension va a terminar automáticamente en {1}.'
+    one_hour: '1 hora'
+    select_duration: 'Seleccionar la duración de la suspensión'
+    send: Enviar
+    suspend_user: 'Suspender Usuario'
+    title_notify: 'Notificar al usuario de su suspensión temporal'
+    title_suspend: 'Suspender Usuario'
+    write_message: 'Escribir un mensaje'
+  thank_you: 'Valoramos tanto su seguridad en este espacio como sus comentarios. Un o una moderadora va a leer su reporte.'
   user:
-    bio_flags: "reportes para este bio"
-    user_bio: "Bio de Usuario"
-    username_flags: "reportes para este nombre de usuario"
+    bio_flags: 'reportes para este bio'
+    user_bio: 'Bio de Usuario'
+    username_flags: 'reportes para este nombre de usuario'
   user_detail:
-    suspended: 'Suspendido'
-    banned: 'Baneado'
-    username: 'Usuario'
+    all: Todos
+    ban: 'Bloquear usuario'
+    banned: Baneado
+    email: 'Correo electrónico'
+    member_since: 'Miembro desde'
+    reject_rate: 'Promedio de rechazo'
+    rejected: Rechazado
+    remove_ban: 'Cancelar bloqueo'
+    remove_suspension: 'Cancelar suspensión'
+    suspend: 'Suspender usuario'
+    suspended: Suspendido
+    total_comments: 'Comentarios totales'
+    user_history: 'Historial del usuario'
+    username: Usuario
     username_needs_approval: 'El usuario necesita aprovación'
     username_rejected: 'Usuario rechazado'
-    suspend: "Suspender usuario"
-    email: "Correo electrónico"
-    reject_rate: "Promedio de rechazo"
-    all: "Todos"
-    rejected: "Rechazado"
-    remove_suspension: "Cancelar suspensión"
-    remove_ban: "Cancelar bloqueo"
-    ban: "Bloquear usuario"
-    member_since: "Miembro desde"
-    total_comments: "Comentarios totales"
-    reports: "Reportes"
-    user_history: "Historial del usuario"
   user_history:
-    user_banned: "Usuario bloqueado"
-    ban_removed: "Bloqueo cancelado"
-    username_status: "Nombre de usuario {0}"
-    suspended: "Suspendido, {0}"
-    suspension_removed: "Suspensión cancelada"
-    system: "Sistema"
-    date: "Fecha"
-    action: "Acción"
-    taken_by: "Está en uso"
-  user_impersonating: "Este usuario suplanta a alguien"
-  user_no_comment: "No has dejado aún ningún comentario. ¡Únete a la conversación!"
-  username_offensive: "Este nombre de usuario es ofensivo"
-  view_conversation: "Ver Conversación"
-  install:
-    initial:
-      description: "Vamos a crear su comunidad Talk en unos pocos pasos."
-      submit: "Empecemos"
-    add_organization:
-      description: "Por favor díganos el nombre de su organización. Esta aparecerá en correos cuando se inviten a nuevos miembros del equipo."
-      label: "Nombre de la Organización"
-      save: "Guardar"
-    create:
-      email: "Dirección de correo"
-      username: "Nombre de Usuario"
-      password: "Contraseña"
-      confirm_password: "Confirmar Contraseña"
-      organization_contact_email: "Organización: Email de contacto"
-      save: "Guardar"
-    permitted_domains:
-      title: "Dominios permitidos"
-      description: "Ingresar los dominios en donde estará Talk, por ejemplo sus ambientes locales, de staging y producción (ej. localhost:3000, staging.domain.com, domain.com)."
-      submit: "Terminar la Instalación"
-    final:
-      description: "¡Gracias por instalar Talk! Enviamos un correo para verificar su dirección de correo. Mientras esta terminando de configurar su cuenta, ya puede comenzar a involucrarse con sus lectores."
-      launch: "Iniciar Talk"
-      close: "Cerrar este instalador"
-  admin_sidebar:
-    view_options: "Ver opciones"
-    sort_comments: "Ordenar comentarios"
+    action: Acción
+    ban_removed: 'Bloqueo cancelado'
+    date: Fecha
+    suspended: 'Suspendido, {0}'
+    suspension_removed: 'Suspensión cancelada'
+    system: Sistema
+    taken_by: 'Está en uso'
+    user_banned: 'Usuario bloqueado'
+    username_status: 'Nombre de usuario {0}'
+  user_impersonating: 'Este usuario suplanta a alguien'
+  user_no_comment: 'No has dejado aún ningún comentario. ¡Únete a la conversación!'
+  username_offensive: 'Este nombre de usuario es ofensivo'
+  validators:
+    confirm_email: 'Los correos no coinciden. Inténtelo nuevamente'
+    confirm_password: 'Las contraseñas no coinciden. Inténtelo nuevamente'
+    required: 'Este campo es requerido'
+    verify_email: 'No es un correo válido'
+    verify_organization_name: 'El nombre de la organización debe contener letras y/o números.'
+    verify_password: 'La contraseña debe tener por lo menos 8 caracteres'
+    verify_username: 'Los nombres pueden contener letras números y _'
+  view_conversation: 'Ver Conversación'
+  your_account_has_been_banned: 'Su cuenta ha sido suspendida.'
+  your_account_has_been_suspended: 'Su cuenta ha sido temporalmente suspendida.'
+  your_username_has_been_rejected: 'Su cuenta ha sido suspendida porque tu nombre de usuario ha sido considerado no apropiado para el espacio. Para recuperar la cuenta, por favor ingresar un nuevo nombre de usuario.'
diff --git a/locales/fi_FI.yml b/locales/fi_FI.yml
index 4758a2920..4d379d9ca 100644
--- a/locales/fi_FI.yml
+++ b/locales/fi_FI.yml
@@ -1,464 +1,469 @@
 fi_FI:
-  your_account_has_been_suspended: Tilisi on väliaikasesti suljettu.
-  your_account_has_been_banned: Tilillesi on asetettu kirjoituskielto.
-  your_username_has_been_rejected: Tilisi on suljettu, koska käyttäjänimesi on epäsopiva. Vaihda käyttäjänimeä jatkaaksesi tilin käyttöä.
-  embed_comments_tab: Kommentit
+  admin_sidebar:
+    sort_comments: 'Järjestä kommentit'
+    view_options: 'Näytä asetukset'
+  already_flagged_username: 'Olet jo ilmiantanut tämän käyttäjänimen.'
   bandialog:
-    are_you_sure: "Haluatko varmasti asettaa kirjoituskiellon käyttäjätilille {0}?"
-    ban_user: "Estä käyttäjä?"
-    banned_user: "Estetty käyttäjä"
-    cancel: "Peruuta"
-    note: "Huom! {0}"
-    note_reject_comment: "Käyttäjän asettaminen kirjoituskieltoon asettaa myös kommentin Hylätyt-jonoon"
-    note_ban_user: "Käyttäjän kirjoituskielto estää kommentoinnin, kommentteihin reagoinnin, sekä kommenttien ilmiantamisen."
-    yes_ban_user: "Kyllä, aseta käyttäjälle kirjoituskielto"
-    write_a_message: "Kirjoita viesti"
-    send: "Lähetä"
-    notify_ban_headline: "Lähetä käyttäjälle ilmoitus kirjoituskiellosta"
-    notify_ban_description: "Tämä lähettää käyttäjälle sähköposti-ilmoituksen kirjoituskiellosta."
+    are_you_sure: 'Haluatko varmasti asettaa kirjoituskiellon käyttäjätilille {0}?'
+    ban_user: 'Estä käyttäjä?'
+    banned_user: 'Estetty käyttäjä'
+    cancel: Peruuta
     email_message_ban: "{0},\n\nTilläsi on rikottu kommentoinnin sääntöjä, jonka takia tilille on asetettu kirjoituskielto. Tiliä ei voida enää käyttää kommentointiin osallistumiseen tai kommenttien ilmiantamiseen. Ota yhteyttä moderointiin, jos tämä on tapahtunut mielestäsi väärin perustein."
-  bio_offensive: "Kuvaus on loukkaava"
-  cancel: "Peruuta"
-  confirm_email:
-    click_to_confirm: "Vahvista sähköpostiosoitteesi"
-    confirm: "Vahvista"
-  password_reset:
-    mail_sent: "Salasananvaihtolinkki on lähetetty rekisteröityyn sähköpostiosoitteeseen"
-    set_new_password: "Luo uusi salasana"
-    new_password: "Uusi salasana"
-    new_password_help: "Salasanan tulee olla vähintään 8 merkin pituinen"
-    confirm_new_password: "Vahvista uusi salasana"
-    change_password: "Vaihda salasana"
-  characters_remaining: "merkki(ä) jäljellä"
+    note: 'Huom! {0}'
+    note_ban_user: 'Käyttäjän kirjoituskielto estää kommentoinnin, kommentteihin reagoinnin, sekä kommenttien ilmiantamisen.'
+    note_reject_comment: 'Käyttäjän asettaminen kirjoituskieltoon asettaa myös kommentin Hylätyt-jonoon'
+    notify_ban_description: 'Tämä lähettää käyttäjälle sähköposti-ilmoituksen kirjoituskiellosta.'
+    notify_ban_headline: 'Lähetä käyttäjälle ilmoitus kirjoituskiellosta'
+    send: Lähetä
+    write_a_message: 'Kirjoita viesti'
+    yes_ban_user: 'Kyllä, aseta käyttäjälle kirjoituskielto'
+  bio_offensive: 'Kuvaus on loukkaava'
+  cancel: Peruuta
+  characters_remaining: 'merkki(ä) jäljellä'
   comment:
-    anon: "Anonyymi"
-    undo_reject: "Peruuta"
-    ban_user: "Estä käyttäjä"
-    comment: "Kommentoi"
+    anon: Anonyymi
+    ban_user: 'Estä käyttäjä'
+    comment: Kommentoi
     edited: Muokattu
-    flagged: "ilmiannettu"
-    view_context: "Näytä konteksti"
+    flagged: ilmiannettu
+    undo_reject: Peruuta
+    view_context: 'Näytä konteksti'
   comment_box:
-    post: "Lähetä"
-    cancel: "Peruuta"
-    reply: "Vastaa"
-    comment: "Kommentoi"
-    name: "Nimi"
-    comment_post_notif: "Kommenttisi on lähetetty."
-    comment_post_notif_premod: "Kiitos kommentistasi. Moderointitiimimme käsittelee kommenttisi mahdollisimman pian."
-    comment_post_banned_word:  "Kommenttisi sisältää vähintään yhden kielletyn sanan, joten kommenttiasi ei tulla julkaisemaan. Jos tämä ilmoitus on mielestäsi aiheeton, olethan yhteydessä moderointitiimiimme."
-    characters_remaining: "merkki(ä) jäljellä"
-  comment_offensive: "Kommentti on loukkaava"
-  comment_singular: Kommentti
+    cancel: Peruuta
+    characters_remaining: 'merkki(ä) jäljellä'
+    comment: Kommentoi
+    comment_post_banned_word: 'Kommenttisi sisältää vähintään yhden kielletyn sanan, joten kommenttiasi ei tulla julkaisemaan. Jos tämä ilmoitus on mielestäsi aiheeton, olethan yhteydessä moderointitiimiimme.'
+    comment_post_notif: 'Kommenttisi on lähetetty.'
+    comment_post_notif_premod: 'Kiitos kommentistasi. Moderointitiimimme käsittelee kommenttisi mahdollisimman pian.'
+    name: Nimi
+    post: Lähetä
+    reply: Vastaa
+  comment_offensive: 'Kommentti on loukkaava'
   comment_plural: Kommentit
-  comment_post_banned_word: "Kommenttisi sisältää vähintään yhden kielletyn sanan, joten kommenttiasi ei tulla julkaisemaan. Jos tämä ilmoitus on mielestäsi aiheeton, olethan yhteydessä moderointitiimiimme."
-  comment_post_notif: "Kommenttisi on lähetetty."
-  comment_post_notif_premod: "Kiitos kommentistasi. Moderointitiimimme käsittelee kommenttisi mahdollisimman pian."
+  comment_post_banned_word: 'Kommenttisi sisältää vähintään yhden kielletyn sanan, joten kommenttiasi ei tulla julkaisemaan. Jos tämä ilmoitus on mielestäsi aiheeton, olethan yhteydessä moderointitiimiimme.'
+  comment_post_notif: 'Kommenttisi on lähetetty.'
+  comment_post_notif_premod: 'Kiitos kommentistasi. Moderointitiimimme käsittelee kommenttisi mahdollisimman pian.'
+  comment_singular: Kommentti
   common:
-    copy: 'Kopioi'
+    copy: Kopioi
     error: 'Tapahtui virhe.'
-    reply: 'vastaa'
-    replies: 'vastaukset'
-    reaction: 'reaktio'
-    reactions: 'reaktiot'
-    story: 'Artikkeli'
-  flagged_usernames:
-    notify_approved: '{0} hyväksyi käyttäjänimen {1}'
-    notify_rejected: '{0} hylkäsi käyttäjänimen {1}'
-    notify_flagged: '{0} ilmiantoi käyttäjänimen {1}'
-    notify_changed: 'käyttäjä {0} vaihtoi käyttäjänimesä muotoon {1}'
+    reaction: reaktio
+    reactions: reaktiot
+    replies: vastaukset
+    reply: vastaa
+    story: Artikkeli
   community:
-    account_creation_date: "Tilin luontiaika"
+    account_creation_date: 'Tilin luontiaika'
     active: Aktiivinen
     admin: Ylläpitäjä
-    ads_marketing: "Vaikuttaa mainokselta"
-    are_you_sure: "Haluatka varmasti asettaa käyttäjlle {0} kirjoituskiellon?"
-    ban_user: "Estä käyttäjä?"
+    ads_marketing: 'Vaikuttaa mainokselta'
+    are_you_sure: 'Haluatka varmasti asettaa käyttäjlle {0} kirjoituskiellon?'
+    ban_user: 'Estä käyttäjä?'
     banned: Estetty
-    banned_user: "Estetty käyttäjä"
+    banned_user: 'Estetty käyttäjä'
     cancel: Peruuta
-    dont_like_username: "Epäsopiva käyttäjänimi"
-    flaggedaccounts: "Ilmiannetut käyttäjänimet"
+    commenter: Kommentoija
+    dont_like_username: 'Epäsopiva käyttäjänimi'
+    flaggedaccounts: 'Ilmiannetut käyttäjänimet'
     flags: Liputuksia
-    impersonating: "Toiseksi tekeytyminen"
-    loading: "Ladataan tuloksia"
+    impersonating: 'Toiseksi tekeytyminen'
+    loading: 'Ladataan tuloksia'
     moderator: Moderaattori
-    newsroom_role: "Uutishuoneen rooli"
-    no_flagged_accounts: "Ilmiannettujen nimimerkkien jono on tyhjä."
-    no_results: "Antamallasi hakusanalla ei löydy yhtään käyttäjää."
-    offensive: "Loukkaava"
+    newsroom_role: 'Uutishuoneen rooli'
+    no_flagged_accounts: 'Ilmiannettujen nimimerkkien jono on tyhjä.'
+    no_results: 'Antamallasi hakusanalla ei löydy yhtään käyttäjää.'
+    offensive: Loukkaava
     other: Muu
     people: Käyttäjät
-    role: "Valitse rooli..."
-    select_status: "Valitse tila..."
-    spam_ads: "Roskapostit/mainokset"
-    staff: "Työntekijä"
+    role: 'Valitse rooli...'
+    select_status: 'Valitse tila...'
+    spam_ads: Roskapostit/mainokset
+    staff: Työntekijä
     status: Tila
-    username_and_email: "Käyttäjänimi ja sähköposti"
-    yes_ban_user: "Kyllä, estä käyttäjä"
-    commenter: "Kommentoija"
+    username_and_email: 'Käyttäjänimi ja sähköposti'
+    yes_ban_user: 'Kyllä, estä käyttäjä'
   configure:
     apply: Käytä
-    banned_word_text: "Näitä sanoja tai fraaseja sisältävät kommentit poistetaan automaattisesti. Lisää uusi kirjoittamalla sana ja painamalla enter- tai tab-näppäintä. Vaihtoehtoisesti kopio lista, jossa sanat on eroteltu pilkuilla."
-    banned_words_title: "Estettyjen sanojen lista."
-    close: "Sulje"
-    close_after: "Sulje kommentit, kun on kulunut"
-    close_stream: "Sulje kommentointi"
-    close_stream_configuration: "Kommentointi suljettu. Kommentointi on mahdollista, jos avaat kommentoinnin uudelleen."
-    closed_comments_desc: "Kirjoita viesti, joka näytetään, kun kommenttivirta on suljettu ja uusia viestejä ei voi enää lähettää."
-    closed_comments_label: "Kirjoita viesti..."
-    closed_stream_settings: "Suljetun keskustelun ilmoitusviesti"
-    comment_count_error: "Syötä numero."
-    comment_count_header: "Rajoita kommentin pituutta"
+    banned_word_text: 'Näitä sanoja tai fraaseja sisältävät kommentit poistetaan automaattisesti. Lisää uusi kirjoittamalla sana ja painamalla enter- tai tab-näppäintä. Vaihtoehtoisesti kopio lista, jossa sanat on eroteltu pilkuilla.'
+    banned_words_title: 'Estettyjen sanojen lista.'
+    close: Sulje
+    close_after: 'Sulje kommentit, kun on kulunut'
+    close_stream: 'Sulje kommentointi'
+    close_stream_configuration: 'Kommentointi suljettu. Kommentointi on mahdollista, jos avaat kommentoinnin uudelleen.'
+    closed_comments_desc: 'Kirjoita viesti, joka näytetään, kun kommenttivirta on suljettu ja uusia viestejä ei voi enää lähettää.'
+    closed_comments_label: 'Kirjoita viesti...'
+    closed_stream_settings: 'Suljetun keskustelun ilmoitusviesti'
+    comment_count_error: 'Syötä numero.'
+    comment_count_header: 'Rajoita kommentin pituutta'
     comment_count_text_post: merkkiin
-    comment_count_text_pre: "Kommentin pituus rajoitetaan"
+    comment_count_text_pre: 'Kommentin pituus rajoitetaan'
     comment_settings: Asetukset
-    comment_stream: "Kommentit"
-    comment_stream_will_close: "Kommentointi sulkeutuu"
+    comment_stream: Kommentit
+    comment_stream_will_close: 'Kommentointi sulkeutuu'
     community: Yhteisö
-    configure: "Muokkaa asetuksia"
-    copy_and_paste: "Kopio ja liitä koodi sisällönhallintajärjestelmääsi upottaaksesi kommenttiosion artikkeliin."
-    custom_css_url: "CSS-tiedoston URL"
-    custom_css_url_desc: "CSS-tiedoston URL, jonka sisällöllä ylikirjoitetaan oletustyylit. Voi olla sisäinen tai ulkoinen."
+    configure: 'Muokkaa asetuksia'
+    copy_and_paste: 'Kopio ja liitä koodi sisällönhallintajärjestelmääsi upottaaksesi kommenttiosion artikkeliin.'
+    custom_css_url: 'CSS-tiedoston URL'
+    custom_css_url_desc: 'CSS-tiedoston URL, jonka sisällöllä ylikirjoitetaan oletustyylit. Voi olla sisäinen tai ulkoinen.'
     days: Päivää
-    description: "Ylläpitäjänä voit muokata tämän artikkelin kommentoinnin asetuksia:"
-    domain_list_text: "Syötä verkkotunnukset, joilla on lupa käyttää Talkia. Esimerkiksi lokaalikehitys-, QA- ja tuotantoympäristöt: localhost:3000 staging.domain.com domain.com."
-    domain_list_title: "Luviteut verkkotunnukset"
-    edit_comment_timeframe_heading: "Muokkaa kommentin muokkausaikaikkunaa"
-    edit_comment_timeframe_text_pre: "Kommentoijilla on"
-    edit_comment_timeframe_text_post: "sekuntia aikaa muokata kommenttejaan."
-    embed_comment_stream: "Upota keskustelu"
-    enable_premod_links_text: Moderaattorien tulee hyväksyä sellaisten kommenttien julkaisu, joissa on linkki.
-    enable_pre_moderation: "Esimoderointi päälle"
-    enable_pre_moderation_text: "Moderaattorien tulee hyväksyä kaikki julkaistavat kommentit."
-    enable_premod_links: "Esimoderoi kommentit, joissa on linkki"
-    enable_premod: "Esimoderointi päälle"
-    enable_premod_description: "Moderaattorien tulee hyväksyä kaikki julkaistavat kommentit."
-    enable_premod_links_description: "Moderaattorien tulee hyväksyä sellaisten kommenttien julkaisu, joissa on linkki."
-    enable_questionbox: "Kysy lukijoilta"
-    enable_questionbox_description: "Tämä kysymys tulee näkymään kommenttiosion ylälaidassa. Kysy artikkelin aiheesta tai ohjaa keskustelua kysymyksen avulla."
+    description: 'Ylläpitäjänä voit muokata tämän artikkelin kommentoinnin asetuksia:'
+    domain_list_text: 'Syötä verkkotunnukset, joilla on lupa käyttää Talkia. Esimerkiksi lokaalikehitys-, QA- ja tuotantoympäristöt: localhost:3000 staging.domain.com domain.com.'
+    domain_list_title: 'Luviteut verkkotunnukset'
+    edit_comment_timeframe_heading: 'Muokkaa kommentin muokkausaikaikkunaa'
+    edit_comment_timeframe_text_post: 'sekuntia aikaa muokata kommenttejaan.'
+    edit_comment_timeframe_text_pre: 'Kommentoijilla on'
+    embed_comment_stream: 'Upota keskustelu'
+    enable_pre_moderation: 'Esimoderointi päälle'
+    enable_pre_moderation_text: 'Moderaattorien tulee hyväksyä kaikki julkaistavat kommentit.'
+    enable_premod: 'Esimoderointi päälle'
+    enable_premod_description: 'Moderaattorien tulee hyväksyä kaikki julkaistavat kommentit.'
+    enable_premod_links: 'Esimoderoi kommentit, joissa on linkki'
+    enable_premod_links_description: 'Moderaattorien tulee hyväksyä sellaisten kommenttien julkaisu, joissa on linkki.'
+    enable_premod_links_text: 'Moderaattorien tulee hyväksyä sellaisten kommenttien julkaisu, joissa on linkki.'
+    enable_questionbox: 'Kysy lukijoilta'
+    enable_questionbox_description: 'Tämä kysymys tulee näkymään kommenttiosion ylälaidassa. Kysy artikkelin aiheesta tai ohjaa keskustelua kysymyksen avulla.'
     hours: Tuntia
-    include_comment_stream: "Sisällytä kommentoinnin kuvaus lukijoille"
-    include_comment_stream_desc: "Kirjoita kommenttiosion yläreunassa näkyvä viesti. Aseta keskustelun aihe, sisällytä sääntöjä tms."
-    include_text: "Lisää teksti tähän."
-    include_question_here: "Kirjoita kysymyksesi tähän:"
+    include_comment_stream: 'Sisällytä kommentoinnin kuvaus lukijoille'
+    include_comment_stream_desc: 'Kirjoita kommenttiosion yläreunassa näkyvä viesti. Aseta keskustelun aihe, sisällytä sääntöjä tms.'
+    include_question_here: 'Kirjoita kysymyksesi tähän:'
+    include_text: 'Lisää teksti tähän.'
     moderate: Moderoi
-    moderation_settings: "Moderointiasetukset"
-    open: "Avaa"
-    open_stream: "Avaa kommentointi"
-    open_stream_configuration: "Tämän artikkelin kommentointi on tällä hetkellä auki. Jos se suljetaan, ei kommentointi ole enää mahdollista, mutta vanhat kommentit jäävät näkyviin."
-    require_email_verification: "Vaadi sähköpostin vahvistus"
-    require_email_verification_text: "Uusien käyttäjien täytyy vahvistaa sähköpostiosoitteensa ennen kommentoinnin aloittamista"
-    save_changes: "Tallenna muutokset"
+    moderation_settings: Moderointiasetukset
+    open: Avaa
+    open_stream: 'Avaa kommentointi'
+    open_stream_configuration: 'Tämän artikkelin kommentointi on tällä hetkellä auki. Jos se suljetaan, ei kommentointi ole enää mahdollista, mutta vanhat kommentit jäävät näkyviin.'
+    require_email_verification: 'Vaadi sähköpostin vahvistus'
+    require_email_verification_text: 'Uusien käyttäjien täytyy vahvistaa sähköpostiosoitteensa ennen kommentoinnin aloittamista'
+    save_changes: 'Tallenna muutokset'
     shortcuts: Pikalinkit
-    sign_out: "Kirjaudu ulos"
+    sign_out: 'Kirjaudu ulos'
     stories: Artikkelitarinat
-    stream_settings: "Kommentoinnin asetukset"
-    suspect_word_title: "Epäilyttävien sanojen lista"
-    suspect_word_text: "Nämä sanat tai fraasit näkyvät korostettuina kommenteissa. Lisää uusi kirjoittamalla sana ja painamalla enter- tai tab-näppäintä. Vaihtoehtoisesti kopio lista, jossa sanat on eroteltu pilkuilla."
-    tech_settings: "Tekniset asetukset"
-    title: "Muokkaa kommentoinnin asetuksia"
+    stream_settings: 'Kommentoinnin asetukset'
+    suspect_word_text: 'Nämä sanat tai fraasit näkyvät korostettuina kommenteissa. Lisää uusi kirjoittamalla sana ja painamalla enter- tai tab-näppäintä. Vaihtoehtoisesti kopio lista, jossa sanat on eroteltu pilkuilla.'
+    suspect_word_title: 'Epäilyttävien sanojen lista'
+    tech_settings: 'Tekniset asetukset'
+    title: 'Muokkaa kommentoinnin asetuksia'
     weeks: Viikkoa
-    wordlist: "Kielletyt sanat"
-  continue: "Jatka"
+    wordlist: 'Kielletyt sanat'
+  confirm_email:
+    click_to_confirm: 'Vahvista sähköpostiosoitteesi'
+    confirm: Vahvista
+  continue: Jatka
   createdisplay:
-    check_the_form: "Tarkista syöttämäsi tiedot"
-    continue: "Käytä Facebook-käyttäjänimeä"
-    error_create: "Käyttäjänimen vaihdossa tapahtui virhe"
-    fake_comment_body: "Tämä on esimerkkikommentti. Lukijat voivat jakaa mielipiteitään ja näkemyksiään kommenttiosiossa."
-    fake_comment_date: "1 minuutti sitten"
-    if_you_dont_change_your_name: "Facebook-käyttäjänimesi näkyy kommenttiesi yhteydessä, ellet tässä vaiheessa vaihda käyttäjänimeäsi."
-    required_field: "Vaadittu tieto"
+    check_the_form: 'Tarkista syöttämäsi tiedot'
+    continue: 'Käytä Facebook-käyttäjänimeä'
+    error_create: 'Käyttäjänimen vaihdossa tapahtui virhe'
+    fake_comment_body: 'Tämä on esimerkkikommentti. Lukijat voivat jakaa mielipiteitään ja näkemyksiään kommenttiosiossa.'
+    fake_comment_date: '1 minuutti sitten'
+    if_you_dont_change_your_name: 'Facebook-käyttäjänimesi näkyy kommenttiesi yhteydessä, ellet tässä vaiheessa vaihda käyttäjänimeäsi.'
+    required_field: 'Vaadittu tieto'
     save: Tallenna
-    special_characters: "Käyttäjänimissä sallittuja merkkejä ovat ainoastaan kirjaimet, numerot, sekä alaviiva"
+    special_characters: 'Käyttäjänimissä sallittuja merkkejä ovat ainoastaan kirjaimet, numerot, sekä alaviiva'
     username: Käyttäjänimi
-    write_your_username: "Muokkaa käyttäjänimeäsi"
-    your_username: "Käyttäjänimesi näkyy jokaisen kommenttisi yhteydessä"
+    write_your_username: 'Muokkaa käyttäjänimeäsi'
+    your_username: 'Käyttäjänimesi näkyy jokaisen kommenttisi yhteydessä'
   done: Valmis
   edit_comment:
-    body_input_label: "Muokkaa tätä kommenttia"
-    save_button: "Tallenna muutokset"
-    edit_window_expired: "Et voi enää muokata tätä kommenttia, koska muokkauksen aikaikkuna on umpeutunut. Jätä sen sijaan uusi kommentti?"
-    edit_window_expired_close: "Sulje"
-    edit_window_timer_prefix: "Muokkauksen aikaikkunaa jäljellä: "
-    second: "sekunti"
-    seconds_plural: "sekuntia"
-    minute: "minuutti"
-    minutes_plural: "minuuttia"
+    body_input_label: 'Muokkaa tätä kommenttia'
+    edit_window_expired: 'Et voi enää muokata tätä kommenttia, koska muokkauksen aikaikkuna on umpeutunut. Jätä sen sijaan uusi kommentti?'
+    edit_window_expired_close: Sulje
+    edit_window_timer_prefix: 'Muokkauksen aikaikkunaa jäljellä: '
+    minute: minuutti
+    minutes_plural: minuuttia
+    save_button: 'Tallenna muutokset'
+    second: sekunti
+    seconds_plural: sekuntia
   email:
-    suspended:
-      subject: "Tilisi on väliaikaisesti suljettu"
     banned:
-      subject: "Tilisi on asetettu kirjoituskieltoon"
-      body: "Tilisi on asetettu kirjoituskieltoon. Et voi osallistua keskusteluun kirjoituskiellon aikana."
+      body: 'Tilisi on asetettu kirjoituskieltoon. Et voi osallistua keskusteluun kirjoituskiellon aikana.'
+      subject: 'Tilisi on asetettu kirjoituskieltoon'
     confirm:
-      has_been_requested: "Sähköpostivahvistus on pyydetty tilille:"
-      to_confirm: "Vahvista tili klikkaamalla seuraavaa linkkiä:"
-      confirm_email: "Vahvista sähköposti"
-      if_you_did_not: "Jätä tämä viesti huomioimatta, jos et ole tehnyt pyyntöä."
-      subject: "Sähköpostin vahvistus"
+      confirm_email: 'Vahvista sähköposti'
+      has_been_requested: 'Sähköpostivahvistus on pyydetty tilille:'
+      if_you_did_not: 'Jätä tämä viesti huomioimatta, jos et ole tehnyt pyyntöä.'
+      subject: 'Sähköpostin vahvistus'
+      to_confirm: 'Vahvista tili klikkaamalla seuraavaa linkkiä:'
     password_reset:
-      we_received_a_request: "Tilisi salasanan vaihtoa on pyydetty. Jätä tämä viesti huomioimatta, jos et ole tehnyt pyyntöä."
-      if_you_did: "Jos pyysit,"
-      please_click: "klikkaa tästä vaihtaaksesi salasanasi."
+      if_you_did: 'Jos pyysit,'
+      please_click: 'klikkaa tästä vaihtaaksesi salasanasi.'
+      we_received_a_request: 'Tilisi salasanan vaihtoa on pyydetty. Jätä tämä viesti huomioimatta, jos et ole tehnyt pyyntöä.'
+    suspended:
+      subject: 'Tilisi on väliaikaisesti suljettu'
+  embed_comments_tab: Kommentit
   embedlink:
-    copy: "Kopioi leikepöydälle"
+    copy: 'Kopioi leikepöydälle'
   error:
-    COMMENT_PARENT_NOT_VISIBLE: "Kommenttia, johon yrität vastata, ei enää ole."
-    EMAIL_VERIFICATION_TOKEN_INVALID: "Sähköpostin vahvistusvarmiste on epävalidi."
-    PASSWORD_RESET_TOKEN_INVALID: "Salasananvaihtolinkki on epävalidi."
-    COMMENT_TOO_SHORT: "Kommentin tulee olla vähintään kaksi merkkiä pitkä. Tarkista kirjoittamasi teksti."
-    NOT_AUTHORIZED: "Sinulla ei ole oikeutta suorittaa tätä toimintoa."
-    NO_SPECIAL_CHARACTERS: "Käyttäjänimissä sallittuja merkkejä ovat ainoastaan kirjaimet, numerot, sekä alaviiva"
-    PASSWORD_LENGTH: "Salasana on liian lyhyt"
-    PROFANITY_ERROR: "Käyttäjänimet eivät saa sisältää hävyttömyyksiä. Ota yhteyttä ylläpitoon, jos mielestäsi on tapahtunut virhe."
-    RATE_LIMIT_EXCEEDED: "Raja-arvo on ylittynyt"
-    USERNAME_IN_USE: "Käyttäjänimi jo käytössä"
-    USERNAME_REQUIRED: "Syötä käyttäjänimi"
-    EMAIL_NOT_VERIFIED: "Sähköpostiosoitetta ei ole vahvistettu"
-    EDIT_WINDOW_ENDED: "Et voi enää muokata tätä kommenttia, koska muokkauksen aikaikkuna on umpeutunut."
-    EDIT_USERNAME_NOT_AUTHORIZED: "Sinulla ei ole oikeutta päivittää tai muokata käyttäjänimeä."
-    SAME_USERNAME_PROVIDED: "Anna eri käyttäjänimi."
-    EMAIL_IN_USE: "Sähköpostiosoite on jo käytössä"
-    EMAIL_REQUIRED: "Syötä sähköpostiosoite"
-    LOGIN_MAXIMUM_EXCEEDED: "Olet tehnyt liian monta epäonnistunutta yritystä. Odota, ole hyvä."
-    PASSWORD_REQUIRED: "Syötä salasana"
-    COMMENTING_CLOSED: "Kommentointi on suljettu"
-    NOT_FOUND: "Resurssia ei löydy"
-    ALREADY_EXISTS: "Resurssi on jo olemassa"
-    INVALID_ASSET_URL: "Tarkista tiedoston URL"
-    CANNOT_IGNORE_STAFF: "Työntekijöitä ei voi jättää huomioimatta"
-    email: "Tarkista sähköpostiosoite"
-    confirm_password: "Salasanat eivät täsmää. Tarkista, ole hyvä."
-    network_error: "Palvelimeen yhdistäminen epäonnistui. Tarkista internetyhteytesi."
-    email_not_verified: "Sähköpostiosoitetta {0} ei ole vahvistettu."
-    email_password: "Sähköpostiosoite ja/tai salasana on väärä."
-    organization_name: "Organisaation nimessä voi käyttää vain kirjaimia ja numeroita."
-    password: "Salasanan tulee olla vähintään 8 merkkiä pitkä"
-    username: "Käyttäjänimissä sallittuja merkkejä ovat ainoastaan kirjaimet, numerot, sekä alaviiva"
-    unexpected: "Tapahtui odottamaton virhe. Pahiottelemme!"
-    required_field: "Tämä on vaadittu kenttä"
-    temporarily_suspended: "Tilisi on suljettu väliaikaisesti. Se aktivoituu uudelleen {0}. Ota yhteyttä, jos on sinulla on aiheesta kysyttävää."
-  flag_comment: "Ilmianna kommentti"
-  flag_reason: "Ilmiannon syy (ei pakollinen)"
-  flag_username: "Ilmianna käyttäjä"
-  framework:
-    banned_account_header: "Tilisi on kirjoituskiellossa"
-    banned_account_body: "Et pysty kirjoittamaan tai ilmiantamaan kommentteja."
-    comment: kommentti
-    comment_is_ignored: "Tämä kommentti on piilossa, koska olet päättänyt jättää kommentin kirjoittajan huomiotta."
-    comment_is_rejected: "Olet piilottanut tämän kommentin."
-    comment_is_hidden: "Tämä kommentti ei ole saatavilla."
-    comments: kommentit
-    configure_stream: "Muokkaa asetuksia"
-    content_not_available: "Sisältö ei ole saatavilla"
-    edit_name:
-      button: Lähetä
-      error: "Käyttäjänimissä sallittuja merkkejä ovat ainoastaan kirjaimet, numerot, sekä alaviiva"
-      label: "Uusi käyttäjänimi"
-      msg: "Tilisi on suljettu väliaikaisesti, koska käyttäjänimi on todettu sopimattomaksi. Vaihda käyttäjänimi, jos haluat jatkaa tilin käyttöä. Ole meihin yhteydessä, jos sinulla on aiheesta kysyttävää."
-    changed_name:
-      msg: "Käyttäjänimen vaihto on moderointitiimillämme tarkistuksessa."
-    my_comments: "Kommenttini"
-    my_profile: "Profiilini"
-    new_count: "Näytä {0} lisää {1}"
-    profile: Profiili
-    show_all_comments: "Näytä kaikki kommentit"
-    success_bio_update: "Kuvauksesi on päivitetty"
-    success_name_update: "Käyttäjänimesi on päivitetty"
-    success_update_settings: "Tekemäsi muutokset on otettu käyttöön"
-    show_all_replies: Näytä kaikki vastaukset
-    show_more_replies: Näytä lisää vastauksia
-    view_more_comments: "näytä lisää kommentteja"
-    view_reply: "näytä vastaus"
-  from_settings_page: "Näet kommentointihistoriasi profiilisivulta."
-  like: Tykkää
-  loading_results: "Ladataan tuloksia"
-  marketing: "Vaikuttaa mainokselta"
-  moderate_this_stream: "Moderoi tätä kommentointia"
+    ALREADY_EXISTS: 'Resurssi on jo olemassa'
+    CANNOT_IGNORE_STAFF: 'Työntekijöitä ei voi jättää huomioimatta'
+    COMMENT_PARENT_NOT_VISIBLE: 'Kommenttia, johon yrität vastata, ei enää ole.'
+    COMMENT_TOO_SHORT: 'Kommentin tulee olla vähintään kaksi merkkiä pitkä. Tarkista kirjoittamasi teksti.'
+    COMMENTING_CLOSED: 'Kommentointi on suljettu'
+    confirm_password: 'Salasanat eivät täsmää. Tarkista, ole hyvä.'
+    EDIT_USERNAME_NOT_AUTHORIZED: 'Sinulla ei ole oikeutta päivittää tai muokata käyttäjänimeä.'
+    EDIT_WINDOW_ENDED: 'Et voi enää muokata tätä kommenttia, koska muokkauksen aikaikkuna on umpeutunut.'
+    email: 'Tarkista sähköpostiosoite'
+    EMAIL_IN_USE: 'Sähköpostiosoite on jo käytössä'
+    email_not_verified: 'Sähköpostiosoitetta {0} ei ole vahvistettu.'
+    EMAIL_NOT_VERIFIED: 'Sähköpostiosoitetta ei ole vahvistettu'
+    email_password: 'Sähköpostiosoite ja/tai salasana on väärä.'
+    EMAIL_REQUIRED: 'Syötä sähköpostiosoite'
+    EMAIL_VERIFICATION_TOKEN_INVALID: 'Sähköpostin vahvistusvarmiste on epävalidi.'
+    INVALID_ASSET_URL: 'Tarkista tiedoston URL'
+    LOGIN_MAXIMUM_EXCEEDED: 'Olet tehnyt liian monta epäonnistunutta yritystä. Odota, ole hyvä.'
+    network_error: 'Palvelimeen yhdistäminen epäonnistui. Tarkista internetyhteytesi.'
+    NO_SPECIAL_CHARACTERS: 'Käyttäjänimissä sallittuja merkkejä ovat ainoastaan kirjaimet, numerot, sekä alaviiva'
+    NOT_AUTHORIZED: 'Sinulla ei ole oikeutta suorittaa tätä toimintoa.'
+    NOT_FOUND: 'Resurssia ei löydy'
+    organization_name: 'Organisaation nimessä voi käyttää vain kirjaimia ja numeroita.'
+    password: 'Salasanan tulee olla vähintään 8 merkkiä pitkä'
+    PASSWORD_LENGTH: 'Salasana on liian lyhyt'
+    PASSWORD_REQUIRED: 'Syötä salasana'
+    PASSWORD_RESET_TOKEN_INVALID: 'Salasananvaihtolinkki on epävalidi.'
+    PROFANITY_ERROR: 'Käyttäjänimet eivät saa sisältää hävyttömyyksiä. Ota yhteyttä ylläpitoon, jos mielestäsi on tapahtunut virhe.'
+    RATE_LIMIT_EXCEEDED: 'Raja-arvo on ylittynyt'
+    required_field: 'Tämä on vaadittu kenttä'
+    SAME_USERNAME_PROVIDED: 'Anna eri käyttäjänimi.'
+    temporarily_suspended: 'Tilisi on suljettu väliaikaisesti. Se aktivoituu uudelleen {0}. Ota yhteyttä, jos on sinulla on aiheesta kysyttävää.'
+    unexpected: 'Tapahtui odottamaton virhe. Pahiottelemme!'
+    username: 'Käyttäjänimissä sallittuja merkkejä ovat ainoastaan kirjaimet, numerot, sekä alaviiva'
+    USERNAME_IN_USE: 'Käyttäjänimi jo käytössä'
+    USERNAME_REQUIRED: 'Syötä käyttäjänimi'
+  flag_comment: 'Ilmianna kommentti'
+  flag_reason: 'Ilmiannon syy (ei pakollinen)'
+  flag_username: 'Ilmianna käyttäjä'
+  flagged_usernames:
+    notify_approved: '{0} hyväksyi käyttäjänimen {1}'
+    notify_changed: 'käyttäjä {0} vaihtoi käyttäjänimesä muotoon {1}'
+    notify_flagged: '{0} ilmiantoi käyttäjänimen {1}'
+    notify_rejected: '{0} hylkäsi käyttäjänimen {1}'
   flags:
     reasons:
-       user:
-         username_offensive: "Loukkaava"
-         username_nolike: "En tykkää"
-         username_impersonating: "Toisena esiintyminen"
-         username_spam: "Roskaviesti"
-         username_other: "Muu"
-       comment:
-         comment_offensive: "Loukkaava"
-         comment_spam: "Roskaviesti"
-         comment_noagree: "Olen eri mieltä"
-         comment_other: "Muu"
-         suspect_word: "Epäilyttävä sana"
-         banned_word: "Kielletty sana"
-         body_count: "Liian pitkä viesti"
-         links: "Linkki"
+      comment:
+        banned_word: 'Kielletty sana'
+        body_count: 'Liian pitkä viesti'
+        comment_noagree: 'Olen eri mieltä'
+        comment_offensive: Loukkaava
+        comment_other: Muu
+        comment_spam: Roskaviesti
+        links: Linkki
+        suspect_word: 'Epäilyttävä sana'
+      user:
+        username_impersonating: 'Toisena esiintyminen'
+        username_nolike: 'En tykkää'
+        username_offensive: Loukkaava
+        username_other: Muu
+        username_spam: Roskaviesti
+  framework:
+    banned_account_body: 'Et pysty kirjoittamaan tai ilmiantamaan kommentteja.'
+    banned_account_header: 'Tilisi on kirjoituskiellossa'
+    changed_name:
+      msg: 'Käyttäjänimen vaihto on moderointitiimillämme tarkistuksessa.'
+    comment: kommentti
+    comment_is_hidden: 'Tämä kommentti ei ole saatavilla.'
+    comment_is_ignored: 'Tämä kommentti on piilossa, koska olet päättänyt jättää kommentin kirjoittajan huomiotta.'
+    comment_is_rejected: 'Olet piilottanut tämän kommentin.'
+    comments: kommentit
+    configure_stream: 'Muokkaa asetuksia'
+    content_not_available: 'Sisältö ei ole saatavilla'
+    edit_name:
+      button: Lähetä
+      error: 'Käyttäjänimissä sallittuja merkkejä ovat ainoastaan kirjaimet, numerot, sekä alaviiva'
+      label: 'Uusi käyttäjänimi'
+      msg: 'Tilisi on suljettu väliaikaisesti, koska käyttäjänimi on todettu sopimattomaksi. Vaihda käyttäjänimi, jos haluat jatkaa tilin käyttöä. Ole meihin yhteydessä, jos sinulla on aiheesta kysyttävää.'
+    my_comments: Kommenttini
+    my_profile: Profiilini
+    new_count: 'Näytä {0} lisää {1}'
+    profile: Profiili
+    show_all_comments: 'Näytä kaikki kommentit'
+    show_all_replies: 'Näytä kaikki vastaukset'
+    show_more_replies: 'Näytä lisää vastauksia'
+    success_bio_update: 'Kuvauksesi on päivitetty'
+    success_name_update: 'Käyttäjänimesi on päivitetty'
+    success_update_settings: 'Tekemäsi muutokset on otettu käyttöön'
+    view_more_comments: 'näytä lisää kommentteja'
+    view_reply: 'näytä vastaus'
+  from_settings_page: 'Näet kommentointihistoriasi profiilisivulta.'
+  install:
+    add_organization:
+      description: 'Kerro organisaatiosi nimi. Tämä näkyy uusien jäsenten kutsuissa.'
+      label: 'Organisaation nimi'
+      save: Tallenna
+    create:
+      confirm_password: 'Salasana uudelleen'
+      email: Sähköpostiosoite
+      password: Salasana
+      save: Tallenna
+      username: Käyttäjänimi
+    final:
+      close: 'Sulje asennusnäkymä'
+      description: 'Kiitos kun asensit Talkin! Lähetämme sähköpostinvarmistusviestin antamaasi osoitteeseen. Voit nyt aloittaa kommentoinnin käytön.'
+      launch: 'Käynnistä Talk'
+    initial:
+      description: 'Ota Talk käyttöön, vain muutama askel jäljellä'
+      submit: 'Aloita käyttö'
+    permitted_domains:
+      description: 'Syötä domainit, joilla on lupa käyttää Talkia. Esimerkiksi lokaalikehitys-, QA- ja tuotantoympäristöt: localhost:3000 staging.domain.com domain.com.'
+      submit: 'Lopeta asennus'
+      title: 'Sallitut domainit'
+  like: Tykkää
+  loading_results: 'Ladataan tuloksia'
+  marketing: 'Vaikuttaa mainokselta'
+  moderate_this_stream: 'Moderoi tätä kommentointia'
   modqueue:
-    account: "Liputuksia"
+    account: Liputuksia
     actions: Toiminnot
     all: kaikki
-    all_streams: "Kaikki keskustelut"
-    notify_edited: '{0} muokkasi kommenttia "{1}"'
-    notify_accepted: '{0} hyväksyi kommentin "{1}"'
-    notify_rejected: '{0} hylkäsi kommentin "{1}"'
-    notify_flagged: '{0} ilmiantoi kommentin "{1}"'
-    notify_reset: '{0} tyhjensi kommentin "{1}" tilan'
-    approve: "Hyväksy"
-    approved: "Hyväksytty"
-    ban_user: "Kirjoituskielto käyttäjälle"
+    all_streams: 'Kaikki keskustelut'
+    approve: Hyväksy
+    approved: Hyväksytty
+    ban_user: 'Kirjoituskielto käyttäjälle'
     billion: mrd
     close: Sulje
-    empty_queue: "Moderointijono on tyhjä."
+    empty_queue: 'Moderointijono on tyhjä.'
     flagged: liputettu
-    reported: ilmiannettu
-    less_detail: "Vähemmän yksityiskohtia"
+    jump_to_queue: 'Siirry tiettyyn jonoon'
+    less_detail: 'Vähemmän yksityiskohtia'
     likes: tykkäyksiä
     million: milj.
-    mod_faster: "Moderoi nopeammin käyttäen pikanäppäimiä"
-    moderate: "Moderoi →"
-    more_detail: "Enemmän yksityiskohtia"
-    new: Uusi
-    newest_first: "Uusin ensin"
+    mod_faster: 'Moderoi nopeammin käyttäen pikanäppäimiä'
+    moderate: 'Moderoi →'
+    more_detail: 'Enemmän yksityiskohtia'
     navigation: Navioginti
-    next_comment: "Seuraava kommentti"
-    toggle_search: "Avaa haku"
-    next_queue: "Vaihda jonoa"
-    oldest_first: "Vanhin ensin"
+    new: Uusi
+    newest_first: 'Uusin ensin'
+    next_comment: 'Seuraava kommentti'
+    next_queue: 'Vaihda jonoa'
+    notify_accepted: '{0} hyväksyi kommentin "{1}"'
+    notify_edited: '{0} muokkasi kommenttia "{1}"'
+    notify_flagged: '{0} ilmiantoi kommentin "{1}"'
+    notify_rejected: '{0} hylkäsi kommentin "{1}"'
+    notify_reset: '{0} tyhjensi kommentin "{1}" tilan'
+    oldest_first: 'Vanhin ensin'
     premod: esimoderoi
-    prev_comment: "Edellinen kommentti"
-    reject: "Hylkää"
-    rejected: "Hylätty"
-    reply: "Vastaa"
-    select_stream: "Valitse kommenttivirta"
-    shift_key: "⇧"
-    shortcuts: "Pikalinkit"
-    sort: "Järjestä"
-    show_shortcuts: "Näytä pikalinkit"
-    singleview: "Zen-moodi"
-    thismenu: "Avaa valikko"
-    jump_to_queue: "Siirry tiettyyn jonoon"
+    prev_comment: 'Edellinen kommentti'
+    reject: Hylkää
+    rejected: Hylätty
+    reply: Vastaa
+    reported: ilmiannettu
+    select_stream: 'Valitse kommenttivirta'
+    shift_key: ⇧
+    shortcuts: Pikalinkit
+    show_shortcuts: 'Näytä pikalinkit'
+    singleview: Zen-moodi
+    sort: Järjestä
+    thismenu: 'Avaa valikko'
     thousand: tuhatta
-    try_these: "Kokeile näitä"
-    view_more_shortcuts: "Näytä enemmän pikalinkkejä"
-  my_comment_history: "Kommentointihistoriani"
+    toggle_search: 'Avaa haku'
+    try_these: 'Kokeile näitä'
+    view_more_shortcuts: 'Näytä enemmän pikalinkkejä'
+  my_comment_history: Kommentointihistoriani
   name: Nimi
-  no_agree_comment: "En ole samaa mieltä"
-  no_like_bio: "En pidä kuvauksesta"
-  no_like_username: "En pidä käyttäjänimestä"
-  already_flagged_username: "Olet jo ilmiantanut tämän käyttäjänimen."
+  no_agree_comment: 'En ole samaa mieltä'
+  no_like_bio: 'En pidä kuvauksesta'
+  no_like_username: 'En pidä käyttäjänimestä'
   other: Muu
+  password_reset:
+    change_password: 'Vaihda salasana'
+    confirm_new_password: 'Vahvista uusi salasana'
+    mail_sent: 'Salasananvaihtolinkki on lähetetty rekisteröityyn sähköpostiosoitteeseen'
+    new_password: 'Uusi salasana'
+    new_password_help: 'Salasanan tulee olla vähintään 8 merkin pituinen'
+    set_new_password: 'Luo uusi salasana'
   permalink: Jaa
-  personal_info: "Kommentti sisältää henkilökohtaisesti tunnistettavia tietoja"
+  personal_info: 'Kommentti sisältää henkilökohtaisesti tunnistettavia tietoja'
   post: Lähetä
   profile: Profiili
   profile_settings: Profiiliasetukset
+  reject_username:
+    description_notify: 'Käyttökiellon asettaminen sulkee tilin väliaikaisesti.'
+    description_reject: 'Haluatko asettaa käyttökiellon, syynä {0}? Jos haluat, asetetaan käyttäjätili väliaikaseen käyttökieltoon, kunnes {0} on kirjoitettu uudelleen.'
+    email_message_reject: 'Toinen yhteisön jäsen on ilmiantanut käyttäjänimesi ja sen perusteella nimi on hylätty. Et voi enää osallistua keskusteluun. Ole ystävällisesti yhteydessä meihin, jos sinulla on asiasta kysyttävää.'
+    no_cancel: 'En, peruuta'
+    send: Lähetä
+    suspend_user: 'Aseta väliaikainen käyttökielto'
+    title_notify: 'Lähetä käyttäjälle tieto asetetusta käyttökiellosta'
+    title_reject: 'Huomasimme sinun hylänneen käyttäjänimen'
+    username: käyttäjänimi
+    write_message: 'Kirjoita viesti'
+    yes_suspend: 'Kyllä, sulje väliaikaisesti'
   reply: Vastaa
   report: Ilmianna
-  report_notif: "Kiitos ilmiannosta. Moderointitiimimme käsittelee tapauksen mahdollisimman pian."
-  report_notif_remove: "Ilmiantosi on poistettu."
+  report_notif: 'Kiitos ilmiannosta. Moderointitiimimme käsittelee tapauksen mahdollisimman pian.'
+  report_notif_remove: 'Ilmiantosi on poistettu.'
   reported: Ilmiannettu
   settings:
-    from_settings_page: "Näet kommenttihistoriasi profiilisivultasi."
-    my_comment_history: "Kommenttihistoriani"
+    from_settings_page: 'Näet kommenttihistoriasi profiilisivultasi.'
+    my_comment_history: Kommenttihistoriani
     profile: Profiili
-    profile_settings: "Profiiliasetukset"
-    sign_in: "Kirjaudu sisään"
-    to_access: "päästäksesi profiilisivulle"
-    user_no_comment: "Et ole jättänyt yhtään kommenttia. Liity keskusteluun!"
+    profile_settings: Profiiliasetukset
+    sign_in: 'Kirjaudu sisään'
+    to_access: 'päästäksesi profiilisivulle'
+    user_no_comment: 'Et ole jättänyt yhtään kommenttia. Liity keskusteluun!'
+  step_1_header: 'Ilmianna ongelma'
+  step_2_header: 'Kerro ilmiannon syy'
+  step_3_header: 'Kiitos panoksestasi'
   stream:
-    all_comments: "Kaikki kommentit"
-    temporarily_suspended: "Tilisi on väliaikasesti suljettu, koska et ole noudattanut {0}-sivuston sääntöjä. Voit liittyä keskusteluun uudelleen {1}."
-    comment_not_found: "Kommenttia ei ole olemassa."
-    no_comments: "Ei vielä kommentteja."
-    no_comments_and_closed: "Tässä artikkelissa ei vielä ollut kommentteja."
-  step_1_header: "Ilmianna ongelma"
-  step_2_header: "Kerro ilmiannon syy"
-  step_3_header: "Kiitos panoksestasi"
+    all_comments: 'Kaikki kommentit'
+    comment_not_found: 'Kommenttia ei ole olemassa.'
+    no_comments: 'Ei vielä kommentteja.'
+    no_comments_and_closed: 'Tässä artikkelissa ei vielä ollut kommentteja.'
+    temporarily_suspended: 'Tilisi on väliaikasesti suljettu, koska et ole noudattanut {0}-sivuston sääntöjä. Voit liittyä keskusteluun uudelleen {1}.'
   streams:
     all: Kaikki
     article: Artikkeli
     closed: Suljettu
-    empty_result: "Ei hakutuloksia. Kokeile laajentaa hakuasi."
-    filter_streams: "Suodata kommenttivirtoja"
+    empty_result: 'Ei hakutuloksia. Kokeile laajentaa hakuasi.'
+    filter_streams: 'Suodata kommenttivirtoja'
     newest: Uusin
     oldest: Vanhin
     open: Avoin
-    pubdate: "Julkaisupäivä"
+    pubdate: Julkaisupäivä
     search: Haku
-    sort_by: "Järjestä"
-    status: "Kommentoinnin tila"
-    stream_status: "Kommentoinnin tila"
+    sort_by: Järjestä
+    status: 'Kommentoinnin tila'
+    stream_status: 'Kommentoinnin tila'
   suspenduser:
-    title_suspend: "Aseta väliaikainen käyttökielto"
-    description_suspend: "Olet asettamassa käyttäjälle {0} väliaikasta käyttökieltoa. Tämä kommentti menee hylätyt-jonoon, ja käyttäjä {0} ei voi reagoida kommentteihin, ilmiantaa, tai vastata niihin, kunnes käyttökielto on päättynyt."
-    select_duration: "Käyttökiellon kesto"
-    one_hour: "1 tunti"
-    hours: "{0} tuntia"
-    days: "{0} päivää"
-    cancel: "Peruuta"
-    suspend_user: "Aseta väliaikainen käyttökielto"
-    email_message_suspend: "Hyvä {0}, tilisi on asetettu {1}-sivuston sääntöjenmukaiseen käyttökieltoon. Et voi osallistua keskusteluun käyttökiellon aikana. Voit liittyä keskusteluun uudelleen {2}."
-    title_notify: "Lähetä käyttäjälle tieto asetetusta käyttökiellosta"
-    notify_suspend_until: "Käyttäjä {0} on asetettu väliaikaiseen käyttökieltoon. Kielto päättyy automaattisesti {1}."
-    description_notify: "Käyttökiellon asettaminen sulkee tilin väliaikaisesti."
-    write_message: "Kirjoita viesti"
+    cancel: Peruuta
+    days: '{0} päivää'
+    description_notify: 'Käyttökiellon asettaminen sulkee tilin väliaikaisesti.'
+    description_suspend: 'Olet asettamassa käyttäjälle {0} väliaikasta käyttökieltoa. Tämä kommentti menee hylätyt-jonoon, ja käyttäjä {0} ei voi reagoida kommentteihin, ilmiantaa, tai vastata niihin, kunnes käyttökielto on päättynyt.'
+    email_message_suspend: 'Hyvä {0}, tilisi on asetettu {1}-sivuston sääntöjenmukaiseen käyttökieltoon. Et voi osallistua keskusteluun käyttökiellon aikana. Voit liittyä keskusteluun uudelleen {2}.'
+    hours: '{0} tuntia'
+    notify_suspend_until: 'Käyttäjä {0} on asetettu väliaikaiseen käyttökieltoon. Kielto päättyy automaattisesti {1}.'
+    one_hour: '1 tunti'
+    select_duration: 'Käyttökiellon kesto'
     send: Lähetä
-  reject_username:
-    username: käyttäjänimi
-    no_cancel: "En, peruuta"
-    description_reject: "Haluatko asettaa käyttökiellon, syynä {0}? Jos haluat, asetetaan käyttäjätili väliaikaseen käyttökieltoon, kunnes {0} on kirjoitettu uudelleen."
-    title_notify: "Lähetä käyttäjälle tieto asetetusta käyttökiellosta"
-    description_notify: "Käyttökiellon asettaminen sulkee tilin väliaikaisesti."
-    title_reject: "Huomasimme sinun hylänneen käyttäjänimen"
-    suspend_user: "Aseta väliaikainen käyttökielto"
-    yes_suspend: "Kyllä, sulje väliaikaisesti"
-    email_message_reject: "Toinen yhteisön jäsen on ilmiantanut käyttäjänimesi ja sen perusteella nimi on hylätty. Et voi enää osallistua keskusteluun. Ole ystävällisesti yhteydessä meihin, jos sinulla on asiasta kysyttävää."
-    write_message: "Kirjoita viesti"
-    send: Lähetä
-  thank_you: "Arvostamme palautettasi. Moderaattorimme käy läpi tekemäsi ilmiannon."
+    suspend_user: 'Aseta väliaikainen käyttökielto'
+    title_notify: 'Lähetä käyttäjälle tieto asetetusta käyttökiellosta'
+    title_suspend: 'Aseta väliaikainen käyttökielto'
+    write_message: 'Kirjoita viesti'
+  thank_you: 'Arvostamme palautettasi. Moderaattorimme käy läpi tekemäsi ilmiannon.'
   user:
-    bio_flags: "liputusta kuvaukselle"
-    user_bio: "Käyttäjän kuvaus"
-    username_flags: "liputusta käyttäjänimelle"
+    bio_flags: 'liputusta kuvaukselle'
+    user_bio: 'Käyttäjän kuvaus'
+    username_flags: 'liputusta käyttäjänimelle'
   user_detail:
-    remove_suspension: "Poista käyttökielto"
-    suspend: "Aseta väliaikainen käyttökielto"
-    remove_ban: "Poista kirjoituskielto"
-    ban: "Aseta kirjoituskielto"
-    member_since: "Jäsenenä lähtien"
-    email: "Sähköposti"
-    total_comments: "Kommentteja yhteensä"
-    reject_rate: "Hylkäysaste"
-    reports: "Raportit"
-    all: "Kaikki"
-    rejected: "Hylätyt"
-    account_history: "Tilin historia"
-  user_impersonating: "Käyttäjä on tekeytynyt toiseksi"
-  user_no_comment: "Et ole jättänyt yhtään kommenttia. Liity mukaan keskusteluun!"
-  username_offensive: "Käyttäjänimi on loukkaava"
-  view_conversation: "Näytä keskustelu"
-  install:
-    initial:
-      description: "Ota Talk käyttöön, vain muutama askel jäljellä"
-      submit: "Aloita käyttö"
-    add_organization:
-      description: "Kerro organisaatiosi nimi. Tämä näkyy uusien jäsenten kutsuissa."
-      label: "Organisaation nimi"
-      save: "Tallenna"
-    create:
-      email: "Sähköpostiosoite"
-      username: "Käyttäjänimi"
-      password: "Salasana"
-      confirm_password: "Salasana uudelleen"
-      save: "Tallenna"
-    permitted_domains:
-      title: "Sallitut domainit"
-      description: "Syötä domainit, joilla on lupa käyttää Talkia. Esimerkiksi lokaalikehitys-, QA- ja tuotantoympäristöt: localhost:3000 staging.domain.com domain.com."
-      submit: "Lopeta asennus"
-    final:
-      description: "Kiitos kun asensit Talkin! Lähetämme sähköpostinvarmistusviestin antamaasi osoitteeseen. Voit nyt aloittaa kommentoinnin käytön."
-      launch: "Käynnistä Talk"
-      close: "Sulje asennusnäkymä"
-  admin_sidebar:
-    view_options: "Näytä asetukset"
-    sort_comments: "Järjestä kommentit"
+    all: Kaikki
+    ban: 'Aseta kirjoituskielto'
+    email: Sähköposti
+    member_since: 'Jäsenenä lähtien'
+    reject_rate: Hylkäysaste
+    rejected: Hylätyt
+    remove_ban: 'Poista kirjoituskielto'
+    remove_suspension: 'Poista käyttökielto'
+    suspend: 'Aseta väliaikainen käyttökielto'
+    total_comments: 'Kommentteja yhteensä'
+  user_impersonating: 'Käyttäjä on tekeytynyt toiseksi'
+  user_no_comment: 'Et ole jättänyt yhtään kommenttia. Liity mukaan keskusteluun!'
+  username_offensive: 'Käyttäjänimi on loukkaava'
+  validators:
+    confirm_password: 'Salasanat eivät täsmää. Tarkista, ole hyvä.'
+    required: 'Tämä on vaadittu kenttä'
+    verify_email: 'Tarkista sähköpostiosoite'
+    verify_organization_name: 'Organisaation nimessä voi käyttää vain kirjaimia ja numeroita.'
+    verify_password: 'Salasanan tulee olla vähintään 8 merkkiä pitkä'
+    verify_username: 'Käyttäjänimissä sallittuja merkkejä ovat ainoastaan kirjaimet, numerot, sekä alaviiva'
+  view_conversation: 'Näytä keskustelu'
+  your_account_has_been_banned: 'Tilillesi on asetettu kirjoituskielto.'
+  your_account_has_been_suspended: 'Tilisi on väliaikasesti suljettu.'
+  your_username_has_been_rejected: 'Tilisi on suljettu, koska käyttäjänimesi on epäsopiva. Vaihda käyttäjänimeä jatkaaksesi tilin käyttöä.'
diff --git a/locales/fr.yml b/locales/fr.yml
index 4e32cf66c..12fdb8e06 100644
--- a/locales/fr.yml
+++ b/locales/fr.yml
@@ -1,488 +1,465 @@
 fr:
-  your_account_has_been_suspended: Votre compte a été temporairement suspendu.
-  your_account_has_been_banned: Votre compte a été banni.
-  your_username_has_been_rejected: Votre compte a été suspendu en raison de votre nom d’utilisateur jugé inapproprié. Veuillez saisir un nouveau nom d’utilisateur pour restaurer votre compte.
-  embed_comments_tab: Commentaires
+  admin_sidebar:
+    sort_comments: 'Trier les commentaires'
+    view_options: 'Afficher les options'
+  already_flagged_username: 'Vous avez déjà signalé ce nom d’utilisateur.'
   bandialog:
-    are_you_sure: "Êtes-vous sûr de vouloir bannir {0}?"
-    ban_user: "Bannir l'utilisateur ?"
-    banned_user: "Utilisateur banni"
+    are_you_sure: 'Êtes-vous sûr de vouloir bannir {0}?'
+    ban_user: 'Bannir l''utilisateur ?'
+    banned_user: 'Utilisateur banni'
     cancel: Annuler
-    note: "Remarque : bannir cet utilisateur rejettera également ce commentaire."
-    note_reject_comment: "Bannir cet utilisateur placera ce commentaire dans la liste des commentaires rejetées."
-    note_ban_user: "Bannir cet utilisateur empêchera cet utilisateur d’écrire, de réagir à ou de signaler des commentaires."
-    yes_ban_user: "Oui, bannir cet utilisateur"
-    write_a_message: "Écrire un message"
-    send: "Envoyer"
-    notify_ban_headline: "Aviser l’utilisateur du bannissement"
-    notify_ban_description: "Ceci avisera l’utilisateur par courrier électronique de son bannissement de la communauté"
     email_message_ban: "Cher {0},\n\nUne personne ayant accès à votre compte a transgressé nos directives communautaires. En conséquence, votre compte a été banni. Vous ne pourrez plus écrire, aimer ou signaler des commentaires. Si vous pensez qu’il s’agit d’une erreur, veuillez contacter notre équipe communautaire."
-  bio_offensive: "Cette biographie est offensante"
-  cancel: "Annuler"
-  confirm_email:
-    click_to_confirm: "Cliquez ci-dessous pour confirmer votre adresse électronique"
-    confirm: "Confirmer"
-  password_reset:
-    mail_sent: 'Si vous avez un compte enregistré, un lien de réinitialisation de mot de passe a été envoyé à cette adresse électronique'
-    set_new_password: "Changer votre mot de passe"
-    new_password: "Nouveau mot de passe"
-    new_password_help: "Le mot de passe doit comporter au moins 8 caractères"
-    confirm_new_password: "Confirmer le nouveau mot de passe"
-    change_password: "Changer le mot de passe"
-  characters_remaining: "caractères restants"
+    note: 'Remarque : bannir cet utilisateur rejettera également ce commentaire.'
+    note_ban_user: 'Bannir cet utilisateur empêchera cet utilisateur d’écrire, de réagir à ou de signaler des commentaires.'
+    note_reject_comment: 'Bannir cet utilisateur placera ce commentaire dans la liste des commentaires rejetées.'
+    notify_ban_description: 'Ceci avisera l’utilisateur par courrier électronique de son bannissement de la communauté'
+    notify_ban_headline: 'Aviser l’utilisateur du bannissement'
+    send: Envoyer
+    write_a_message: 'Écrire un message'
+    yes_ban_user: 'Oui, bannir cet utilisateur'
+  bio_offensive: 'Cette biographie est offensante'
+  cancel: Annuler
+  characters_remaining: 'caractères restants'
   comment:
-    anon: "Anonyme"
-    ban_user: "Bannir utilisateur"
-    undo_reject: "Annuler"
-    comment: "Publier un commentaire"
-    flagged: "signalé"
+    anon: Anonyme
+    ban_user: 'Bannir utilisateur'
+    comment: 'Publier un commentaire'
     edited: Modifié
-    view_context: "Afficher le contexte"
+    flagged: signalé
+    undo_reject: Annuler
+    view_context: 'Afficher le contexte'
   comment_box:
-    post: "Publier"
-    cancel: "Annuler"
-    reply: "Répondre"
-    comment: "Publier un commentaire"
-    name: "Nom"
-    comment_post_notif: "Votre commentaire a été publié."
-    comment_post_notif_premod: "Merci d'avoir envoyé un commentaire. Notre équipe de modération passera en revue votre commentaire sous peu."
-    comment_post_banned_word: "Votre commentaire contient un ou plusieurs mots qui ne sont pas autorisés, il ne sera pas publié. Si vous pensez qu'il y a une erreur, contactez notre équipe de modération."
-    characters_remaining: "caractères restants"
-  comment_offensive: "Ce commentaire est offensant"
-  comment_singular: Commentaire
+    cancel: Annuler
+    characters_remaining: 'caractères restants'
+    comment: 'Publier un commentaire'
+    comment_post_banned_word: 'Votre commentaire contient un ou plusieurs mots qui ne sont pas autorisés, il ne sera pas publié. Si vous pensez qu''il y a une erreur, contactez notre équipe de modération.'
+    comment_post_notif: 'Votre commentaire a été publié.'
+    comment_post_notif_premod: 'Merci d''avoir envoyé un commentaire. Notre équipe de modération passera en revue votre commentaire sous peu.'
+    name: Nom
+    post: Publier
+    reply: Répondre
+  comment_history_blank:
+    info: 'Un historique de vos commentaires apparaîtra ici'
+    title: 'Vous n’avez écrit aucun commentaire'
+  comment_offensive: 'Ce commentaire est offensant'
   comment_plural: Commentaires
-  comment_post_banned_word: "Votre commentaire contient un ou plusieurs mots qui ne sont pas autorisés, il ne sera pas publié. Si vous pensez qu'il y a une erreur, contactez notre équipe de modération."
-  comment_post_notif: "Votre commentaire a été publié."
-  comment_post_notif_premod: "Merci d'avoir envoyé un commentaire. Notre équipe de modération passera en revue votre commentaire sous peu."
+  comment_post_banned_word: 'Votre commentaire contient un ou plusieurs mots qui ne sont pas autorisés, il ne sera pas publié. Si vous pensez qu''il y a une erreur, contactez notre équipe de modération.'
+  comment_post_notif: 'Votre commentaire a été publié.'
+  comment_post_notif_premod: 'Merci d''avoir envoyé un commentaire. Notre équipe de modération passera en revue votre commentaire sous peu.'
+  comment_singular: Commentaire
   common:
-    copy: 'Copier'
+    copy: Copier
     error: 'Une erreur est survenue.'
-    reply: 'répondre'
-    replies: 'réponses'
-    reaction: 'réaction'
-    reactions: 'réactions'
-    story: 'Histoire'
-  flagged_usernames:
-    notify_approved: "{0} a approuvé le nom d’utilisateur {1}"
-    notify_rejected: "{0} a rejeté le nom d’utilisateur {1}"
-    notify_flagged: "{0} a signalé le nom d’utilisateur {1}"
-    notify_changed: "l’utilisateur {0} a modifié son nom d’utilisateur en {1}"
+    reaction: réaction
+    reactions: réactions
+    replies: réponses
+    reply: répondre
+    story: Histoire
   community:
-    account_creation_date: "Date de création du compte"
+    account_creation_date: 'Date de création du compte'
     active: Actif
     admin: Administrateur
-    ads_marketing: "Cela ressemble à du marketing / un message publicitaire"
-    are_you_sure: "Êtes-vous sûr de vouloir bannir {0} ?"
-    ban_user: "Bannir l'utilisateur ?"
+    ads_marketing: 'Cela ressemble à du marketing / un message publicitaire'
+    are_you_sure: 'Êtes-vous sûr de vouloir bannir {0} ?'
+    ban_user: 'Bannir l''utilisateur ?'
     banned: Banni
-    banned_user: "Utilisateur banni"
+    banned_user: 'Utilisateur banni'
     cancel: Annuler
-    dont_like_username: "Ne pas aimer le nom d’utilisateur"
-    flaggedaccounts: "Noms d'utilisateurs signalés"
+    commenter: Commenter
+    dont_like_username: 'Ne pas aimer le nom d’utilisateur'
+    flaggedaccounts: 'Noms d''utilisateurs signalés'
     flags: Signalements
-    impersonating: "Usurpation d’identité"
-    loading: "Chargement des résultats"
+    impersonating: 'Usurpation d’identité'
+    loading: 'Chargement des résultats'
     moderator: Modérateur
-    newsroom_role: "Rôle de la salle de presse"
-    no_flagged_accounts: "La liste des comptes signalés est vide."
-    no_results: "Aucun utilisateur n'a été trouvé avec ce nom d'utilisateur ou cette adresse de messagerie. Ils se cachent !"
-    offensive: "Offensive"
-    other: "Autre"
+    newsroom_role: 'Rôle de la salle de presse'
+    no_flagged_accounts: 'La liste des comptes signalés est vide.'
+    no_results: 'Aucun utilisateur n''a été trouvé avec ce nom d''utilisateur ou cette adresse de messagerie. Ils se cachent !'
+    offensive: Offensive
+    other: Autre
     people: Gens
-    role: "Sélectionnez le rôle ..."
-    select_status: "Sélectionnez l'état ..."
-    spam_ads: "Spam/Ads"
-    staff: "Équipe"
+    role: 'Sélectionnez le rôle ...'
+    select_status: 'Sélectionnez l''état ...'
+    spam_ads: Spam/Ads
+    staff: Équipe
     status: Statut
-    username_and_email: "Nom d'utilisateur et e-mail"
-    yes_ban_user: "Oui bannir l'utilisateur"
-    commenter: "Commenter"
+    username_and_email: 'Nom d''utilisateur et e-mail'
+    yes_ban_user: 'Oui bannir l''utilisateur'
   configure:
+    access_message: 'Vous devez être un administrateur pour accéder aux paramètres de configuration. Veuillez trouver l''administrateur le plus proche et demandez-lui d''augmenter votre niveau d’accès !'
     apply: Appliquer
-    banned_word_text: "Les commentaires qui contiennent ces mots ou ces expressions (non sensibles à la casse) seront automatiquement supprimés du flux de commentaires. Tapez un mot et appuyez sur Entrée ou Tabulation pour ajouter. En option, envoyez une liste séparée par des virgules."
-    banned_words_title: "Liste des mots interdits"
-    close: "Fermer"
-    close_after: "Fermer les commentaires après"
-    close_stream: "Fermer le fil"
-    close_stream_configuration: "Ce fil de commentaires est actuellement fermé. En ouvrant ce fil commentaire, de nouveaux commentaires peuvent être soumis et publiés."
-    closed_comments_desc: "Écrivez un message à afficher lorsque votre fil de commentaires est fermé et n'accepte plus de nouveaux commentaires."
-    closed_comments_label: "Écrire un message..."
-    closed_stream_settings: "Message de fil de commentaires fermé"
-    comment_count_error: "S'il vous plait, entrez un nombre valide."
-    comment_count_header: "Limiter la longueur d'un commentaire"
+    banned_word_text: 'Les commentaires qui contiennent ces mots ou ces expressions (non sensibles à la casse) seront automatiquement supprimés du flux de commentaires. Tapez un mot et appuyez sur Entrée ou Tabulation pour ajouter. En option, envoyez une liste séparée par des virgules.'
+    banned_words_title: 'Liste des mots interdits'
+    close: Fermer
+    close_after: 'Fermer les commentaires après'
+    close_stream: 'Fermer le fil'
+    close_stream_configuration: 'Ce fil de commentaires est actuellement fermé. En ouvrant ce fil commentaire, de nouveaux commentaires peuvent être soumis et publiés.'
+    closed_comments_desc: 'Écrivez un message à afficher lorsque votre fil de commentaires est fermé et n''accepte plus de nouveaux commentaires.'
+    closed_comments_label: 'Écrire un message...'
+    closed_stream_settings: 'Message de fil de commentaires fermé'
+    comment_count_error: 'S''il vous plait, entrez un nombre valide.'
+    comment_count_header: 'Limiter la longueur d''un commentaire'
     comment_count_text_post: caractères
-    comment_count_text_pre: "Les commentaires seront limités à"
+    comment_count_text_pre: 'Les commentaires seront limités à'
     comment_settings: Paramètres
-    comment_stream: "Fil de commentaires"
-    comment_stream_will_close: "Le fil de commentaires va se fermer"
+    comment_stream: 'Fil de commentaires'
+    comment_stream_will_close: 'Le fil de commentaires va se fermer'
     community: Communauté
     configure: Configurer
-    copy_and_paste: "Copiez et collez le code ci-dessous dans votre CMS pour intégrer votre boîte de commentaires dans vos articles."
-    custom_css_url: "URL CSS personnalisée"
-    custom_css_url_desc: "URL d'une feuille de style CSS qui remplacera les styles par défaut d'intégration des commentaires. Peut être interne ou externe."
+    copy_and_paste: 'Copiez et collez le code ci-dessous dans votre CMS pour intégrer votre boîte de commentaires dans vos articles.'
+    custom_css_url: 'URL CSS personnalisée'
+    custom_css_url_desc: 'URL d''une feuille de style CSS qui remplacera les styles par défaut d''intégration des commentaires. Peut être interne ou externe.'
     days: Journées
-    description: "Personnaliser les paramètres du fil de commentaires pour cet élément."
-    domain_list_text: "Entrez les domaines que vous souhaitez autoriser pour Talk, par exemple vos environnements locaux de production et de production (ex : localhost: 3000 staging.domain.com domain.com)."
-    domain_list_title: "Domaines autorisés"
-    edit_comment_timeframe_heading: "Modifier l'horodatage des commentaires"
-    edit_comment_timeframe_text_pre: "Les commentateurs auront"
-    edit_comment_timeframe_text_post: "secondes pour modifier leurs commentaires."
-    embed_comment_stream: "Intégrer le fil"
-    enable_premod_links_text: "Les modérateurs doivent approuver tout commentaire contenant un lien avant sa publication."
-    enable_pre_moderation: "Activer modération a priori"
-    enable_pre_moderation_text: "Les modérateurs doivent approuver tout commentaire avant qu'il ne soit publié."
-    enable_premod_links: "Modérer les commentaires contenant des liens"
-    enable_premod: "Activer la modération a priori"
-    enable_premod_description: "Les modérateurs doivent approuver tout commentaire avant sa publication."
-    enable_premod_links_description: "Les modérateurs doivent approuver tout commentaire contenant un lien avant sa publication."
-    enable_questionbox: "Posez une question aux lecteurs."
-    enable_questionbox_description: "Cette question apparaîtra en haut de ce fil de commentaires. Demandez aux lecteurs de s'exprimer sur un sujet évoqué dans l'article ou posez les termes de la discussion, etc."
+    description: 'Personnaliser les paramètres du fil de commentaires pour cet élément.'
+    domain_list_text: 'Entrez les domaines que vous souhaitez autoriser pour Talk, par exemple vos environnements locaux de production et de production (ex : localhost: 3000 staging.domain.com domain.com).'
+    domain_list_title: 'Domaines autorisés'
+    edit_comment_timeframe_heading: 'Modifier l''horodatage des commentaires'
+    edit_comment_timeframe_text_post: 'secondes pour modifier leurs commentaires.'
+    edit_comment_timeframe_text_pre: 'Les commentateurs auront'
+    embed_comment_stream: 'Intégrer le fil'
+    enable_pre_moderation: 'Activer modération a priori'
+    enable_pre_moderation_text: 'Les modérateurs doivent approuver tout commentaire avant qu''il ne soit publié.'
+    enable_premod: 'Activer la modération a priori'
+    enable_premod_description: 'Les modérateurs doivent approuver tout commentaire avant sa publication.'
+    enable_premod_links: 'Modérer les commentaires contenant des liens'
+    enable_premod_links_description: 'Les modérateurs doivent approuver tout commentaire contenant un lien avant sa publication.'
+    enable_premod_links_text: 'Les modérateurs doivent approuver tout commentaire contenant un lien avant sa publication.'
+    enable_questionbox: 'Posez une question aux lecteurs.'
+    enable_questionbox_description: 'Cette question apparaîtra en haut de ce fil de commentaires. Demandez aux lecteurs de s''exprimer sur un sujet évoqué dans l''article ou posez les termes de la discussion, etc.'
     hours: Heures
-    include_comment_stream: "Inclure la description du fil de commentaires pour les lecteurs"
-    include_comment_stream_desc: "Écrivez un message à ajouter au haut de votre flux de commentaires. Publiez un sujet de discussion, avec des suggestion sur la tenue des débats, etc."
-    include_text: "Entrez votre texte ici."
-    include_question_here: "Écrivez votre question ici."
+    include_comment_stream: 'Inclure la description du fil de commentaires pour les lecteurs'
+    include_comment_stream_desc: 'Écrivez un message à ajouter au haut de votre flux de commentaires. Publiez un sujet de discussion, avec des suggestion sur la tenue des débats, etc.'
+    include_question_here: 'Écrivez votre question ici.'
+    include_text: 'Entrez votre texte ici.'
     moderate: Modérer
-    moderation_settings: "Paramètres de la modération"
-    open: "Ouvert"
-    open_stream: "Ouvrir le fil"
-    open_stream_configuration: "Ce fil de commentaires est actuellement ouvert. En fermant ce fil de commentaires, aucun nouveau commentaire ne pourra être envoyé, les commentaires précédents seront toujours affichés."
-    require_email_verification: "Exiger une vérification de l'e-mail"
-    require_email_verification_text: "Les nouveaux utilisateurs doivent vérifier leur adresse e-mail avant de commenter."
-    save_changes: "Sauvegarder les changements"
-    shortcuts: Raccourcis
-    sign_out: "Se Déconnecter"
-    stories: Histoires
-    stream_settings: "Paramètres du fil"
-    access_message: "Vous devez être un administrateur pour accéder aux paramètres de configuration. Veuillez trouver l'administrateur le plus proche et demandez-lui d'augmenter votre niveau d’accès !"
-    suspect_word_title: "Liste des mots suspects"
-    suspect_word_text: "Les commentaires contenant ces mots ou expressions (non sensibles à la casse) seront mis en évidence dans le flux de commentaires. Tapez un mot et appuyez sur Entrée ou Tabulation pour ajouter. En option, entrez une liste séparée par des virgules."
-    tech_settings: "Paramètres techniques"
-    title: "Configurer le fil de commentaires"
-    weeks: Semaines
-    wordlist: "Mots interdits"
+    moderation_settings: 'Paramètres de la modération'
+    open: Ouvert
+    open_stream: 'Ouvrir le fil'
+    open_stream_configuration: 'Ce fil de commentaires est actuellement ouvert. En fermant ce fil de commentaires, aucun nouveau commentaire ne pourra être envoyé, les commentaires précédents seront toujours affichés.'
+    require_email_verification: 'Exiger une vérification de l''e-mail'
+    require_email_verification_text: 'Les nouveaux utilisateurs doivent vérifier leur adresse e-mail avant de commenter.'
+    save_changes: 'Sauvegarder les changements'
     save_changes_dialog:
-      unsaved_changes: "Modifications non enregistrées"
-      copy: "Vous avez fait une ou plusieurs modifications sans enregistrer. Souhaitez-vous sauvegarder ou abandonner vos modifications ?"
-      save_settings: "Enregistrer la configuration"
-      discard: "Abandonner"
-      cancel: "Annuler"
+      cancel: Annuler
+      copy: 'Vous avez fait une ou plusieurs modifications sans enregistrer. Souhaitez-vous sauvegarder ou abandonner vos modifications ?'
+      discard: Abandonner
+      save_settings: 'Enregistrer la configuration'
+      unsaved_changes: 'Modifications non enregistrées'
+    shortcuts: Raccourcis
+    sign_out: 'Se Déconnecter'
+    stories: Histoires
+    stream_settings: 'Paramètres du fil'
+    suspect_word_text: 'Les commentaires contenant ces mots ou expressions (non sensibles à la casse) seront mis en évidence dans le flux de commentaires. Tapez un mot et appuyez sur Entrée ou Tabulation pour ajouter. En option, entrez une liste séparée par des virgules.'
+    suspect_word_title: 'Liste des mots suspects'
+    tech_settings: 'Paramètres techniques'
+    title: 'Configurer le fil de commentaires'
+    weeks: Semaines
+    wordlist: 'Mots interdits'
+  confirm_email:
+    click_to_confirm: 'Cliquez ci-dessous pour confirmer votre adresse électronique'
+    confirm: Confirmer
   continue: Continuer
   createdisplay:
-    check_the_form: "Formulaire invalide. Veuillez vérifier les champs"
-    continue: "Continuer avec le même nom d’utilisateur Facebook"
-    error_create: "Une erreur lors du changement de nom d’utilisateur"
-    fake_comment_body: "Ceci est un exemple de commentaire. Les lecteurs peuvent livrer leurs réflexions et avis avec les salles de presse dans la section des commentaires."
-    fake_comment_date: "il y a 1 minute"
-    if_you_dont_change_your_name: "Si vous ne modifiez pas votre nom d’utilisateur à cette étape, votre nom d’affichage Facefook apparaîtra avec tous vos commentaires."
-    required_field: "Champ obligatoire"
+    check_the_form: 'Formulaire invalide. Veuillez vérifier les champs'
+    continue: 'Continuer avec le même nom d’utilisateur Facebook'
+    error_create: 'Une erreur lors du changement de nom d’utilisateur'
+    fake_comment_body: 'Ceci est un exemple de commentaire. Les lecteurs peuvent livrer leurs réflexions et avis avec les salles de presse dans la section des commentaires.'
+    fake_comment_date: 'il y a 1 minute'
+    if_you_dont_change_your_name: 'Si vous ne modifiez pas votre nom d’utilisateur à cette étape, votre nom d’affichage Facefook apparaîtra avec tous vos commentaires.'
+    required_field: 'Champ obligatoire'
     save: Sauvegarder
-    special_characters: "Les noms d'utilisateur ne peuvent contenir que des lettres, des chiffres et \"_\""
-    username: Nom d’utilisateur
-    write_your_username: "Modifier votre nom d’utilisateur"
-    your_username: "Votre nom d’utilisateur apparait sur chaque commentaire publié."
+    special_characters: 'Les noms d''utilisateur ne peuvent contenir que des lettres, des chiffres et "_"'
+    username: 'Nom d’utilisateur'
+    write_your_username: 'Modifier votre nom d’utilisateur'
+    your_username: 'Votre nom d’utilisateur apparait sur chaque commentaire publié.'
   done: Terminé
   edit_comment:
-    body_input_label: "Modifier ce commentaire"
-    save_button: "Sauvegarder les changements"
-    edit_window_expired: "Vous ne pouvez plus modifier ce commentaire. La fenêtre de temps pour le faire a expiré. Pourquoi ne pas en publier un autre ?"
-    edit_window_expired_close: "Fermer"
-    edit_window_timer_prefix: "Fenêtre d'édition :"
-    second: "seconde"
-    seconds_plural: "secondes"
-    minute: "minute"
-    minutes_plural: "minutes"
-    email:
-    suspended:
-      subject: "Votre compte a été suspendu"
-    banned:
-      subject: "Votre compte a été banni"
-      body: "Conformément aux directives communautaires du projet Coral, votre compte a été banni. Vous ne pouvez désormais plus commenter, signaler ou collaborer avec notre communauté."
-    confirm:
-      has_been_requested: "Une confirmation de l’adresse électronique a été demandée pour le compte suivant :"
-      to_confirm: "Pour confirmer le compte, veuillez suivre le lien suivant :"
-      confirm_email: "Confirmer l’adresse électronique"
-      if_you_did_not: "Si vous n’êtes pas à l’origine de cette requête, vous pouvez ignorer ce courriel en toute sécurité."
-      subject: "Confirmation adresse électronique"
-    password_reset:
-      we_received_a_request: "Nous avons reçu une demande de réinitialisation de votre mot de passe. Si vous n'avez pas demandé cette modification, vous pouvez ignorer ce courriel."
-      if_you_did: "Si vous êtes à l’origine de cette requête,"
-      please_click: "veuillez cliquez ici pour réinitialiser le mot de passe"
+    body_input_label: 'Modifier ce commentaire'
+    edit_window_expired: 'Vous ne pouvez plus modifier ce commentaire. La fenêtre de temps pour le faire a expiré. Pourquoi ne pas en publier un autre ?'
+    edit_window_expired_close: Fermer
+    edit_window_timer_prefix: 'Fenêtre d''édition :'
+    minute: minute
+    minutes_plural: minutes
+    save_button: 'Sauvegarder les changements'
+    second: seconde
+    seconds_plural: secondes
+  embed_comments_tab: Commentaires
   embedlink:
-    copy: "Copier dans le presse-papier"
+    copy: 'Copier dans le presse-papier'
   error:
-    COMMENT_PARENT_NOT_VISIBLE: "Le commentaire auquel vous répondez a été supprimé ou n’existe plus."
-    EMAIL_VERIFICATION_TOKEN_INVALID: "Le code de vérification de l'adresse électronique n'est pas valide."
-    EMAIL_ALREADY_VERIFIED: "Adresse électronique déjà vérifiée."
-    PASSWORD_RESET_TOKEN_INVALID: "Votre lien de réinitialisation de mot de passe n'est pas valide."
-    COMMENT_TOO_SHORT: "Votre commentaire doit contenir quelque chose"
-    NOT_AUTHORIZED: "Vous n'êtes pas autorisé à effectuer cette action."
-    NO_SPECIAL_CHARACTERS: "Les noms d'utilisateur ne peuvent contenir que des lettres, des chiffres et \"_\" seulement"
-    PASSWORD_LENGTH: "Le mot de passe est trop court"
-    PROFANITY_ERROR: "Les noms d'utilisateur ne doivent pas contenir de mots offensants. Veuillez contacter l'administrateur si vous pensez qu'il y a une erreur."
-    RATE_LIMIT_EXCEEDED: "Nombre d’utilisations dépassé"
-    USERNAME_IN_USE: "Ce nom d'utilisateur est déjà pris"
-    USERNAME_REQUIRED: "Doit entrer un nom d'utilisateur"
-    EMAIL_NOT_VERIFIED: "Adresse électronique non vérifiée"
-    EDIT_WINDOW_ENDED: "Vous ne pouvez plus modifier ce commentaire. La fenêtre de temps pour le faire a expiré."
-    EDIT_USERNAME_NOT_AUTHORIZED: "Vous n'avez pas la permission de mettre à jour votre nom d'utilisateur."
-    SAME_USERNAME_PROVIDED: "Vous devez soumettre un nom d’utilisateur différent."
-    EMAIL_IN_USE: "Adresse électronique déjà utilisée"
-    EMAIL_REQUIRED: "Une adresse électronique est requise"
-    LOGIN_MAXIMUM_EXCEEDED: "Vous avez effectué trop de tentatives infructueuses pour entrer votre mot de passe. S'il vous plaît, attendez."
-    PASSWORD_REQUIRED: "Doit entrer un mot de passe"
-    COMMENTING_CLOSED: "Les commentaires sont déjà fermés"
-    NOT_FOUND: "Ressource introuvable"
-    ALREADY_EXISTS: "Ressource déjà existante"
-    INVALID_ASSET_URL: "L'URL est invalide"
-    CANNOT_IGNORE_STAFF: "Ne peut pas ignorer les membres de l'équipe."
-    email: "Pas une adresse e-mail valide"
-    confirm_password: "Les mots de passe ne correspondent pas. Vérifiez à nouveau"
-    network_error: "Échec de connexion au serveur. Vérifiez votre connexion Internet et réessayez."
-    email_not_verified: "L'adresse e-mail {0} n'est pas vérifiée."
-    email_password: "Combinaison e-mail / mot de passe incorrecte."
-    organization_name: "Le nom de l'organisation ne peut contenir que des lettres ou des chiffres."
-    password: "Le mot de passe doit être d'au moins 8 caractères"
-    username: "Les noms d'utilisateur ne peuvent contenir que des chiffres, des lettres et \"_\""
-    required_field: "Ce champ est obligatoire"
-    unexpected: "Désolé, une erreur inattendue s'est produite."
-    temporarily_suspended: "Votre compte est actuellement suspendu. Il sera réactivé {0}. Veuillez nous contacter si vous avez des questions."
-  flag_comment: "Signaler un commentaire"
-  flag_reason: "Motif du signalement (facultatif)"
-  flag_username: "Signaler un nom d'utilisateur"
-  framework:
-    banned_account_header: "Votre compte est actuellement banni."
-    banned_account_body: "Cela signifie que vous ne pouvez pas aimer, signaler ou écrire des commentaires."
-    comment: commentaire
-    comment_is_rejected: "Vous avez rejeté ce commentaire."
-    comment_is_hidden: "Ce commentaire n’est pas disponible."
-    comment_is_ignored: "Ce commentaire est caché car vous avez ignoré cet utilisateur."
-    comments: commentaires
-    configure_stream: "Configurer le fil"
-    content_not_available: "Ce contenu n'est pas disponible"
-    edit_name:
-      button: Soumettre
-      error: "Les noms d'utilisateur ne peuvent contenir que des chiffres, des lettres et \"_\""
-      label: "Nouveau nom d'utilisateur"
-      msg: "Votre compte est actuellement suspendu car votre nom d'utilisateur a été jugé inapproprié. Pour restaurer votre compte, entrez un nouveau nom d'utilisateur. Contactez-nous si vous avez des questions."
-    changed_name:
-      msg: "Votre modification de nom d’utilisateur est sous révision par notre équipe de modération."
-    my_comments: "Mes commentaires"
-    my_profile: "Mon profil"
-    new_count: "Voir {0} plus {1}"
-    profile: Profil
-    show_all_comments: "Afficher tous les commentaires"
-    success_bio_update: "Votre biographie a été mise à jour"
-    success_name_update: "Votre nom d'utilisateur a été mis à jour"
-    success_update_settings: "Les modifications que vous avez apportées ont été appliqué es au fil de commentaires sur cet article"
-    view_all_replies: "Voir {0} réponses"
-    view_all_replies_initial: "Voir toutes les {0} réponses"
-    view_more_comments: "Voir plus de commentaires"
-    view_reply: "Voir la réponse"
-  from_settings_page: "Dans la page Profil, vous pouvez voir l'historique de vos commentaires."
-  like: "J'aime"
-  loading_results: "Chargement des résultats"
-  marketing: "Cela ressemble à du marketing / une publicité"
-  moderate_this_stream: "Modifiez ce fil"
+    ALREADY_EXISTS: 'Ressource déjà existante'
+    CANNOT_IGNORE_STAFF: 'Ne peut pas ignorer les membres de l''équipe.'
+    COMMENT_PARENT_NOT_VISIBLE: 'Le commentaire auquel vous répondez a été supprimé ou n’existe plus.'
+    COMMENT_TOO_SHORT: 'Votre commentaire doit contenir quelque chose'
+    COMMENTING_CLOSED: 'Les commentaires sont déjà fermés'
+    confirm_password: 'Les mots de passe ne correspondent pas. Vérifiez à nouveau'
+    EDIT_USERNAME_NOT_AUTHORIZED: 'Vous n''avez pas la permission de mettre à jour votre nom d''utilisateur.'
+    EDIT_WINDOW_ENDED: 'Vous ne pouvez plus modifier ce commentaire. La fenêtre de temps pour le faire a expiré.'
+    email: 'Pas une adresse e-mail valide'
+    EMAIL_ALREADY_VERIFIED: 'Adresse électronique déjà vérifiée.'
+    EMAIL_IN_USE: 'Adresse électronique déjà utilisée'
+    email_not_verified: 'L''adresse e-mail {0} n''est pas vérifiée.'
+    EMAIL_NOT_VERIFIED: 'Adresse électronique non vérifiée'
+    email_password: 'Combinaison e-mail / mot de passe incorrecte.'
+    EMAIL_REQUIRED: 'Une adresse électronique est requise'
+    EMAIL_VERIFICATION_TOKEN_INVALID: 'Le code de vérification de l''adresse électronique n''est pas valide.'
+    INVALID_ASSET_URL: 'L''URL est invalide'
+    LOGIN_MAXIMUM_EXCEEDED: 'Vous avez effectué trop de tentatives infructueuses pour entrer votre mot de passe. S''il vous plaît, attendez.'
+    network_error: 'Échec de connexion au serveur. Vérifiez votre connexion Internet et réessayez.'
+    NO_SPECIAL_CHARACTERS: 'Les noms d''utilisateur ne peuvent contenir que des lettres, des chiffres et "_" seulement'
+    NOT_AUTHORIZED: 'Vous n''êtes pas autorisé à effectuer cette action.'
+    NOT_FOUND: 'Ressource introuvable'
+    organization_name: 'Le nom de l''organisation ne peut contenir que des lettres ou des chiffres.'
+    password: 'Le mot de passe doit être d''au moins 8 caractères'
+    PASSWORD_LENGTH: 'Le mot de passe est trop court'
+    PASSWORD_REQUIRED: 'Doit entrer un mot de passe'
+    PASSWORD_RESET_TOKEN_INVALID: 'Votre lien de réinitialisation de mot de passe n''est pas valide.'
+    PROFANITY_ERROR: 'Les noms d''utilisateur ne doivent pas contenir de mots offensants. Veuillez contacter l''administrateur si vous pensez qu''il y a une erreur.'
+    RATE_LIMIT_EXCEEDED: 'Nombre d’utilisations dépassé'
+    required_field: 'Ce champ est obligatoire'
+    SAME_USERNAME_PROVIDED: 'Vous devez soumettre un nom d’utilisateur différent.'
+    temporarily_suspended: 'Votre compte est actuellement suspendu. Il sera réactivé {0}. Veuillez nous contacter si vous avez des questions.'
+    unexpected: 'Désolé, une erreur inattendue s''est produite.'
+    username: 'Les noms d''utilisateur ne peuvent contenir que des chiffres, des lettres et "_"'
+    USERNAME_IN_USE: 'Ce nom d''utilisateur est déjà pris'
+    USERNAME_REQUIRED: 'Doit entrer un nom d''utilisateur'
+  flag_comment: 'Signaler un commentaire'
+  flag_reason: 'Motif du signalement (facultatif)'
+  flag_username: 'Signaler un nom d''utilisateur'
+  flagged_usernames:
+    notify_approved: '{0} a approuvé le nom d’utilisateur {1}'
+    notify_changed: 'l’utilisateur {0} a modifié son nom d’utilisateur en {1}'
+    notify_flagged: '{0} a signalé le nom d’utilisateur {1}'
+    notify_rejected: '{0} a rejeté le nom d’utilisateur {1}'
   flags:
     reasons:
-       user:
-         username_offensive: "Offensive"
-         username_nolike: "Dislike"
-         username_impersonating: "Usurpation d’identité"
-         username_spam: "Spam"
-         username_other: "Autre"
-       comment:
-         comment_offensive: "Offensive"
-         comment_spam: "Spam"
-         comment_noagree: "Pas d’accord"
-         comment_other: "Autre"
-         suspect_word: "Mot suspect"
-         banned_word: "Mot banni"
-         body_count: "Le texte dépasse la longueur maximale"
-         links: "Lien"
+      comment:
+        banned_word: 'Mot banni'
+        body_count: 'Le texte dépasse la longueur maximale'
+        comment_noagree: 'Pas d’accord'
+        comment_offensive: Offensive
+        comment_other: Autre
+        comment_spam: Spam
+        links: Lien
+        suspect_word: 'Mot suspect'
+      user:
+        username_impersonating: 'Usurpation d’identité'
+        username_nolike: Dislike
+        username_offensive: Offensive
+        username_other: Autre
+        username_spam: Spam
+  framework:
+    banned_account_body: 'Cela signifie que vous ne pouvez pas aimer, signaler ou écrire des commentaires.'
+    banned_account_header: 'Votre compte est actuellement banni.'
+    changed_name:
+      msg: 'Votre modification de nom d’utilisateur est sous révision par notre équipe de modération.'
+    comment: commentaire
+    comment_is_hidden: 'Ce commentaire n’est pas disponible.'
+    comment_is_ignored: 'Ce commentaire est caché car vous avez ignoré cet utilisateur.'
+    comment_is_rejected: 'Vous avez rejeté ce commentaire.'
+    comments: commentaires
+    configure_stream: 'Configurer le fil'
+    content_not_available: 'Ce contenu n''est pas disponible'
+    edit_name:
+      button: Soumettre
+      error: 'Les noms d''utilisateur ne peuvent contenir que des chiffres, des lettres et "_"'
+      label: 'Nouveau nom d''utilisateur'
+      msg: 'Votre compte est actuellement suspendu car votre nom d''utilisateur a été jugé inapproprié. Pour restaurer votre compte, entrez un nouveau nom d''utilisateur. Contactez-nous si vous avez des questions.'
+    my_comments: 'Mes commentaires'
+    my_profile: 'Mon profil'
+    new_count: 'Voir {0} plus {1}'
+    profile: Profil
+    show_all_comments: 'Afficher tous les commentaires'
+    success_bio_update: 'Votre biographie a été mise à jour'
+    success_name_update: 'Votre nom d''utilisateur a été mis à jour'
+    success_update_settings: 'Les modifications que vous avez apportées ont été appliqué es au fil de commentaires sur cet article'
+    view_more_comments: 'Voir plus de commentaires'
+    view_reply: 'Voir la réponse'
+  from_settings_page: 'Dans la page Profil, vous pouvez voir l''historique de vos commentaires.'
+  install:
+    add_organization:
+      description: 'Veuillez nous indiquer le nom de votre organisation. Cela apparaîtra dans les e-mails lors de l''invitation de nouveaux membres dans l''équipe.'
+      label: 'Nom de l''organisation'
+      save: Sauvegarder
+    create:
+      confirm_password: 'Confirmez Le mot de passe'
+      email: 'Adresse e-mail'
+      organization_contact_email: 'Organization Contact Email'
+      password: 'Mot de passe'
+      save: Sauvegarder
+      username: 'Nom d''utilisateur'
+    final:
+      close: 'Fermez cet installateur'
+      description: 'Merci d''avoir installé Talk ! Nous avons envoyé un e-mail pour vérifier votre adresse électronique. Pendant que vous terminez la configuration, vous pouvez commencer à engager vos lecteurs dès maintenant.'
+      launch: 'Lancer Talk'
+    initial:
+      description: 'Configurez votre communauté Talk en quelques petites étapes.'
+      submit: Commencer
+    permitted_domains:
+      description: 'Entrez les domaines que vous souhaitez autoriser pour Talk, par ex. vos environnements locaux, de déploiement et de production (ex localhost:3000, staging.domain.com, domain.com).'
+      submit: 'Terminer l''installation'
+      title: 'Domaines autorisés'
+  like: 'J''aime'
+  loading_results: 'Chargement des résultats'
+  marketing: 'Cela ressemble à du marketing / une publicité'
+  moderate_this_stream: 'Modifiez ce fil'
   modqueue:
-    account: "Signalements du compte"
+    account: 'Signalements du compte'
     actions: Actions
     all: tous
-    all_streams: "Tous les fils"
-    notify_edited: '{0} a modifié le commentaire "{1}"'
-    notify_accepted: '{0} a accepté le commentaire "{1}"'
-    notify_rejected: '{0} a rejeté le commentaire "{1}"'
-    notify_flagged: '{0} a signalé le commentaire "{1}"'
-    notify_reset: '{0} a réinitialisé le statut du commentaire "{1}"'
-    approve: "Approuver"
-    approved: "Approuvé"
-    ban_user: "Bannir"
+    all_streams: 'Tous les fils'
+    approve: Approuver
+    approved: Approuvé
+    ban_user: Bannir
     billion: B
     close: Fermer
-    empty_queue: "Plus de commentaires à modérer ! Vous avez terminé, allez prendre un ☕️"
+    empty_queue: 'Plus de commentaires à modérer ! Vous avez terminé, allez prendre un ☕️'
     flagged: signalé
-    reported: signalé
-    less_detail: "Moins de détails"
-    likes: "J'aime"
+    jump_to_queue: 'Aller dans une file d''attente spécifique'
+    less_detail: 'Moins de détails'
+    likes: 'J''aime'
     million: M
-    mod_faster: "Modérer plus rapidement avec les raccourcis clavier"
-    moderate: "Modérer →"
-    more_detail: "Plus de détails"
-    new: Nouveau
-    newest_first: "Le plus récent d'abord"
+    mod_faster: 'Modérer plus rapidement avec les raccourcis clavier'
+    moderate: 'Modérer →'
+    more_detail: 'Plus de détails'
     navigation: Navigation
-    next_comment: "Aller au prochain commentaire"
-    toggle_search: "Ouvrir la recherche"
-    next_queue: "Changer de file"
-    oldest_first: "Le plus ancien d'abord"
+    new: Nouveau
+    newest_first: 'Le plus récent d''abord'
+    next_comment: 'Aller au prochain commentaire'
+    next_queue: 'Changer de file'
+    notify_accepted: '{0} a accepté le commentaire "{1}"'
+    notify_edited: '{0} a modifié le commentaire "{1}"'
+    notify_flagged: '{0} a signalé le commentaire "{1}"'
+    notify_rejected: '{0} a rejeté le commentaire "{1}"'
+    notify_reset: '{0} a réinitialisé le statut du commentaire "{1}"'
+    oldest_first: 'Le plus ancien d''abord'
     premod: Pre-modérer
-    prev_comment: "Aller au commentaire précédent"
-    reject: "Rejeter"
-    rejected: "Rejeté"
-    reply: "Répondre"
-    select_stream: "Sélectionnez le fil"
+    prev_comment: 'Aller au commentaire précédent'
+    reject: Rejeter
+    rejected: Rejeté
+    reply: Répondre
+    reported: signalé
+    select_stream: 'Sélectionnez le fil'
     shift_key: ⇧
     shortcuts: Raccourcis
-    sort: "Trier"
-    show_shortcuts: "Afficher les raccourcis"
-    singleview: "Mode zen"
-    thismenu: "Ouvrir ce menu"
-    jump_to_queue: "Aller dans une file d'attente spécifique"
+    show_shortcuts: 'Afficher les raccourcis'
+    singleview: 'Mode zen'
+    sort: Trier
+    thismenu: 'Ouvrir ce menu'
     thousand: k
-    try_these: "Essayez ces"
-    view_more_shortcuts: "Afficher plus de raccourcis"
-  my_comment_history: "Mon historique de commentaires"
+    toggle_search: 'Ouvrir la recherche'
+    try_these: 'Essayez ces'
+    view_more_shortcuts: 'Afficher plus de raccourcis'
+  my_comment_history: 'Mon historique de commentaires'
   name: Nom
-  no_agree_comment: "Je ne suis pas d'accord avec ce commentaire"
-  no_like_bio: "Je n'aime pas cette biographie"
-  no_like_username: "Je n'aime pas ce nom d'utilisateur"
-  already_flagged_username: "Vous avez déjà signalé ce nom d’utilisateur."
+  no_agree_comment: 'Je ne suis pas d''accord avec ce commentaire'
+  no_like_bio: 'Je n''aime pas cette biographie'
+  no_like_username: 'Je n''aime pas ce nom d''utilisateur'
   other: Autre
+  password_reset:
+    change_password: 'Changer le mot de passe'
+    confirm_new_password: 'Confirmer le nouveau mot de passe'
+    mail_sent: 'Si vous avez un compte enregistré, un lien de réinitialisation de mot de passe a été envoyé à cette adresse électronique'
+    new_password: 'Nouveau mot de passe'
+    new_password_help: 'Le mot de passe doit comporter au moins 8 caractères'
+    set_new_password: 'Changer votre mot de passe'
   permalink: Partager
-  personal_info: "Ce commentaire révèle des informations personnelles identifiables"
+  personal_info: 'Ce commentaire révèle des informations personnelles identifiables'
   post: Publier
   profile: Profil
-  profile_settings: "Paramètres"
+  profile_settings: Paramètres
+  reject_username:
+    description_notify: 'Suspendre cet utilisateur désactivera temporairement son compte.'
+    description_reject: 'Voulez-vous interdire temporairement cet utilisateur en raison de leur {0}? Cela va temporairement suspendre l''utilisateur jusqu''à ce qu''ils réécrivent leurs {0}.'
+    email_message_reject: 'Un autre membre de la communauté a récemment signalé votre nom d''utilisateur pour examen. En raison de son contenu, votre nom d''utilisateur a été rejeté. Cela signifie que vous ne pouvez plus commenter, ni signaler du contenu jusqu''à ce que vous changiez votre nom d''utilisateur. Veuillez nous envoyer un e-mail si vous avez des questions ou des préoccupations.'
+    no_cancel: 'Pas d''annulation'
+    send: Envoyer
+    suspend_user: 'Suspendre l''utilisateur'
+    title_notify: 'Aviser l''utilisateur de sa suspension temporaire'
+    title_reject: 'Nous avons remarqué que vous avez rejeté un nom d''utilisateur'
+    username: 'Nom d''utilisateur'
+    write_message: 'Écrire un message'
+    yes_suspend: 'Oui suspendre'
   reply: Répondre
   report: Signaler
-  report_notif: "Merci de signaler ce commentaire. Notre équipe de modération a été informée."
-  report_notif_remove: "Votre signalement a été supprimé."
+  report_notif: 'Merci de signaler ce commentaire. Notre équipe de modération a été informée.'
+  report_notif_remove: 'Votre signalement a été supprimé.'
   reported: Signalé
-  comment_history_blank:
-    title: Vous n’avez écrit aucun commentaire
-    info: Un historique de vos commentaires apparaîtra ici
   settings:
-    from_settings_page: "Dans la page Profil, vous pouvez voir l'historique de vos commentaires."
-    my_comment_history: "Mon historique de commentaires"
+    from_settings_page: 'Dans la page Profil, vous pouvez voir l''historique de vos commentaires.'
+    my_comment_history: 'Mon historique de commentaires'
     profile: Profil
-    profile_settings: "Paramètres du profil"
-    sign_in: "Se connecter"
-    to_access: "Accéder au profil"
-    user_no_comment: "Vous n'avez jamais laissé de commentaire. Rejoignez la conversation!"
+    profile_settings: 'Paramètres du profil'
+    sign_in: 'Se connecter'
+    to_access: 'Accéder au profil'
+    user_no_comment: 'Vous n''avez jamais laissé de commentaire. Rejoignez la conversation!'
+  step_1_header: 'Signaler un problème'
+  step_2_header: 'Aidez-nous à comprendre'
+  step_3_header: 'Merci pour votre participation'
   stream:
-    all_comments: "Tous les commentaires"
-    temporarily_suspended: "Conformément à la charte d'utilisation des commentaires de {0}, votre compte a été temporairement suspendu. Merci de revenir dans la conversation {1}."
-    comment_not_found: "Ce commentaire a été supprimé ou n'existe pas."
-    no_comments: "Il n’y a aucun commentaire pour le moment. Soyez le premier à commenter !"
-    no_comments_and_closed: "Il n'y avait aucun commentaire sur cet article."
-  step_1_header: "Signaler un problème"
-  step_2_header: "Aidez-nous à comprendre"
-  step_3_header: "Merci pour votre participation"
+    all_comments: 'Tous les commentaires'
+    comment_not_found: 'Ce commentaire a été supprimé ou n''existe pas.'
+    no_comments: 'Il n’y a aucun commentaire pour le moment. Soyez le premier à commenter !'
+    no_comments_and_closed: 'Il n''y avait aucun commentaire sur cet article.'
+    temporarily_suspended: 'Conformément à la charte d''utilisation des commentaires de {0}, votre compte a été temporairement suspendu. Merci de revenir dans la conversation {1}.'
   streams:
     all: Tous
     article: Récit
     closed: Fermé
-    empty_result: "Aucun contenu ne correspond à cette recherche. Peut-être essayer d'élargir votre recherche ?"
-    filter_streams: "Filtrer les flux"
-    newest: Le plus récent
-    oldest: Le plus ancien
+    empty_result: 'Aucun contenu ne correspond à cette recherche. Peut-être essayer d''élargir votre recherche ?'
+    filter_streams: 'Filtrer les flux'
+    newest: 'Le plus récent'
+    oldest: 'Le plus ancien'
     open: Ouvrir
-    pubdate: "Date de publication"
+    pubdate: 'Date de publication'
     search: Recherche
-    sort_by: "Trier par"
-    status: "Statut du fil"
-    stream_status: "Statut du fil"
+    sort_by: 'Trier par'
+    status: 'Statut du fil'
+    stream_status: 'Statut du fil'
   suspenduser:
-    title_suspend: "Suspendre l'utilisateur"
-    description_suspend: "Vous suspendez {0}. Ce commentaire sera rejeté, et {0} ne sera pas autorisé à aimer, à signaler, à répondre ou à publier jusqu'à ce que la suspension soit levée."
-    select_duration: "Sélectionnez la durée de la suspension"
-    one_hour: "1 heure"
-    hours: "{0} heures"
-    days: "{0} jours"
-    hour: "{0} heures"
-    day: "{0} jours"
-    cancel: "Annuler"
-    suspend_user: "Suspendre l'utilisateur"
+    cancel: Annuler
+    day: '{0} jours'
+    days: '{0} jours'
+    description_notify: 'Suspendre cet utilisateur désactivera temporairement son compte.'
+    description_suspend: 'Vous suspendez {0}. Ce commentaire sera rejeté, et {0} ne sera pas autorisé à aimer, à signaler, à répondre ou à publier jusqu''à ce que la suspension soit levée.'
     email_message_suspend: "Cher {0},\n\nConformément à la charte des commentaires de {1}, votre compte a été temporairement suspendu. Pendant cette période, vous ne pourrez pas commenter, signaler ou participer à d'autres commentaires. \n\nMerci de revenir dans la conversation {2}."
-    title_notify: "Aviser l'utilisateur de sa suspension temporaire"
-    notify_suspend_until: "L'utilisateur {0} a été temporairement suspendu. Cette suspension se terminera automatiquement {1}."
-    description_notify: "Suspendre cet utilisateur désactivera temporairement son compte."
-    write_message: "Écrire un message"
+    hour: '{0} heures'
+    hours: '{0} heures'
+    notify_suspend_until: 'L''utilisateur {0} a été temporairement suspendu. Cette suspension se terminera automatiquement {1}.'
+    one_hour: '1 heure'
+    select_duration: 'Sélectionnez la durée de la suspension'
     send: Envoyer
-  reject_username:
-    username: "Nom d'utilisateur"
-    no_cancel: "Pas d'annulation"
-    description_reject: "Voulez-vous interdire temporairement cet utilisateur en raison de leur {0}? Cela va temporairement suspendre l'utilisateur jusqu'à ce qu'ils réécrivent leurs {0}."
-    title_notify: "Aviser l'utilisateur de sa suspension temporaire"
-    description_notify: "Suspendre cet utilisateur désactivera temporairement son compte."
-    title_reject: "Nous avons remarqué que vous avez rejeté un nom d'utilisateur"
-    suspend_user: "Suspendre l'utilisateur"
-    yes_suspend: "Oui suspendre"
-    email_message_reject: "Un autre membre de la communauté a récemment signalé votre nom d'utilisateur pour examen. En raison de son contenu, votre nom d'utilisateur a été rejeté. Cela signifie que vous ne pouvez plus commenter, ni signaler du contenu jusqu'à ce que vous changiez votre nom d'utilisateur. Veuillez nous envoyer un e-mail si vous avez des questions ou des préoccupations."
-    write_message: "Écrire un message"
-    send: Envoyer
-  thank_you: "Nous apprécions vos commentaires. Un modérateur passera en revue votre signalement. Merci pour votre aide."
+    suspend_user: 'Suspendre l''utilisateur'
+    title_notify: 'Aviser l''utilisateur de sa suspension temporaire'
+    title_suspend: 'Suspendre l''utilisateur'
+    write_message: 'Écrire un message'
+  thank_you: 'Nous apprécions vos commentaires. Un modérateur passera en revue votre signalement. Merci pour votre aide.'
   user:
-    bio_flags: "Signaler pour cette biographie"
-    user_bio: "Bio de l'utilisateur"
-    username_flags: "Signaler pour ce nom d'utilisateur"
+    bio_flags: 'Signaler pour cette biographie'
+    user_bio: 'Bio de l''utilisateur'
+    username_flags: 'Signaler pour ce nom d''utilisateur'
   user_detail:
-    remove_suspension: "Lever la suspension"
-    suspend: "Suspendre l’utilisateur"
-    remove_ban: "Lever le bannissement"
-    ban: "Bannir l’utilisateur"
-    member_since: "Membre depuis"
-    email: "adresse électronique"
-    total_comments: "Nombre total de commentaires"
-    reject_rate: "Fréquence de rejet"
-    reports: "Signalements"
-    all: "Tous"
-    rejected: "Rejeté"
-    account_history: "Historique de compte"
-  account_history:
-    user_banned: "Utilisateur banni"
-    ban_removed: "Bannissement levé"
-    username_status: "Nom d’utilisateur {0}"
-    suspended: "Suspendu, {0}"
-    suspension_removed: "Suspension levée"
-    system: "Système"
-    date: "Date"
-    action: "Action"
-    taken_by: "Prise par"
-  user_impersonating: "Cet utilisateur se fait passer pour quelqu'un d'autre"
-  user_no_comment: "Vous n'avez jamais laissé de commentaire. Rejoignez la conversation !"
-  username_offensive: "Ce nom d'utilisateur est offensant"
-  view_conversation: "Afficher la conversation"
-  install:
-    initial:
-      description: "Configurez votre communauté Talk en quelques petites étapes."
-      submit: "Commencer"
-    add_organization:
-      description: "Veuillez nous indiquer le nom de votre organisation. Cela apparaîtra dans les e-mails lors de l'invitation de nouveaux membres dans l'équipe."
-      label: "Nom de l'organisation"
-      save: "Sauvegarder"
-    create:
-      email: "Adresse e-mail"
-      username: "Nom d'utilisateur"
-      password: "Mot de passe"
-      confirm_password: "Confirmez Le mot de passe"
-      organization_contact_email: "Organization Contact Email"
-      save: "Sauvegarder"
-    permitted_domains:
-      title: "Domaines autorisés"
-      description: "Entrez les domaines que vous souhaitez autoriser pour Talk, par ex. vos environnements locaux, de déploiement et de production (ex localhost:3000, staging.domain.com, domain.com)."
-      submit: "Terminer l'installation"
-    final:
-      description: "Merci d'avoir installé Talk ! Nous avons envoyé un e-mail pour vérifier votre adresse électronique. Pendant que vous terminez la configuration, vous pouvez commencer à engager vos lecteurs dès maintenant."
-      launch: "Lancer Talk"
-      close: "Fermez cet installateur"
-  admin_sidebar:
-    view_options: "Afficher les options"
-    sort_comments: "Trier les commentaires"
+    all: Tous
+    ban: 'Bannir l’utilisateur'
+    email: 'adresse électronique'
+    member_since: 'Membre depuis'
+    reject_rate: 'Fréquence de rejet'
+    rejected: Rejeté
+    remove_ban: 'Lever le bannissement'
+    remove_suspension: 'Lever la suspension'
+    suspend: 'Suspendre l’utilisateur'
+    total_comments: 'Nombre total de commentaires'
+  user_impersonating: 'Cet utilisateur se fait passer pour quelqu''un d''autre'
+  user_no_comment: 'Vous n''avez jamais laissé de commentaire. Rejoignez la conversation !'
+  username_offensive: 'Ce nom d''utilisateur est offensant'
+  validators:
+    confirm_password: 'Les mots de passe ne correspondent pas. Vérifiez à nouveau'
+    required: 'Ce champ est obligatoire'
+    verify_email: 'Pas une adresse e-mail valide'
+    verify_organization_name: 'Le nom de l''organisation ne peut contenir que des lettres ou des chiffres.'
+    verify_password: 'Le mot de passe doit être d''au moins 8 caractères'
+    verify_username: 'Les noms d''utilisateur ne peuvent contenir que des chiffres, des lettres et "_"'
+  view_conversation: 'Afficher la conversation'
+  your_account_has_been_banned: 'Votre compte a été banni.'
+  your_account_has_been_suspended: 'Votre compte a été temporairement suspendu.'
+  your_username_has_been_rejected: 'Votre compte a été suspendu en raison de votre nom d’utilisateur jugé inapproprié. Veuillez saisir un nouveau nom d’utilisateur pour restaurer votre compte.'
diff --git a/locales/nl_NL.yml b/locales/nl_NL.yml
index 297917c9e..8245931f3 100644
--- a/locales/nl_NL.yml
+++ b/locales/nl_NL.yml
@@ -1,472 +1,477 @@
 nl_NL:
-  your_account_has_been_suspended: Je account is tijdelijk geschorst.
-  your_account_has_been_banned: Je account is verbannen.
-  your_username_has_been_rejected: Je account is geschorst omdat we je gebruikersnaam ongepast vinden. Verander je gebruikersnaam om hem weer te activeren.
-  embed_comments_tab: Reacties
+  admin_sidebar:
+    sort_comments: 'Sorteer reacties'
+    view_options: 'Bekijk opties'
+  already_flagged_username: 'Je hebt deze gebruikersnaam al gemeld.'
   bandialog:
-    are_you_sure: "Weet je zeker dat je {0} wil verbannen?"
-    ban_user: "Gebruiker verbannen?"
-    banned_user: "Verbannen gebruiker"
-    cancel: "Annuleren"
-    note: "Opmerking: {0}"
-    note_reject_comment: "Door deze gebruiker te verbannen verplaats je diens reactie ook naar de lijst met afgewezen reacties."
-    note_ban_user: "Door deze gebruiker te verbannen kan deze geen reactie meer wijzigen of verwijderen."
-    yes_ban_user: "Ja, verban gebruiker"
-    write_a_message: "Schrijf een bericht"
-    send: "Versturen"
-    notify_ban_headline: "Stel gebruiker op de hoogte van verbanning"
-    notify_ban_description: "Dit stelt de gebruiker via email op de hoogte verbannen te zijn van de community"
+    are_you_sure: 'Weet je zeker dat je {0} wil verbannen?'
+    ban_user: 'Gebruiker verbannen?'
+    banned_user: 'Verbannen gebruiker'
+    cancel: Annuleren
     email_message_ban: "Beste {0},\n\nIemand met toegang tot je account heeft onze community richtlijnen overtreden. Om die reden is je account verbannen. Je kunt niet langer reageren, of reacties goedkeuren of rapporteren. Als je denkt dat dit berust op een vergissing, neem dan contact op met ons community team."
-  bio_offensive: "Deze biografie is aanstootgevend."
-  cancel: "Annuleren"
-  confirm_email:
-    click_to_confirm: "Klik hieronder om je e-mailadres te bevestigen."
-    confirm: "Bevestig"
-  password_reset:
-    set_new_password: "Verander je wachtwoord"
-    new_password: "Nieuw wachtwoord"
-    new_password_help: "Wachtwoord moet minimaal 8 karakters lang zijn."
-    confirm_new_password: "Bevestig nieuw wachtwoord"
-    change_password: "Verander wachtwoord"
-  characters_remaining: "tekens resterend"
+    note: 'Opmerking: {0}'
+    note_ban_user: 'Door deze gebruiker te verbannen kan deze geen reactie meer wijzigen of verwijderen.'
+    note_reject_comment: 'Door deze gebruiker te verbannen verplaats je diens reactie ook naar de lijst met afgewezen reacties.'
+    notify_ban_description: 'Dit stelt de gebruiker via email op de hoogte verbannen te zijn van de community'
+    notify_ban_headline: 'Stel gebruiker op de hoogte van verbanning'
+    send: Versturen
+    write_a_message: 'Schrijf een bericht'
+    yes_ban_user: 'Ja, verban gebruiker'
+  bio_offensive: 'Deze biografie is aanstootgevend.'
+  cancel: Annuleren
+  characters_remaining: 'tekens resterend'
   comment:
-    anon: "Anoniem"
-    undo_reject: "Ongedaan maken"
-    ban_user: "Verban gebruiker"
-    comment: "Plaats een reactie"
+    anon: Anoniem
+    ban_user: 'Verban gebruiker'
+    comment: 'Plaats een reactie'
     edited: Gewijzigd
-    flagged: "Gemarkeerd"
-    view_context: "Bekijk context"
+    flagged: Gemarkeerd
+    undo_reject: 'Ongedaan maken'
+    view_context: 'Bekijk context'
   comment_box:
-    post: "Plaats"
-    cancel: "Annuleren"
-    reply: "Beantwoord"
-    comment: "Plaats een reactie"
-    name: "Naam"
-    comment_post_notif: "Je reactie is geplaatst"
-    comment_post_notif_premod: "Dank voor je reactie! Deze wordt zo snel mogelijk gemodereerd."
-    comment_post_banned_word:  "Je reactie bevat een of meerdere termen die wij niet toestaan. Neem contact op wanneer je het er niet mee eens bent."
-    characters_remaining: "tekens resterend"
-  comment_offensive: "Deze reactie is aanstootgevend"
-  comment_singular: Reactie
+    cancel: Annuleren
+    characters_remaining: 'tekens resterend'
+    comment: 'Plaats een reactie'
+    comment_post_banned_word: 'Je reactie bevat een of meerdere termen die wij niet toestaan. Neem contact op wanneer je het er niet mee eens bent.'
+    comment_post_notif: 'Je reactie is geplaatst'
+    comment_post_notif_premod: 'Dank voor je reactie! Deze wordt zo snel mogelijk gemodereerd.'
+    name: Naam
+    post: Plaats
+    reply: Beantwoord
+  comment_offensive: 'Deze reactie is aanstootgevend'
   comment_plural: Reacties
-  comment_post_banned_word: "Je reactie bevat een of meerdere termen die wij niet toestaan. Neem contact op wanneer je het er niet mee eens bent."
-  comment_post_notif: "Je reactie is geplaatst."
-  comment_post_notif_premod: "Dank voor je reactie! Deze wordt zo snel mogelijk gemodereerd."
+  comment_post_banned_word: 'Je reactie bevat een of meerdere termen die wij niet toestaan. Neem contact op wanneer je het er niet mee eens bent.'
+  comment_post_notif: 'Je reactie is geplaatst.'
+  comment_post_notif_premod: 'Dank voor je reactie! Deze wordt zo snel mogelijk gemodereerd.'
+  comment_singular: Reactie
   common:
-    copy: 'Kopieer'
+    copy: Kopieer
     error: 'Er is een fout opgetreden.'
-    reply: 'antwoord'
-    replies: 'antwoorden'
-    reaction: 'reactie'
-    reactions: 'reacties'
-    story: 'Verhaal'
-  flagged_usernames:
-    notify_approved: '{0} heeft gebruikersnaam {1} goedgekeurd'
-    notify_rejected: '{0} heeft gebruikersnaam {1} afgekeurd'
-    notify_flagged: '{0} heeft gebruikersnaam {1} gerapporteerd'
-    notify_changed: 'gebruiker {0} heeft zijn/haar gebruikersnaam veranderd naar {1}'
+    reaction: reactie
+    reactions: reacties
+    replies: antwoorden
+    reply: antwoord
+    story: Verhaal
   community:
-    account_creation_date: "Aanmaakdatum account"
+    account_creation_date: 'Aanmaakdatum account'
     active: Actief
     admin: Administrator
-    ads_marketing: "Dit lijkt op een advertentie/marketing"
-    are_you_sure: "Weet je zeker dat je {0} wil verbannen?"
-    ban_user: "Verban gebruiker?"
+    ads_marketing: 'Dit lijkt op een advertentie/marketing'
+    are_you_sure: 'Weet je zeker dat je {0} wil verbannen?'
+    ban_user: 'Verban gebruiker?'
     banned: Verbannen
-    banned_user: "Verbannen gebruiker"
+    banned_user: 'Verbannen gebruiker'
     cancel: Annuleren
-    dont_like_username: "Keur gebruikersnaam af"
-    flaggedaccounts: "Gerapporteerde gebruikersnamen"
+    commenter: Reageerder
+    dont_like_username: 'Keur gebruikersnaam af'
+    flaggedaccounts: 'Gerapporteerde gebruikersnamen'
     flags: Rapporteringen
-    impersonating: "Imitatie"
-    loading: "Resultaten worden geladen"
+    impersonating: Imitatie
+    loading: 'Resultaten worden geladen'
     moderator: Moderator
-    newsroom_role: "Newsroom rol"
-    no_flagged_accounts: "De lijst met gerapporteerde gebruikers is momenteel leeg."
-    no_results: "Geen accounts gevonden met deze gebruikersnaam of e-mailadres."
-    offensive: "Aanstootgevend"
+    newsroom_role: 'Newsroom rol'
+    no_flagged_accounts: 'De lijst met gerapporteerde gebruikers is momenteel leeg.'
+    no_results: 'Geen accounts gevonden met deze gebruikersnaam of e-mailadres.'
+    offensive: Aanstootgevend
     other: Anders
     people: Gebruikers
-    role: "Selecteer rol..."
-    select_status: "Selecteer status..."
-    spam_ads: "Spam/Ads"
-    staff: "Staff"
+    role: 'Selecteer rol...'
+    select_status: 'Selecteer status...'
+    spam_ads: Spam/Ads
+    staff: Staff
     status: Status
-    username_and_email: "Gebruikersnaam en e-mailadres"
-    yes_ban_user: "Ja, verban gebruiker"
-    commenter: "Reageerder"
+    username_and_email: 'Gebruikersnaam en e-mailadres'
+    yes_ban_user: 'Ja, verban gebruiker'
   configure:
     apply: Toepassen
-    banned_word_text: "Reacties die deze woorden of zinnen bevatten (niet hoofdlettergevoelig) worden automatisch uit de conversatie verwijderd. Voer een woord in, en druk op enter of Tab om toe te passen. Je kunt ook een kommagescheiden lijst plakken."
-    banned_words_title: "Lijst met verbannen woorden"
-    close: "Sluiten"
-    close_after: "Reacties afsluiten na"
-    close_stream: "Sluit conversatie"
-    close_stream_configuration: "Deze conversatie is momenteel afgesloten. Door deze te heropenen kunnen nieuwe reacties worden toegevoegd en weergegeven."
-    closed_comments_desc: "Schrijf een bericht om weer te geven wanneer de conversatie is afgesloten."
-    closed_comments_label: "Schrijf een bericht..."
-    closed_stream_settings: "Afgesloten conversatie bericht"
-    comment_count_error: "Voer een geldig getal in."
-    comment_count_header: "Reactielengte beperken"
+    banned_word_text: 'Reacties die deze woorden of zinnen bevatten (niet hoofdlettergevoelig) worden automatisch uit de conversatie verwijderd. Voer een woord in, en druk op enter of Tab om toe te passen. Je kunt ook een kommagescheiden lijst plakken.'
+    banned_words_title: 'Lijst met verbannen woorden'
+    close: Sluiten
+    close_after: 'Reacties afsluiten na'
+    close_stream: 'Sluit conversatie'
+    close_stream_configuration: 'Deze conversatie is momenteel afgesloten. Door deze te heropenen kunnen nieuwe reacties worden toegevoegd en weergegeven.'
+    closed_comments_desc: 'Schrijf een bericht om weer te geven wanneer de conversatie is afgesloten.'
+    closed_comments_label: 'Schrijf een bericht...'
+    closed_stream_settings: 'Afgesloten conversatie bericht'
+    comment_count_error: 'Voer een geldig getal in.'
+    comment_count_header: 'Reactielengte beperken'
     comment_count_text_post: tekens
-    comment_count_text_pre: "Reacties worden ingekort op"
+    comment_count_text_pre: 'Reacties worden ingekort op'
     comment_settings: Instellingen
-    comment_stream: "Conversatie"
-    comment_stream_will_close: "Deze conversatie zal worden afgesloten."
+    comment_stream: Conversatie
+    comment_stream_will_close: 'Deze conversatie zal worden afgesloten.'
     community: Community
     configure: Instellen
-    copy_and_paste: "Kopieer en plak onderstaande code om je reactie-box in je artikel op te nemen."
-    custom_css_url: "Eigen CSS URL"
-    custom_css_url_desc: "URL van CSS stylesheet die de standaard Embed Conversatie stylesheet overschrijft. Kan intern of extern zijn."
+    copy_and_paste: 'Kopieer en plak onderstaande code om je reactie-box in je artikel op te nemen.'
+    custom_css_url: 'Eigen CSS URL'
+    custom_css_url_desc: 'URL van CSS stylesheet die de standaard Embed Conversatie stylesheet overschrijft. Kan intern of extern zijn.'
     days: Dagen
-    description: "Als admin kun je de instellingen aanpassen voor de conversatie bij dit verhaal:"
-    domain_list_text: "Voer de domeinen in die je wil toestaan voor Talk, bijvoorbeeld je staging en productie-omgevingen (bijv. localhost:3000 staging.domeinnaam.com domeinnaam.com)."
-    domain_list_title: "Toegestane domeinnamen"
-    edit_comment_timeframe_heading: "Wijzig reactie tijdsduur"
-    edit_comment_timeframe_text_pre: "Gebruikers hebben"
-    edit_comment_timeframe_text_post: "secondes om hun reactie te wijzigen."
-    embed_comment_stream: "Embed conversatie"
-    enable_premod_links_text: "Moderators moeten elke reactie met een link goedkeuren voordat deze is gepubliceerd."
-    enable_pre_moderation: "Pre-moderatie inschakelen"
-    enable_pre_moderation_text: "Moderators moeten elke reactie goedkeuren voordat deze is gepubliceerd."
-    enable_premod_links: "Pre-Modereer reacties met een link"
-    enable_premod: "Pre-moderatie inschakelen"
-    enable_premod_description: "Moderators moeten elke reactie goedkeuren voordat deze is gepubliceerd."
-    enable_premod_links_description: "Moderators moeten elke reactie met een link goedkeuren voordat deze is gepubliceerd."
-    enable_questionbox: "Stel een vraag aan de lezers"
-    enable_questionbox_description: "Deze vraag zal bovenaan de conversatie verschijnen. Vraag lezers naar een probleem in het artikel, poneer discussie vragen, enzovoort."
+    description: 'Als admin kun je de instellingen aanpassen voor de conversatie bij dit verhaal:'
+    domain_list_text: 'Voer de domeinen in die je wil toestaan voor Talk, bijvoorbeeld je staging en productie-omgevingen (bijv. localhost:3000 staging.domeinnaam.com domeinnaam.com).'
+    domain_list_title: 'Toegestane domeinnamen'
+    edit_comment_timeframe_heading: 'Wijzig reactie tijdsduur'
+    edit_comment_timeframe_text_post: 'secondes om hun reactie te wijzigen.'
+    edit_comment_timeframe_text_pre: 'Gebruikers hebben'
+    embed_comment_stream: 'Embed conversatie'
+    enable_pre_moderation: 'Pre-moderatie inschakelen'
+    enable_pre_moderation_text: 'Moderators moeten elke reactie goedkeuren voordat deze is gepubliceerd.'
+    enable_premod: 'Pre-moderatie inschakelen'
+    enable_premod_description: 'Moderators moeten elke reactie goedkeuren voordat deze is gepubliceerd.'
+    enable_premod_links: 'Pre-Modereer reacties met een link'
+    enable_premod_links_description: 'Moderators moeten elke reactie met een link goedkeuren voordat deze is gepubliceerd.'
+    enable_premod_links_text: 'Moderators moeten elke reactie met een link goedkeuren voordat deze is gepubliceerd.'
+    enable_questionbox: 'Stel een vraag aan de lezers'
+    enable_questionbox_description: 'Deze vraag zal bovenaan de conversatie verschijnen. Vraag lezers naar een probleem in het artikel, poneer discussie vragen, enzovoort.'
     hours: Uren
-    include_comment_stream: "Neem conversatie beschrijving op voor lezers."
-    include_comment_stream_desc: "Schrijf een bericht voor boven je conversatie. Poneer een stelling, wijs op de community richtlijnen, etc."
-    include_text: "Schrijf hier je tekst."
-    include_question_here: "Schrijf je vraag hier:"
+    include_comment_stream: 'Neem conversatie beschrijving op voor lezers.'
+    include_comment_stream_desc: 'Schrijf een bericht voor boven je conversatie. Poneer een stelling, wijs op de community richtlijnen, etc.'
+    include_question_here: 'Schrijf je vraag hier:'
+    include_text: 'Schrijf hier je tekst.'
     moderate: Modereer
-    moderation_settings: "Moderatie instellingen"
-    open: "Open"
-    open_stream: "Open Stream"
-    open_stream_configuration: "Deze converstatie is momenteel open. Door deze te sluiten kunnen geen nieuwe reacties meer worden geplaatst, maar de oude zullen nog steeds worden weergegeven."
-    require_email_verification: "Maak e-mail verificatie vereist"
-    require_email_verification_text: "Nieuwe gebruikers moeten hun e-mailadres verifiëren voordat ze door kunnen gaan."
-    save_changes: "Wijzigingen opslaan"
+    moderation_settings: 'Moderatie instellingen'
+    open: Open
+    open_stream: 'Open Stream'
+    open_stream_configuration: 'Deze converstatie is momenteel open. Door deze te sluiten kunnen geen nieuwe reacties meer worden geplaatst, maar de oude zullen nog steeds worden weergegeven.'
+    require_email_verification: 'Maak e-mail verificatie vereist'
+    require_email_verification_text: 'Nieuwe gebruikers moeten hun e-mailadres verifiëren voordat ze door kunnen gaan.'
+    save_changes: 'Wijzigingen opslaan'
     shortcuts: Sneltoetsen
-    sign_out: "Uitloggen"
+    sign_out: Uitloggen
     stories: Conversaties
-    stream_settings: "Conversatie instellingen"
-    suspect_word_title: "Lijst met verdachte woorden"
-    suspect_word_text: "Reacties die deze woorden of zinsdelen bevatten (niet hoofdlettergevoelig) zullen worden gemarkeerd in de conversatie. Type een woord en druk op enter of tab om toe te voegen. Je kunt optioneel een komma-gescheiden lijst plakken."
-    tech_settings: "Technische instellingen"
-    title: "Conversatie cnfigureren"
+    stream_settings: 'Conversatie instellingen'
+    suspect_word_text: 'Reacties die deze woorden of zinsdelen bevatten (niet hoofdlettergevoelig) zullen worden gemarkeerd in de conversatie. Type een woord en druk op enter of tab om toe te voegen. Je kunt optioneel een komma-gescheiden lijst plakken.'
+    suspect_word_title: 'Lijst met verdachte woorden'
+    tech_settings: 'Technische instellingen'
+    title: 'Conversatie cnfigureren'
     weeks: Weken
-    wordlist: "Zwarte woordenlijst"
-  continue: "Doorgaan"
+    wordlist: 'Zwarte woordenlijst'
+  confirm_email:
+    click_to_confirm: 'Klik hieronder om je e-mailadres te bevestigen.'
+    confirm: Bevestig
+  continue: Doorgaan
   createdisplay:
-    check_the_form: "Ongeldig formulier. Kijk de invoer na."
-    continue: "Doorgaan met dezelfde Facebook gebruikersnaam"
-    error_create: "Fout bij het wijzigen van de gebruikersnaam"
-    fake_comment_body: "Dit is een voorbeeld reactie. Lezers kunnen hun gedachten en meningen delen met de Newsrooms in de reactie-sectie."
-    fake_comment_date: "1 minuut geleden"
-    if_you_dont_change_your_name: "Wanneer je gebruikersnaam niet verandert, zal je Facebook gebruikersnaam verschijnen bij al je reacties."
-    required_field: "Verplicht veld"
+    check_the_form: 'Ongeldig formulier. Kijk de invoer na.'
+    continue: 'Doorgaan met dezelfde Facebook gebruikersnaam'
+    error_create: 'Fout bij het wijzigen van de gebruikersnaam'
+    fake_comment_body: 'Dit is een voorbeeld reactie. Lezers kunnen hun gedachten en meningen delen met de Newsrooms in de reactie-sectie.'
+    fake_comment_date: '1 minuut geleden'
+    if_you_dont_change_your_name: 'Wanneer je gebruikersnaam niet verandert, zal je Facebook gebruikersnaam verschijnen bij al je reacties.'
+    required_field: 'Verplicht veld'
     save: Opslaan
-    special_characters: "Gebruikersnamen kunnen alleen cijfers, letters en _ bevatten."
+    special_characters: 'Gebruikersnamen kunnen alleen cijfers, letters en _ bevatten.'
     username: Gebruikersnaam
-    write_your_username: "Wijzig je gebruikersnaam"
-    your_username: "Je gebruikersnaam verschijnt bij elke reactie die je plaatst."
+    write_your_username: 'Wijzig je gebruikersnaam'
+    your_username: 'Je gebruikersnaam verschijnt bij elke reactie die je plaatst.'
   done: Klaar
   edit_comment:
-    body_input_label: "Wijzig deze reactie"
-    save_button: "Wijzigingen opslaan"
-    edit_window_expired: "Je kunt deze reactie niet meer wijzigen. De tijdsduur hiervoor is verstreken."
-    edit_window_expired_close: "Sluiten"
-    edit_window_timer_prefix: "Wijzig venster: "
-    second: "seconde"
-    seconds_plural: "secondes"
-    minute: "minuut"
-    minutes_plural: "minuten"
+    body_input_label: 'Wijzig deze reactie'
+    edit_window_expired: 'Je kunt deze reactie niet meer wijzigen. De tijdsduur hiervoor is verstreken.'
+    edit_window_expired_close: Sluiten
+    edit_window_timer_prefix: 'Wijzig venster: '
+    minute: minuut
+    minutes_plural: minuten
+    save_button: 'Wijzigingen opslaan'
+    second: seconde
+    seconds_plural: secondes
   email:
-    suspended:
-      subject: "Je account is tijdelijk geschorst."
     banned:
-      subject: "Je account is verbannen."
-      body: "In lijn met The Coral Project's community richtlijnen is je account verbannen. Je kunt niet langer reageren, rapporteren of interacteren met onze community."
+      body: 'In lijn met The Coral Project''s community richtlijnen is je account verbannen. Je kunt niet langer reageren, rapporteren of interacteren met onze community.'
+      subject: 'Je account is verbannen.'
     confirm:
-      has_been_requested: "Een e-mail bevestiging is aangevraagd voor het volgend account:"
-      to_confirm: "Ga naar de volgende link om het account te bevestigen:"
-      confirm_email: "Bevestig e-mail"
-      if_you_did_not: "Wanneer jij dit niet hebt aangevraagd, kun je deze e-mail negeren."
-      subject: "Email bevestiging"
+      confirm_email: 'Bevestig e-mail'
+      has_been_requested: 'Een e-mail bevestiging is aangevraagd voor het volgend account:'
+      if_you_did_not: 'Wanneer jij dit niet hebt aangevraagd, kun je deze e-mail negeren.'
+      subject: 'Email bevestiging'
+      to_confirm: 'Ga naar de volgende link om het account te bevestigen:'
     password_reset:
-      we_received_a_request: "We hebben een verzoek gekregen om je wachtwoord opnieuw in te stellen. Wanneer je dit niet zelf was, kun je deze mail negeren."
-      if_you_did: "Wanneer je dit zelf was,"
-      please_click: "klik dan hier om je wachtwoord te veranderen"
+      if_you_did: 'Wanneer je dit zelf was,'
+      please_click: 'klik dan hier om je wachtwoord te veranderen'
+      we_received_a_request: 'We hebben een verzoek gekregen om je wachtwoord opnieuw in te stellen. Wanneer je dit niet zelf was, kun je deze mail negeren.'
+    suspended:
+      subject: 'Je account is tijdelijk geschorst.'
+  embed_comments_tab: Reacties
   embedlink:
-    copy: "Kopieer naar klembord"
+    copy: 'Kopieer naar klembord'
   error:
-    COMMENT_PARENT_NOT_VISIBLE: "De reactie waarop je probeert te reageren bestaat niet of is inmiddels verwijderd."
-    EMAIL_VERIFICATION_TOKEN_INVALID: "Ongeldig e-mail verificatie token"
-    PASSWORD_RESET_TOKEN_INVALID: "Je wachtwoord-herstel token is ongeldig."
-    COMMENT_TOO_SHORT: "Reacties moeten meer dan één teken hebben. Herzie je reactie en probeer opnieuw."
-    NOT_AUTHORIZED: "Je bent niet geauthoriseerd om dit te doen."
-    NO_SPECIAL_CHARACTERS: "Gebruikersnamen kunnen alleen cijfers, letters en _ bevatten."
-    PASSWORD_LENGTH: "Wachtwoord is te kort"
-    PROFANITY_ERROR: "Gebruikersnamen mogen niet aanstootgevend zijn. Neem contact op met de administrator wanneer je denkt dat dit niet klopt."
-    RATE_LIMIT_EXCEEDED: "Gebruikslimiet overschreden"
-    USERNAME_IN_USE: "Gebruikersnaam al in gebruik"
-    USERNAME_REQUIRED: "Gebruikersnaam is vereist"
-    EMAIL_NOT_VERIFIED: "E-mailadres is niet geverifiëerd"
-    EDIT_WINDOW_ENDED: "Dit commentaar kan niet langer worden gewijzigd. Het tijdsbestek is verstreken."
-    EDIT_USERNAME_NOT_AUTHORIZED: "Je bent niet gemachtigd om je gebruikersnaam te wijzigen."
-    SAME_USERNAME_PROVIDED: "Je moet een andere gebruikersnaam invoeren."
-    EMAIL_IN_USE: "E-mailadres al in gebruik"
-    EMAIL_REQUIRED: "Een e-mailadres is vereist"
-    LOGIN_MAXIMUM_EXCEEDED: "Je hebt te veel mislukte inlogpogingen gedaan. Even geduld aub."
-    PASSWORD_REQUIRED: "Je moet een wachtwoord invoeren."
-    COMMENTING_CLOSED: "Reageren is al afgesloten."
-    NOT_FOUND: "Bron niet gevonden"
-    ALREADY_EXISTS: "Bron bestaat al"
-    INVALID_ASSET_URL: "Ongeldige URL"
-    CANNOT_IGNORE_STAFF: "Kan geen Staff-leden negeren."
-    email: "Geen geldig e-mailadres"
-    confirm_password: "Wachtwoorden komen niet overeen. Controleer opnieuw."
-    network_error: "Kon geen verbinding maken met server. Controleer je internetverbinding en probeer het opnieuw."
-    email_not_verified: "E-mailadres {0} is niet geverifiëerd"
-    email_password: "E-mail en/of wachtwoord combinatie onjuist"
-    organization_name: "Organisatienaam kan alleen cijfers en letters bevatten."
-    password: "Wachtwoord moet minimaal 8 karakters lang zijn"
-    username: "Gebruikersnamen kunnen alleen cijfers, letters en _ bevatten."
-    unexpected: "Onverwachte fout opgetreden. Sorry!"
-    temporarily_suspended: "Your account is currently suspended. It will be reactivated {0}. Please contact us if you have any questions."
-  flag_comment: "Rapporteer reactie"
-  flag_reason: "Reden voor rapporteren (optioneel)"
-  flag_username: "Rapporteer gebruikersnaam"
-  framework:
-    banned_account_header: "Je account is momenteel verbannen."
-    banned_account_body: "Dit betekent dat je niet kunt reageren, liken of rapporteren."
-    comment: reactie
-    comment_is_ignored: "Deze reactie is verborgen omdat je de gebruiker negeert."
-    comment_is_rejected: "Je hebt deze reactie afgewezen."
-    comment_is_hidden: "Deze reactie is niet beschikbaar."
-    comments: reacties
-    configure_stream: "Configureren"
-    content_not_available: "Deze inhoud is niet beschikbaar"
-    edit_name:
-      button: Versturen
-      error: "Gebruikersnamen kunnen alleen cijfers, letters en _ bevatten."
-      label: "Nieuwe gebruikersnaam"
-      msg: "Je account is momenteel geschorst omdat je gebruikersnaam ongepast is bevonden. Om je account te herstellen, moet je je gebruikersnaam herstellen. Neem contact met ons op wanneer je vragen hebt."
-    changed_name:
-      msg: "De verandering van je gebruikersnaam wordt door ons moderatieteam gecontroleerd."
-    my_comments: "Mijn reacties"
-    my_profile: "Mijn profiel"
-    new_count: "Bekijk {0} meer {1}"
-    profile: Profiel
-    show_all_comments: "Toon alle reacties"
-    success_bio_update: "Je biografie is bijgewerkt."
-    success_name_update: "Je gebruikersnaam is bijgewerkt."
-    success_update_settings: "De conversatie is aangepast."
-    show_all_replies: Toon alle reacties
-    show_more_replies: Toon meer reacties
-    view_more_comments: "Bekijk meer reacties"
-    view_reply: "Bekijk reactie"
-  from_settings_page: "Vanuit de profielpagina kun je je reactiegeschiedenis bekijken."
-  like: Like
-  loading_results: "Resultaten worden geladen"
-  marketing: "Dit lijkt op een advertentie/marketing"
-  moderate_this_stream: "Modereer deze conversatie"
+    ALREADY_EXISTS: 'Bron bestaat al'
+    CANNOT_IGNORE_STAFF: 'Kan geen Staff-leden negeren.'
+    COMMENT_PARENT_NOT_VISIBLE: 'De reactie waarop je probeert te reageren bestaat niet of is inmiddels verwijderd.'
+    COMMENT_TOO_SHORT: 'Reacties moeten meer dan één teken hebben. Herzie je reactie en probeer opnieuw.'
+    COMMENTING_CLOSED: 'Reageren is al afgesloten.'
+    confirm_password: 'Wachtwoorden komen niet overeen. Controleer opnieuw.'
+    EDIT_USERNAME_NOT_AUTHORIZED: 'Je bent niet gemachtigd om je gebruikersnaam te wijzigen.'
+    EDIT_WINDOW_ENDED: 'Dit commentaar kan niet langer worden gewijzigd. Het tijdsbestek is verstreken.'
+    email: 'Geen geldig e-mailadres'
+    EMAIL_IN_USE: 'E-mailadres al in gebruik'
+    email_not_verified: 'E-mailadres {0} is niet geverifiëerd'
+    EMAIL_NOT_VERIFIED: 'E-mailadres is niet geverifiëerd'
+    email_password: 'E-mail en/of wachtwoord combinatie onjuist'
+    EMAIL_REQUIRED: 'Een e-mailadres is vereist'
+    EMAIL_VERIFICATION_TOKEN_INVALID: 'Ongeldig e-mail verificatie token'
+    INVALID_ASSET_URL: 'Ongeldige URL'
+    LOGIN_MAXIMUM_EXCEEDED: 'Je hebt te veel mislukte inlogpogingen gedaan. Even geduld aub.'
+    network_error: 'Kon geen verbinding maken met server. Controleer je internetverbinding en probeer het opnieuw.'
+    NO_SPECIAL_CHARACTERS: 'Gebruikersnamen kunnen alleen cijfers, letters en _ bevatten.'
+    NOT_AUTHORIZED: 'Je bent niet geauthoriseerd om dit te doen.'
+    NOT_FOUND: 'Bron niet gevonden'
+    organization_name: 'Organisatienaam kan alleen cijfers en letters bevatten.'
+    password: 'Wachtwoord moet minimaal 8 karakters lang zijn'
+    PASSWORD_LENGTH: 'Wachtwoord is te kort'
+    PASSWORD_REQUIRED: 'Je moet een wachtwoord invoeren.'
+    PASSWORD_RESET_TOKEN_INVALID: 'Je wachtwoord-herstel token is ongeldig.'
+    PROFANITY_ERROR: 'Gebruikersnamen mogen niet aanstootgevend zijn. Neem contact op met de administrator wanneer je denkt dat dit niet klopt.'
+    RATE_LIMIT_EXCEEDED: 'Gebruikslimiet overschreden'
+    SAME_USERNAME_PROVIDED: 'Je moet een andere gebruikersnaam invoeren.'
+    temporarily_suspended: 'Your account is currently suspended. It will be reactivated {0}. Please contact us if you have any questions.'
+    unexpected: 'Onverwachte fout opgetreden. Sorry!'
+    username: 'Gebruikersnamen kunnen alleen cijfers, letters en _ bevatten.'
+    USERNAME_IN_USE: 'Gebruikersnaam al in gebruik'
+    USERNAME_REQUIRED: 'Gebruikersnaam is vereist'
+  flag_comment: 'Rapporteer reactie'
+  flag_reason: 'Reden voor rapporteren (optioneel)'
+  flag_username: 'Rapporteer gebruikersnaam'
+  flagged_usernames:
+    notify_approved: '{0} heeft gebruikersnaam {1} goedgekeurd'
+    notify_changed: 'gebruiker {0} heeft zijn/haar gebruikersnaam veranderd naar {1}'
+    notify_flagged: '{0} heeft gebruikersnaam {1} gerapporteerd'
+    notify_rejected: '{0} heeft gebruikersnaam {1} afgekeurd'
   flags:
     reasons:
-       user:
-         username_offensive: "Aanstootgevend"
-         username_nolike: "Niet leuk"
-         username_impersonating: "Impersonatie"
-         username_spam: "Spam"
-         username_other: "Anders"
-       comment:
-         comment_offensive: "Aanstootgevend"
-         comment_spam: "Spam"
-         comment_noagree: "Niet eens"
-         comment_other: "Anders"
-         suspect_word: "Verdacht woord"
-         banned_word: "Geblokeerd woord"
-         body_count: "Tekst is te lang"
-         links: "Link"
+      comment:
+        banned_word: 'Geblokeerd woord'
+        body_count: 'Tekst is te lang'
+        comment_noagree: 'Niet eens'
+        comment_offensive: Aanstootgevend
+        comment_other: Anders
+        comment_spam: Spam
+        links: Link
+        suspect_word: 'Verdacht woord'
+      user:
+        username_impersonating: Impersonatie
+        username_nolike: 'Niet leuk'
+        username_offensive: Aanstootgevend
+        username_other: Anders
+        username_spam: Spam
+  framework:
+    banned_account_body: 'Dit betekent dat je niet kunt reageren, liken of rapporteren.'
+    banned_account_header: 'Je account is momenteel verbannen.'
+    changed_name:
+      msg: 'De verandering van je gebruikersnaam wordt door ons moderatieteam gecontroleerd.'
+    comment: reactie
+    comment_is_hidden: 'Deze reactie is niet beschikbaar.'
+    comment_is_ignored: 'Deze reactie is verborgen omdat je de gebruiker negeert.'
+    comment_is_rejected: 'Je hebt deze reactie afgewezen.'
+    comments: reacties
+    configure_stream: Configureren
+    content_not_available: 'Deze inhoud is niet beschikbaar'
+    edit_name:
+      button: Versturen
+      error: 'Gebruikersnamen kunnen alleen cijfers, letters en _ bevatten.'
+      label: 'Nieuwe gebruikersnaam'
+      msg: 'Je account is momenteel geschorst omdat je gebruikersnaam ongepast is bevonden. Om je account te herstellen, moet je je gebruikersnaam herstellen. Neem contact met ons op wanneer je vragen hebt.'
+    my_comments: 'Mijn reacties'
+    my_profile: 'Mijn profiel'
+    new_count: 'Bekijk {0} meer {1}'
+    profile: Profiel
+    show_all_comments: 'Toon alle reacties'
+    show_all_replies: 'Toon alle reacties'
+    show_more_replies: 'Toon meer reacties'
+    success_bio_update: 'Je biografie is bijgewerkt.'
+    success_name_update: 'Je gebruikersnaam is bijgewerkt.'
+    success_update_settings: 'De conversatie is aangepast.'
+    view_more_comments: 'Bekijk meer reacties'
+    view_reply: 'Bekijk reactie'
+  from_settings_page: 'Vanuit de profielpagina kun je je reactiegeschiedenis bekijken.'
+  install:
+    add_organization:
+      description: 'Vertel ons de naam van je organisatie. Deze zal te zien zijn in e-mails wanneer je nieuwe teamleden uitnodigt.'
+      label: Organisatienaam
+      save: Opslaan
+    create:
+      confirm_password: 'Bevestig wachtwoord'
+      email: E-mailadres
+      password: Wachtwoord
+      save: Opslaan
+      username: Gebruikersnaam
+    final:
+      close: 'Installatie afsluiten'
+      description: 'Dank voor het installeren van Talk! We hebben een bericht gestuurd om je e-mailadres te valideren. Terwijl je je account verder opzet, kun je alvast de interactie aangaan met je gebruikers.'
+      launch: 'Start Talk'
+    initial:
+      description: 'Laten we je Talk-community opzetten met een paar simpele stappen.'
+      submit: Begin
+    permitted_domains:
+      description: 'Voer de domeinen in die je wil toestaan voor Talk, bijvoorbeeld je staging en productie-omgevingen (bijv. localhost:3000 staging.domeinnaam.com domeinnaam.com)'
+      submit: 'Installatie afronden'
+      title: 'Toegestane domeinnamen'
+  like: Like
+  loading_results: 'Resultaten worden geladen'
+  marketing: 'Dit lijkt op een advertentie/marketing'
+  moderate_this_stream: 'Modereer deze conversatie'
   modqueue:
-    account: "account meldingen"
+    account: 'account meldingen'
     actions: Acties
     all: Alle
-    all_streams: "Alle conversaties"
-    notify_edited: '{0} wijzigde reactie "{1}"'
-    notify_accepted: '{0} accepteerde reactie "{1}"'
-    notify_rejected: '{0} heeft reactie "{1}" afgewezen'
-    notify_flagged: '{0} heeft reactie "{1}" gerapporteerd'
-    notify_reset: '{0} heeft de status van reactie "{1}" hersteld'
-    approve: "Goedkeuren"
-    approved: "Goedgekeurd"
-    ban_user: "Verban"
-    billion: "G"
+    all_streams: 'Alle conversaties'
+    approve: Goedkeuren
+    approved: Goedgekeurd
+    ban_user: Verban
+    billion: G
     close: Sluiten
-    empty_queue: "Geen reacties meer te beoordelen!"
+    empty_queue: 'Geen reacties meer te beoordelen!'
     flagged: gemeld
-    reported: gerapporteerd
-    less_detail: "Minder detail"
+    jump_to_queue: 'Spring naar specifieke wachtrij'
+    less_detail: 'Minder detail'
     likes: likes
-    million: "M"
-    mod_faster: "Beoordeel sneller met sneltoetsen"
-    moderate: "Beoordeel →"
-    more_detail: "Meer detail"
-    new: Nieuw
-    newest_first: "Nieuwste eerst"
+    million: M
+    mod_faster: 'Beoordeel sneller met sneltoetsen'
+    moderate: 'Beoordeel →'
+    more_detail: 'Meer detail'
     navigation: Navigatie
-    next_comment: "Ga naar de volgende reactie"
-    toggle_search: "Open zoekvenster"
-    next_queue: "Verander wachtrij"
-    oldest_first: "Oudste eerst"
-    premod: "Pre-moderatie"
-    prev_comment: "Ga naar de vorige reactie"
-    reject: "Wijs af"
-    rejected: "Afgewezen"
-    reply: "Beantwoord"
-    select_stream: "Selecteer conversatie"
-    shift_key: "⇧"
-    shortcuts: "Sneltoetsen"
-    sort: "Sorteer"
-    show_shortcuts: "Toon sneltoetsen"
-    singleview: "Zen-modus"
-    thismenu: "Open dit menu"
-    jump_to_queue: "Spring naar specifieke wachtrij"
+    new: Nieuw
+    newest_first: 'Nieuwste eerst'
+    next_comment: 'Ga naar de volgende reactie'
+    next_queue: 'Verander wachtrij'
+    notify_accepted: '{0} accepteerde reactie "{1}"'
+    notify_edited: '{0} wijzigde reactie "{1}"'
+    notify_flagged: '{0} heeft reactie "{1}" gerapporteerd'
+    notify_rejected: '{0} heeft reactie "{1}" afgewezen'
+    notify_reset: '{0} heeft de status van reactie "{1}" hersteld'
+    oldest_first: 'Oudste eerst'
+    premod: Pre-moderatie
+    prev_comment: 'Ga naar de vorige reactie'
+    reject: 'Wijs af'
+    rejected: Afgewezen
+    reply: Beantwoord
+    reported: gerapporteerd
+    select_stream: 'Selecteer conversatie'
+    shift_key: ⇧
+    shortcuts: Sneltoetsen
+    show_shortcuts: 'Toon sneltoetsen'
+    singleview: Zen-modus
+    sort: Sorteer
+    thismenu: 'Open dit menu'
     thousand: k
-    try_these: "Probeer deze"
-    view_more_shortcuts: "Bekijk meer sneltoetsen"
-  my_comment_history: "Mijn reactie geschiedenis"
+    toggle_search: 'Open zoekvenster'
+    try_these: 'Probeer deze'
+    view_more_shortcuts: 'Bekijk meer sneltoetsen'
+  my_comment_history: 'Mijn reactie geschiedenis'
   name: Naam
-  no_agree_comment: "Ik ben het niet eens met deze reactie"
-  no_like_bio: "Ik vind deze biografie niet leuk"
-  no_like_username: "Ik vind deze gebruikersnaam niet leuk"
-  already_flagged_username: "Je hebt deze gebruikersnaam al gemeld."
+  no_agree_comment: 'Ik ben het niet eens met deze reactie'
+  no_like_bio: 'Ik vind deze biografie niet leuk'
+  no_like_username: 'Ik vind deze gebruikersnaam niet leuk'
   other: Ander
+  password_reset:
+    change_password: 'Verander wachtwoord'
+    confirm_new_password: 'Bevestig nieuw wachtwoord'
+    new_password: 'Nieuw wachtwoord'
+    new_password_help: 'Wachtwoord moet minimaal 8 karakters lang zijn.'
+    set_new_password: 'Verander je wachtwoord'
   permalink: Deel
-  personal_info: "Deze reactie onthult persoonlijk identificeerbare gegevens."
+  personal_info: 'Deze reactie onthult persoonlijk identificeerbare gegevens.'
   post: Plaats
   profile: Profiel
-  profile_settings: "Instellingen"
+  profile_settings: Instellingen
+  reject_username:
+    description_notify: 'Door de schorsing zal deze tijdelijk diens account niet kunnen gebruiken.'
+    description_reject: 'Wil je deze gebruiker tijdelijk schorsen om diens {0}? Dan wordt de gebruiker geschorst totdat deze diens {0} heeft herschreven.'
+    email_message_reject: 'Iemand anders uit de community heeft je gebruikersnaam gemeld ter controle. Vanwege de inhoud van je gebruikersnaam is je account geschorst. Dit betekent dat je niet langer kunt reageen, liken of inhoud melden totdat je je gebruikersnaam hebt veranderd. Stuur ons een e-mail wanneer je vragen of zorgen hebt.'
+    no_cancel: 'Geen annuleringsmogelijkheid'
+    send: Verstuur
+    suspend_user: 'Schors gebruiker'
+    title_notify: 'Breng de gebruiker op de hoogte van de schorsing.'
+    title_reject: 'We zagen dat je een gebruikersnaam hebt afgewezen'
+    username: gebruikersnaam
+    write_message: 'Schrijf een bericht'
+    yes_suspend: 'Ja, schors'
   reply: Beantwoord
   report: Rapporteer
-  report_notif: "Dank voor het rapporteren van deze reactie. Deze wordt zo snel mogelijk gemodereerd."
-  report_notif_remove: "Je melding is verwijderd."
+  report_notif: 'Dank voor het rapporteren van deze reactie. Deze wordt zo snel mogelijk gemodereerd.'
+  report_notif_remove: 'Je melding is verwijderd.'
   reported: Gerapporteerd
   settings:
-    from_settings_page: "Op je profielpagina kun je je reactie-geschiedenis zien."
-    my_comment_history: "Mijn reactie geschiedenis"
+    from_settings_page: 'Op je profielpagina kun je je reactie-geschiedenis zien.'
+    my_comment_history: 'Mijn reactie geschiedenis'
     profile: Profiel
-    profile_settings: "Profiel instellingen"
-    sign_in: "Inloggen"
-    to_access: "om profiel te benaderen"
-    user_no_comment: "Je hebt nog niet eerder gereageerd."
+    profile_settings: 'Profiel instellingen'
+    sign_in: Inloggen
+    to_access: 'om profiel te benaderen'
+    user_no_comment: 'Je hebt nog niet eerder gereageerd.'
+  step_1_header: 'Rapporteer een issue'
+  step_2_header: 'Help ons begrijpen'
+  step_3_header: 'Dankjewel voor je input'
   stream:
-    all_comments: "Alle reacties"
-    temporarily_suspended: "In overeenstemming met de community richtlijnen van {0} is je account tijdelijk geschorst. Keer terug naar de conversaties {1}."
-    comment_not_found: "Deze opmerking is verwijderd of bestaat niet."
-    no_comments: "Er zijn nog geen reacties. Schrijf er zelf eentje!"
-    no_comments_and_closed: "Er waren geen reacties op dit artikel."
-  step_1_header: "Rapporteer een issue"
-  step_2_header: "Help ons begrijpen"
-  step_3_header: "Dankjewel voor je input"
+    all_comments: 'Alle reacties'
+    comment_not_found: 'Deze opmerking is verwijderd of bestaat niet.'
+    no_comments: 'Er zijn nog geen reacties. Schrijf er zelf eentje!'
+    no_comments_and_closed: 'Er waren geen reacties op dit artikel.'
+    temporarily_suspended: 'In overeenstemming met de community richtlijnen van {0} is je account tijdelijk geschorst. Keer terug naar de conversaties {1}.'
   streams:
     all: Alle
     article: Artikel
     closed: Gesloten
-    empty_result: "Niets gevonden bij deze zoekopdracht. Misschien moet je je zoekopdracht proberen te verbreden?"
-    filter_streams: "Filter conversaties"
+    empty_result: 'Niets gevonden bij deze zoekopdracht. Misschien moet je je zoekopdracht proberen te verbreden?'
+    filter_streams: 'Filter conversaties'
     newest: Nieuwste
     oldest: Oudste
     open: Open
-    pubdate: "Publicatie datum"
+    pubdate: 'Publicatie datum'
     search: Zoeken
-    sort_by: "Sorteer op"
-    status: "Conversatie status"
-    stream_status: "Conversatie status"
+    sort_by: 'Sorteer op'
+    status: 'Conversatie status'
+    stream_status: 'Conversatie status'
   suspenduser:
-    title_suspend: "Schors gebruiker"
-    description_suspend: "Je schorst {0}. Deze reactie wordt afgewezen, en {0} zal niet meer kunnen liken, rapporteren of reageren totdat de schorsingsduur verstreken is."
-    select_duration: "Selecteer schorsingsduur"
-    one_hour: "1 uur"
-    hours: "{0} uur"
-    days: "{0} dagen"
-    cancel: "Annuleren"
-    suspend_user: "Schors gebruiker"
+    cancel: Annuleren
+    days: '{0} dagen'
+    description_notify: 'Wanneer je de gebruiker schorst zal zijn/haar account tijdelijk worden uitgeschakeld.'
+    description_suspend: 'Je schorst {0}. Deze reactie wordt afgewezen, en {0} zal niet meer kunnen liken, rapporteren of reageren totdat de schorsingsduur verstreken is.'
     email_message_suspend: "Beste {0},\n\nIn overeenstemming met de community richtlijnen van {1} is je account tijdelijk geschorst. Tijdens deze schorsing kun je niet reageren, liken of interacteren met je collega-reageerders. Hervat het gesprek {2}."
-    title_notify: "Breng de gebruiker op de hoogte van de schorsing."
-    notify_suspend_until: "Gebruiker {0} is tijdelijk geschorst. Deze schorsing houdt automatisch op {1}."
-    description_notify: "Wanneer je de gebruiker schorst zal zijn/haar account tijdelijk worden uitgeschakeld."
-    write_message: "Schrijf een bericht"
+    hours: '{0} uur'
+    notify_suspend_until: 'Gebruiker {0} is tijdelijk geschorst. Deze schorsing houdt automatisch op {1}.'
+    one_hour: '1 uur'
+    select_duration: 'Selecteer schorsingsduur'
     send: Verstuur
-  reject_username:
-    username: gebruikersnaam
-    no_cancel: "Geen annuleringsmogelijkheid"
-    description_reject: "Wil je deze gebruiker tijdelijk schorsen om diens {0}? Dan wordt de gebruiker geschorst totdat deze diens {0} heeft herschreven."
-    title_notify: "Breng de gebruiker op de hoogte van de schorsing."
-    description_notify: "Door de schorsing zal deze tijdelijk diens account niet kunnen gebruiken."
-    title_reject: "We zagen dat je een gebruikersnaam hebt afgewezen"
-    suspend_user: "Schors gebruiker"
-    yes_suspend: "Ja, schors"
-    email_message_reject: "Iemand anders uit de community heeft je gebruikersnaam gemeld ter controle. Vanwege de inhoud van je gebruikersnaam is je account geschorst. Dit betekent dat je niet langer kunt reageen, liken of inhoud melden totdat je je gebruikersnaam hebt veranderd. Stuur ons een e-mail wanneer je vragen of zorgen hebt."
-    write_message: "Schrijf een bericht"
-    send: Verstuur
-  thank_you: "We waarderen je feedback. Een moderator zal je rapport bekijken."
+    suspend_user: 'Schors gebruiker'
+    title_notify: 'Breng de gebruiker op de hoogte van de schorsing.'
+    title_suspend: 'Schors gebruiker'
+    write_message: 'Schrijf een bericht'
+  thank_you: 'We waarderen je feedback. Een moderator zal je rapport bekijken.'
   user:
-    bio_flags: "Meldingen voor deze biografie"
-    user_bio: "Gebruikers biografie"
-    username_flags: "Meldingen voor deze gebruikersnaam"
+    bio_flags: 'Meldingen voor deze biografie'
+    user_bio: 'Gebruikers biografie'
+    username_flags: 'Meldingen voor deze gebruikersnaam'
   user_detail:
-    remove_suspension: "Schorsing opheffen"
-    suspend: "Gebruiker schorsen"
-    remove_ban: "Verbanning verwijderen"
-    ban: "Gebruiker verbannen"
-    member_since: "Lid sinds"
-    email: "Email"
-    total_comments: "Totaal aantal reacties"
-    reject_rate: "Beoordeling verwijderen"
-    reports: "Rapportages"
-    all: "Alle"
-    rejected: "Afgewezen"
-    user_history: "Accountgeschiedenis"
+    all: Alle
+    ban: 'Gebruiker verbannen'
+    email: Email
+    member_since: 'Lid sinds'
+    reject_rate: 'Beoordeling verwijderen'
+    rejected: Afgewezen
+    remove_ban: 'Verbanning verwijderen'
+    remove_suspension: 'Schorsing opheffen'
+    suspend: 'Gebruiker schorsen'
+    total_comments: 'Totaal aantal reacties'
+    user_history: Accountgeschiedenis
   user_history:
-    user_banned: "User banned"
-    ban_removed: "Ban removed"
-    username_status: "Username {0}"
-    suspended: "Suspended, {0}"
-    suspension_removed: "Suspension removed"
-    system: "System"
-    date: "Date"
-    action: "Action"
-    taken_by: "Taken By"
-  user_impersonating: "Deze gebruiker imiteert"
-  user_no_comment: "Je hebt nog niet eerder gereageerd. Laat je mening horen!"
-  username_offensive: "Dit is een aanstootgevende gebruikersnaam."
-  view_conversation: "Bekijk conversatie"
-  install:
-    initial:
-      description: "Laten we je Talk-community opzetten met een paar simpele stappen."
-      submit: "Begin"
-    add_organization:
-      description: "Vertel ons de naam van je organisatie. Deze zal te zien zijn in e-mails wanneer je nieuwe teamleden uitnodigt."
-      label: "Organisatienaam"
-      save: "Opslaan"
-    create:
-      email: "E-mailadres"
-      username: "Gebruikersnaam"
-      password: "Wachtwoord"
-      confirm_password: "Bevestig wachtwoord"
-      save: "Opslaan"
-    permitted_domains:
-      title: "Toegestane domeinnamen"
-      description: "Voer de domeinen in die je wil toestaan voor Talk, bijvoorbeeld je staging en productie-omgevingen (bijv. localhost:3000 staging.domeinnaam.com domeinnaam.com)"
-      submit: "Installatie afronden"
-    final:
-      description: "Dank voor het installeren van Talk! We hebben een bericht gestuurd om je e-mailadres te valideren. Terwijl je je account verder opzet, kun je alvast de interactie aangaan met je gebruikers."
-      launch: "Start Talk"
-      close: "Installatie afsluiten"
-  admin_sidebar:
-    view_options: "Bekijk opties"
-    sort_comments: "Sorteer reacties"
+    action: Action
+    ban_removed: 'Ban removed'
+    date: Date
+    suspended: 'Suspended, {0}'
+    suspension_removed: 'Suspension removed'
+    system: System
+    taken_by: 'Taken By'
+    user_banned: 'User banned'
+    username_status: 'Username {0}'
+  user_impersonating: 'Deze gebruiker imiteert'
+  user_no_comment: 'Je hebt nog niet eerder gereageerd. Laat je mening horen!'
+  username_offensive: 'Dit is een aanstootgevende gebruikersnaam.'
+  validators:
+    confirm_password: 'Wachtwoorden komen niet overeen. Controleer opnieuw.'
+    verify_email: 'Geen geldig e-mailadres'
+    verify_organization_name: 'Organisatienaam kan alleen cijfers en letters bevatten.'
+    verify_password: 'Wachtwoord moet minimaal 8 karakters lang zijn'
+    verify_username: 'Gebruikersnamen kunnen alleen cijfers, letters en _ bevatten.'
+  view_conversation: 'Bekijk conversatie'
+  your_account_has_been_banned: 'Je account is verbannen.'
+  your_account_has_been_suspended: 'Je account is tijdelijk geschorst.'
+  your_username_has_been_rejected: 'Je account is geschorst omdat we je gebruikersnaam ongepast vinden. Verander je gebruikersnaam om hem weer te activeren.'
diff --git a/locales/pt_BR.yml b/locales/pt_BR.yml
index 82e2d27d9..1f39f04ed 100644
--- a/locales/pt_BR.yml
+++ b/locales/pt_BR.yml
@@ -1,427 +1,431 @@
 pt_BR:
-  your_account_has_been_suspended: Sua conta foi temporariamente suspensa.
-  your_account_has_been_banned: Sua conta foi banida.
-  your_username_has_been_rejected: Sua conta foi rejeitada porque seu nome de usuário foi considerado inapropriado. Para restaurar sua conta, insira um novo nome de usuário.
-  embed_comments_tab: Comentários
+  admin_sidebar:
+    sort_comments: 'Ordenar comentários'
+    view_options: 'Opções de visualização'
+  already_flagged_username: 'Você já sinalizou este usuário.'
   bandialog:
-    are_you_sure: "Tem certeza de que gostaria de banir {0}?"
-    ban_user: "Deseja banir o usuário?"
-    banned_user: "Usuário banido"
-    cancel: "Cancelar"
-    note: "Nota: {0}"
-    note_reject_comment: "Banir esse usuário também colocará esse comentário na fila rejeitada."
-    note_ban_user: "Banir este usuário não os permitirá editar comentários ou remover qualquer coisa."
-    yes_ban_user: "Sim, banir o usuário"
-    write_a_message: "Escrever uma mensagem"
-    send: "Enviar"
-    notify_ban_headline: "Notificar o usuário do banimento"
-    notify_ban_description: "Isso notificará o usuário por email que ele foi banido da comunidade."
+    are_you_sure: 'Tem certeza de que gostaria de banir {0}?'
+    ban_user: 'Deseja banir o usuário?'
+    banned_user: 'Usuário banido'
+    cancel: Cancelar
     email_message_ban: "Caro {0},\n\nAlguém com acesso a sua conta violou nossas diretrizes da comunidade. Em consequência disso, sua conta foi banida. Você não poderá mais comentar, curtir ou denunciar comentários. Se você acha que isso foi um engano, entre em contato com nossa equipe."
-  bio_offensive: "Esse perfil é ofensiva"
-  cancel: "Cancelar"
-  confirm_email:
-    click_to_confirm: "Clique abaixo para confirmar seu endereço de email"
-    confirm: "Confirmar"
-  password_reset:
-    set_new_password: "Alterar sua senha"
-    new_password: "Nova senha"
-    new_password_help: "A senha deve ter mais de 8 caracteres"
-    confirm_new_password: "Confirmar nova senha"
-    change_password: "Alterar senha"
-  characters_remaining: "caracteres restantes"
+    note: 'Nota: {0}'
+    note_ban_user: 'Banir este usuário não os permitirá editar comentários ou remover qualquer coisa.'
+    note_reject_comment: 'Banir esse usuário também colocará esse comentário na fila rejeitada.'
+    notify_ban_description: 'Isso notificará o usuário por email que ele foi banido da comunidade.'
+    notify_ban_headline: 'Notificar o usuário do banimento'
+    send: Enviar
+    write_a_message: 'Escrever uma mensagem'
+    yes_ban_user: 'Sim, banir o usuário'
+  bio_offensive: 'Esse perfil é ofensiva'
+  cancel: Cancelar
+  characters_remaining: 'caracteres restantes'
   comment:
-    anon: "Anônimo"
-    undo_reject: "Desfazer"
-    ban_user: "Banir o usuário"
-    comment: "Escreva um comentário..."
+    anon: Anônimo
+    ban_user: 'Banir o usuário'
+    comment: 'Escreva um comentário...'
     edited: Editado
-    flagged: "Marcado"
-    view_context: "Veja o contexto"
+    flagged: Marcado
+    undo_reject: Desfazer
+    view_context: 'Veja o contexto'
   comment_box:
-    post: "Enviar"
-    cancel: "Cancelar"
-    reply: "Responder"
-    comment: "Escreva um comentário..."
-    name: "Nome"
-    comment_post_notif: "Seu comentário foi enviado."
-    comment_post_notif_premod: "Obrigado por compartilhar sua opinião. Nossa equipe de moderação analisará seu comentário em breve."
-    comment_post_banned_word: "Seu comentário não foi publicado porque contém conteúdo inadequado."
-    characters_remaining: "caracteres restantes"
-  comment_offensive: "Este comentário é ofensivo"
-  comment_singular: Comentário
+    cancel: Cancelar
+    characters_remaining: 'caracteres restantes'
+    comment: 'Escreva um comentário...'
+    comment_post_banned_word: 'Seu comentário não foi publicado porque contém conteúdo inadequado.'
+    comment_post_notif: 'Seu comentário foi enviado.'
+    comment_post_notif_premod: 'Obrigado por compartilhar sua opinião. Nossa equipe de moderação analisará seu comentário em breve.'
+    name: Nome
+    post: Enviar
+    reply: Responder
+  comment_offensive: 'Este comentário é ofensivo'
   comment_plural: Comentários
-  comment_post_banned_word:  "Seu comentário não foi publicado porque contém conteúdo inadequado."
-  comment_post_notif: "Seu comentário foi postado."
-  comment_post_notif_premod: "Obrigado por compartilhar sua opinião. Nossa equipe de moderação analisará seu comentário em breve."
+  comment_post_banned_word: 'Seu comentário não foi publicado porque contém conteúdo inadequado.'
+  comment_post_notif: 'Seu comentário foi postado.'
+  comment_post_notif_premod: 'Obrigado por compartilhar sua opinião. Nossa equipe de moderação analisará seu comentário em breve.'
+  comment_singular: Comentário
   common:
-    copy: 'Copiar'
+    copy: Copiar
     error: 'Ocorreu um erro.'
-    reply: 'Resposta'
-    replies: 'Respostas'
-    reaction: 'Reação'
-    reactions: 'Reações'
-    story: 'Conversas'
+    reaction: Reação
+    reactions: Reações
+    replies: Respostas
+    reply: Resposta
+    story: Conversas
   community:
-    account_creation_date: "Data de criação da conta"
+    account_creation_date: 'Data de criação da conta'
     active: Ativo
     admin: Administrador
-    ads_marketing: "Este comentário parece anúncio"
-    are_you_sure: "Você tem certeza de que gostaria de banir {0}?"
-    ban_user: "Banir o usuário?"
+    ads_marketing: 'Este comentário parece anúncio'
+    are_you_sure: 'Você tem certeza de que gostaria de banir {0}?'
+    ban_user: 'Banir o usuário?'
     banned: Banido
-    banned_user: "Usuário banido"
+    banned_user: 'Usuário banido'
     cancel: Cancelar
-    dont_like_username: "Descurtir usuário"
-    flaggedaccounts: "Usuários marcados"
+    commenter: Comentador
+    dont_like_username: 'Descurtir usuário'
+    flaggedaccounts: 'Usuários marcados'
     flags: Marcadas
-    impersonating: "Representação"
-    loading: "Carregando resultados"
+    impersonating: Representação
+    loading: 'Carregando resultados'
     moderator: Moderador
-    newsroom_role: "Papel da empresa"
-    no_flagged_accounts: "A fila de usuários marcados está atualmente vazia."
-    no_results: "Nenhum usuário encontrado com esse nome de usuário ou e-mail. Eles estão se escondendo!"
-    offensive: "Ofensivo"
+    newsroom_role: 'Papel da empresa'
+    no_flagged_accounts: 'A fila de usuários marcados está atualmente vazia.'
+    no_results: 'Nenhum usuário encontrado com esse nome de usuário ou e-mail. Eles estão se escondendo!'
+    offensive: Ofensivo
     other: Outros
     people: Pessoas
-    role: "Selecione um papel..."
-    select_status: "Selecione um status..."
-    spam_ads: "Spam/Ads"
-    staff: "Equipe"
+    role: 'Selecione um papel...'
+    select_status: 'Selecione um status...'
+    spam_ads: Spam/Ads
+    staff: Equipe
     status: Situação
-    username_and_email: "Nome de usuário e email"
-    yes_ban_user: "Sim, banir este usuário"
-    commenter: "Comentador"
+    username_and_email: 'Nome de usuário e email'
+    yes_ban_user: 'Sim, banir este usuário'
   configure:
     apply: Aplicar
-    banned_word_text: "Os comentários que contenham essas palavras ou frases (não sensíveis a maiúsculas e minúsculas) serão automaticamente removidos da lista de comentários. Digite uma palavra e pressione Enter ou Tab para adicionar ou cole uma lista separada por vírgulas."
-    banned_words_title: "Lista de palavras proibidas"
-    close: "Fechar"
-    close_after: "Fechar comentários após"
-    close_stream: "Fechar comentários"
-    close_stream_configuration: "Comentários fechados no momento. Ao abrir comentários, novos comentários podem ser enviados e exibidos."
-    closed_comments_desc: "Escreva uma mensagem a ser exibida quando os comentários estiverem fechados."
-    closed_comments_label: "Escreva uma mensagem..."
-    closed_stream_settings: "Mensagem de comentários fechados"
-    comment_count_error: "Por favor insira um número válido."
-    comment_count_header: "Limite o tamanho do comentário"
+    banned_word_text: 'Os comentários que contenham essas palavras ou frases (não sensíveis a maiúsculas e minúsculas) serão automaticamente removidos da lista de comentários. Digite uma palavra e pressione Enter ou Tab para adicionar ou cole uma lista separada por vírgulas.'
+    banned_words_title: 'Lista de palavras proibidas'
+    close: Fechar
+    close_after: 'Fechar comentários após'
+    close_stream: 'Fechar comentários'
+    close_stream_configuration: 'Comentários fechados no momento. Ao abrir comentários, novos comentários podem ser enviados e exibidos.'
+    closed_comments_desc: 'Escreva uma mensagem a ser exibida quando os comentários estiverem fechados.'
+    closed_comments_label: 'Escreva uma mensagem...'
+    closed_stream_settings: 'Mensagem de comentários fechados'
+    comment_count_error: 'Por favor insira um número válido.'
+    comment_count_header: 'Limite o tamanho do comentário'
     comment_count_text_post: caracteres
-    comment_count_text_pre: "Os comentários serão limitados a"
+    comment_count_text_pre: 'Os comentários serão limitados a'
     comment_settings: Configurações
-    comment_stream: "Lista de comentários"
-    comment_stream_will_close: "Comentários fechados"
+    comment_stream: 'Lista de comentários'
+    comment_stream_will_close: 'Comentários fechados'
     community: Usuários
     configure: Configurar
-    copy_and_paste: "Copie e cole o código abaixo em seu CMS para incorporar sua caixa de comentários em seus artigos."
-    custom_css_url: "URL para CSS customizado"
-    custom_css_url_desc: "URL de uma folha de estilo CSS para substituir os estilos padrão dos comentários embutidos. Pode ser interno ou externo."
+    copy_and_paste: 'Copie e cole o código abaixo em seu CMS para incorporar sua caixa de comentários em seus artigos.'
+    custom_css_url: 'URL para CSS customizado'
+    custom_css_url_desc: 'URL de uma folha de estilo CSS para substituir os estilos padrão dos comentários embutidos. Pode ser interno ou externo.'
     days: Dias
-    description: "Personalizar as configurações da lista de comentários para esta história."
-    domain_list_text: "Insira os domínios que você gostaria de permitir para o Talk, como seus ambientes de desenvolvimento, teste ou produção (ej. localhost:3000 staging.domain.com domain.com)."
-    domain_list_title: "Domínios permitidos"
-    edit_comment_timeframe_heading: "Período de tempo para editar comentários"
-    edit_comment_timeframe_text_pre: "Os usuários terão"
-    edit_comment_timeframe_text_post: "segundos para editar seus comentários."
-    embed_comment_stream: "Comentários embutidos"
-    enable_premod_links_text: "Demandar aprovação de moderadores antes de publicar comentários com links."
-    enable_pre_moderation: "Habilitar pré-moderação"
-    enable_pre_moderation_text: "Demandar aprovação de moderadores para todos os comentários."
-    enable_premod_links: "Os moderadores devem aprovar qualquer comentário antes de ser publicado."
-    enable_premod: "Habilitar pré-moderação"
-    enable_premod_description: "Demandar aprovação de moderadores para todos os comentários."
-    enable_premod_links_description: "Demandar aprovação de moderadores antes de publicar comentários com links."
-    enable_questionbox: "Faça uma pergunta aos leitores"
-    enable_questionbox_description: "Esta pergunta aparecerá no topo da lista de comentários. Pergunte aos leitores sobre um determinado problema no artigo, abra o assunto para discussão, etc."
+    description: 'Personalizar as configurações da lista de comentários para esta história.'
+    domain_list_text: 'Insira os domínios que você gostaria de permitir para o Talk, como seus ambientes de desenvolvimento, teste ou produção (ej. localhost:3000 staging.domain.com domain.com).'
+    domain_list_title: 'Domínios permitidos'
+    edit_comment_timeframe_heading: 'Período de tempo para editar comentários'
+    edit_comment_timeframe_text_post: 'segundos para editar seus comentários.'
+    edit_comment_timeframe_text_pre: 'Os usuários terão'
+    embed_comment_stream: 'Comentários embutidos'
+    enable_pre_moderation: 'Habilitar pré-moderação'
+    enable_pre_moderation_text: 'Demandar aprovação de moderadores para todos os comentários.'
+    enable_premod: 'Habilitar pré-moderação'
+    enable_premod_description: 'Demandar aprovação de moderadores para todos os comentários.'
+    enable_premod_links: 'Os moderadores devem aprovar qualquer comentário antes de ser publicado.'
+    enable_premod_links_description: 'Demandar aprovação de moderadores antes de publicar comentários com links.'
+    enable_premod_links_text: 'Demandar aprovação de moderadores antes de publicar comentários com links.'
+    enable_questionbox: 'Faça uma pergunta aos leitores'
+    enable_questionbox_description: 'Esta pergunta aparecerá no topo da lista de comentários. Pergunte aos leitores sobre um determinado problema no artigo, abra o assunto para discussão, etc.'
     hours: Horas
-    include_comment_stream: "Incluir descrição da lista comentários para leitores"
-    include_comment_stream_desc: "Escreva uma mensagem para adicionar ao topo do seu hilo de comentários. Posicionar um tópico, incluem diretrizes comunitárias, etc."
-    include_text: "Inclua seu texto aqui:"
-    include_question_here: "Escreva sua pergunta aqui:"
+    include_comment_stream: 'Incluir descrição da lista comentários para leitores'
+    include_comment_stream_desc: 'Escreva uma mensagem para adicionar ao topo do seu hilo de comentários. Posicionar um tópico, incluem diretrizes comunitárias, etc.'
+    include_question_here: 'Escreva sua pergunta aqui:'
+    include_text: 'Inclua seu texto aqui:'
     moderate: Moderar
-    moderation_settings: "Configurações de moderação"
-    open: "Abrir"
-    open_stream: "Abrir comentários"
-    open_stream_configuration: "Comentários abertos no momento. Ao fechar esta lista de comentários, nenhum novo comentário poderá ser enviado. Mas os comentários anteriores ainda serão exibidos."
-    require_email_verification: "Requerer verificação de email"
-    require_email_verification_text: "Novos usuários devem verificar seu e-mail antes de comentar"
-    save_changes: "Salvar alterações"
+    moderation_settings: 'Configurações de moderação'
+    open: Abrir
+    open_stream: 'Abrir comentários'
+    open_stream_configuration: 'Comentários abertos no momento. Ao fechar esta lista de comentários, nenhum novo comentário poderá ser enviado. Mas os comentários anteriores ainda serão exibidos.'
+    require_email_verification: 'Requerer verificação de email'
+    require_email_verification_text: 'Novos usuários devem verificar seu e-mail antes de comentar'
+    save_changes: 'Salvar alterações'
     shortcuts: Atalhos
-    sign_out: "Sair"
+    sign_out: Sair
     stories: Histórias
-    stream_settings: "Configurações de comentários"
-    suspect_word_title: "Lista de palavras suspeitas"
-    suspect_word_text: "Os comentários que contenham essas palavras ou frases (não sensíveis a maiúsculas e minúsculas) serão automaticamente removidos da lista de comentários. Digite uma palavra e pressione Enter ou Tab para adicionar ou cole uma lista separada por vírgulas."
-    tech_settings: "Configurações técnicas"
-    title: "Configurar comentários"
+    stream_settings: 'Configurações de comentários'
+    suspect_word_text: 'Os comentários que contenham essas palavras ou frases (não sensíveis a maiúsculas e minúsculas) serão automaticamente removidos da lista de comentários. Digite uma palavra e pressione Enter ou Tab para adicionar ou cole uma lista separada por vírgulas.'
+    suspect_word_title: 'Lista de palavras suspeitas'
+    tech_settings: 'Configurações técnicas'
+    title: 'Configurar comentários'
     weeks: Semanas
-    wordlist: "Palavras Proibidas"
-  continue: "Continua"
+    wordlist: 'Palavras Proibidas'
+  confirm_email:
+    click_to_confirm: 'Clique abaixo para confirmar seu endereço de email'
+    confirm: Confirmar
+  continue: Continua
   createdisplay:
-    check_the_form: "Formulário inválido. Verifique as entradas do formulário."
-    continue: "Continue com o mesmo nome de usuário do Facebook"
-    error_create: "Erro ao alterar o nome de usuário"
-    fake_comment_body: "Este é um exemplo de comentário. Os leitores podem compartilhar seus pensamentos e opiniões com a redação na seção de comentários."
-    fake_comment_date: "1 minuto atrás"
-    if_you_dont_change_your_name: "Se você não alterar seu nome de usuário nesta etapa, seu nome de exibição do Facebook aparecerá ao lado de todos os seus comentários."
-    required_field: "Requerido"
+    check_the_form: 'Formulário inválido. Verifique as entradas do formulário.'
+    continue: 'Continue com o mesmo nome de usuário do Facebook'
+    error_create: 'Erro ao alterar o nome de usuário'
+    fake_comment_body: 'Este é um exemplo de comentário. Os leitores podem compartilhar seus pensamentos e opiniões com a redação na seção de comentários.'
+    fake_comment_date: '1 minuto atrás'
+    if_you_dont_change_your_name: 'Se você não alterar seu nome de usuário nesta etapa, seu nome de exibição do Facebook aparecerá ao lado de todos os seus comentários.'
+    required_field: Requerido
     save: Salvar
-    special_characters: "Nomes de usuários podem conter números de letras e _ somente"
-    username: Nome de usuário
-    write_your_username: "Edite seu nome de usuário"
-    your_username: "Nosso nome de usuário aparece em todos os comentários que você publica."
+    special_characters: 'Nomes de usuários podem conter números de letras e _ somente'
+    username: 'Nome de usuário'
+    write_your_username: 'Edite seu nome de usuário'
+    your_username: 'Nosso nome de usuário aparece em todos os comentários que você publica.'
   done: Feito
   edit_comment:
-    body_input_label: "Edite este comentário"
-    save_button: "Salvar alterações"
-    edit_window_expired: "Você não pode mais editar esse comentário. A janela de tempo para fazê-lo expirou. Por que não publicar outro?"
-    edit_window_expired_close: "Fechar"
-    edit_window_timer_prefix: "Tempo para editar:"
-    second: "segundo"
-    seconds_plural: "segundos"
-    minute: "minuto"
-    minutes_plural: "minutos"
+    body_input_label: 'Edite este comentário'
+    edit_window_expired: 'Você não pode mais editar esse comentário. A janela de tempo para fazê-lo expirou. Por que não publicar outro?'
+    edit_window_expired_close: Fechar
+    edit_window_timer_prefix: 'Tempo para editar:'
+    minute: minuto
+    minutes_plural: minutos
+    save_button: 'Salvar alterações'
+    second: segundo
+    seconds_plural: segundos
   email:
-    suspended:
-      subject: "Sua conta foi suspensa"
     banned:
-      subject: "Sua conta foi banida"
-      body: "De acordo com as diretrizes da comunidade do Coral Project, sua conta foi banida. Você não tem mais permissão para comentar, sinalizar ou interagir com nossa comunidade."
+      body: 'De acordo com as diretrizes da comunidade do Coral Project, sua conta foi banida. Você não tem mais permissão para comentar, sinalizar ou interagir com nossa comunidade.'
+      subject: 'Sua conta foi banida'
     confirm:
-      has_been_requested: "Uma confirmação de e-mail foi solicitada para a seguinte conta:"
-      to_confirm: "Para confirmar a conta, visite este link: "
-      confirm_email: "Confirme e-mail"
-      if_you_did_not: "Se você não solicitou isso, você pode ignorar este e-mail."
-      subject: "Confirmação de e-mail"
+      confirm_email: 'Confirme e-mail'
+      has_been_requested: 'Uma confirmação de e-mail foi solicitada para a seguinte conta:'
+      if_you_did_not: 'Se você não solicitou isso, você pode ignorar este e-mail.'
+      subject: 'Confirmação de e-mail'
+      to_confirm: 'Para confirmar a conta, visite este link: '
     password_reset:
-      we_received_a_request: "Recebemos um pedido para redefinir sua senha. Se você não solicitou esta alteração, pode ignorar este e-mail."
-      if_you_did: "Se você solicitou isso, "
-      please_click: "clique aqui para redefinir sua senha."
+      if_you_did: 'Se você solicitou isso, '
+      please_click: 'clique aqui para redefinir sua senha.'
+      we_received_a_request: 'Recebemos um pedido para redefinir sua senha. Se você não solicitou esta alteração, pode ignorar este e-mail.'
+    suspended:
+      subject: 'Sua conta foi suspensa'
+  embed_comments_tab: Comentários
   embedlink:
-    copy: "Copiar para área de transferência"
+    copy: 'Copiar para área de transferência'
   error:
-    COMMENT_PARENT_NOT_VISIBLE: "O comentário que você está respondendo foi removido ou não existe."
-    EMAIL_VERIFICATION_TOKEN_INVALID: "O token de verificação do email é inválido."
-    PASSWORD_RESET_TOKEN_INVALID: "Seu link de redefinição de senha é inválido."
-    COMMENT_TOO_SHORT: "Seu comentário precisar ter mais de um caracter. Revise seu comentário e envie novamente"
-    NOT_AUTHORIZED: "Você não está autorizado a executar esta ação."
-    NO_SPECIAL_CHARACTERS: "Nomes de usuários podem conter números de letras e _ somente"
-    PASSWORD_LENGTH: "A senha é muito curta"
-    PROFANITY_ERROR: "Os nomes de usuários não devem conter palavrões. Entre em contato com o administrador se você acredita que isso seja incorreto."
-    RATE_LIMIT_EXCEEDED: "Tentativas excedidas"
-    USERNAME_IN_USE: "Nome de usuário já em uso"
-    USERNAME_REQUIRED: "O nome do usuário é obrigatório"
-    EMAIL_NOT_VERIFIED: "E-mail não verificado"
-    EDIT_WINDOW_ENDED: "Você não pode mais editar esse comentário. O tempo expirou."
-    EDIT_USERNAME_NOT_AUTHORIZED: "Você não tem permissão para revisar seu nome de usuário."
-    SAME_USERNAME_PROVIDED: "Você deve enviar um nome de usuário diferente."
-    EMAIL_IN_USE: "Endereço de e-mail já está em uso."
-    EMAIL_REQUIRED: "É necessário o endereço de e-mail."
-    LOGIN_MAXIMUM_EXCEEDED: "Você fez muitas tentativas de senha mal sucedidas. Espere alguns instantes."
-    PASSWORD_REQUIRED: "Você deve inserir uma senha."
-    COMMENTING_CLOSED: "Os comentários já estão fechados."
-    NOT_FOUND: "Recurso não encontrado"
-    ALREADY_EXISTS: "O recurso já existe"
-    INVALID_ASSET_URL: "O URL do recurso é inválido"
-    CANNOT_IGNORE_STAFF: "Não é possível ignorar membros Staff."
-    email: "Não é um e-mail válido"
-    confirm_password: "Suas senhas não coincidem. Por favor, tente novamente."
-    network_error: "Falha ao conectar-se ao servidor. Verifique a sua conexão com a internet e tente novamente."
-    email_not_verified: "O endereço de e-mail {0} não é verificado."
-    email_password: "Combinação de e-mail e/ou senha incorreta."
-    organization_name: "O nome da organização só deve conter letras ou números."
-    password: "A senha deve conter pelo menos 8 caracteres"
-    username: "Nomes de usuários podem conter números de letras e _ somente"
-    unexpected: "Ocorreu um erro inesperado. Desculpa!"
-  flag_comment: "Informe o comentário"
-  flag_reason: "Motivo do relatório (opcional)"
-  flag_username: "Informe o nome de usuário"
+    ALREADY_EXISTS: 'O recurso já existe'
+    CANNOT_IGNORE_STAFF: 'Não é possível ignorar membros Staff.'
+    COMMENT_PARENT_NOT_VISIBLE: 'O comentário que você está respondendo foi removido ou não existe.'
+    COMMENT_TOO_SHORT: 'Seu comentário precisar ter mais de um caracter. Revise seu comentário e envie novamente'
+    COMMENTING_CLOSED: 'Os comentários já estão fechados.'
+    confirm_password: 'Suas senhas não coincidem. Por favor, tente novamente.'
+    EDIT_USERNAME_NOT_AUTHORIZED: 'Você não tem permissão para revisar seu nome de usuário.'
+    EDIT_WINDOW_ENDED: 'Você não pode mais editar esse comentário. O tempo expirou.'
+    email: 'Não é um e-mail válido'
+    EMAIL_IN_USE: 'Endereço de e-mail já está em uso.'
+    email_not_verified: 'O endereço de e-mail {0} não é verificado.'
+    EMAIL_NOT_VERIFIED: 'E-mail não verificado'
+    email_password: 'Combinação de e-mail e/ou senha incorreta.'
+    EMAIL_REQUIRED: 'É necessário o endereço de e-mail.'
+    EMAIL_VERIFICATION_TOKEN_INVALID: 'O token de verificação do email é inválido.'
+    INVALID_ASSET_URL: 'O URL do recurso é inválido'
+    LOGIN_MAXIMUM_EXCEEDED: 'Você fez muitas tentativas de senha mal sucedidas. Espere alguns instantes.'
+    network_error: 'Falha ao conectar-se ao servidor. Verifique a sua conexão com a internet e tente novamente.'
+    NO_SPECIAL_CHARACTERS: 'Nomes de usuários podem conter números de letras e _ somente'
+    NOT_AUTHORIZED: 'Você não está autorizado a executar esta ação.'
+    NOT_FOUND: 'Recurso não encontrado'
+    organization_name: 'O nome da organização só deve conter letras ou números.'
+    password: 'A senha deve conter pelo menos 8 caracteres'
+    PASSWORD_LENGTH: 'A senha é muito curta'
+    PASSWORD_REQUIRED: 'Você deve inserir uma senha.'
+    PASSWORD_RESET_TOKEN_INVALID: 'Seu link de redefinição de senha é inválido.'
+    PROFANITY_ERROR: 'Os nomes de usuários não devem conter palavrões. Entre em contato com o administrador se você acredita que isso seja incorreto.'
+    RATE_LIMIT_EXCEEDED: 'Tentativas excedidas'
+    SAME_USERNAME_PROVIDED: 'Você deve enviar um nome de usuário diferente.'
+    unexpected: 'Ocorreu um erro inesperado. Desculpa!'
+    username: 'Nomes de usuários podem conter números de letras e _ somente'
+    USERNAME_IN_USE: 'Nome de usuário já em uso'
+    USERNAME_REQUIRED: 'O nome do usuário é obrigatório'
+  flag_comment: 'Informe o comentário'
+  flag_reason: 'Motivo do relatório (opcional)'
+  flag_username: 'Informe o nome de usuário'
   framework:
-    banned_account_header: "Sua conta está atualmente banida."
-    banned_account_body: "Isso significa que você não pode curtir, informar ou escrever comentários."
+    banned_account_body: 'Isso significa que você não pode curtir, informar ou escrever comentários.'
+    banned_account_header: 'Sua conta está atualmente banida.'
+    changed_name:
+      msg: 'Sua alteração de nome de usuário está sendo analisada por nossa equipe de moderação.'
     comment: comentário
-    comment_is_ignored: "Este comentário está oculto porque você ignorou esse usuário."
-    comment_is_rejected: "Você rejeitou este comentário."
-    comment_is_hidden: "Este comentário não está disponível."
+    comment_is_hidden: 'Este comentário não está disponível.'
+    comment_is_ignored: 'Este comentário está oculto porque você ignorou esse usuário.'
+    comment_is_rejected: 'Você rejeitou este comentário.'
     comments: comentários
-    configure_stream: "Configurar"
-    content_not_available: "Este conteúdo não está disponível"
+    configure_stream: Configurar
+    content_not_available: 'Este conteúdo não está disponível'
     edit_name:
       button: Enviar
-      error: "Nomes de usuários podem conter números de letras e _ somente"
-      label: "Novo usuário"
-      msg: "Sua conta está suspensa porque seu nome de usuário foi considerado inapropriado. Para restaurar sua conta, insira um novo nome de usuário. Entre em contato conosco se você tiver alguma dúvida."
-    changed_name:
-      msg: "Sua alteração de nome de usuário está sendo analisada por nossa equipe de moderação."
-    my_comments: "Meus comentários"
-    my_profile: "Meu perfil"
-    new_count: "Ver {0} {1}"
+      error: 'Nomes de usuários podem conter números de letras e _ somente'
+      label: 'Novo usuário'
+      msg: 'Sua conta está suspensa porque seu nome de usuário foi considerado inapropriado. Para restaurar sua conta, insira um novo nome de usuário. Entre em contato conosco se você tiver alguma dúvida.'
+    my_comments: 'Meus comentários'
+    my_profile: 'Meu perfil'
+    new_count: 'Ver {0} {1}'
     profile: Perfil
-    show_all_comments: "Exibir todos os comentários"
-    success_bio_update: "Sua biografia foi atualizada"
-    success_name_update: "Seu nome de usuário foi atualizado"
-    success_update_settings: "As alterações que você fez foram aplicadas no hilo de comentários neste artigo"
-    show_all_replies: Exibir todas as respostas
-    show_more_replies: Exibir mais respostas
-    view_more_comments: "ver mais comentários"
-    view_reply: "ver resposta"
-  from_settings_page: "Na página de Perfil, você pode ver seu histórico de comentários."
+    show_all_comments: 'Exibir todos os comentários'
+    show_all_replies: 'Exibir todas as respostas'
+    show_more_replies: 'Exibir mais respostas'
+    success_bio_update: 'Sua biografia foi atualizada'
+    success_name_update: 'Seu nome de usuário foi atualizado'
+    success_update_settings: 'As alterações que você fez foram aplicadas no hilo de comentários neste artigo'
+    view_more_comments: 'ver mais comentários'
+    view_reply: 'ver resposta'
+  from_settings_page: 'Na página de Perfil, você pode ver seu histórico de comentários.'
+  install:
+    add_organization:
+      description: 'Por favor, conte-nos o nome da sua organização. Isso aparecerá em e-mails ao convidar novos membros da equipe.'
+      label: 'Nome da organização'
+      save: Salvar
+    create:
+      confirm_password: 'Confirme a senha'
+      email: 'Endereço de e-mail'
+      organization_contact_email: 'Organization Contact Email'
+      password: Senha
+      save: Salvar
+      username: 'Nome de usuário'
+    final:
+      close: 'Feche este instalador'
+      description: 'Obrigado por instalar o Talk! Enviamos um e-mail para verificar seu endereço de e-mail. Enquanto você terminar de configurar a conta, você pode começar a se envolver com seus leitores agora.'
+      launch: 'Iniciar Talk'
+    initial:
+      description: 'Vamos configurar sua comunidade do Talk em apenas alguns pequenos passos.'
+      submit: 'Vamos começar'
+    permitted_domains:
+      description: 'Insira os domínios que você gostaria de permitir para o Talk, como o seu site de preparação ou site de produção (ej. localhost:3000 staging.domain.com dom    ain.com).'
+      submit: 'Completar a instalação'
+      title: 'Domínios permitidos'
   like: Gostar
-  loading_results: "Carregando resultados"
-  marketing: "Isso parece um anúncio/marketing"
-  moderate_this_stream: "Moderar comentários"
+  loading_results: 'Carregando resultados'
+  marketing: 'Isso parece um anúncio/marketing'
+  moderate_this_stream: 'Moderar comentários'
   modqueue:
-    account: "contas marcadas"
+    account: 'contas marcadas'
     actions: Ações
     all: todos
-    all_streams: "Todas as listas"
-    notify_edited: '{0} editou o comentário "{1}"'
-    notify_accepted: '{0} aprovou o comentário "{1}"'
-    notify_rejected: '{0} rejeitou o comentário "{1}"'
-    notify_flagged: '{0} marcou o comentário "{1}"'
-    approve: "Aprovar"
-    approved: "Aprovado"
-    ban_user: "Banir"
+    all_streams: 'Todas as listas'
+    approve: Aprovar
+    approved: Aprovado
+    ban_user: Banir
     billion: B
     close: Fechar
-    dont_like_username: "Eu não gosto desse nome de usuário"
-    empty_queue: "Não há mais comentários para moderar! Aproveite para relaxar e esticar as pernas"
+    empty_queue: 'Não há mais comentários para moderar! Aproveite para relaxar e esticar as pernas'
     flagged: marcado
-    impersonating: Representação
-    less_detail: "Menos detalhes"
+    jump_to_queue: 'Ir para fila específica'
+    less_detail: 'Menos detalhes'
     likes: Curtidas
     million: M
-    mod_faster: "Modere mais rápido com atalhos de teclado"
-    moderate: "Moderar →"
-    more_detail: "Mais detalhes"
-    new: "Novo"
-    newest_first: "Mais novos primeiro"
+    mod_faster: 'Modere mais rápido com atalhos de teclado'
+    moderate: 'Moderar →'
+    more_detail: 'Mais detalhes'
     navigation: Navegação
-    next_comment: "Vá para o próximo comentário"
-    toggle_search: "Abrir busca"
-    next_queue: "Trocar filas"
-    oldest_first: "Mais velhos primeiro"
+    new: Novo
+    newest_first: 'Mais novos primeiro'
+    next_comment: 'Vá para o próximo comentário'
+    next_queue: 'Trocar filas'
+    notify_accepted: '{0} aprovou o comentário "{1}"'
+    notify_edited: '{0} editou o comentário "{1}"'
+    notify_flagged: '{0} marcou o comentário "{1}"'
+    notify_rejected: '{0} rejeitou o comentário "{1}"'
+    oldest_first: 'Mais velhos primeiro'
     premod: pré-moderação
-    prev_comment: "Vá para o comentário anterior"
-    reject: "Rejeitar"
-    rejected: "Rejeitado"
-    reply: "Responder"
-    select_stream: "Selecione a lista"
-    shift_key: "⇧"
-    shortcuts: "Atalhos"
-    sort: "Ordenar"
-    show_shortcuts: "Ver atalhos"
-    singleview: "Modo zen"
-    thismenu: "Abra este menu"
-    jump_to_queue: "Ir para fila específica"
+    prev_comment: 'Vá para o comentário anterior'
+    reject: Rejeitar
+    rejected: Rejeitado
+    reply: Responder
+    select_stream: 'Selecione a lista'
+    shift_key: ⇧
+    shortcuts: Atalhos
+    show_shortcuts: 'Ver atalhos'
+    singleview: 'Modo zen'
+    sort: Ordenar
+    thismenu: 'Abra este menu'
     thousand: k
-    try_these: "Tente este"
-    view_more_shortcuts: "Ver mais atalhos"
-  my_comment_history: "Histórico de comentários"
+    toggle_search: 'Abrir busca'
+    try_these: 'Tente este'
+    view_more_shortcuts: 'Ver mais atalhos'
+  my_comment_history: 'Histórico de comentários'
   name: Nome
-  no_agree_comment: "Eu não concordo com este comentário"
-  no_like_bio: "Eu não gosto dessa descrição de perfil"
-  no_like_username: "Eu não gosto deste nome de usuário"
-  already_flagged_username: "Você já sinalizou este usuário."
+  no_agree_comment: 'Eu não concordo com este comentário'
+  no_like_bio: 'Eu não gosto dessa descrição de perfil'
+  no_like_username: 'Eu não gosto deste nome de usuário'
   other: Outro
+  password_reset:
+    change_password: 'Alterar senha'
+    confirm_new_password: 'Confirmar nova senha'
+    new_password: 'Nova senha'
+    new_password_help: 'A senha deve ter mais de 8 caracteres'
+    set_new_password: 'Alterar sua senha'
   permalink: Compartilhar
-  personal_info: "Este comentário revela informações de identificação pessoal"
+  personal_info: 'Este comentário revela informações de identificação pessoal'
   post: Publicar
   profile: Perfil
-  profile_settings: "Configurações"
+  profile_settings: Configurações
+  reject_username:
+    description_notify: 'Suspender este usuário temporariamente desativará sua conta.'
+    description_reject: 'Gostaria de proibir temporariamente este usuário por causa de seu {0}? O usuário será suspenso temporariamente até que eles reescrevam seu {0}.'
+    email_message_reject: 'Outro membro da comunidade recentemente sinalizou seu nome de usuário para revisão. Por causa do seu conteúdo, seu nome de usuário foi rejeitado. Isso significa que você não pode mais comentar, gostar, ou denunciar conteúdo até que você reescreva seu nome de usuário. Por favor envie-nos um e-mail se tiver dúvidas ou preocupações.'
+    no_cancel: 'Não cancelar'
+    send: Enviar
+    suspend_user: 'Suspender usuário'
+    title_notify: 'Notificar o usuário da suspensão temporária'
+    title_reject: 'Percebemos que você rejeitou um nome de usuário'
+    username: 'nome de usuário'
+    write_message: 'Escreve uma mensagem'
+    yes_suspend: 'Sim suspender'
   reply: Responder
   report: Denunciar
-  report_notif: "Obrigado por denunciar este comentário. Nossa equipe de moderação foi notificada e irá revisá-la em breve."
-  report_notif_remove: "O comentário que você denunciou foi removido."
+  report_notif: 'Obrigado por denunciar este comentário. Nossa equipe de moderação foi notificada e irá revisá-la em breve.'
+  report_notif_remove: 'O comentário que você denunciou foi removido.'
   reported: Denunciado
   settings:
-    from_settings_page: "Na página de Perfil, você pode ver seu histórico de comentários."
-    my_comment_history: "Histórico de comentários"
+    from_settings_page: 'Na página de Perfil, você pode ver seu histórico de comentários.'
+    my_comment_history: 'Histórico de comentários'
     profile: Perfil
-    profile_settings: "Configurações de perfil"
-    sign_in: "Entre"
-    to_access: "para acessar o perfil"
-    user_no_comment: "Você nunca deixou um comentário. Participe da conversa!"
+    profile_settings: 'Configurações de perfil'
+    sign_in: Entre
+    to_access: 'para acessar o perfil'
+    user_no_comment: 'Você nunca deixou um comentário. Participe da conversa!'
+  step_1_header: 'Relatar um problema'
+  step_2_header: 'Ajude-nos a entender'
+  step_3_header: 'Obrigdo por sua contribuição'
   stream:
-    all_comments: "Todos os comentários"
-    temporarily_suspended: "De acordo com as diretrizes da comunidade de {0}, sua conta foi temporariamente suspensa. Por favor, volte para a conversa {1}."
-    comment_not_found: "Este comentário foi removido ou não existe."
-    no_comments: "Ainda não há comentários, por que não escrever um?"
-    no_comments_and_closed: "Não houve comentários sobre este artigo."
-  step_1_header: "Relatar um problema"
-  step_2_header: "Ajude-nos a entender"
-  step_3_header: "Obrigdo por sua contribuição"
+    all_comments: 'Todos os comentários'
+    comment_not_found: 'Este comentário foi removido ou não existe.'
+    no_comments: 'Ainda não há comentários, por que não escrever um?'
+    no_comments_and_closed: 'Não houve comentários sobre este artigo.'
+    temporarily_suspended: 'De acordo com as diretrizes da comunidade de {0}, sua conta foi temporariamente suspensa. Por favor, volte para a conversa {1}.'
   streams:
     all: Todos
     article: História
     closed: Fechado
-    empty_result: "Nenhum resultado encontrado para esta pesquisa. Que tal refazer a pesquisa com termos diferentes?"
-    filter_streams: "Filtra as listas"
-    newest: O mais novo
-    oldest: O mais velho
+    empty_result: 'Nenhum resultado encontrado para esta pesquisa. Que tal refazer a pesquisa com termos diferentes?'
+    filter_streams: 'Filtra as listas'
+    newest: 'O mais novo'
+    oldest: 'O mais velho'
     open: Aberto
-    pubdate: "Data de publicação"
+    pubdate: 'Data de publicação'
     search: Pesquisar
-    sort_by: "Ordenar por"
-    status: "Situação dos comentários"
-    stream_status: "Situação dos comentários"
+    sort_by: 'Ordenar por'
+    status: 'Situação dos comentários'
+    stream_status: 'Situação dos comentários'
   suspenduser:
-    title_suspend: "Suspender usuário"
-    description_suspend: "Você está suspendendo {0}. Este comentário irá para a fila Rejeitada, e {0} não poderá gostar, denunciar, responder ou publicar até que o tempo de suspensão seja concluído."
-    select_duration: "Selecione a duração da suspensão"
-    one_hour: "1 hora"
-    hours: "{0} horas"
-    days: "{0} dias"
-    cancel: "Cancelar"
-    suspend_user: "Suspender usuário"
+    cancel: Cancelar
+    days: '{0} dias'
+    description_notify: 'Suspender este usuário temporariamente desativará sua conta.'
+    description_suspend: 'Você está suspendendo {0}. Este comentário irá para a fila Rejeitada, e {0} não poderá gostar, denunciar, responder ou publicar até que o tempo de suspensão seja concluído.'
     email_message_suspend: "Querido/a {0},\n\nDe acordo com as diretrizes da comunidade de {1}, sua conta foi temporariamente suspensa. Durante a suspensão, você não poderá comentar, denunciar ou se responder outros usuários(as). Por favor, volte para a conversa {2}."
-    title_notify: "Notificar o usuário da suspensão temporária"
-    notify_suspend_until: "O usuário {0} foi temporariamente suspenso. Esta suspensão terminará automaticamente {1}."
-    description_notify: "Suspender este usuário temporariamente desativará sua conta."
-    write_message: "Escrever uma mensagem"
+    hours: '{0} horas'
+    notify_suspend_until: 'O usuário {0} foi temporariamente suspenso. Esta suspensão terminará automaticamente {1}.'
+    one_hour: '1 hora'
+    select_duration: 'Selecione a duração da suspensão'
     send: Enviar
-  reject_username:
-    username: nome de usuário
-    no_cancel: "Não cancelar"
-    description_reject: "Gostaria de proibir temporariamente este usuário por causa de seu {0}? O usuário será suspenso temporariamente até que eles reescrevam seu {0}."
-    title_notify: "Notificar o usuário da suspensão temporária"
-    description_notify: "Suspender este usuário temporariamente desativará sua conta."
-    title_reject: "Percebemos que você rejeitou um nome de usuário"
-    suspend_user: "Suspender usuário"
-    yes_suspend: "Sim suspender"
-    email_message_reject: "Outro membro da comunidade recentemente sinalizou seu nome de usuário para revisão. Por causa do seu conteúdo, seu nome de usuário foi rejeitado. Isso significa que você não pode mais comentar, gostar, ou denunciar conteúdo até que você reescreva seu nome de usuário. Por favor envie-nos um e-mail se tiver dúvidas ou preocupações."
-    write_message: "Escreve uma mensagem"
-    send: Enviar
-  thank_you: "Nós valorizamos sua segurança e opinião. Um moderador irá rever o seu relatório."
+    suspend_user: 'Suspender usuário'
+    title_notify: 'Notificar o usuário da suspensão temporária'
+    title_suspend: 'Suspender usuário'
+    write_message: 'Escrever uma mensagem'
+  thank_you: 'Nós valorizamos sua segurança e opinião. Um moderador irá rever o seu relatório.'
   user:
-    bio_flags: "Marcadas para este perfil"
-    user_bio: "Perfil do usuário"
-    username_flags: "Marcadas para este usuário"
-  user_impersonating: "Este usuário está representando"
-  user_no_comment: "Você nunca deixou um comentário. Participe da conversa!"
-  username_offensive: "Esse nome de usuário é ofensivo"
-  view_conversation: "Ver conversa"
-  install:
-    initial:
-      description: "Vamos configurar sua comunidade do Talk em apenas alguns pequenos passos."
-      submit: "Vamos começar"
-    add_organization:
-      description: "Por favor, conte-nos o nome da sua organização. Isso aparecerá em e-mails ao convidar novos membros da equipe."
-      label: "Nome da organização"
-      save: "Salvar"
-    create:
-      email: "Endereço de e-mail"
-      username: "Nome de usuário"
-      password: "Senha"
-      confirm_password: "Confirme a senha"
-      organization_contact_email: "Organization Contact Email"
-      save: "Salvar"
-    permitted_domains:
-      title: "Domínios permitidos"
-      description: "Insira os domínios que você gostaria de permitir para o Talk, como o seu site de preparação ou site de produção (ej. localhost:3000 staging.domain.com dom    ain.com)."
-      submit: "Completar a instalação"
-    final:
-      description: "Obrigado por instalar o Talk! Enviamos um e-mail para verificar seu endereço de e-mail. Enquanto você terminar de configurar a conta, você pode começar a se envolver com seus leitores agora."
-      launch: "Iniciar Talk"
-      close: "Feche este instalador"
-  admin_sidebar:
-    view_options: "Opções de visualização"
-    sort_comments: "Ordenar comentários"
\ No newline at end of file
+    bio_flags: 'Marcadas para este perfil'
+    user_bio: 'Perfil do usuário'
+    username_flags: 'Marcadas para este usuário'
+  user_impersonating: 'Este usuário está representando'
+  user_no_comment: 'Você nunca deixou um comentário. Participe da conversa!'
+  username_offensive: 'Esse nome de usuário é ofensivo'
+  validators:
+    confirm_password: 'Suas senhas não coincidem. Por favor, tente novamente.'
+    verify_email: 'Não é um e-mail válido'
+    verify_organization_name: 'O nome da organização só deve conter letras ou números.'
+    verify_password: 'A senha deve conter pelo menos 8 caracteres'
+    verify_username: 'Nomes de usuários podem conter números de letras e _ somente'
+  view_conversation: 'Ver conversa'
+  your_account_has_been_banned: 'Sua conta foi banida.'
+  your_account_has_been_suspended: 'Sua conta foi temporariamente suspensa.'
+  your_username_has_been_rejected: 'Sua conta foi rejeitada porque seu nome de usuário foi considerado inapropriado. Para restaurar sua conta, insira um novo nome de usuário.'
diff --git a/locales/zh_CN.yml b/locales/zh_CN.yml
index c70f5b779..c3a1b2249 100644
--- a/locales/zh_CN.yml
+++ b/locales/zh_CN.yml
@@ -1,408 +1,414 @@
 zh_CN:
-  your_account_has_been_suspended: "您的帐户已被暂时停用。"
-  your_account_has_been_banned: "您的帐户已被禁用。"
-  your_username_has_been_rejected: "由于您使用了不恰当的用户名，您的帐户已被暂停使用。若需恢复帐户，请输入一个新的用户名"
-  embed_comments_tab: "评论"
+  already_flagged_username: 'You have already flagged this username.'
   bandialog:
-    are_you_sure: "您确定要封禁 {0} 吗？"
-    ban_user: "确定封禁该用户？"
-    banned_user: "已封禁的用户"
-    cancel: "取消"
-    note: "注意：{0}"
-    note_reject_comment: "封禁该用户将使这条评论被移入“被拒”队列。"
-    note_ban_user: "封禁该用户将使其无法编辑或删除评论。"
-    yes_ban_user: "是的，封禁该用户"
-  bio_offensive: "该简介含有冒犯言语"
-  cancel: "取消"
-  confirm_email:
-    click_to_confirm: "Click below to confirm your email address"
-    confirm: "Confirm"
-  characters_remaining: "字符剩余可用"
+    are_you_sure: '您确定要封禁 {0} 吗？'
+    ban_user: 确定封禁该用户？
+    banned_user: 已封禁的用户
+    cancel: 取消
+    note: '注意：{0}'
+    note_ban_user: 封禁该用户将使其无法编辑或删除评论。
+    note_reject_comment: 封禁该用户将使这条评论被移入“被拒”队列。
+    yes_ban_user: 是的，封禁该用户
+  bio_offensive: 该简介含有冒犯言语
+  cancel: 取消
+  characters_remaining: 字符剩余可用
   comment:
-    anon: "匿名"
-    undo_reject: "撤销"
-    ban_user: "封禁用户"
-    comment: "发表评论"
-    edited: "已被编辑"
-    flagged: "已被举报"
-    view_context: "查看全文"
+    anon: 匿名
+    ban_user: 封禁用户
+    comment: 发表评论
+    edited: 已被编辑
+    flagged: 已被举报
+    undo_reject: 撤销
+    view_context: 查看全文
   comment_box:
-    post: "发布"
-    cancel: "取消"
-    reply: "回复"
-    comment: "发表评论"
-    name: "名称"
-    comment_post_notif: "您的评论已发布。"
-    comment_post_notif_premod: "感谢发表评论。我们的管理团队会马上审查您的评论。"
-    comment_post_banned_word:  "您的评论包含一个或多个被禁词汇，不会被发表。若您认为该判断有误，请联系我们的管理团队。"
-    characters_remaining: "剩余可用字符"
-  comment_offensive: "该评论含有冒犯言语"
-  comment_singular: "评论"
-  comment_plural: "评论"
-  comment_post_banned_word: "您的评论包含一个或多个被禁词汇，不会被发表。若您认为该判断有误，请联系我们的管理团队。"
-  comment_post_notif: "您的评论已发布。"
-  comment_post_notif_premod: "感谢发表评论。我们的管理团队会马上审查您的评论。"
+    cancel: 取消
+    characters_remaining: 剩余可用字符
+    comment: 发表评论
+    comment_post_banned_word: 您的评论包含一个或多个被禁词汇，不会被发表。若您认为该判断有误，请联系我们的管理团队。
+    comment_post_notif: 您的评论已发布。
+    comment_post_notif_premod: 感谢发表评论。我们的管理团队会马上审查您的评论。
+    name: 名称
+    post: 发布
+    reply: 回复
+  comment_offensive: 该评论含有冒犯言语
+  comment_plural: 评论
+  comment_post_banned_word: 您的评论包含一个或多个被禁词汇，不会被发表。若您认为该判断有误，请联系我们的管理团队。
+  comment_post_notif: 您的评论已发布。
+  comment_post_notif_premod: 感谢发表评论。我们的管理团队会马上审查您的评论。
+  comment_singular: 评论
   common:
-    copy: '复制'
-    error: '发生了错误。'
-    reply: '回复'
-    replies: '回复'
-    reaction: '回应'
-    reactions: '回应'
-    story: '文章'
+    copy: 复制
+    error: 发生了错误。
+    reaction: 回应
+    reactions: 回应
+    replies: 回复
+    reply: 回复
+    story: 文章
   community:
-    account_creation_date: "账户创建日期"
-    active: "活动中"
-    admin: "管理员"
-    ads_marketing: "这看起来像是广告"
-    are_you_sure: "您确定要屏蔽 {0} 吗？"
-    ban_user: "确认封禁该用户吗？"
-    banned: "已封禁"
-    banned_user: "被封禁的用户"
-    cancel: "取消"
-    dont_like_username: "不喜欢用户名"
-    flaggedaccounts: "被举报用户"
-    flags: "举报"
-    impersonating: "冒名"
-    loading: "加载结果中"
-    moderator: "审查员"
-    newsroom_role: "编辑团队人员"
-    no_flagged_accounts: "被举报的用户名列表为空。"
-    no_results: "没有用户使用该用户名或邮箱地址。他们藏起来了！"
-    offensive: "冒犯"
-    other: "其他"
-    people: "联系人"
-    role: "选择角色..."
-    select_status: "选择状态..."
-    spam_ads: "垃圾信息/广告"
-    staff: "员工"
-    status: "状态"
-    username_and_email: "用户名和邮箱"
-    yes_ban_user: "确定封禁该用户"
-    none: "无"
+    account_creation_date: 账户创建日期
+    active: 活动中
+    admin: 管理员
+    ads_marketing: 这看起来像是广告
+    are_you_sure: '您确定要屏蔽 {0} 吗？'
+    ban_user: 确认封禁该用户吗？
+    banned: 已封禁
+    banned_user: 被封禁的用户
+    cancel: 取消
+    dont_like_username: 不喜欢用户名
+    flaggedaccounts: 被举报用户
+    flags: 举报
+    impersonating: 冒名
+    loading: 加载结果中
+    moderator: 审查员
+    newsroom_role: 编辑团队人员
+    no_flagged_accounts: 被举报的用户名列表为空。
+    no_results: 没有用户使用该用户名或邮箱地址。他们藏起来了！
+    offensive: 冒犯
+    other: 其他
+    people: 联系人
+    role: 选择角色...
+    select_status: 选择状态...
+    spam_ads: 垃圾信息/广告
+    staff: 员工
+    status: 状态
+    username_and_email: 用户名和邮箱
+    yes_ban_user: 确定封禁该用户
   configure:
-    apply: "应用"
-    banned_word_text: "包含这些词汇或词组的评论（不分大小写）将会自动从评论流中被删除。要添加词汇，请输入一个词汇，按下回车键或 Tab 键。或者您也可以粘贴一个以英文逗号分隔的列表。"
-    banned_words_title: "被禁词汇表"
-    close: "关闭"
-    close_after: "指定时间后关闭评论："
-    close_stream: "关闭流"
-    close_stream_configuration: "该评论流目前已被关闭。开启评论流后新评论才能被提交及展示。"
-    closed_comments_desc: "填写当评论流关闭、不再接受新评论时显示的信息。"
-    closed_comments_label: "填写信息..."
-    closed_stream_settings: "已关闭流的描述"
-    comment_count_error: "请输入有效的数字。"
-    comment_count_header: "限制评论长度"
-    comment_count_text_post: "字符"
-    comment_count_text_pre: "评论长度将被限制到"
-    comment_settings: "设置"
-    comment_stream: "评论流"
-    comment_stream_will_close: "该评论流将关闭"
-    community: "社群"
-    configure: "配置"
-    copy_and_paste: "将下面的代码复制粘贴到您的内容管理系统中，以在文章页面中嵌入评论框。"
-    custom_css_url: "自定义 CSS 地址"
-    custom_css_url_desc: "自定义 CSS 将覆盖内置的样式。可为内部地址或外部地址。"
-    days: "日"
-    description: "作为管理员，您可以对该故事的评论流进行配置。"
-    domain_list_text: "输入许可使用 Talk 的域名，如您的本地环境、测试环境、生产环境（如 localhost:3000、staging.domain.com、domain.com）。"
-    domain_list_title: "被许可域名"
-    edit_comment_timeframe_heading: "评论编辑时间限制"
-    edit_comment_timeframe_text_pre: "评论者将有"
-    edit_comment_timeframe_text_post: "秒来编辑评论。"
-    embed_comment_stream: "嵌入评论流"
-    enable_premod_links_text: "让包含链接的评论发表前接受审查。"
-    enable_pre_moderation: "开启预审查"
-    enable_pre_moderation_text: "让所有评论发表前接受审查。"
-    enable_premod_links: "预审查包含链接的评论"
-    enable_premod: "开启预审查"
-    enable_premod_description: "让所有评论发表前接受审查。"
-    enable_premod_links_description: "让包含链接的评论发表前接受审查。"
-    enable_questionbox: "向读者提问"
-    enable_questionbox_description: "该问题将在评论流顶部出现。可以就文章中特定内容发问，也可以设置一个讨论问题，等等。"
-    hours: "小时"
-    include_comment_stream: "开启评论流描述"
-    include_comment_stream_desc: "填写将在评论流顶部出现的描述。可以写评论主题、社群指引方针，等等。"
-    include_text: "此处输入文本。"
-    include_question_here: "此处输入问题："
-    moderate: "审查"
-    moderation_settings: "审查设定"
-    open: "开启"
-    open_stream: "开启流"
-    open_stream_configuration: "该评论流目前开启。关闭该评论流后，新评论将无法被提交，但先前的评论仍将被展示。"
-    require_email_verification: "需要邮件确认"
-    require_email_verification_text: "新用户必须确认邮箱后才能评论"
-    save_changes: "保存更改"
-    shortcuts: "快捷方式"
-    sign_out: "登出"
-    stories: "文章"
-    stream_settings: "流设定"
-    suspect_word_title: "可疑词列表"
-    suspect_word_text: "包含这些词汇或词组的评论（不分大小写）将不会被精选出来。要添加词汇，请输入一个词汇，按下回车键或 Tab 键。或者您也可以粘贴一个以英文逗号分隔的列表。"
-    tech_settings: "技术设置"
-    title: "评论流设置"
-    weeks: "周"
-    wordlist: "被禁词汇"
-  continue: "继续"
+    apply: 应用
+    banned_word_text: '包含这些词汇或词组的评论（不分大小写）将会自动从评论流中被删除。要添加词汇，请输入一个词汇，按下回车键或 Tab 键。或者您也可以粘贴一个以英文逗号分隔的列表。'
+    banned_words_title: 被禁词汇表
+    close: 关闭
+    close_after: 指定时间后关闭评论：
+    close_stream: 关闭流
+    close_stream_configuration: 该评论流目前已被关闭。开启评论流后新评论才能被提交及展示。
+    closed_comments_desc: 填写当评论流关闭、不再接受新评论时显示的信息。
+    closed_comments_label: 填写信息...
+    closed_stream_settings: 已关闭流的描述
+    comment_count_error: 请输入有效的数字。
+    comment_count_header: 限制评论长度
+    comment_count_text_post: 字符
+    comment_count_text_pre: 评论长度将被限制到
+    comment_settings: 设置
+    comment_stream: 评论流
+    comment_stream_will_close: 该评论流将关闭
+    community: 社群
+    configure: 配置
+    copy_and_paste: 将下面的代码复制粘贴到您的内容管理系统中，以在文章页面中嵌入评论框。
+    custom_css_url: '自定义 CSS 地址'
+    custom_css_url_desc: '自定义 CSS 将覆盖内置的样式。可为内部地址或外部地址。'
+    days: 日
+    description: 作为管理员，您可以对该故事的评论流进行配置。
+    domain_list_text: '输入许可使用 Talk 的域名，如您的本地环境、测试环境、生产环境（如 localhost:3000、staging.domain.com、domain.com）。'
+    domain_list_title: 被许可域名
+    edit_comment_timeframe_heading: 评论编辑时间限制
+    edit_comment_timeframe_text_post: 秒来编辑评论。
+    edit_comment_timeframe_text_pre: 评论者将有
+    embed_comment_stream: 嵌入评论流
+    enable_pre_moderation: 开启预审查
+    enable_pre_moderation_text: 让所有评论发表前接受审查。
+    enable_premod: 开启预审查
+    enable_premod_description: 让所有评论发表前接受审查。
+    enable_premod_links: 预审查包含链接的评论
+    enable_premod_links_description: 让包含链接的评论发表前接受审查。
+    enable_premod_links_text: 让包含链接的评论发表前接受审查。
+    enable_questionbox: 向读者提问
+    enable_questionbox_description: 该问题将在评论流顶部出现。可以就文章中特定内容发问，也可以设置一个讨论问题，等等。
+    hours: 小时
+    include_comment_stream: 开启评论流描述
+    include_comment_stream_desc: 填写将在评论流顶部出现的描述。可以写评论主题、社群指引方针，等等。
+    include_question_here: 此处输入问题：
+    include_text: 此处输入文本。
+    moderate: 审查
+    moderation_settings: 审查设定
+    open: 开启
+    open_stream: 开启流
+    open_stream_configuration: 该评论流目前开启。关闭该评论流后，新评论将无法被提交，但先前的评论仍将被展示。
+    require_email_verification: 需要邮件确认
+    require_email_verification_text: 新用户必须确认邮箱后才能评论
+    save_changes: 保存更改
+    shortcuts: 快捷方式
+    sign_out: 登出
+    stories: 文章
+    stream_settings: 流设定
+    suspect_word_text: '包含这些词汇或词组的评论（不分大小写）将不会被精选出来。要添加词汇，请输入一个词汇，按下回车键或 Tab 键。或者您也可以粘贴一个以英文逗号分隔的列表。'
+    suspect_word_title: 可疑词列表
+    tech_settings: 技术设置
+    title: 评论流设置
+    weeks: 周
+    wordlist: 被禁词汇
+  confirm_email:
+    click_to_confirm: 'Click below to confirm your email address'
+    confirm: Confirm
+  continue: 继续
   createdisplay:
-    check_the_form: "表单无效。请检查输入框。"
-    continue: "使用 Facebook 用户名"
-    error_create: "更改用户名时发生了错误"
-    fake_comment_body: "此为评论样例。读者可以在评论部分中分享他们关于新闻编辑室的想法和意见。"
-    fake_comment_date: "1 分钟前"
-    if_you_dont_change_your_name: "若您不在此改变用户名，您的 Facebook 用户名将随您的评论一同出现。"
-    required_field: "必填字段"
-    save: "保存"
-    special_characters: "用户名只能包含字母、数字跟下划线"
-    username: "用户名"
-    write_your_username: "编辑您的用户名"
-    your_username: "您的用户名将随您发表的所有评论一同出现。"
-  done: "完成"
+    check_the_form: 表单无效。请检查输入框。
+    continue: '使用 Facebook 用户名'
+    error_create: 更改用户名时发生了错误
+    fake_comment_body: 此为评论样例。读者可以在评论部分中分享他们关于新闻编辑室的想法和意见。
+    fake_comment_date: '1 分钟前'
+    if_you_dont_change_your_name: '若您不在此改变用户名，您的 Facebook 用户名将随您的评论一同出现。'
+    required_field: 必填字段
+    save: 保存
+    special_characters: 用户名只能包含字母、数字跟下划线
+    username: 用户名
+    write_your_username: 编辑您的用户名
+    your_username: 您的用户名将随您发表的所有评论一同出现。
+  done: 完成
   edit_comment:
-    body_input_label: "编辑该评论"
-    save_button: "保存更改"
-    edit_window_expired: "已超过时间限制，您不再能够编辑该评论。不如再发表个评论？"
-    edit_window_expired_close: "关闭"
-    edit_window_timer_prefix: "编辑时间限制："
-    second: "秒"
-    seconds_plural: "秒"
-    minute: "分钟"
-    minutes_plural: "分钟"
+    body_input_label: 编辑该评论
+    edit_window_expired: 已超过时间限制，您不再能够编辑该评论。不如再发表个评论？
+    edit_window_expired_close: 关闭
+    edit_window_timer_prefix: 编辑时间限制：
+    minute: 分钟
+    minutes_plural: 分钟
+    save_button: 保存更改
+    second: 秒
+    seconds_plural: 秒
   email:
-    suspended:
-      subject: "您的帐号已被停用"
     banned:
-      subject: "您的帐号已被禁用"
-      body: "根据社群指引方针，您的帐号已被屏蔽。您不再可以发表评论、举报，或者参与社群。"
+      body: 根据社群指引方针，您的帐号已被屏蔽。您不再可以发表评论、举报，或者参与社群。
+      subject: 您的帐号已被禁用
     confirm:
-      has_been_requested: "下述帐号已申请邮箱验证："
-      to_confirm: "要确认帐号，请访问下述链接："
-      confirm_email: "确认邮箱"
-      if_you_did_not: "若您没有申请这封邮件，您可以忽略本邮件。"
-      subject: "确认邮箱"
+      confirm_email: 确认邮箱
+      has_been_requested: 下述帐号已申请邮箱验证：
+      if_you_did_not: 若您没有申请这封邮件，您可以忽略本邮件。
+      subject: 确认邮箱
+      to_confirm: 要确认帐号，请访问下述链接：
     password_reset:
-      we_received_a_request: "我们收到了重置密码的请求。若您没有申请重置密码，您可以忽略本邮件。"
-      if_you_did: "若您曾申请，"
-      please_click: "请点击此处重置密码"
+      if_you_did: 若您曾申请，
+      please_click: 请点击此处重置密码
+      we_received_a_request: 我们收到了重置密码的请求。若您没有申请重置密码，您可以忽略本邮件。
+    suspended:
+      subject: 您的帐号已被停用
+  embed_comments_tab: 评论
   embedlink:
-    copy: "复制到粘贴板"
+    copy: 复制到粘贴板
   error:
-    COMMENT_TOO_SHORT: "评论至少应有一个字符。请修改您的评论，再度尝试。"
-    NOT_AUTHORIZED: "您没有权限进行该操作"
-    NO_SPECIAL_CHARACTERS: "用户名只能包含字母、数字跟下划线"
-    PASSWORD_LENGTH: "密码太短"
-    PROFANITY_ERROR: "用户名不能包含侮辱性词汇。如果您确信判断有误，请联系管理员。"
-    RATE_LIMIT_EXCEEDED: "评论数已超过上限"
-    USERNAME_IN_USE: "用户名已被占用"
-    USERNAME_REQUIRED: "必须输入用户名"
-    EMAIL_NOT_VERIFIED: "邮箱地址未验证"
-    EDIT_WINDOW_ENDED: "由于超过时间期限，您已无法编辑该评论。"
-    EDIT_USERNAME_NOT_AUTHORIZED: "您没有权限更改用户名。"
-    SAME_USERNAME_PROVIDED: "您必须提交一个未被使用过的用户名。"
-    EMAIL_IN_USE: "邮箱地址已被占用"
-    EMAIL_REQUIRED: "请输入一个电子邮箱地址"
-    LOGIN_MAXIMUM_EXCEEDED: "您输入了太多次不正确的密码。请稍候再试。"
-    PASSWORD_REQUIRED: "必须输入密码"
-    COMMENTING_CLOSED: "评论已被关闭"
-    NOT_FOUND: "找不到资源"
-    ALREADY_EXISTS: "资源已存在"
-    INVALID_ASSET_URL: "网址无效"
-    CANNOT_IGNORE_STAFF: "不能屏蔽管理人员。"
-    email: "非有效邮箱"
-    confirm_password: "密码不匹配。请检查"
-    network_error: "无法连接服务器。请检查您的互联网连接，然后重试。"
-    email_not_verified: "邮箱地址 {0} 未经验证。"
-    email_password: "邮箱与密码的组合错误。"
-    organization_name: "组织名只能包含字母或数字。"
-    password: "密码长度须至少为 8 字符"
-    username: "用户名只能包含字母、数字跟下划线"
-    unexpected: "发生了异常错误。对不起！"
-    required_field: "该字段必填"
-  flag_comment: "举报评论"
-  flag_reason: "举报理由（可选）"
-  flag_username: "举报用户名"
+    ALREADY_EXISTS: 资源已存在
+    CANNOT_IGNORE_STAFF: 不能屏蔽管理人员。
+    COMMENT_TOO_SHORT: 评论至少应有一个字符。请修改您的评论，再度尝试。
+    COMMENTING_CLOSED: 评论已被关闭
+    confirm_password: 密码不匹配。请检查
+    EDIT_USERNAME_NOT_AUTHORIZED: 您没有权限更改用户名。
+    EDIT_WINDOW_ENDED: 由于超过时间期限，您已无法编辑该评论。
+    email: 非有效邮箱
+    EMAIL_IN_USE: 邮箱地址已被占用
+    email_not_verified: '邮箱地址 {0} 未经验证。'
+    EMAIL_NOT_VERIFIED: 邮箱地址未验证
+    email_password: 邮箱与密码的组合错误。
+    EMAIL_REQUIRED: 请输入一个电子邮箱地址
+    INVALID_ASSET_URL: 网址无效
+    LOGIN_MAXIMUM_EXCEEDED: 您输入了太多次不正确的密码。请稍候再试。
+    network_error: 无法连接服务器。请检查您的互联网连接，然后重试。
+    NO_SPECIAL_CHARACTERS: 用户名只能包含字母、数字跟下划线
+    NOT_AUTHORIZED: 您没有权限进行该操作
+    NOT_FOUND: 找不到资源
+    organization_name: 组织名只能包含字母或数字。
+    password: '密码长度须至少为 8 字符'
+    PASSWORD_LENGTH: 密码太短
+    PASSWORD_REQUIRED: 必须输入密码
+    PROFANITY_ERROR: 用户名不能包含侮辱性词汇。如果您确信判断有误，请联系管理员。
+    RATE_LIMIT_EXCEEDED: 评论数已超过上限
+    required_field: 该字段必填
+    SAME_USERNAME_PROVIDED: 您必须提交一个未被使用过的用户名。
+    unexpected: 发生了异常错误。对不起！
+    username: 用户名只能包含字母、数字跟下划线
+    USERNAME_IN_USE: 用户名已被占用
+    USERNAME_REQUIRED: 必须输入用户名
+  flag_comment: 举报评论
+  flag_reason: 举报理由（可选）
+  flag_username: 举报用户名
   framework:
-    banned_account_header: "您的帐号目前已被禁用"
-    banned_account_body: "这意味着您不能点赞，举报或评论。"
-    comment: "评论"
-    comment_is_ignored: "由于您屏蔽了该用户，这条评论被隐藏。"
-    comment_is_rejected: "您已拒绝该评论。"
-    comment_is_hidden: "该评论不可用"
-    comments: "评论"
-    configure_stream: "配置"
-    content_not_available: "该内容不可用"
+    banned_account_body: 这意味着您不能点赞，举报或评论。
+    banned_account_header: 您的帐号目前已被禁用
+    comment: 评论
+    comment_is_hidden: 该评论不可用
+    comment_is_ignored: 由于您屏蔽了该用户，这条评论被隐藏。
+    comment_is_rejected: 您已拒绝该评论。
+    comments: 评论
+    configure_stream: 配置
+    content_not_available: 该内容不可用
     edit_name:
-      button: "提交"
-      error: "用户名只能包含字母、数字跟下划线"
-      label: "新用户名"
-      msg: "由于您的用户名不当，您的帐号目前被暂停使用。如要恢复您的帐户，请输入一个新的用户名。如有任何疑问，请与我们联系。"
-    my_comments: "我的评论"
-    my_profile: "我的资料"
-    new_count: "查看 {0} 更多 {1}"
-    profile: "概况"
-    show_all_comments: "显示所有评论"
-    success_bio_update: "您的简介已更新"
-    success_name_update: "您的用户名已更新"
-    success_update_settings: "你所做的更改已在这篇文章的评论流中应用"
-    show_all_replies: "显示所有回复"
-    show_more_replies: "显示更多回复"
-    view_more_comments: "查看更多评论"
-    view_reply: "查看回复"
-  from_settings_page: "您可在资料页面查看您的评论历史。"
-  like: "喜欢"
-  loading_results: "加载结果中"
-  marketing: "这看起来像是广告"
-  moderate_this_stream: "审查该流"
-  modqueue:
-    account: "帐户标记"
-    actions: "操作"
-    all: "全部"
-    all_streams: "全部流"
-    notify_edited: '{0} 编辑了评论 "{1}"'
-    notify_accepted: '{0} 接受了评论 "{1}"'
-    notify_rejected: '{0} 拒绝了评论 "{1}"'
-    notify_flagged: '{0} 举报了评论 "{1}"'
-    notify_reset: '{0} 重置了评论 "{1}" 的状态'
-    approve: "批准"
-    approved: "批准"
-    ban_user: "禁止"
-    billion: "十亿"
-    close: "关闭"
-    empty_queue: "没有新评论了！你太投入了。喝点 ☕️ 吧。"
-    flagged: "已举报"
-    reported: "被报告"
-    less_detail: "收起细节"
-    likes: "喜欢"
-    million: "百万"
-    mod_faster: "使用键盘快捷键，加快审核速度"
-    moderate: "审查该流 →"
-    more_detail: "更多细节"
-    new: "新评论"
-    newest_first: "最新在前"
-    navigation: "导航"
-    next_comment: "下一个评论"
-    toggle_search: "开启搜索"
-    next_queue: "切换队列"
-    oldest_first: "最旧在前"
-    premod: "预审"
-    prev_comment: "上一个评论"
-    reject: "拒绝"
-    rejected: "已拒绝"
-    reply: "回复"
-    select_stream: "选择流"
-    shift_key: "⇧"
-    shortcuts: "快捷键"
-    sort: "排序"
-    show_shortcuts: "显示快捷键"
-    singleview: "禅宗模式"
-    thismenu: "开启该菜单"
-    jump_to_queue: "跳转到特定序列"
-    thousand: "千"
-    try_these: "试试这些"
-    view_more_shortcuts: "查看更多快捷键"
-  my_comment_history: "我的评论历史"
-  name: "名称"
-  no_agree_comment: "我不同意该评论"
-  no_like_bio: "我不喜欢这个简介"
-  no_like_username: "我不喜欢这个用户名"
-  already_flagged_username: "You have already flagged this username."
-  other: "其他"
-  permalink: "分享"
-  personal_info: "这个评论透露了可确定个人身份的信息"
-  post: "发表"
-  profile: "资料"
-  profile_settings: "设置"
-  reply: "回复"
-  report: "举报"
-  report_notif: "感谢您举报此评论。我们的审核小组已经收到通知，并会很快进行审查。"
-  report_notif_remove: "您的报告已移除。"
-  reported: "已举报"
-  settings:
-    from_settings_page: "您可在资料页面查看您的评论历史。"
-    my_comment_history: "我的评论历史"
-    profile: "资料"
-    profile_settings: "资料设定"
-    sign_in: "登入"
-    to_access: "以查看资料"
-    user_no_comment: "您未曾发表评论。现在就来加入对话吧！"
-  stream:
-    all_comments: "所有评论"
-    temporarily_suspended: "根据 {0} 的社群指引方针，您的帐号已被暂时停用。请稍后加入对话 {1}。"
-    comment_not_found: "此评论已被删除或不存在。"
-    no_comments: "还没有评论，不如你写个？"
-    no_comments_and_closed: "该文章没有评论。"
-  step_1_header: "报告问题"
-  step_2_header: "帮助我们了解"
-  step_3_header: "感谢您的反馈"
-  streams:
-    all: "全部"
-    article: "文章"
-    closed: "已关闭"
-    empty_result: "没有符合该搜索的内容。试试扩大您的搜索？"
-    filter_streams: "过滤方式"
-    newest: "最新在前"
-    oldest: "最旧在前"
-    open: "开启"
-    pubdate: "发布日期"
-    search: "搜索"
-    sort_by: "排序方式"
-    status: "流状态"
-    stream_status: "流状态"
-  suspenduser:
-    title_suspend: "停用用户"
-    description_suspend: "您将停用 {0}。该评论将会转移到被拒绝队列中。在停用期结束前，{0} 不能喜欢、报告、回复或发表。"
-    select_duration: "选择停用期"
-    one_hour: "1 小时"
-    hours: "{0} 小时"
-    days: "{0} 日"
-    cancel: "取消"
-    suspend_user: "停用用户"
-    email_message_suspend: "尊敬的 {0},\n\n根据 {1} 的社群指引方针，您的帐号已被暂时停用。停用期内您无法评论、举报，或与其他评论者互动。请稍后加入对话 {2}。"
-    title_notify: "提醒用户帐号被停用"
-    notify_suspend_until: "用户 {0} 已被暂时停用。 将在 {1} 后自动恢复。"
-    description_notify: "停用该用户将暂时禁用用户的帐号。"
-    write_message: "填写信息"
-    send: "发送"
-  reject_username:
-    username: "用户名"
-    no_cancel: "不要取消"
-    description_reject: "您要因为 {0} 暂时停用该用户吗？这将持续到用户更改 {0}。"
-    title_notify: "通知用户他们的账号暂时被禁用。"
-    description_notify: "封禁此用户，其帐号将被暂时禁用。"
-    title_reject: "我们留意到您拒绝了个用户名"
-    suspend_user: "停用用户"
-    yes_suspend: "确定停用"
-    email_message_reject: "社群中的另一位成员举报了您的用户名。因为用户名的内容，您的帐号被拒绝。在你更改用户名前，你不能评论、喜欢或举报内容。若有任何问题或疑虑，请联络我们。"
-    write_message: "填写信息"
-    send: "发送"
-  thank_you: "我们很重视您的安全和反馈。一位审核员将尽快审阅您的举报内容。"
-  user:
-    bio_flags: "对简介的举报"
-    user_bio: "用户简介"
-    username_flags: "对用户名的举报"
-  user_impersonating: "冒名用户"
-  user_no_comment: "您未曾发表评论。现在就来加入对话吧！"
-  username_offensive: "用户名有冒犯性"
-  view_conversation: "查看对话"
+      button: 提交
+      error: 用户名只能包含字母、数字跟下划线
+      label: 新用户名
+      msg: 由于您的用户名不当，您的帐号目前被暂停使用。如要恢复您的帐户，请输入一个新的用户名。如有任何疑问，请与我们联系。
+    my_comments: 我的评论
+    my_profile: 我的资料
+    new_count: '查看 {0} 更多 {1}'
+    profile: 概况
+    show_all_comments: 显示所有评论
+    show_all_replies: 显示所有回复
+    show_more_replies: 显示更多回复
+    success_bio_update: 您的简介已更新
+    success_name_update: 您的用户名已更新
+    success_update_settings: 你所做的更改已在这篇文章的评论流中应用
+    view_more_comments: 查看更多评论
+    view_reply: 查看回复
+  from_settings_page: 您可在资料页面查看您的评论历史。
   install:
-    initial:
-      description: "让我们用几步来快速安装好您的 Talk 社群。"
-      submit: "立即开始"
     add_organization:
-      description: "请告诉我们您的组织名称。在邀请新团队成员时，这一信息将在邮件中显示。"
-      label: "机构名称"
-      save: "保存"
+      description: 请告诉我们您的组织名称。在邀请新团队成员时，这一信息将在邮件中显示。
+      label: 机构名称
+      save: 保存
     create:
-      email: "邮箱地址"
-      username: "用户名"
-      password: "密码"
-      confirm_password: "确认密码"
-      save: "保存"
-    permitted_domains:
-      title: "被许可域名"
-      description: "输入许可使用 Talk 的域名，如您的本地环境、测试环境、生产环境（如 localhost:3000、staging.domain.com、domain.com）。"
-      submit: "完成安装"
+      confirm_password: 确认密码
+      email: 邮箱地址
+      password: 密码
+      save: 保存
+      username: 用户名
     final:
-      description: "感谢您安装 Talk！我们已向您的邮箱发送一封验证邮件。当您进行帐号设置时，您可以开始跟您的读者开始互动。"
-      launch: "启动 Talk"
-      close: "关闭安装程序"
\ No newline at end of file
+      close: 关闭安装程序
+      description: '感谢您安装 Talk！我们已向您的邮箱发送一封验证邮件。当您进行帐号设置时，您可以开始跟您的读者开始互动。'
+      launch: '启动 Talk'
+    initial:
+      description: '让我们用几步来快速安装好您的 Talk 社群。'
+      submit: 立即开始
+    permitted_domains:
+      description: '输入许可使用 Talk 的域名，如您的本地环境、测试环境、生产环境（如 localhost:3000、staging.domain.com、domain.com）。'
+      submit: 完成安装
+      title: 被许可域名
+  like: 喜欢
+  loading_results: 加载结果中
+  marketing: 这看起来像是广告
+  moderate_this_stream: 审查该流
+  modqueue:
+    account: 帐户标记
+    actions: 操作
+    all: 全部
+    all_streams: 全部流
+    approve: 批准
+    approved: 批准
+    ban_user: 禁止
+    billion: 十亿
+    close: 关闭
+    empty_queue: '没有新评论了！你太投入了。喝点 ☕️ 吧。'
+    flagged: 已举报
+    jump_to_queue: 跳转到特定序列
+    less_detail: 收起细节
+    likes: 喜欢
+    million: 百万
+    mod_faster: 使用键盘快捷键，加快审核速度
+    moderate: '审查该流 →'
+    more_detail: 更多细节
+    navigation: 导航
+    new: 新评论
+    newest_first: 最新在前
+    next_comment: 下一个评论
+    next_queue: 切换队列
+    notify_accepted: '{0} 接受了评论 "{1}"'
+    notify_edited: '{0} 编辑了评论 "{1}"'
+    notify_flagged: '{0} 举报了评论 "{1}"'
+    notify_rejected: '{0} 拒绝了评论 "{1}"'
+    notify_reset: '{0} 重置了评论 "{1}" 的状态'
+    oldest_first: 最旧在前
+    premod: 预审
+    prev_comment: 上一个评论
+    reject: 拒绝
+    rejected: 已拒绝
+    reply: 回复
+    reported: 被报告
+    select_stream: 选择流
+    shift_key: ⇧
+    shortcuts: 快捷键
+    show_shortcuts: 显示快捷键
+    singleview: 禅宗模式
+    sort: 排序
+    thismenu: 开启该菜单
+    thousand: 千
+    toggle_search: 开启搜索
+    try_these: 试试这些
+    view_more_shortcuts: 查看更多快捷键
+  my_comment_history: 我的评论历史
+  name: 名称
+  no_agree_comment: 我不同意该评论
+  no_like_bio: 我不喜欢这个简介
+  no_like_username: 我不喜欢这个用户名
+  other: 其他
+  permalink: 分享
+  personal_info: 这个评论透露了可确定个人身份的信息
+  post: 发表
+  profile: 资料
+  profile_settings: 设置
+  reject_username:
+    description_notify: 封禁此用户，其帐号将被暂时禁用。
+    description_reject: '您要因为 {0} 暂时停用该用户吗？这将持续到用户更改 {0}。'
+    email_message_reject: 社群中的另一位成员举报了您的用户名。因为用户名的内容，您的帐号被拒绝。在你更改用户名前，你不能评论、喜欢或举报内容。若有任何问题或疑虑，请联络我们。
+    no_cancel: 不要取消
+    send: 发送
+    suspend_user: 停用用户
+    title_notify: 通知用户他们的账号暂时被禁用。
+    title_reject: 我们留意到您拒绝了个用户名
+    username: 用户名
+    write_message: 填写信息
+    yes_suspend: 确定停用
+  reply: 回复
+  report: 举报
+  report_notif: 感谢您举报此评论。我们的审核小组已经收到通知，并会很快进行审查。
+  report_notif_remove: 您的报告已移除。
+  reported: 已举报
+  settings:
+    from_settings_page: 您可在资料页面查看您的评论历史。
+    my_comment_history: 我的评论历史
+    profile: 资料
+    profile_settings: 资料设定
+    sign_in: 登入
+    to_access: 以查看资料
+    user_no_comment: 您未曾发表评论。现在就来加入对话吧！
+  step_1_header: 报告问题
+  step_2_header: 帮助我们了解
+  step_3_header: 感谢您的反馈
+  stream:
+    all_comments: 所有评论
+    comment_not_found: 此评论已被删除或不存在。
+    no_comments: 还没有评论，不如你写个？
+    no_comments_and_closed: 该文章没有评论。
+    temporarily_suspended: '根据 {0} 的社群指引方针，您的帐号已被暂时停用。请稍后加入对话 {1}。'
+  streams:
+    all: 全部
+    article: 文章
+    closed: 已关闭
+    empty_result: 没有符合该搜索的内容。试试扩大您的搜索？
+    filter_streams: 过滤方式
+    newest: 最新在前
+    oldest: 最旧在前
+    open: 开启
+    pubdate: 发布日期
+    search: 搜索
+    sort_by: 排序方式
+    status: 流状态
+    stream_status: 流状态
+  suspenduser:
+    cancel: 取消
+    days: '{0} 日'
+    description_notify: 停用该用户将暂时禁用用户的帐号。
+    description_suspend: '您将停用 {0}。该评论将会转移到被拒绝队列中。在停用期结束前，{0} 不能喜欢、报告、回复或发表。'
+    email_message_suspend: "尊敬的 {0},\n\n根据 {1} 的社群指引方针，您的帐号已被暂时停用。停用期内您无法评论、举报，或与其他评论者互动。请稍后加入对话 {2}。"
+    hours: '{0} 小时'
+    notify_suspend_until: '用户 {0} 已被暂时停用。 将在 {1} 后自动恢复。'
+    one_hour: '1 小时'
+    select_duration: 选择停用期
+    send: 发送
+    suspend_user: 停用用户
+    title_notify: 提醒用户帐号被停用
+    title_suspend: 停用用户
+    write_message: 填写信息
+  thank_you: 我们很重视您的安全和反馈。一位审核员将尽快审阅您的举报内容。
+  user:
+    bio_flags: 对简介的举报
+    user_bio: 用户简介
+    username_flags: 对用户名的举报
+  user_impersonating: 冒名用户
+  user_no_comment: 您未曾发表评论。现在就来加入对话吧！
+  username_offensive: 用户名有冒犯性
+  validators:
+    confirm_password: 密码不匹配。请检查
+    required: 该字段必填
+    verify_email: 非有效邮箱
+    verify_organization_name: 组织名只能包含字母或数字。
+    verify_password: '密码长度须至少为 8 字符'
+    verify_username: 用户名只能包含字母、数字跟下划线
+  view_conversation: 查看对话
+  your_account_has_been_banned: 您的帐户已被禁用。
+  your_account_has_been_suspended: 您的帐户已被暂时停用。
+  your_username_has_been_rejected: 由于您使用了不恰当的用户名，您的帐户已被暂停使用。若需恢复帐户，请输入一个新的用户名
diff --git a/locales/zh_TW.yml b/locales/zh_TW.yml
index 2b5db5d44..caa01ec62 100644
--- a/locales/zh_TW.yml
+++ b/locales/zh_TW.yml
@@ -1,404 +1,410 @@
 zh_TW:
-  your_account_has_been_suspended: 您的賬戶已被暫停使用。
-  your_account_has_been_banned: 您的賬戶已被禁用。
-  your_username_has_been_rejected: 由於您使用了不恰當的用戶名，您的帳戶已被暫停使用。若需恢復帳戶，請輸入一個新的用戶名。
-  embed_comments_tab: 評論
   bandialog:
-    are_you_sure: "你確定要封禁{0}嗎？"
-    ban_user: "確定封禁該用戶？"
-    banned_user: "已封禁的用戶"
-    cancel: "取消"
-    note: "注意：{0}"
-    note_reject_comment: "封禁該用戶將使這條評論被移入“被拒”列表。"
-    note_ban_user: "封禁該用戶將使其無法編輯或刪除評論。"
-    yes_ban_user: "是的，封禁該用戶"
-  bio_offensive: "該介紹包含具有攻擊性的內容。"
-  cancel: "取消"
-  characters_remaining: "剩餘字符數"
+    are_you_sure: '你確定要封禁{0}嗎？'
+    ban_user: 確定封禁該用戶？
+    banned_user: 已封禁的用戶
+    cancel: 取消
+    note: '注意：{0}'
+    note_ban_user: 封禁該用戶將使其無法編輯或刪除評論。
+    note_reject_comment: 封禁該用戶將使這條評論被移入“被拒”列表。
+    yes_ban_user: 是的，封禁該用戶
+  bio_offensive: 該介紹包含具有攻擊性的內容。
+  cancel: 取消
+  characters_remaining: 剩餘字符數
   comment:
-    anon: "匿名用戶"
-    undo_reject: "撤銷"
-    ban_user: "封禁用戶"
-    comment: "發表評論"
+    anon: 匿名用戶
+    ban_user: 封禁用戶
+    comment: 發表評論
     edited: 編輯
-    flagged: "已標記"
-    view_context: "查看全文"
+    flagged: 已標記
+    undo_reject: 撤銷
+    view_context: 查看全文
   comment_box:
-    post: "發布"
-    cancel: "取消"
-    reply: "回覆"
-    comment: "發表評論"
-    name: "姓名"
-    comment_post_notif: "您的評論已發布"
-    comment_post_notif_premod: "感謝您發表評論。我們的審核團隊將盡快審核您的評論。"
-    comment_post_banned_word:  "由於您的評論包含至少一個禁用詞，評論發布失敗。如對此有疑問，請聯繫我們的審核團隊。"
-    characters_remaining: "剩余字符"
-  comment_offensive: "該評論包含侮辱性詞語"
-  comment_singular: 評論
+    cancel: 取消
+    characters_remaining: 剩余字符
+    comment: 發表評論
+    comment_post_banned_word: 由於您的評論包含至少一個禁用詞，評論發布失敗。如對此有疑問，請聯繫我們的審核團隊。
+    comment_post_notif: 您的評論已發布
+    comment_post_notif_premod: 感謝您發表評論。我們的審核團隊將盡快審核您的評論。
+    name: 姓名
+    post: 發布
+    reply: 回覆
+  comment_offensive: 該評論包含侮辱性詞語
   comment_plural: 評論流
-  comment_post_banned_word: "由於您的評論包含至少一個禁用詞，評論發布失敗。如對此有疑問，請聯繫我們的審核團隊。"
-  comment_post_notif: "您的評論已發布"
-  comment_post_notif_premod: "感謝您發表評論。我們的審核團隊將盡快審核您的評論。"
+  comment_post_banned_word: 由於您的評論包含至少一個禁用詞，評論發布失敗。如對此有疑問，請聯繫我們的審核團隊。
+  comment_post_notif: 您的評論已發布
+  comment_post_notif_premod: 感謝您發表評論。我們的審核團隊將盡快審核您的評論。
+  comment_singular: 評論
   common:
-    copy: '覆制'
-    error: '出錯了'
-    reply: '回覆'
-    replies: '回覆'
-    reaction: '回應'
-    reactions: '回應'
-    story: '故事'
+    copy: 覆制
+    error: 出錯了
+    reaction: 回應
+    reactions: 回應
+    replies: 回覆
+    reply: 回覆
+    story: 故事
   community:
-    account_creation_date: "賬戶創建日期"
+    account_creation_date: 賬戶創建日期
     active: 激活
     admin: 管理員
-    ads_marketing: "看上去像廣告/營銷"
-    are_you_sure: "您確定您要封禁{0}？"
-    ban_user: "確認封禁該用戶嗎？"
+    ads_marketing: 看上去像廣告/營銷
+    are_you_sure: '您確定您要封禁{0}？'
+    ban_user: 確認封禁該用戶嗎？
     banned: 已封禁
-    banned_user: "被封禁的用戶"
+    banned_user: 被封禁的用戶
     cancel: 取消
-    dont_like_username: "踩用戶名"
-    flaggedaccounts: "被舉報的用戶名"
+    dont_like_username: 踩用戶名
+    flaggedaccounts: 被舉報的用戶名
     flags: 標記
-    impersonating: "冒充"
-    loading: "正在加載"
+    impersonating: 冒充
+    loading: 正在加載
     moderator: 版主
-    newsroom_role: "新聞編輯室身份"
-    no_flagged_accounts: "被舉報的用戶名列表為空"
-    no_results: "沒有發現使用該用戶名或郵箱的用戶。他們藏起來了！"
-    offensive: "違規"
+    newsroom_role: 新聞編輯室身份
+    no_flagged_accounts: 被舉報的用戶名列表為空
+    no_results: 沒有發現使用該用戶名或郵箱的用戶。他們藏起來了！
+    offensive: 違規
     other: 其他
     people: 聯繫人
-    role: "選擇身份..."
-    select_status: "選擇狀態..."
-    spam_ads: "垃圾郵件/廣告"
-    staff: "管理員"
+    role: 選擇身份...
+    select_status: 選擇狀態...
+    spam_ads: 垃圾郵件/廣告
+    staff: 管理員
     status: 狀態
-    username_and_email: "用戶名和郵箱地址"
-    yes_ban_user: "同意封禁該用戶"
-    none: "無"
+    username_and_email: 用戶名和郵箱地址
+    yes_ban_user: 同意封禁該用戶
   configure:
     apply: 應用
-    banned_word_text: "包含以下字或詞組（不區分大小寫）的評論將被自動從評論流中移除。 輸入一個詞，然後按Enter或Tab鍵添加新詞，也可粘貼以逗號分隔的列表至此。"
-    banned_words_title: "禁用詞列表"
-    close: "關閉"
-    close_after: "稍後關閉評論"
-    close_stream: "關閉評論"
-    close_stream_configuration: "評論流現已關閉。打開評論流可提交並顯示新的評論。"
-    closed_comments_desc: "當您的評論流關閉時，留言仍會顯示在評論流，但是其他人將無法評論"
-    closed_comments_label: "留言"
-    closed_stream_settings: "關閉私信"
-    comment_count_error: "請輸入一個有效數字"
-    comment_count_header: "限制評論長度"
+    banned_word_text: '包含以下字或詞組（不區分大小寫）的評論將被自動從評論流中移除。 輸入一個詞，然後按Enter或Tab鍵添加新詞，也可粘貼以逗號分隔的列表至此。'
+    banned_words_title: 禁用詞列表
+    close: 關閉
+    close_after: 稍後關閉評論
+    close_stream: 關閉評論
+    close_stream_configuration: 評論流現已關閉。打開評論流可提交並顯示新的評論。
+    closed_comments_desc: 當您的評論流關閉時，留言仍會顯示在評論流，但是其他人將無法評論
+    closed_comments_label: 留言
+    closed_stream_settings: 關閉私信
+    comment_count_error: 請輸入一個有效數字
+    comment_count_header: 限制評論長度
     comment_count_text_post: 字數
-    comment_count_text_pre: "評論將被限制在"
+    comment_count_text_pre: 評論將被限制在
     comment_settings: 設置
-    comment_stream: "評論"
-    comment_stream_will_close: "關閉評論"
+    comment_stream: 評論
+    comment_stream_will_close: 關閉評論
     community: 社區
     configure: 配置
-    copy_and_paste: "將以下代碼覆制並粘貼到您的CMS中，可以將您的評論框加入到文章中"
-    custom_css_url: "自定義CSS地址"
-    custom_css_url_desc: "CSS風格的網址將覆蓋默認的評論流風格，包括內部和外部"
+    copy_and_paste: 將以下代碼覆制並粘貼到您的CMS中，可以將您的評論框加入到文章中
+    custom_css_url: 自定義CSS地址
+    custom_css_url_desc: CSS風格的網址將覆蓋默認的評論流風格，包括內部和外部
     days: 日
-    description: "您作為管理員有權限自定義此故事評論流的設置："
-    domain_list_text: "輸入您允許Talk使用的域名，例如您的本地環境，模擬環境和生產環境（例如localhost：3000，staging.domain.com，domain.com）。"
-    domain_list_title: "允許的域名"
-    edit_comment_timeframe_heading: "編輯評論時間範圍"
-    edit_comment_timeframe_text_pre: "評論員將享受"
-    edit_comment_timeframe_text_post: "幾秒鐘編輯評論"
-    embed_comment_stream: "加入評論流"
-    enable_premod_links_text: "任何包含鏈接的評論必須經過版主審核後才能發布"
-    enable_pre_moderation: "啟用預審"
-    enable_pre_moderation_text: "任何評論必須經過版主審核後才能發布"
-    enable_premod_links: "預審包含鏈接的評論"
-    enable_premod: "啟用預審"
-    enable_premod_description: "任何評論必須經過版主審核後才能發布"
-    enable_premod_links_description: "任何包含鏈接的評論必須經過版主審核後才能發布"
-    enable_questionbox: "向讀者提問"
-    enable_questionbox_description: "該問題將會在評論流置頂。您可以詢問其他讀者有關文章中的具體時間或是提出討論等"
+    description: 您作為管理員有權限自定義此故事評論流的設置：
+    domain_list_text: 輸入您允許Talk使用的域名，例如您的本地環境，模擬環境和生產環境（例如localhost：3000，staging.domain.com，domain.com）。
+    domain_list_title: 允許的域名
+    edit_comment_timeframe_heading: 編輯評論時間範圍
+    edit_comment_timeframe_text_post: 幾秒鐘編輯評論
+    edit_comment_timeframe_text_pre: 評論員將享受
+    embed_comment_stream: 加入評論流
+    enable_pre_moderation: 啟用預審
+    enable_pre_moderation_text: 任何評論必須經過版主審核後才能發布
+    enable_premod: 啟用預審
+    enable_premod_description: 任何評論必須經過版主審核後才能發布
+    enable_premod_links: 預審包含鏈接的評論
+    enable_premod_links_description: 任何包含鏈接的評論必須經過版主審核後才能發布
+    enable_premod_links_text: 任何包含鏈接的評論必須經過版主審核後才能發布
+    enable_questionbox: 向讀者提問
+    enable_questionbox_description: 該問題將會在評論流置頂。您可以詢問其他讀者有關文章中的具體時間或是提出討論等
     hours: 小時
-    include_comment_stream: "包含讀者的評論流描述"
-    include_comment_stream_desc: "留言將在您的評論流中置頂。發布一個社區規則等"
-    include_text: "在此插入您的文本"
-    include_question_here: "請在此處輸入問題："
+    include_comment_stream: 包含讀者的評論流描述
+    include_comment_stream_desc: 留言將在您的評論流中置頂。發布一個社區規則等
+    include_question_here: 請在此處輸入問題：
+    include_text: 在此插入您的文本
     moderate: 審核
-    moderation_settings: "審核設置"
-    open: "開啟"
-    open_stream: "打開評論流"
-    open_stream_configuration: "評論流現已打開。評論流關閉後其他用戶將無法提交新的評論，但先前的評論仍將顯示。"
-    require_email_verification: "需要驗證郵箱"
-    require_email_verification_text: "新用戶必須驗證郵箱後才能評論"
-    save_changes: "保存更改"
+    moderation_settings: 審核設置
+    open: 開啟
+    open_stream: 打開評論流
+    open_stream_configuration: 評論流現已打開。評論流關閉後其他用戶將無法提交新的評論，但先前的評論仍將顯示。
+    require_email_verification: 需要驗證郵箱
+    require_email_verification_text: 新用戶必須驗證郵箱後才能評論
+    save_changes: 保存更改
     shortcuts: 快捷鍵
-    sign_out: "註銷"
+    sign_out: 註銷
     stories: 故事
-    stream_settings: "評論流設定"
-    suspect_word_title: "敏感詞列表"
-    suspect_word_text: "包含以下詞或短語（不區分大小寫）的評論將在評論流中高亮顯示。輸入一個詞，然後按Enter或Tab鍵添加，可根據需要粘貼以逗號作為分隔符的列表。"
-    tech_settings: "技術設置"
-    title: "評論流設置"
+    stream_settings: 評論流設定
+    suspect_word_text: 包含以下詞或短語（不區分大小寫）的評論將在評論流中高亮顯示。輸入一個詞，然後按Enter或Tab鍵添加，可根據需要粘貼以逗號作為分隔符的列表。
+    suspect_word_title: 敏感詞列表
+    tech_settings: 技術設置
+    title: 評論流設置
     weeks: 週
-    wordlist: "禁用詞"
-  continue: "繼續"
+    wordlist: 禁用詞
+  continue: 繼續
   createdisplay:
-    check_the_form: "表單無效。請檢查輸入框"
-    continue: "使用與Facebook相同的用戶名"
-    error_create: "更改用戶名時出現錯誤"
-    fake_comment_body: "這是一個評論示例。讀者可以在評論區與編輯團隊分享想法和觀點。"
-    fake_comment_date: "1分鐘前"
-    if_you_dont_change_your_name: "如果您當前沒有更改您的用戶名，您的Facebook將在您的所有評論旁邊顯示該用戶名。"
-    required_field: "必填選項"
+    check_the_form: 表單無效。請檢查輸入框
+    continue: 使用與Facebook相同的用戶名
+    error_create: 更改用戶名時出現錯誤
+    fake_comment_body: 這是一個評論示例。讀者可以在評論區與編輯團隊分享想法和觀點。
+    fake_comment_date: 1分鐘前
+    if_you_dont_change_your_name: 如果您當前沒有更改您的用戶名，您的Facebook將在您的所有評論旁邊顯示該用戶名。
+    required_field: 必填選項
     save: 保存
-    special_characters: "用戶名只能包含字母、數字和下劃線"
+    special_characters: 用戶名只能包含字母、數字和下劃線
     username: 用戶名
-    write_your_username: "編輯您的用戶名"
-    your_username: "您的每條評論均會帶上您的用戶名。"
+    write_your_username: 編輯您的用戶名
+    your_username: 您的每條評論均會帶上您的用戶名。
   done: 完成
   edit_comment:
-    body_input_label: "編輯評論"
-    save_button: "保存更改"
-    edit_window_expired: "由於超過時間期限，您已無法編輯該評論。為什麼不發表一條新評論呢？"
-    edit_window_expired_close: "關閉"
-    edit_window_timer_prefix: "編輯窗口："
-    second: "秒"
-    seconds_plural: "秒"
-    minute: "分鐘"
-    minutes_plural: "分鐘"
+    body_input_label: 編輯評論
+    edit_window_expired: 由於超過時間期限，您已無法編輯該評論。為什麼不發表一條新評論呢？
+    edit_window_expired_close: 關閉
+    edit_window_timer_prefix: 編輯窗口：
+    minute: 分鐘
+    minutes_plural: 分鐘
+    save_button: 保存更改
+    second: 秒
+    seconds_plural: 秒
   email:
-    suspended:
-      subject: "您的賬戶已被暫停使用"
     banned:
-      subject: "您的賬戶已被禁用"
-      body: "根據Coral項目使用準則, 您的賬戶已被禁用。您已不再可以評論, 標記或是參與社區活動。"
+      body: '根據Coral項目使用準則, 您的賬戶已被禁用。您已不再可以評論, 標記或是參與社區活動。'
+      subject: 您的賬戶已被禁用
     confirm:
-      has_been_requested: "以下賬戶要求接收確認郵件："
-      to_confirm: "為確認該賬戶，請點擊下方鏈接："
-      confirm_email: "確認郵箱"
-      if_you_did_not: "如果您並未發送該請求，請忽略此郵件"
-      subject: "確認郵箱"
+      confirm_email: 確認郵箱
+      has_been_requested: 以下賬戶要求接收確認郵件：
+      if_you_did_not: 如果您並未發送該請求，請忽略此郵件
+      subject: 確認郵箱
+      to_confirm: 為確認該賬戶，請點擊下方鏈接：
     password_reset:
-      we_received_a_request: "我們收到了重置密碼的請求。如果您並未請求更改密碼，請忽略該郵件。"
-      if_you_did: "如果您發送了重置請求，"
-      please_click: "請點擊此處重置密碼"
+      if_you_did: 如果您發送了重置請求，
+      please_click: 請點擊此處重置密碼
+      we_received_a_request: 我們收到了重置密碼的請求。如果您並未請求更改密碼，請忽略該郵件。
+    suspended:
+      subject: 您的賬戶已被暫停使用
+  embed_comments_tab: 評論
   embedlink:
-    copy: "覆制到剪貼板"
+    copy: 覆制到剪貼板
   error:
-    COMMENT_TOO_SHORT: "評論長度必須超過一個字符，請您修改評論後重試。"
-    NOT_AUTHORIZED: "您無權執行該操作。"
-    NO_SPECIAL_CHARACTERS: "用戶名只能包含字母、數字和下劃線"
-    PASSWORD_LENGTH: "密碼過短"
-    PROFANITY_ERROR: "用戶名不得包含侮辱性詞彙。如果您對此有疑問，請聯繫管理員。"
-    RATE_LIMIT_EXCEEDED: "評論數已超過上限"
-    USERNAME_IN_USE: "該用戶名已被佔用"
-    USERNAME_REQUIRED: "必須輸入用戶名"
-    EMAIL_NOT_VERIFIED: "郵箱地址未驗證"
-    EDIT_WINDOW_ENDED: "您無法編輯該評論，頁面已過期"
-    EDIT_USERNAME_NOT_AUTHORIZED: "您無權更新您的用戶名"
-    SAME_USERNAME_PROVIDED: "您必須提交一個未被使用過的用戶名。"
-    EMAIL_IN_USE: "電子郵件地址已被占用"
-    EMAIL_REQUIRED: "請輸入一個電子郵箱地址"
-    LOGIN_MAXIMUM_EXCEEDED: "您輸入了太多次不正確的密碼。請稍候再試。"
-    PASSWORD_REQUIRED: "必須輸入密碼"
-    COMMENTING_CLOSED: "評論已關閉"
-    NOT_FOUND: "未找到資源"
-    ALREADY_EXISTS: "資源已存在"
-    INVALID_ASSET_URL: "網址無效"
-    CANNOT_IGNORE_STAFF: "不能屏蔽員工。"
-    email: "電子郵箱地址無效"
-    confirm_password: "密碼不匹配。請檢查。"
-    network_error: "無法連接服務器。請檢查您的互聯網連接，然後重試。"
-    email_not_verified: "電子郵箱地址{0}未經驗證。"
-    email_password: "電子郵箱和/或密碼的組合不正確。"
-    organization_name: "組織名稱只能包含字母或數字。"
-    password: "密碼必須至少8個字符"
-    username: "用戶名只能包含字母、數字和下劃線。"
-    unexpected: "發生了意外錯誤。抱歉!"
-    required_field: "該字段必填"
-  flag_comment: "舉報評論"
-  flag_reason: "舉報原因（可選）"
-  flag_username: "舉報用戶名"
+    ALREADY_EXISTS: 資源已存在
+    CANNOT_IGNORE_STAFF: 不能屏蔽員工。
+    COMMENT_TOO_SHORT: 評論長度必須超過一個字符，請您修改評論後重試。
+    COMMENTING_CLOSED: 評論已關閉
+    confirm_password: 密碼不匹配。請檢查。
+    EDIT_USERNAME_NOT_AUTHORIZED: 您無權更新您的用戶名
+    EDIT_WINDOW_ENDED: 您無法編輯該評論，頁面已過期
+    email: 電子郵箱地址無效
+    EMAIL_IN_USE: 電子郵件地址已被占用
+    email_not_verified: '電子郵箱地址{0}未經驗證。'
+    EMAIL_NOT_VERIFIED: 郵箱地址未驗證
+    email_password: 電子郵箱和/或密碼的組合不正確。
+    EMAIL_REQUIRED: 請輸入一個電子郵箱地址
+    INVALID_ASSET_URL: 網址無效
+    LOGIN_MAXIMUM_EXCEEDED: 您輸入了太多次不正確的密碼。請稍候再試。
+    network_error: 無法連接服務器。請檢查您的互聯網連接，然後重試。
+    NO_SPECIAL_CHARACTERS: 用戶名只能包含字母、數字和下劃線
+    NOT_AUTHORIZED: 您無權執行該操作。
+    NOT_FOUND: 未找到資源
+    organization_name: 組織名稱只能包含字母或數字。
+    password: 密碼必須至少8個字符
+    PASSWORD_LENGTH: 密碼過短
+    PASSWORD_REQUIRED: 必須輸入密碼
+    PROFANITY_ERROR: 用戶名不得包含侮辱性詞彙。如果您對此有疑問，請聯繫管理員。
+    RATE_LIMIT_EXCEEDED: 評論數已超過上限
+    required_field: 該字段必填
+    SAME_USERNAME_PROVIDED: 您必須提交一個未被使用過的用戶名。
+    unexpected: 發生了意外錯誤。抱歉!
+    username: 用戶名只能包含字母、數字和下劃線。
+    USERNAME_IN_USE: 該用戶名已被佔用
+    USERNAME_REQUIRED: 必須輸入用戶名
+  flag_comment: 舉報評論
+  flag_reason: 舉報原因（可選）
+  flag_username: 舉報用戶名
   framework:
-    banned_account_header: "您的帳戶目前被禁用。"
-    banned_account_body: "這意味著您不能點贊，舉報或評論。"
+    banned_account_body: 這意味著您不能點贊，舉報或評論。
+    banned_account_header: 您的帳戶目前被禁用。
     comment: 評論
-    comment_is_ignored: "由於您屏蔽了該用戶，這條評論被隱藏。"
-    comment_is_rejected: "你已拒絕了該評論。"
-    comment_is_hidden: "此評論無效。"
+    comment_is_hidden: 此評論無效。
+    comment_is_ignored: 由於您屏蔽了該用戶，這條評論被隱藏。
+    comment_is_rejected: 你已拒絕了該評論。
     comments: 評論
-    configure_stream: "配置"
-    content_not_available: "此內容不可用"
+    configure_stream: 配置
+    content_not_available: 此內容不可用
     edit_name:
       button: 提交
-      error: "用戶名只能包含字母、數字和下劃線。"
-      label: "新用戶名"
-      msg: "由於您的用戶名不當，您的帳號目前已被暫停使用。如要恢復您的帳戶，請輸入一個新的用戶名。如有任何疑問，請與我們聯繫。"
-    my_comments: "我的評論"
-    my_profile: "我的概況"
-    new_count: "查看{0}更多{1}"
+      error: 用戶名只能包含字母、數字和下劃線。
+      label: 新用戶名
+      msg: 由於您的用戶名不當，您的帳號目前已被暫停使用。如要恢復您的帳戶，請輸入一個新的用戶名。如有任何疑問，請與我們聯繫。
+    my_comments: 我的評論
+    my_profile: 我的概況
+    new_count: '查看{0}更多{1}'
     profile: 概況
-    show_all_comments: "顯示全部評論"
-    success_bio_update: "您的個人簡介已更新"
-    success_name_update: "您的用戶名已更新"
-    success_update_settings: "您的更改已被應用於本文的評論流"
+    show_all_comments: 顯示全部評論
     show_all_replies: 顯示全部回覆
     show_more_replies: 顯示更多回覆
-    view_more_comments: "查看更多評論"
-    view_reply: "查看回覆"
-  from_settings_page: "您可以在概況頁面看到您的評論歷史記錄。"
+    success_bio_update: 您的個人簡介已更新
+    success_name_update: 您的用戶名已更新
+    success_update_settings: 您的更改已被應用於本文的評論流
+    view_more_comments: 查看更多評論
+    view_reply: 查看回覆
+  from_settings_page: 您可以在概況頁面看到您的評論歷史記錄。
+  install:
+    add_organization:
+      description: 請告訴我們您的組織名稱。在邀請新團隊成員時，這一資訊將在郵件中顯示。
+      label: 機構名稱
+      save: 保存
+    create:
+      confirm_password: 確認密碼
+      email: 電子郵箱地址
+      password: 密碼
+      save: 保存
+      username: 用戶名
+    final:
+      close: 關閉安裝程序
+      description: 感謝安裝Talk！我們給您發送了一封郵件以驗證您的電子郵箱地址。在完成帳戶設置後，您即可開始與您的讀者互動。
+      launch: 啟動Talk
+    initial:
+      description: 讓我們通過幾個簡單的步驟設置您的Talk社區。
+      submit: 立即開始
+    permitted_domains:
+      description: '輸入您允許Talk使用的域名，例如您的本地環境，測試環境和投入使用的環境（例如localhost：3000，staging.domain.com，domain.com）。 '
+      submit: 完成安裝
+      title: 允許的域名
   like: 讚
-  loading_results: "加載結果"
-  marketing: "這看起來像是廣告/營銷"
-  moderate_this_stream: "審核這個流"
+  loading_results: 加載結果
+  marketing: 這看起來像是廣告/營銷
+  moderate_this_stream: 審核這個流
   modqueue:
-    account: "帳戶標記"
+    account: 帳戶標記
     actions: 操作
     all: 所有
-    all_streams: "所有流"
-    notify_edited: '{0}編輯了評論“{1}”'
-    notify_accepted: '{0}接受了評論“{1}”'
-    notify_rejected: '{0}拒絕了評論“{1}”'
-    notify_flagged: '{0}標記了評論“{1}”'
-    notify_reset: '{0}重置了評論“{1}”的狀態'
-    approve: "批準"
-    approved: "已批準"
-    ban_user: "禁止"
+    all_streams: 所有流
+    approve: 批準
+    approved: 已批準
+    ban_user: 禁止
     billion: 十億
     close: 關
-    empty_queue: "沒有更多評論需要審核了！您都完成了，來杯☕️吧！"
+    empty_queue: 沒有更多評論需要審核了！您都完成了，來杯☕️吧！
     flagged: 被標記的
-    reported: 被舉報的
-    less_detail: "收起"
+    jump_to_queue: 跳轉到特定隊列
+    less_detail: 收起
     likes: 讚
     million: 百萬
-    mod_faster: "使用鍵盤快捷鍵，加快審核速度"
-    moderate: "審核 →"
-    more_detail: "展開"
-    new: 新
-    newest_first: "最新評論優先"
+    mod_faster: 使用鍵盤快捷鍵，加快審核速度
+    moderate: '審核 →'
+    more_detail: 展開
     navigation: 導航
-    next_comment: "轉到下一條評論"
-    toggle_search: "打開搜索"
-    next_queue: "切換隊列"
-    oldest_first: "最早評論優先"
+    new: 新
+    newest_first: 最新評論優先
+    next_comment: 轉到下一條評論
+    next_queue: 切換隊列
+    notify_accepted: '{0}接受了評論“{1}”'
+    notify_edited: '{0}編輯了評論“{1}”'
+    notify_flagged: '{0}標記了評論“{1}”'
+    notify_rejected: '{0}拒絕了評論“{1}”'
+    notify_reset: '{0}重置了評論“{1}”的狀態'
+    oldest_first: 最早評論優先
     premod: 預審核
-    prev_comment: "轉到之前的評論"
-    reject: "拒絕"
-    rejected: "已拒絕"
-    reply: "回覆"
-    select_stream: "選擇流"
-    shift_key: "⇧"
-    shortcuts: "快捷鍵"
-    sort: "排序"
-    show_shortcuts: "顯示快捷鍵"
-    singleview: "禪宗模式"
-    thismenu: "打開這個菜單"
-    jump_to_queue: "跳轉到特定隊列"
+    prev_comment: 轉到之前的評論
+    reject: 拒絕
+    rejected: 已拒絕
+    reply: 回覆
+    reported: 被舉報的
+    select_stream: 選擇流
+    shift_key: ⇧
+    shortcuts: 快捷鍵
+    show_shortcuts: 顯示快捷鍵
+    singleview: 禪宗模式
+    sort: 排序
+    thismenu: 打開這個菜單
     thousand: 千
-    try_these: "試試這些"
-    view_more_shortcuts: "查看更多快捷方式"
-  my_comment_history: "我的評論歷史"
+    toggle_search: 打開搜索
+    try_these: 試試這些
+    view_more_shortcuts: 查看更多快捷方式
+  my_comment_history: 我的評論歷史
   name: 名字
-  no_agree_comment: "我不同意這個評論"
-  no_like_bio: "我不喜歡這個個人簡介"
-  no_like_username: "我不喜歡這個用戶名"
+  no_agree_comment: 我不同意這個評論
+  no_like_bio: 我不喜歡這個個人簡介
+  no_like_username: 我不喜歡這個用戶名
   other: 其他
   permalink: 分享
-  personal_info: "該評論洩露了個人身份資訊"
+  personal_info: 該評論洩露了個人身份資訊
   post: 帖子
   profile: 概況
-  profile_settings: "設置"
+  profile_settings: 設置
+  reject_username:
+    description_notify: 封禁此用戶，其帳號將被暫時禁用。
+    description_reject: '您想針對他們的{0}暫時封禁此用戶嗎？這樣做會暫時凍結這個用戶的賬號，直到他們重寫{0}。'
+    email_message_reject: 另一位社區成員最近標記了您的用戶名，要求管理員對其進行審核。由於您的用戶名內容不當，您無法繼續使用您的用戶名。這意味著除非您重新輸入用戶名，您將不能再評論、點贊或標記內容。如果您有任何疑問或顧慮，請發郵件給我們。
+    no_cancel: 不取消
+    send: 發送
+    suspend_user: 暫時封禁用戶
+    title_notify: 通知用戶他們的賬號暫時被禁用。
+    title_reject: 我們注意到您拒絕了一個用戶名
+    username: 用戶名
+    write_message: 寫消息
+    yes_suspend: 是，暫時封禁
   reply: 回覆
   report: 舉報
-  report_notif: "感謝您舉報此評論。我們的審核小組已經收到通知，並會很快進行審查。"
-  report_notif_remove: "您的舉報已被刪除。"
+  report_notif: 感謝您舉報此評論。我們的審核小組已經收到通知，並會很快進行審查。
+  report_notif_remove: 您的舉報已被刪除。
   reported: 已舉報
   settings:
-    from_settings_page: "您可以在概況頁面看到您的評論歷史記錄。"
-    my_comment_history: "我的評論歷史"
+    from_settings_page: 您可以在概況頁面看到您的評論歷史記錄。
+    my_comment_history: 我的評論歷史
     profile: 概況
-    profile_settings: "概況設置"
-    sign_in: "登陸"
-    to_access: "訪問概況"
-    user_no_comment: "您尚未發表過評論。加入對話吧！"
+    profile_settings: 概況設置
+    sign_in: 登陸
+    to_access: 訪問概況
+    user_no_comment: 您尚未發表過評論。加入對話吧！
+  step_1_header: 舉報問題
+  step_2_header: 幫助我們了解情況
+  step_3_header: 謝謝您的參與
   stream:
-    all_comments: "全部評論"
-    temporarily_suspended: "根據{0}的社區規定，您的帳戶已被暫時停用。請重新加入對話{1}。"
-    comment_not_found: "此評論已被刪除或不存在。"
-    no_comments: "暫時還沒有評論，何不寫條評論呢？"
-    no_comments_and_closed: "這篇文章沒有評論。"
-  step_1_header: "舉報問題"
-  step_2_header: "幫助我們了解情況"
-  step_3_header: "謝謝您的參與"
+    all_comments: 全部評論
+    comment_not_found: 此評論已被刪除或不存在。
+    no_comments: 暫時還沒有評論，何不寫條評論呢？
+    no_comments_and_closed: 這篇文章沒有評論。
+    temporarily_suspended: '根據{0}的社區規定，您的帳戶已被暫時停用。請重新加入對話{1}。'
   streams:
     all: 全部
     article: 故事
     closed: 已關閉
-    empty_result: "沒有符合該搜索的內容。試試擴大您的搜索？"
-    filter_streams: "過濾流"
+    empty_result: 沒有符合該搜索的內容。試試擴大您的搜索？
+    filter_streams: 過濾流
     newest: 最新
     oldest: 最早
     open: 打開
-    pubdate: "發布日期"
+    pubdate: 發布日期
     search: 搜索
-    sort_by: "排序方式"
-    status: "流狀態"
-    stream_status: "流狀態"
+    sort_by: 排序方式
+    status: 流狀態
+    stream_status: 流狀態
   suspenduser:
-    title_suspend: "暫停用戶"
-    description_suspend: "您正在暫停{0}。此評論將進入拒絕隊列。直到暫停時間結束，{0}該評論才將允許被點贊，舉報，回复或發布。"
-    select_duration: "選擇暫停期限"
-    one_hour: "1 小時"
-    hours: "{0} 小時"
-    days: "{0} 天"
-    cancel: "取消"
-    suspend_user: "暫時禁言用戶"
-    email_message_suspend: "尊敬的{0}，\ n \ n根據{1}的社區規定，您的帳戶已被暫時禁言。在禁言期間，您將無法評論，舉報或與其他評論者進行交流。請重新加入對話{2}。"
-    title_notify: "通知用戶他們的賬戶被禁言"
-    notify_suspend_until: "用戶{0}已被暫時禁言。禁言期將自動結束{1}。"
-    description_notify: "封禁用戶將令其帳戶將被暫時禁用。"
-    write_message: "寫消息"
+    cancel: 取消
+    days: '{0} 天'
+    description_notify: 封禁用戶將令其帳戶將被暫時禁用。
+    description_suspend: '您正在暫停{0}。此評論將進入拒絕隊列。直到暫停時間結束，{0}該評論才將允許被點贊，舉報，回复或發布。'
+    email_message_suspend: '尊敬的{0}， n  n根據{1}的社區規定，您的帳戶已被暫時禁言。在禁言期間，您將無法評論，舉報或與其他評論者進行交流。請重新加入對話{2}。'
+    hours: '{0} 小時'
+    notify_suspend_until: '用戶{0}已被暫時禁言。禁言期將自動結束{1}。'
+    one_hour: '1 小時'
+    select_duration: 選擇暫停期限
     send: 發送
-  reject_username:
-    username: 用戶名
-    no_cancel: "不取消"
-    description_reject: "您想針對他們的{0}暫時封禁此用戶嗎？這樣做會暫時凍結這個用戶的賬號，直到他們重寫{0}。"
-    title_notify: "通知用戶他們的賬號暫時被禁用。"
-    description_notify: "封禁此用戶，其帳號將被暫時禁用。"
-    title_reject: "我們注意到您拒絕了一個用戶名"
-    suspend_user: "暫時封禁用戶"
-    yes_suspend: "是，暫時封禁"
-    email_message_reject: "另一位社區成員最近標記了您的用戶名，要求管理員對其進行審核。由於您的用戶名內容不當，您無法繼續使用您的用戶名。這意味著除非您重新輸入用戶名，您將不能再評論、點贊或標記內容。如果您有任何疑問或顧慮，請發郵件給我們。"
-    write_message: "寫消息"
-    send: 發送
-  thank_you: "我們很重視您的安全和反饋。一位審核員將盡快審閱您的舉報內容。"
+    suspend_user: 暫時禁言用戶
+    title_notify: 通知用戶他們的賬戶被禁言
+    title_suspend: 暫停用戶
+    write_message: 寫消息
+  thank_you: 我們很重視您的安全和反饋。一位審核員將盡快審閱您的舉報內容。
   user:
-    bio_flags: "該簡介的標記"
-    user_bio: "用戶簡介"
-    username_flags: "該用戶名的標記"
-  user_impersonating: "此用戶正在冒充"
-  user_no_comment: "您尚未評論過。加入對話吧！"
-  username_offensive: "這個用戶名有冒犯性"
-  view_conversation: "查看對話"
-  install:
-    initial:
-      description: "讓我們通過幾個簡單的步驟設置您的Talk社區。"
-      submit: "立即開始"
-    add_organization:
-      description: "請告訴我們您的組織名稱。在邀請新團隊成員時，這一資訊將在郵件中顯示。"
-      label: "機構名稱"
-      save: "保存"
-    create:
-      email: "電子郵箱地址"
-      username: "用戶名"
-      password: "密碼"
-      confirm_password: "確認密碼"
-      save: "保存"
-    permitted_domains:
-      title: "允許的域名"
-      description: "輸入您允許Talk使用的域名，例如您的本地環境，測試環境和投入使用的環境（例如localhost：3000，staging.domain.com，domain.com）。 "
-      submit: "完成安裝"
-    final:
-      description: "感謝安裝Talk！我們給您發送了一封郵件以驗證您的電子郵箱地址。在完成帳戶設置後，您即可開始與您的讀者互動。"
-      launch: "啟動Talk"
-      close: "關閉安裝程序"
+    bio_flags: 該簡介的標記
+    user_bio: 用戶簡介
+    username_flags: 該用戶名的標記
+  user_impersonating: 此用戶正在冒充
+  user_no_comment: 您尚未評論過。加入對話吧！
+  username_offensive: 這個用戶名有冒犯性
+  validators:
+    confirm_password: 密碼不匹配。請檢查。
+    required: 該字段必填
+    verify_email: 電子郵箱地址無效
+    verify_organization_name: 組織名稱只能包含字母或數字。
+    verify_password: 密碼必須至少8個字符
+    verify_username: 用戶名只能包含字母、數字和下劃線。
+  view_conversation: 查看對話
+  your_account_has_been_banned: 您的賬戶已被禁用。
+  your_account_has_been_suspended: 您的賬戶已被暫停使用。
+  your_username_has_been_rejected: 由於您使用了不恰當的用戶名，您的帳戶已被暫停使用。若需恢復帳戶，請輸入一個新的用戶名。
diff --git a/package.json b/package.json
index 7a3c72567..c9693164d 100644
--- a/package.json
+++ b/package.json
@@ -108,6 +108,7 @@
     "express-static-gzip": "^0.3.1",
     "extract-text-webpack-plugin": "^3.0.2",
     "file-loader": "^0.11.2",
+    "final-form": "^4.6.1",
     "fluent-langneg": "^0.1.0",
     "form-data": "^2.3.1",
     "fs-extra": "^4.0.1",
@@ -176,6 +177,7 @@
     "react-apollo": "^1.4.12",
     "react-broadcast": "^0.6.2",
     "react-dom": "^15.4.2",
+    "react-final-form": "^3.4.2",
     "react-input-autosize": "^1.1.4",
     "react-loadable": "^5.3.1",
     "react-mdl": "^1.11.0",
@@ -227,6 +229,7 @@
     "chai-as-promised": "^6.0.0",
     "chai-datetime": "^1.5.0",
     "chai-http": "^3.0.0",
+    "deep-sort-object": "^1.0.2",
     "enzyme": "^3.0.0",
     "enzyme-adapter-react-15": "^1.0.0",
     "eslint": "^4.5.0",
diff --git a/plugin-api/beta/client/lib/validation.js b/plugin-api/beta/client/lib/validation.js
new file mode 100644
index 000000000..251c5f78f
--- /dev/null
+++ b/plugin-api/beta/client/lib/validation.js
@@ -0,0 +1 @@
+export * from 'coral-framework/lib/validation';
diff --git a/plugins/talk-plugin-local-auth/client/components/AddEmailAddressDialog.css b/plugins/talk-plugin-local-auth/client/components/AddEmailAddress/AddEmailForm.css
similarity index 51%
rename from plugins/talk-plugin-local-auth/client/components/AddEmailAddressDialog.css
rename to plugins/talk-plugin-local-auth/client/components/AddEmailAddress/AddEmailForm.css
index 41b531147..f191a3167 100644
--- a/plugins/talk-plugin-local-auth/client/components/AddEmailAddressDialog.css
+++ b/plugins/talk-plugin-local-auth/client/components/AddEmailAddress/AddEmailForm.css
@@ -1,15 +1,3 @@
-.dialog {
-  border: none;
-  box-shadow: 0 9px 46px 8px rgba(0, 0, 0, 0.14), 0 11px 15px -7px rgba(0, 0, 0, 0.12), 0 24px 38px 3px rgba(0, 0, 0, 0.2);
-  width: 320px;
-  top: 50%;
-  transform: translateY(-50%);
-  padding: 20px;
-  border-radius: 4px;
-  font-family: Helvetica,Helvetica Neue,Verdana,sans-serif;
-  color:#3B4A53;
-}
-
 .title {
   font-size: 1.3em;
   margin: 15px 0;
@@ -28,7 +16,7 @@
   margin: 20px 0;
   list-style: none;
 }
-  
+
 .item {
   display: flex;
   margin-bottom: 20px;
@@ -46,37 +34,21 @@
     font-size: 1.3em;
   }
 }
-  
+
 .button {
   color: #787D80;
   border-radius: 2px;
   background-color: transparent;
   height: 30px;
   font-size: 0.9em;
-  line-height: normal;
   width: 100%;
   display: inline-block;
   text-align: center;
-  line-height: 30px;
   font-size: 1em;
+  background-color: #3498DB;
+  color: white;
 
   &:hover {
-    background-color: #eaeaea;
     cursor: pointer;
   }
-
-  &.cancel {
-    background-color: transparent;
-    color: #787D80;
-  }
-
-  &.proceed {
-    background-color: #3498DB;
-    color: white;
-  }
-
-  &.danger {
-    background-color: #FA4643;
-    color: white;
-  }
-}
\ No newline at end of file
+}
diff --git a/plugins/talk-plugin-local-auth/client/components/AddEmailAddress/AddEmailForm.js b/plugins/talk-plugin-local-auth/client/components/AddEmailAddress/AddEmailForm.js
new file mode 100644
index 000000000..fe260d782
--- /dev/null
+++ b/plugins/talk-plugin-local-auth/client/components/AddEmailAddress/AddEmailForm.js
@@ -0,0 +1,127 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import styles from './AddEmailForm.css';
+import { Icon } from 'plugin-api/beta/client/components/ui';
+import InputField from '../InputField';
+import { t } from 'plugin-api/beta/client/services';
+import {
+  composeValidators,
+  required,
+  verifyEmail,
+  confirmEmail,
+  verifyPassword,
+  confirmPassword,
+} from 'coral-framework/lib/validation';
+import { Form, Field } from 'react-final-form';
+
+const AddEmailContent = ({ onSubmit }) => (
+  <div>
+    <h4 className={styles.title}>
+      {t('talk-plugin-local-auth.add_email.content.title')}
+    </h4>
+    <p className={styles.description}>
+      {t('talk-plugin-local-auth.add_email.content.description')}
+    </p>
+    <ul className={styles.list}>
+      <li className={styles.item}>
+        <Icon name="done" className={styles.itemIcon} />
+        <span className={styles.text}>
+          {t('talk-plugin-local-auth.add_email.content.item_1')}
+        </span>
+      </li>
+      <li className={styles.item}>
+        <Icon name="done" className={styles.itemIcon} />
+        <span className={styles.text}>
+          {t('talk-plugin-local-auth.add_email.content.item_2')}
+        </span>
+      </li>
+      <li className={styles.item}>
+        <Icon name="done" className={styles.itemIcon} />
+        <span className={styles.text}>
+          {t('talk-plugin-local-auth.add_email.content.item_3')}
+        </span>
+      </li>
+    </ul>
+    <Form onSubmit={onSubmit}>
+      {({ handleSubmit, submitting }) => (
+        <form autoComplete="off" onSubmit={handleSubmit}>
+          <Field
+            name="email"
+            validate={composeValidators(required, verifyEmail)}
+          >
+            {({ input, meta }) => (
+              <InputField
+                label={t(
+                  'talk-plugin-local-auth.add_email.enter_email_address'
+                )}
+                name={input.name}
+                onChange={input.onChange}
+                value={input.value}
+                errorMsg={meta.error}
+                showError={meta.touched}
+                columnDisplay
+              />
+            )}
+          </Field>
+          <Field name="confirmEmail" validate={confirmEmail('email')}>
+            {({ input, meta }) => (
+              <InputField
+                label={t(
+                  'talk-plugin-local-auth.add_email.confirm_email_address'
+                )}
+                name={input.name}
+                onChange={input.onChange}
+                value={input.value}
+                errorMsg={meta.error}
+                showError={meta.touched}
+                columnDisplay
+              />
+            )}
+          </Field>
+          <Field
+            name="password"
+            validate={composeValidators(required, verifyPassword)}
+          >
+            {({ input, meta }) => (
+              <InputField
+                label={t('talk-plugin-local-auth.add_email.insert_password')}
+                name={input.name}
+                onChange={input.onChange}
+                value={input.value}
+                errorMsg={meta.error}
+                showError={meta.touched}
+                type="password"
+                columnDisplay
+              />
+            )}
+          </Field>
+          <Field name="confirmPassword" validate={confirmPassword('password')}>
+            {({ input, meta }) => (
+              <InputField
+                label={t('talk-plugin-local-auth.add_email.confirm_password')}
+                name={input.name}
+                onChange={input.onChange}
+                value={input.value}
+                errorMsg={meta.error}
+                showError={meta.touched}
+                type="password"
+                columnDisplay
+              />
+            )}
+          </Field>
+          <div>
+            <button className={styles.button} disabled={submitting}>
+              {t('talk-plugin-local-auth.add_email.add_email_address')}
+            </button>
+          </div>
+        </form>
+      )}
+    </Form>
+  </div>
+);
+
+AddEmailContent.propTypes = {
+  onSubmit: PropTypes.func.isRequired,
+};
+
+export default AddEmailContent;
diff --git a/plugins/talk-plugin-local-auth/client/components/AddEmailAddress/Dialog.css b/plugins/talk-plugin-local-auth/client/components/AddEmailAddress/Dialog.css
new file mode 100644
index 000000000..98880adde
--- /dev/null
+++ b/plugins/talk-plugin-local-auth/client/components/AddEmailAddress/Dialog.css
@@ -0,0 +1,11 @@
+.root {
+  border: none;
+  box-shadow: 0 9px 46px 8px rgba(0, 0, 0, 0.14), 0 11px 15px -7px rgba(0, 0, 0, 0.12), 0 24px 38px 3px rgba(0, 0, 0, 0.2);
+  width: 320px;
+  top: 50%;
+  transform: translateY(-50%);
+  padding: 20px;
+  border-radius: 4px;
+  font-family: Helvetica,Helvetica Neue,Verdana,sans-serif;
+  color:#3B4A53;
+}
diff --git a/plugins/talk-plugin-local-auth/client/components/AddEmailAddress/Dialog.js b/plugins/talk-plugin-local-auth/client/components/AddEmailAddress/Dialog.js
new file mode 100644
index 000000000..08bfd5863
--- /dev/null
+++ b/plugins/talk-plugin-local-auth/client/components/AddEmailAddress/Dialog.js
@@ -0,0 +1,5 @@
+import React from 'react';
+import { Dialog } from 'plugin-api/beta/client/components/ui';
+import styles from './Dialog.css';
+
+export default props => <Dialog className={styles.root} {...props} />;
diff --git a/plugins/talk-plugin-local-auth/client/components/AddEmailAddress/EmailAddressAdded.css b/plugins/talk-plugin-local-auth/client/components/AddEmailAddress/EmailAddressAdded.css
new file mode 100644
index 000000000..4728f7980
--- /dev/null
+++ b/plugins/talk-plugin-local-auth/client/components/AddEmailAddress/EmailAddressAdded.css
@@ -0,0 +1,29 @@
+.title {
+  font-size: 1.3em;
+  margin: 15px 0;
+  text-align: center;
+}
+
+.description {
+  font-size: 1em;
+  line-height: 20px;
+  margin: 0;
+  margin-bottom: 15px;
+}
+
+.button {
+  color: #787D80;
+  border-radius: 2px;
+  height: 30px;
+  font-size: 0.9em;
+  width: 100%;
+  display: inline-block;
+  text-align: center;
+  font-size: 1em;
+  background-color: #3498DB;
+  color: white;
+
+  &:hover {
+    cursor: pointer;
+  }
+}
diff --git a/plugins/talk-plugin-local-auth/client/components/EmailAddressAdded.js b/plugins/talk-plugin-local-auth/client/components/AddEmailAddress/EmailAddressAdded.js
similarity index 73%
rename from plugins/talk-plugin-local-auth/client/components/EmailAddressAdded.js
rename to plugins/talk-plugin-local-auth/client/components/AddEmailAddress/EmailAddressAdded.js
index 6d5775f3c..a8c930a1a 100644
--- a/plugins/talk-plugin-local-auth/client/components/EmailAddressAdded.js
+++ b/plugins/talk-plugin-local-auth/client/components/AddEmailAddress/EmailAddressAdded.js
@@ -1,10 +1,9 @@
 import React from 'react';
-import cn from 'classnames';
 import PropTypes from 'prop-types';
-import styles from './AddEmailAddressDialog.css';
+import styles from './EmailAddressAdded.css';
 import { t } from 'plugin-api/beta/client/services';
 
-const EmailAddressAdded = ({ done }) => (
+const EmailAddressAdded = ({ onDone }) => (
   <div>
     <h4 className={styles.title}>
       {t('talk-plugin-local-auth.add_email.added.title')}
@@ -17,16 +16,16 @@ const EmailAddressAdded = ({ done }) => (
       {t('talk-plugin-local-auth.add_email.added.description_2')}{' '}
       <strong>{t('talk-plugin-local-auth.add_email.added.path')}</strong>.
     </p>
-    <div className={styles.actions}>
-      <a className={cn(styles.button, styles.proceed)} onClick={done}>
+    <div>
+      <button className={styles.button} onClick={onDone}>
         {t('talk-plugin-local-auth.add_email.done')}
-      </a>
+      </button>
     </div>
   </div>
 );
 
 EmailAddressAdded.propTypes = {
-  done: PropTypes.func.isRequired,
+  onDone: PropTypes.func.isRequired,
 };
 
 export default EmailAddressAdded;
diff --git a/plugins/talk-plugin-local-auth/client/components/AddEmailAddress/VerifyEmailAddress.css b/plugins/talk-plugin-local-auth/client/components/AddEmailAddress/VerifyEmailAddress.css
new file mode 100644
index 000000000..4728f7980
--- /dev/null
+++ b/plugins/talk-plugin-local-auth/client/components/AddEmailAddress/VerifyEmailAddress.css
@@ -0,0 +1,29 @@
+.title {
+  font-size: 1.3em;
+  margin: 15px 0;
+  text-align: center;
+}
+
+.description {
+  font-size: 1em;
+  line-height: 20px;
+  margin: 0;
+  margin-bottom: 15px;
+}
+
+.button {
+  color: #787D80;
+  border-radius: 2px;
+  height: 30px;
+  font-size: 0.9em;
+  width: 100%;
+  display: inline-block;
+  text-align: center;
+  font-size: 1em;
+  background-color: #3498DB;
+  color: white;
+
+  &:hover {
+    cursor: pointer;
+  }
+}
diff --git a/plugins/talk-plugin-local-auth/client/components/VerifyEmailAddress.js b/plugins/talk-plugin-local-auth/client/components/AddEmailAddress/VerifyEmailAddress.js
similarity index 65%
rename from plugins/talk-plugin-local-auth/client/components/VerifyEmailAddress.js
rename to plugins/talk-plugin-local-auth/client/components/AddEmailAddress/VerifyEmailAddress.js
index cc1ff3626..c044ea14c 100644
--- a/plugins/talk-plugin-local-auth/client/components/VerifyEmailAddress.js
+++ b/plugins/talk-plugin-local-auth/client/components/AddEmailAddress/VerifyEmailAddress.js
@@ -1,10 +1,9 @@
 import React from 'react';
-import cn from 'classnames';
 import PropTypes from 'prop-types';
-import styles from './AddEmailAddressDialog.css';
+import styles from './VerifyEmailAddress.css';
 import { t } from 'plugin-api/beta/client/services';
 
-const VerifyEmailAddress = ({ emailAddress, done }) => (
+const VerifyEmailAddress = ({ emailAddress, onDone }) => (
   <div>
     <h4 className={styles.title}>
       {t('talk-plugin-local-auth.add_email.verify.title')}
@@ -12,17 +11,17 @@ const VerifyEmailAddress = ({ emailAddress, done }) => (
     <p className={styles.description}>
       {t('talk-plugin-local-auth.add_email.verify.description', emailAddress)}
     </p>
-    <div className={styles.actions}>
-      <a className={cn(styles.button, styles.proceed)} onClick={done}>
+    <div>
+      <button className={styles.button} onClick={onDone}>
         {t('talk-plugin-local-auth.add_email.done')}
-      </a>
+      </button>
     </div>
   </div>
 );
 
 VerifyEmailAddress.propTypes = {
   emailAddress: PropTypes.string.isRequired,
-  done: PropTypes.func.isRequired,
+  onDone: PropTypes.func.isRequired,
 };
 
 export default VerifyEmailAddress;
diff --git a/plugins/talk-plugin-local-auth/client/components/AddEmailAddress/index.js b/plugins/talk-plugin-local-auth/client/components/AddEmailAddress/index.js
new file mode 100644
index 000000000..5a9b0b18b
--- /dev/null
+++ b/plugins/talk-plugin-local-auth/client/components/AddEmailAddress/index.js
@@ -0,0 +1,4 @@
+export { default as AddEmailForm } from './AddEmailForm';
+export { default as Dialog } from './Dialog';
+export { default as EmailAddressAdded } from './EmailAddressAdded';
+export { default as VerifyEmailAddress } from './VerifyEmailAddress';
diff --git a/plugins/talk-plugin-local-auth/client/components/AddEmailAddressDialog.js b/plugins/talk-plugin-local-auth/client/components/AddEmailAddressDialog.js
deleted file mode 100644
index 00912fdfd..000000000
--- a/plugins/talk-plugin-local-auth/client/components/AddEmailAddressDialog.js
+++ /dev/null
@@ -1,184 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Dialog } from 'plugin-api/beta/client/components/ui';
-import validate from 'coral-framework/helpers/validate';
-import { getErrorMessages } from 'coral-framework/utils';
-import styles from './AddEmailAddressDialog.css';
-import { t } from 'plugin-api/beta/client/services';
-
-import AddEmailContent from './AddEmailContent';
-import VerifyEmailAddress from './VerifyEmailAddress';
-import EmailAddressAdded from './EmailAddressAdded';
-
-const initialState = {
-  step: 0,
-  showErrors: false,
-  errors: {},
-  formData: {
-    emailAddress: '',
-    confirmPassword: '',
-    confirmEmailAddress: '',
-  },
-};
-
-const validateRequired = v =>
-  v ? '' : t('talk-plugin-local-auth.add_email.required_field');
-
-const validateRepeat = (key, msg) => (v, data) => (v !== data[key] ? msg : '');
-
-const validateEmail = v =>
-  validateRequired(v) || !validate.email(v)
-    ? t('talk-plugin-local-auth.add_email.invalid_email_address')
-    : '';
-
-const validatePassword = v => validateRequired(v);
-
-class AddEmailAddressDialog extends React.Component {
-  state = initialState;
-
-  fields = {
-    emailAddress: validateEmail,
-    confirmPassword: validatePassword,
-    confirmEmailAddress: validateRepeat(
-      'emailAddress',
-      t('talk-plugin-local-auth.add_email.confirm_email_address')
-    ),
-  };
-
-  componentDidMount() {
-    this.props.startAttach();
-  }
-
-  onChange = e => {
-    const { name, value } = e.target;
-    this.setState(
-      state => ({
-        formData: {
-          ...state.formData,
-          [name]: value,
-        },
-      }),
-      () => {
-        this.validate();
-      }
-    );
-  };
-
-  validateField = (value, name) => {
-    const error = this.fields[name](value, this.state.formData);
-    if (error) {
-      this.addError({ [name]: error });
-      return false;
-    }
-    this.removeError(name);
-    return true;
-  };
-
-  addError = err => {
-    this.setState(({ errors }) => ({
-      errors: { ...errors, ...err },
-    }));
-  };
-
-  validate() {
-    let hasErrors = false;
-    Object.keys(this.state.formData).forEach(k => {
-      hasErrors = !this.validateField(this.state.formData[k], k) || hasErrors;
-    });
-    return !hasErrors;
-  }
-
-  removeError = errKey => {
-    this.setState(state => {
-      const { [errKey]: _, ...errors } = state.errors;
-      return {
-        errors,
-      };
-    });
-  };
-
-  showErrors = () => {
-    this.setState({
-      showErrors: true,
-    });
-  };
-
-  finish = () => {
-    this.props.finishAttach();
-  };
-
-  confirmChanges = async e => {
-    e.preventDefault();
-
-    if (!this.validate()) {
-      this.showErrors();
-      return;
-    }
-
-    const { emailAddress, confirmPassword } = this.state.formData;
-    const { attachLocalAuth } = this.props;
-
-    try {
-      await attachLocalAuth({
-        email: emailAddress,
-        password: confirmPassword,
-      });
-
-      this.props.notify(
-        'success',
-        t('talk-plugin-local-auth.add_email.added.alert')
-      );
-      this.goToNextStep();
-    } catch (err) {
-      this.props.notify('error', getErrorMessages(err));
-    }
-  };
-
-  goToNextStep = () => {
-    this.setState(({ step }) => ({
-      step: step + 1,
-    }));
-  };
-
-  render() {
-    const { errors, formData, showErrors, step } = this.state;
-    const {
-      root: { settings },
-    } = this.props;
-
-    return (
-      <Dialog className={styles.dialog} open={true}>
-        {step === 0 && (
-          <AddEmailContent
-            formData={formData}
-            errors={errors}
-            showErrors={showErrors}
-            confirmChanges={this.confirmChanges}
-            onChange={this.onChange}
-          />
-        )}
-        {step === 1 &&
-          !settings.requireEmailConfirmation && (
-            <EmailAddressAdded done={this.finish} />
-          )}
-        {step === 1 &&
-          settings.requireEmailConfirmation && (
-            <VerifyEmailAddress
-              emailAddress={formData.emailAddress}
-              done={this.finish}
-            />
-          )}
-      </Dialog>
-    );
-  }
-}
-
-AddEmailAddressDialog.propTypes = {
-  attachLocalAuth: PropTypes.func.isRequired,
-  notify: PropTypes.func.isRequired,
-  root: PropTypes.object.isRequired,
-  startAttach: PropTypes.func.isRequired,
-  finishAttach: PropTypes.func.isRequired,
-};
-
-export default AddEmailAddressDialog;
diff --git a/plugins/talk-plugin-local-auth/client/components/AddEmailContent.js b/plugins/talk-plugin-local-auth/client/components/AddEmailContent.js
deleted file mode 100644
index de296c812..000000000
--- a/plugins/talk-plugin-local-auth/client/components/AddEmailContent.js
+++ /dev/null
@@ -1,101 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import styles from './AddEmailAddressDialog.css';
-import { Icon } from 'plugin-api/beta/client/components/ui';
-import cn from 'classnames';
-import InputField from './InputField';
-import { t } from 'plugin-api/beta/client/services';
-
-const AddEmailContent = ({
-  formData,
-  errors,
-  showErrors,
-  confirmChanges,
-  onChange,
-}) => (
-  <div>
-    <h4 className={styles.title}>
-      {t('talk-plugin-local-auth.add_email.content.title')}
-    </h4>
-    <p className={styles.description}>
-      {t('talk-plugin-local-auth.add_email.content.description')}
-    </p>
-    <ul className={styles.list}>
-      <li className={styles.item}>
-        <Icon name="done" className={styles.itemIcon} />
-        <span className={styles.text}>
-          {t('talk-plugin-local-auth.add_email.content.item_1')}
-        </span>
-      </li>
-      <li className={styles.item}>
-        <Icon name="done" className={styles.itemIcon} />
-        <span className={styles.text}>
-          {t('talk-plugin-local-auth.add_email.content.item_2')}
-        </span>
-      </li>
-      <li className={styles.item}>
-        <Icon name="done" className={styles.itemIcon} />
-        <span className={styles.text}>
-          {t('talk-plugin-local-auth.add_email.content.item_3')}
-        </span>
-      </li>
-    </ul>
-
-    <form autoComplete="off" onSubmit={confirmChanges}>
-      <InputField
-        id="emailAddress"
-        label={t('talk-plugin-local-auth.add_email.enter_email_address')}
-        name="emailAddress"
-        type="email"
-        onChange={onChange}
-        value={formData.emailAddress}
-        hasError={!!errors.emailAddress}
-        errorMsg={errors.emailAddress}
-        showError={showErrors}
-        columnDisplay
-        showSuccess={false}
-      />
-      <InputField
-        id="confirmEmailAddress"
-        label={t('talk-plugin-local-auth.add_email.confirm_email_address')}
-        name="confirmEmailAddress"
-        type="email"
-        onChange={onChange}
-        value={formData.confirmEmailAddress}
-        hasError={!!errors.confirmEmailAddress}
-        errorMsg={errors.confirmEmailAddress}
-        showError={showErrors}
-        columnDisplay
-        showSuccess={false}
-      />
-      <InputField
-        id="confirmPassword"
-        label={t('talk-plugin-local-auth.add_email.insert_password')}
-        name="confirmPassword"
-        type="password"
-        onChange={onChange}
-        value={formData.confirmPassword}
-        hasError={!!errors.confirmPassword}
-        errorMsg={errors.confirmPassword}
-        showError={showErrors}
-        columnDisplay
-        showSuccess={false}
-      />
-      <div className={styles.actions}>
-        <button className={cn(styles.button, styles.proceed)}>
-          {t('talk-plugin-local-auth.add_email.add_email_address')}
-        </button>
-      </div>
-    </form>
-  </div>
-);
-
-AddEmailContent.propTypes = {
-  formData: PropTypes.object.isRequired,
-  errors: PropTypes.object.isRequired,
-  showErrors: PropTypes.bool.isRequired,
-  confirmChanges: PropTypes.func.isRequired,
-  onChange: PropTypes.func.isRequired,
-};
-
-export default AddEmailContent;
diff --git a/plugins/talk-plugin-local-auth/client/components/InputField.js b/plugins/talk-plugin-local-auth/client/components/InputField.js
index 7dca22197..34bbb0bc2 100644
--- a/plugins/talk-plugin-local-auth/client/components/InputField.js
+++ b/plugins/talk-plugin-local-auth/client/components/InputField.js
@@ -4,6 +4,7 @@ import cn from 'classnames';
 import styles from './InputField.css';
 import ErrorMessage from './ErrorMessage';
 import { Icon } from 'plugin-api/beta/client/components/ui';
+import uuid from 'uuid/v4';
 
 const InputField = ({
   id = '',
@@ -12,7 +13,6 @@ const InputField = ({
   name = '',
   onChange = () => {},
   showError = true,
-  hasError = false,
   errorMsg = '',
   children,
   columnDisplay = false,
@@ -27,12 +27,13 @@ const InputField = ({
     ...(value !== undefined ? { value } : {}),
     ...(defaultValue !== undefined ? { defaultValue } : {}),
   };
+  const computedId = id || (label && uuid());
 
   return (
     <div className={styles.detailItem}>
       <div className={cn(styles.detailItemContainer)}>
         {label && (
-          <label className={styles.detailLabel} id={id}>
+          <label className={styles.detailLabel} id={computedId}>
             {label}
           </label>
         )}
@@ -44,13 +45,13 @@ const InputField = ({
           <div
             className={cn(
               styles.detailInput,
-              { [styles.error]: hasError && showError },
+              { [styles.error]: errorMsg && showError },
               { [styles.disabled]: disabled }
             )}
           >
             {icon && <Icon name={icon} className={styles.detailIcon} />}
             <input
-              id={id}
+              id={computedId}
               type={type}
               name={name}
               className={styles.detailValue}
@@ -62,12 +63,12 @@ const InputField = ({
             />
           </div>
           <div className={styles.detailItemMessage}>
-            {!hasError &&
+            {!errorMsg &&
               showSuccess &&
               value && (
                 <Icon className={styles.checkIcon} name="check_circle" />
               )}
-            {hasError && showError && <ErrorMessage>{errorMsg}</ErrorMessage>}
+            {errorMsg && showError && <ErrorMessage>{errorMsg}</ErrorMessage>}
           </div>
         </div>
       </div>
@@ -87,7 +88,6 @@ InputField.propTypes = {
   defaultValue: PropTypes.string,
   icon: PropTypes.string,
   showError: PropTypes.bool,
-  hasError: PropTypes.bool,
   errorMsg: PropTypes.string,
   children: PropTypes.node,
   columnDisplay: PropTypes.bool,
diff --git a/plugins/talk-plugin-local-auth/client/components/Label.js b/plugins/talk-plugin-local-auth/client/components/Label.js
new file mode 100644
index 000000000..1e2ce5fb7
--- /dev/null
+++ b/plugins/talk-plugin-local-auth/client/components/Label.js
@@ -0,0 +1,4 @@
+import * as React from 'react';
+
+const Label = props => <div {...props} />;
+export default Label;
diff --git a/plugins/talk-plugin-local-auth/client/containers/AddEmailAddressDialog.js b/plugins/talk-plugin-local-auth/client/containers/AddEmailAddressDialog.js
index 695acb8c9..34bb5603d 100644
--- a/plugins/talk-plugin-local-auth/client/containers/AddEmailAddressDialog.js
+++ b/plugins/talk-plugin-local-auth/client/containers/AddEmailAddressDialog.js
@@ -1,11 +1,90 @@
+import React from 'react';
+import PropTypes from 'prop-types';
 import { compose, gql } from 'react-apollo';
 import { bindActionCreators } from 'redux';
 import { connect, withFragments, excludeIf } from 'plugin-api/beta/client/hocs';
-import AddEmailAddressDialog from '../components/AddEmailAddressDialog';
 import { notify } from 'coral-framework/actions/notification';
 import { withAttachLocalAuth } from '../hocs';
 import { startAttach, finishAttach } from '../actions';
 import get from 'lodash/get';
+import { getErrorMessages } from 'coral-framework/utils';
+import { t } from 'plugin-api/beta/client/services';
+import {
+  Dialog,
+  AddEmailForm,
+  VerifyEmailAddress,
+  EmailAddressAdded,
+} from '../components/AddEmailAddress';
+
+class AddEmailAddressDialog extends React.Component {
+  state = {
+    step: 0,
+  };
+
+  componentDidMount() {
+    this.props.startAttach();
+  }
+
+  handleDone = () => {
+    this.props.finishAttach();
+  };
+
+  handleSubmit = async ({ email, password }) => {
+    const { attachLocalAuth } = this.props;
+    try {
+      await attachLocalAuth({
+        email,
+        password,
+      });
+
+      this.props.notify(
+        'success',
+        t('talk-plugin-local-auth.add_email.added.alert')
+      );
+      this.goToNextStep();
+    } catch (err) {
+      this.props.notify('error', getErrorMessages(err));
+    }
+  };
+
+  goToNextStep = () => {
+    this.setState(({ step }) => ({
+      step: step + 1,
+    }));
+  };
+
+  render() {
+    const { step } = this.state;
+    const {
+      root: {
+        me: { email },
+        settings: { requireEmailConfirmation },
+      },
+    } = this.props;
+
+    return (
+      <Dialog open={true}>
+        {step === 0 && <AddEmailForm onSubmit={this.handleSubmit} />}
+        {step === 1 &&
+          !requireEmailConfirmation && (
+            <EmailAddressAdded onDone={this.handleDone} />
+          )}
+        {step === 1 &&
+          requireEmailConfirmation && (
+            <VerifyEmailAddress emailAddress={email} onDone={this.handleDone} />
+          )}
+      </Dialog>
+    );
+  }
+}
+
+AddEmailAddressDialog.propTypes = {
+  attachLocalAuth: PropTypes.func.isRequired,
+  notify: PropTypes.func.isRequired,
+  startAttach: PropTypes.func.isRequired,
+  finishAttach: PropTypes.func.isRequired,
+  root: PropTypes.object,
+};
 
 const mapStateToProps = ({ talkPluginLocalAuth: state }) => ({
   inProgress: state.inProgress,
diff --git a/plugins/talk-plugin-local-auth/translations.yml b/plugins/talk-plugin-local-auth/translations.yml
index d9727a2d3..41902ad8a 100644
--- a/plugins/talk-plugin-local-auth/translations.yml
+++ b/plugins/talk-plugin-local-auth/translations.yml
@@ -55,6 +55,7 @@ en:
       confirm_email_address: "Confirm Email Address:"
       email_does_not_match: "Email Address does not match"
       insert_password: "Insert Password:"
+      confirm_password: "Confirm Password:"
       required_field: "This field is required"
       done: "Done"
       content:
diff --git a/scripts/i18n.js b/scripts/i18n.js
new file mode 100755
index 000000000..22e34ff80
--- /dev/null
+++ b/scripts/i18n.js
@@ -0,0 +1,208 @@
+#!/usr/bin/env node
+
+const program = require('commander');
+const path = require('path');
+const fs = require('fs');
+const yaml = require('yamljs');
+const sortObject = require('deep-sort-object');
+const get = require('lodash/get');
+const set = require('lodash/set');
+const cloneDeep = require('lodash/cloneDeep');
+
+// Make things colorful!
+require('colors');
+
+const localesPath = path.resolve(__dirname, '../locales');
+
+/**
+ * Walk through all locale files, parse it and call
+ * callback with the data. If the callback returns a
+ * value, use this to write a new yaml locale file.
+ *
+ * Currently this is limited to the top level locales
+ * not including the plugins.
+ */
+function walk(callback) {
+  fs.readdirSync(localesPath).forEach(file => {
+    const filePath = path.join(localesPath, file);
+    const data = yaml.load(filePath);
+    const transformed = callback(cloneDeep(data), file);
+    if (transformed) {
+      fs.writeFileSync(filePath, yaml.stringify(transformed, 100, 2));
+    }
+  });
+}
+
+/**
+ * Sort translation keys alphabetically
+ */
+function actionSort() {
+  walk((data, file) => {
+    console.log(`Sorting ${file}`);
+    return sortObject(data);
+  });
+  console.log('All locales sorted'.green);
+}
+
+/**
+ * Delete a key from translations files
+ */
+function actionDelete(pathStr) {
+  const pathArray = pathStr.split('.');
+  const parentPathArray = pathArray.slice(0, pathArray.length - 1);
+  const leaf = pathArray[pathArray.length - 1];
+  let found = false;
+
+  walk((data, file) => {
+    const languages = Object.keys(data);
+    languages.forEach(language => {
+      const translations = data[language];
+      const find = get(translations, parentPathArray);
+      if (find[leaf]) {
+        console.log(`Deleted '${language}.${pathStr}' from ${file}`.green);
+        delete find[leaf];
+        found = true;
+      }
+    });
+    return data;
+  });
+
+  if (!found) {
+    console.log(`Could not find translations for ${pathStr}`);
+  }
+}
+
+/**
+ * Copy value of key to another key in translations files
+ */
+function actionCopy(from, to, { force }) {
+  let found = false;
+
+  walk((data, file) => {
+    const languages = Object.keys(data);
+    languages.forEach(language => {
+      const translations = data[language];
+      const find = get(translations, from);
+      if (find) {
+        // File already exist.
+        if (get(translations, to)) {
+          if (!force) {
+            // Do not overwrite and skip this iteration.
+            console.log(
+              `'${language}.${to}' already exists in ${file} use -f to overwrite`
+                .red
+            );
+            return;
+          } else {
+            // Force overwrite.
+            console.log(
+              `Overwritten '${language}.${to}' with '${language}.${from}' in ${file}`
+                .green
+            );
+          }
+        } else {
+          console.log(
+            `Copied '${language}.${from}' to '${language}.${to}' in ${file}`
+              .green
+          );
+        }
+
+        // Write.
+        set(translations, to, find);
+        found = true;
+      }
+    });
+    return sortObject(data);
+  });
+
+  if (!found) {
+    console.log(`Could not find translations for ${from}`);
+  }
+}
+
+/**
+ * Drop all translation keys that are not also present in the EN locale.
+ */
+function actionDropUnused() {
+  const enKeys = [];
+
+  const gatherKeys = (value, parentKey = '') => {
+    if (typeof value !== 'object' || Array.isArray(value)) {
+      return;
+    }
+    const keys = Object.keys(value);
+    keys.forEach(k => {
+      const path = `${parentKey ? `${parentKey}.` : ''}${k}`;
+      enKeys.push(path);
+      gatherKeys(value[k], path);
+    });
+  };
+
+  const dropUnusedKeys = (value, language, parentKey = '') => {
+    if (typeof value !== 'object' || Array.isArray(value)) {
+      return;
+    }
+    const keys = Object.keys(value);
+    keys.forEach(k => {
+      const path = `${parentKey ? `${parentKey}.` : ''}${k}`;
+      if (enKeys.indexOf(path) === -1) {
+        console.log(`Drop ${language}.${path}`);
+        delete value[k];
+        return;
+      }
+      dropUnusedKeys(value[k], language, path);
+    });
+  };
+
+  // Gather all possible translations in the en locale.
+  walk(data => {
+    const translations = data.en;
+    if (!translations) {
+      return;
+    }
+    gatherKeys(translations);
+  });
+
+  // Remove translations not in the en locale.
+  walk(data => {
+    const languages = Object.keys(data).filter(l => l !== 'en');
+    languages.forEach(language => {
+      const translations = data[language];
+      dropUnusedKeys(translations, language);
+    });
+    return data;
+  });
+}
+
+program
+  .version('0.1.0')
+  .description(
+    'Tools to help manage i18n locales.\n  Currently this is limited to top level locales excluding the plugin locales.'
+  );
+
+program
+  .command('sort')
+  .description('Sort keys of all locales in alphabetical order')
+  .action(actionSort);
+
+program
+  .command('delete <path>')
+  .description('Delete key at path in all locales')
+  .action(actionDelete);
+
+program
+  .command('copy <from> <to>')
+  .description('Copy translation from one key to another')
+  .option('-f, --force', 'Force overwrite')
+  .action(actionCopy);
+
+program
+  .command('drop-unused')
+  .description('Drop translations that are not present in the en locale')
+  .action(actionDropUnused);
+
+program.parse(process.argv);
+
+if (!process.argv.slice(2).length) {
+  program.help();
+}
diff --git a/yarn.lock b/yarn.lock
index 47830a4fd..085b39ab7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2913,6 +2913,12 @@ deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
 
+deep-sort-object@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/deep-sort-object/-/deep-sort-object-1.0.2.tgz#3892dcef5dfd0efc2d6fa96beabccb33cd8ef91f"
+  dependencies:
+    is-plain-object "^2.0.1"
+
 default-require-extensions@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8"
@@ -3948,6 +3954,10 @@ fill-range@^4.0.0:
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
+final-form@^4.6.1:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/final-form/-/final-form-4.6.1.tgz#e3f3058524c2eb8b950be452087ffe124e39554d"
+
 finalhandler@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.6.tgz#007aea33d1a4d3e42017f624848ad58d212f814f"
@@ -9369,6 +9379,10 @@ react-dom@^16.2.0:
     object-assign "^4.1.1"
     prop-types "^15.6.0"
 
+react-final-form@^3.4.2:
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/react-final-form/-/react-final-form-3.4.2.tgz#4fd3fe958c481c98c4d4970ee7679bc1ac4185dc"
+
 react-input-autosize@^1.1.4:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-1.2.0.tgz#87241071159f742123897691da6796ec33b57d05"

From 8c20376c952f9247eae29ac3ba6654e3fd7fbca1 Mon Sep 17 00:00:00 2001
From: Cristian <cristian.dean@corp.globo.com>
Date: Mon, 11 Jun 2018 12:34:54 -0300
Subject: [PATCH 143/144] Add translations in some missing pages and fix others

---
 .../coral-admin/src/components/AdminLogin.js  | 23 +++++++-------
 .../src/components/ForgotPassword.js          |  8 ++---
 client/coral-admin/src/components/Header.js   |  4 +--
 client/coral-admin/src/components/Login.js    |  5 ++--
 client/coral-admin/src/components/SignIn.js   | 11 +++----
 .../routes/Configure/components/EmbedLink.js  |  2 +-
 .../Moderation/components/StorySearch.js      | 15 ++++++----
 locales/de.yml                                |  1 -
 locales/en.yml                                | 19 ++++++++++--
 locales/es.yml                                |  1 -
 locales/pt_BR.yml                             | 30 +++++++++++++++++--
 11 files changed, 82 insertions(+), 37 deletions(-)

diff --git a/client/coral-admin/src/components/AdminLogin.js b/client/coral-admin/src/components/AdminLogin.js
index 99bd61696..e6bcb3b89 100644
--- a/client/coral-admin/src/components/AdminLogin.js
+++ b/client/coral-admin/src/components/AdminLogin.js
@@ -5,6 +5,7 @@ import styles from './NotFound.css';
 import { Button, TextField, Alert, Success } from 'coral-ui';
 import Recaptcha from 'react-recaptcha';
 import cn from 'classnames';
+import t from 'coral-framework/services/i18n';
 
 class AdminLogin extends React.Component {
   constructor(props) {
@@ -41,13 +42,13 @@ class AdminLogin extends React.Component {
         {errorMessage && <Alert>{errorMessage}</Alert>}
         <TextField
           id="email"
-          label="Email Address"
+          label={t('login.email_address')}
           value={this.state.email}
           onChange={e => this.setState({ email: e.target.value })}
         />
         <TextField
           id="password"
-          label="Password"
+          label={t('login.password')}
           value={this.state.password}
           onChange={e => this.setState({ password: e.target.value })}
           type="password"
@@ -60,10 +61,10 @@ class AdminLogin extends React.Component {
           full
           onClick={this.handleSignIn}
         >
-          Sign In
+          {t('login.sign_in_button')}
         </Button>
         <p className={styles.forgotPasswordCTA}>
-          Forgot your password?{' '}
+          {t('login.forgot_password')}{' '}
           <a
             href="#"
             className={styles.forgotPasswordLink}
@@ -72,7 +73,7 @@ class AdminLogin extends React.Component {
               this.setState({ requestPassword: true });
             }}
           >
-            Request a new one.
+            {t('login.request_passowrd')}
           </a>
         </p>
         {loginMaxExceeded && (
@@ -95,14 +96,14 @@ class AdminLogin extends React.Component {
       >
         {this.props.passwordRequestSuccess}{' '}
         <a className={styles.signInLink} href="#">
-          Sign in
+          {t('login.sign_in')}
         </a>
         <Success />
       </p>
     ) : (
       <form onSubmit={this.handleRequestPassword}>
         <TextField
-          label="Email Address"
+          label={t('login.email_address')}
           value={this.state.email}
           onChange={e => this.setState({ email: e.target.value })}
         />
@@ -112,17 +113,15 @@ class AdminLogin extends React.Component {
           full
           onClick={this.handleRequestPassword}
         >
-          Reset Password
+          {t('login.reset_password')}
         </Button>
       </form>
     );
     return (
       <Layout fixedDrawer restricted={true}>
         <div className={cn(styles.loginLayout, 'talk-admin-login')}>
-          <h1 className={styles.loginHeader}>Team sign in</h1>
-          <p className={styles.loginCTA}>
-            Sign in to interact with your community.
-          </p>
+          <h1 className={styles.loginHeader}>{t('login.team_sign_in')}</h1>
+          <p className={styles.loginCTA}>{t('login.sign_in_message')}</p>
           {this.state.requestPassword ? requestPasswordForm : signInForm}
         </div>
       </Layout>
diff --git a/client/coral-admin/src/components/ForgotPassword.js b/client/coral-admin/src/components/ForgotPassword.js
index fe08436ae..d2d1dbf4e 100644
--- a/client/coral-admin/src/components/ForgotPassword.js
+++ b/client/coral-admin/src/components/ForgotPassword.js
@@ -43,21 +43,21 @@ class ForgotPassword extends React.Component {
       <form onSubmit={this.handleSubmit}>
         {errorMessage && <Alert>{errorMessage}</Alert>}
         <TextField
-          label="Email Address"
+          label={t('login.email_address')}
           value={email}
           onChange={this.handleEmailChange}
         />
         <Button type="submit" cStyle="black" full>
-          Reset Password
+          {t('login.reset_password')}
         </Button>
         <p className={styles.cta}>
-          Go back to{' '}
+          {t('login.go_back')}{' '}
           <a
             href="#"
             className={styles.signInLink}
             onClick={this.handleSignInLink}
           >
-            Sign In
+            {t('login.sign_in')}
           </a>
           .
         </p>
diff --git a/client/coral-admin/src/components/Header.js b/client/coral-admin/src/components/Header.js
index f0bb68c0c..fadd33c15 100644
--- a/client/coral-admin/src/components/Header.js
+++ b/client/coral-admin/src/components/Header.js
@@ -83,7 +83,7 @@ const CoralHeader = ({
                         target="_blank"
                         rel="noopener noreferrer"
                       >
-                        View latest version
+                        {t('configure.view_last_version')}
                       </a>
                     </MenuItem>
                     <MenuItem>
@@ -92,7 +92,7 @@ const CoralHeader = ({
                         target="_blank"
                         rel="noopener noreferrer"
                       >
-                        Report a bug or give feedback
+                        {t('configure.report_bug_or_feedback')}
                       </a>
                     </MenuItem>
                     {currentUser && (
diff --git a/client/coral-admin/src/components/Login.js b/client/coral-admin/src/components/Login.js
index cc5ec9436..2f3f9a975 100644
--- a/client/coral-admin/src/components/Login.js
+++ b/client/coral-admin/src/components/Login.js
@@ -5,6 +5,7 @@ import PropTypes from 'prop-types';
 import styles from './Login.css';
 import Layout from 'coral-admin/src/components/Layout';
 import cn from 'classnames';
+import t from 'coral-framework/services/i18n';
 
 class LoginContainer extends Component {
   renderForm() {
@@ -19,8 +20,8 @@ class LoginContainer extends Component {
     return (
       <Layout fixedDrawer restricted={true}>
         <div className={cn(styles.layout, 'talk-admin-login')}>
-          <h1 className={styles.header}>Team sign in</h1>
-          <p className={styles.cta}>Sign in to interact with your community.</p>
+          <h1 className={styles.header}>{t('login.team_sign_in')}</h1>
+          <p className={styles.cta}>{t('login.sign_in_message')}</p>
           {this.renderForm()}
         </div>
       </Layout>
diff --git a/client/coral-admin/src/components/SignIn.js b/client/coral-admin/src/components/SignIn.js
index a067ace1d..46d47ecf0 100644
--- a/client/coral-admin/src/components/SignIn.js
+++ b/client/coral-admin/src/components/SignIn.js
@@ -5,6 +5,7 @@ import { Button, TextField, Alert } from 'coral-ui';
 import cn from 'classnames';
 import Recaptcha from 'coral-framework/components/Recaptcha';
 import External from './External';
+import t from 'coral-framework/services/i18n';
 
 class SignIn extends React.Component {
   recaptcha = null;
@@ -40,13 +41,13 @@ class SignIn extends React.Component {
           {errorMessage && <Alert>{errorMessage}</Alert>}
           <TextField
             id="email"
-            label="Email Address"
+            label={t('login.email_address')}
             value={email}
             onChange={this.handleEmailChange}
           />
           <TextField
             id="password"
-            label="Password"
+            label={t('login.password')}
             value={password}
             onChange={this.handlePasswordChange}
             type="password"
@@ -68,17 +69,17 @@ class SignIn extends React.Component {
             cStyle="black"
             full
           >
-            Sign In
+            {t('login.sign_in')}
           </Button>
           <p className={styles.forgotPasswordCTA}>
             {/* TODO: translate */}
-            Forgot your password?{' '}
+            {t('login.forgot_password')}{' '}
             <a
               href="#"
               className={styles.forgotPasswordLink}
               onClick={this.handleForgotPasswordLink}
             >
-              Request a new one.
+              {t('login.request_passowrd')}
             </a>
           </p>
         </form>
diff --git a/client/coral-admin/src/routes/Configure/components/EmbedLink.js b/client/coral-admin/src/routes/Configure/components/EmbedLink.js
index f03716e43..4ed50e98e 100644
--- a/client/coral-admin/src/routes/Configure/components/EmbedLink.js
+++ b/client/coral-admin/src/routes/Configure/components/EmbedLink.js
@@ -34,7 +34,7 @@ class EmbedLink extends Component {
     `;
 
     return (
-      <ConfigureCard title={'Embed Comment Stream'}>
+      <ConfigureCard title={t('configure.embed_comment_stream')}>
         <p>{t('configure.copy_and_paste')}</p>
         <textarea
           rows={5}
diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.js b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
index cb233c1e6..912c7f5a1 100644
--- a/client/coral-admin/src/routes/Moderation/components/StorySearch.js
+++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import styles from './StorySearch.css';
 import { Button, Spinner, Icon } from 'coral-ui';
 import Story from './Story';
+import t from 'coral-framework/services/i18n';
 
 const StorySearch = props => {
   const {
@@ -36,14 +37,14 @@ const StorySearch = props => {
               onClick={props.search}
               raised
             >
-              Search
+              {t('streams.search')}
             </Button>
           </div>
           <div className={styles.results}>
             {props.assetId && (
               <div className={styles.cta}>
                 <a onClick={props.goToModerateAll}>
-                  Moderate comments on All Stories
+                  {t('moderate_all_streams')}
                 </a>
               </div>
             )}
@@ -51,13 +52,15 @@ const StorySearch = props => {
               {props.moderation.storySearchString ? (
                 <div className={styles.searchResults}>
                   <Icon name="search" />
-                  <span className={styles.headlineRecent}>Search Results</span>
+                  <span className={styles.headlineRecent}>
+                    {t('streams.search_results')}
+                  </span>
                 </div>
               ) : (
                 <div className={styles.searchResults}>
                   <Icon name="access_time" />
                   <span className={styles.headlineRecent}>
-                    Most Recent Stories
+                    {t('streams.most_recent_stories')}
                   </span>
                 </div>
               )}
@@ -85,7 +88,9 @@ const StorySearch = props => {
               )}
 
               {assets.nodes.length === 0 && (
-                <div className={styles.noResults}>No results</div>
+                <div className={styles.noResults}>
+                  {t('streams.search_results')}
+                </div>
               )}
             </div>
           </div>
diff --git a/locales/de.yml b/locales/de.yml
index 1e604038e..4c6bd84e3 100644
--- a/locales/de.yml
+++ b/locales/de.yml
@@ -140,7 +140,6 @@ de:
     open_stream: 'Kommentarbereich öffnen'
     open_stream_configuration: 'Dieser Kommentarbereich ist momentan geöffnet. Nach dem Schließen dieses Kommentarbereich wird es nicht mehr möglich sein, zu kommentieren. Bestehende Kommentare bleiben sichtbar.'
     organization_contact_email: 'E-Mail-Adresse der Organisation'
-    organization_details: 'Details zur Organisation'
     organization_info_copy: 'Wir verwenden diese Informationen in automatisierten E-Mail-Benachrichtigungen, die Talk versendet. Damit können Nutzer Ihre Organisation identifizieren und sie haben die Möglichkeit bei Problemen in Kontakt mit Ihnen zu treten.'
     organization_info_copy_2: 'Wir empfehlen, einee generische E-Mail-Adresse (z.B. community@yournewsroom.com) für diesen Zweck einzurichten. Die kann über die Zeit gleich bleiben, und gibt nach außen keine Namen preis, die von Nutzern im Fall von Konflikten für persönliche Angriffe missbraucht werden könnten.'
     organization_information: 'Über die Organisation'
diff --git a/locales/en.yml b/locales/en.yml
index 48fb74da0..ac3952779 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -119,7 +119,7 @@ en:
     edit_comment_timeframe_text_post: 'seconds to edit their comments.'
     edit_comment_timeframe_text_pre: 'Commenters will have'
     edit_info: 'Edit Info'
-    embed_comment_stream: 'Embed Stream'
+    embed_comment_stream: 'Embed Comment Stream'
     enable_pre_moderation: 'Enable pre-moderation'
     enable_pre_moderation_text: 'Moderators must approve any comment before it is published.'
     enable_premod: 'Enable Premoderation'
@@ -140,11 +140,11 @@ en:
     open_stream: 'Open Stream'
     open_stream_configuration: 'This comment stream is currently open. By closing this comment stream no new comments may be submitted and all previous comments will still be displayed.'
     organization_contact_email: 'Organization Contact Email'
-    organization_details: 'Organization Details'
     organization_info_copy: 'We use this information in email notifications generated by Talk. This connects the messages to your organization, and provides a way for users to contact you if they have an issue with their account.'
     organization_info_copy_2: 'We recommend creating a generic email account (eg. community@yournewsroom.com) for this purpose. This means it can remain consistent over time, and doesn''t expose a name that users could target if their account were blocked.'
     organization_information: 'Organization Information'
     organization_name: 'Organization Name'
+    report_bug_or_feedback: 'Report a bug or give feedback'
     require_email_verification: 'Require Email Verification'
     require_email_verification_text: 'New Users must verify their email before commenting'
     save: Save
@@ -163,6 +163,7 @@ en:
     suspect_word_title: 'Suspect words list'
     tech_settings: 'Tech Settings'
     title: 'Configure Comment Stream'
+    view_last_version: 'View latest version'
     weeks: Weeks
     wordlist: 'Banned Words'
   confirm_email:
@@ -349,7 +350,18 @@ en:
       title: 'Permitted domains'
   like: Like
   loading_results: 'Loading Results'
+  login:
+    email_address: 'Email Address'
+    forgot_password: 'Forgot your password?'
+    go_back: 'Go back'
+    sign_in: 'Sign In'
+    sign_in_button: 'Sign Inx'
+    sign_in_message: 'Sign in to interact with your community.'
+    password: Password
+    request_passowrd: 'Request a new one.'
+    team_sign_in: 'Team sign in'
   marketing: 'This looks like an ad/marketing'
+  moderate_all_streams: 'Moderate comments on All Stories'
   moderate_this_stream: 'Moderate this stream'
   modqueue:
     account: 'account flags'
@@ -465,11 +477,14 @@ en:
     closed: Closed
     empty_result: 'No assets match this search. Maybe try widening your search?'
     filter_streams: 'Filter Streams'
+    most_recent_stories: 'Most Recent Stories'
     newest: Newest
+    no_results: 'No results'
     oldest: Oldest
     open: Open
     pubdate: 'Publication Date'
     search: Search
+    search_results: 'Search Results'
     sort_by: 'Sort By'
     status: 'Stream Status'
     stream_status: 'Stream Status'
diff --git a/locales/es.yml b/locales/es.yml
index 1c1c45209..eb646e4c6 100644
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -135,7 +135,6 @@ es:
     open_stream: 'Abrir Hilo de Comentarios'
     open_stream_configuration: 'Este hilo de comentarios está abierto. Al cerrarlo no se podrán publicar nuevos comentarios pero todos los comentarios anteriores aún serán mostrados.'
     organization_contact_email: 'Email de la Organización'
-    organization_details: 'Detalles de la Organización'
     organization_info_copy: 'Nosotros usamos esta información en las notificaciones de email generadas por Talk. Esto conecta los mensajes de tu organización, y provee una forma para que los usuarios se comuniquen si tienen un inconveniente con su cuenta.'
     organization_info_copy_2: 'Recomendamos crear un email genérico (ej: community@yournewsroom.com) for this purpose. Esto significa que puede permanecer consistente con el tiempo y no expone un nombre que los usuarios puedan atacar si su cuenta fue bloqueada.'
     organization_information: 'Información de la Organización'
diff --git a/locales/pt_BR.yml b/locales/pt_BR.yml
index 1f39f04ed..a29e1b651 100644
--- a/locales/pt_BR.yml
+++ b/locales/pt_BR.yml
@@ -107,12 +107,15 @@ pt_BR:
     custom_css_url_desc: 'URL de uma folha de estilo CSS para substituir os estilos padrão dos comentários embutidos. Pode ser interno ou externo.'
     days: Dias
     description: 'Personalizar as configurações da lista de comentários para esta história.'
+    disable_commenting_desc: 'Escreva uma mensagem que será exibida enquanto os comentários estiverem desativados.'
+    disable_commenting_title: 'Desativar todos os comentários do site.'
     domain_list_text: 'Insira os domínios que você gostaria de permitir para o Talk, como seus ambientes de desenvolvimento, teste ou produção (ej. localhost:3000 staging.domain.com domain.com).'
     domain_list_title: 'Domínios permitidos'
     edit_comment_timeframe_heading: 'Período de tempo para editar comentários'
     edit_comment_timeframe_text_post: 'segundos para editar seus comentários.'
     edit_comment_timeframe_text_pre: 'Os usuários terão'
-    embed_comment_stream: 'Comentários embutidos'
+    edit_info: 'Alterar Informações'
+    embed_comment_stream: 'Incorporar stream de comentários'
     enable_pre_moderation: 'Habilitar pré-moderação'
     enable_pre_moderation_text: 'Demandar aprovação de moderadores para todos os comentários.'
     enable_premod: 'Habilitar pré-moderação'
@@ -132,8 +135,15 @@ pt_BR:
     open: Abrir
     open_stream: 'Abrir comentários'
     open_stream_configuration: 'Comentários abertos no momento. Ao fechar esta lista de comentários, nenhum novo comentário poderá ser enviado. Mas os comentários anteriores ainda serão exibidos.'
+    organization_contact_email: 'Email da organização'
+    organization_info_copy: 'Usamos essas informações em notificações de email geradas pelo Talk. Isso conecta as mensagens à sua organização e fornece uma maneira de os usuários entrarem em contato com você caso tenham um problema com a conta.'
+    organization_info_copy_2: 'Recomendamos a criação de uma conta de e-mail genérica (por exemplo, comunidade@suaredacao.com) para essa finalidade. Isso significa que ele pode permanecer consistente ao longo do tempo e não expor um nome que os usuários pudessem segmentar se a conta fosse bloqueada.'
+    organization_information: 'Informações da Organização'
+    organization_name: 'Nome da Organização'
+    report_bug_or_feedback: 'Relatar bug ou dar um feedback'
     require_email_verification: 'Requerer verificação de email'
     require_email_verification_text: 'Novos usuários devem verificar seu e-mail antes de comentar'
+    save: Salvar
     save_changes: 'Salvar alterações'
     shortcuts: Atalhos
     sign_out: Sair
@@ -143,12 +153,13 @@ pt_BR:
     suspect_word_title: 'Lista de palavras suspeitas'
     tech_settings: 'Configurações técnicas'
     title: 'Configurar comentários'
+    view_last_version: 'Ver últimos releases'
     weeks: Semanas
     wordlist: 'Palavras Proibidas'
   confirm_email:
     click_to_confirm: 'Clique abaixo para confirmar seu endereço de email'
     confirm: Confirmar
-  continue: Continua
+  continue: Continuar
   createdisplay:
     check_the_form: 'Formulário inválido. Verifique as entradas do formulário.'
     continue: 'Continue com o mesmo nome de usuário do Facebook'
@@ -284,7 +295,18 @@ pt_BR:
       title: 'Domínios permitidos'
   like: Gostar
   loading_results: 'Carregando resultados'
+  login:
+    email_address: 'Email'
+    forgot_password: 'Esqueceu sua senha?'
+    go_back: 'Voltar'
+    sign_in: 'Entrar'
+    sign_in_button: 'Entrar'
+    sign_in_message: 'Entre para interagir com a comunidade.'
+    password: Senha
+    request_passowrd: 'Recupere-a clicando aqui.'
+    team_sign_in: 'Team sign in'
   marketing: 'Isso parece um anúncio/marketing'
+  moderate_all_streams: 'Comentários moderados em todas as matérias'
   moderate_this_stream: 'Moderar comentários'
   modqueue:
     account: 'contas marcadas'
@@ -319,6 +341,7 @@ pt_BR:
     prev_comment: 'Vá para o comentário anterior'
     reject: Rejeitar
     rejected: Rejeitado
+    reported: Reportado
     reply: Responder
     select_stream: 'Selecione a lista'
     shift_key: ⇧
@@ -388,11 +411,14 @@ pt_BR:
     closed: Fechado
     empty_result: 'Nenhum resultado encontrado para esta pesquisa. Que tal refazer a pesquisa com termos diferentes?'
     filter_streams: 'Filtra as listas'
+    most_recent_stories: 'Matérias mais recentes'
     newest: 'O mais novo'
+    no_results: 'No results'
     oldest: 'O mais velho'
     open: Aberto
     pubdate: 'Data de publicação'
     search: Pesquisar
+    search_results: 'Pesquisar Resultados'
     sort_by: 'Ordenar por'
     status: 'Situação dos comentários'
     stream_status: 'Situação dos comentários'

From 18fa98d8eab11ac9f7d4dcf9ae68ecd09fbbf359 Mon Sep 17 00:00:00 2001
From: Jeff Nelson <jeff@jeffnelson.com>
Date: Wed, 13 Jun 2018 07:13:39 -0700
Subject: [PATCH 144/144] add config for MAILGUN_SMTP_PASSWORD to app.json

---
 app.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app.json b/app.json
index 6c85e3cc2..9f245105f 100644
--- a/app.json
+++ b/app.json
@@ -18,6 +18,10 @@
             "value": "",
             "required": true
         },
+        "MAILGUN_SMTP_PASSWORD": {
+            "value": "",
+            "required": true
+        },
         "NODE_ENV": "production",
         "REWRITE_ENV": "TALK_MONGO_URL:MONGO_URI,TALK_REDIS_URL:REDIS_URL,TALK_SMTP_HOST:MAILGUN_SMTP_SERVER,TALK_SMTP_PORT:MAILGUN_SMTP_PORT,TALK_SMTP_USERNAME:MAILGUN_SMTP_LOGIN,TALK_SMTP_PASSWORD:MAILGUN_SMTP_PASSWORD",
         "NPM_CONFIG_PRODUCTION": "false"