Merge branch 'next' into suspect-label

circle.yml

@@ -62,7 +62,10 @@ deployment:
       - bash ./scripts/docker.sh deploy
 
   latest:
-    branch: master
+    branches:
+      only:
+        - master
+        - next
     owner: coralproject
     commands:
       - bash ./scripts/docker.sh deploy

client/coral-admin/src/routes/Moderation/containers/StorySearch.js

@@ -3,7 +3,7 @@ import {compose, gql} from 'react-apollo';
 import StorySearch from '../components/StorySearch';
 import {withRouter} from 'react-router';
 import withQuery from 'coral-framework/hocs/withQuery';
-import {isEmpty} from 'lodash';
+import isEmpty from 'lodash/isEmpty';
 
 class StorySearchContainer extends React.Component {
   constructor(props) {

client/coral-ui/components/Drawer.css

@@ -37,6 +37,12 @@
   text-align: center;
   cursor: pointer;
 
+  .icon {
+    color: #595959;
+    font-size: 25px;
+    display: block;
+  }
+
   &:hover {
     color: #ccc;
   }

client/coral-ui/components/Drawer.js

@@ -2,11 +2,14 @@ import React from 'react';
 import cn from 'classnames';
 import PropTypes from 'prop-types';
 import styles from './Drawer.css';
+import {Icon} from 'coral-ui';
 
 const Drawer = ({children, onClose, className = ''}) => {
   return (
     <div className={cn(styles.drawer, className)}>
-      <button className={cn(styles.closeButton, [className, 'close-button'].join('-'))} onClick={onClose}>×</button>
+      <button className={cn(styles.closeButton, [className, 'close-button'].join('-'))} onClick={onClose}>
+        <Icon name="close" className={styles.icon} />
+      </button>
       <div className={styles.content}>
         {children}
       </div>

errors.js

@@ -158,7 +158,7 @@ const ErrNotAuthorized = new APIError('not authorized', {
 
 // ErrSettingsNotInit is returned when the settings are required but not
 // initialized.
-const ErrSettingsNotInit = new Error('settings not initialized, run `./bin/cli setup` to setup the application first');
+const ErrSettingsNotInit = new Error('Talk is currently not setup. Please proceed to our webinstaller at $ROOT_URL/admin/install or run ./bin/cli-setup. Visit https://coralproject.github.io/talk/ for more information on installation and configuration instructions');
 
 // ErrSettingsInit is returned when the setup endpoint is hit and we are already
 // initialized.

locales/en.yml

@@ -10,7 +10,7 @@ en:
     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 edit comment or remove anything."
+    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"

package.json

@@ -124,6 +124,7 @@
     "kue": "0.11.6",
     "linkify-it": "^2.0.3",
     "lodash": "^4.16.6",
+    "lodash-es": "^4.16.6",
     "marked": "^0.3.6",
     "material-design-lite": "^1.2.1",
     "metascraper": "1.0.7",

plugins/talk-plugin-featured-comments/client/components/ModTag.css

@@ -7,11 +7,11 @@
   padding: 0px 5px;
   border-radius: 2px;
   font-size: 12px;
-  height: 24px;
+  height: 26px;
   transition: background-color .2s cubic-bezier(.4,0,.2,1), color .2s cubic-bezier(.4,0,.2,1), border-color .2s cubic-bezier(.4,0,.2,1);
   margin: 2px 0px;
   letter-spacing: 0.4px;
-
+  line-height: 25px;
 }
 
 .tag:hover {
@@ -38,5 +38,5 @@
 .tagIcon {
   margin-right: 5px;
   font-size: 15px;
-  vertical-align: text-bottom;
+  vertical-align: sub;
 }

plugins/talk-plugin-ignore-user/client/components/IgnoreUserConfirmation.css

@@ -16,6 +16,7 @@
   padding: 0;
   margin: 0 0 8px 0;
   font-size: 15px;
+  word-wrap: break-word;
 }
 
 .button {

scripts/docker.sh

@@ -29,7 +29,7 @@ deploy_tag() {
       docker tag coralproject/talk:latest-onbuild coralproject/talk:$version-onbuild
   done
 
-  # Push each of the tags to docker hub, including latest
+  # Push each of the tags to dockerhub, including latest
   for version in $tag_list latest
   do
       echo "==> pushing $version"
@@ -44,6 +44,16 @@ deploy_latest() {
   docker push coralproject/talk:latest-onbuild
 }
 
+deploy_branch() {
+  echo "==> tagging branch $CIRCLE_BRANCH"
+  docker tag coralproject/talk:latest coralproject/talk:$CIRCLE_BRANCH
+  docker tag coralproject/talk:latest-onbuild coralproject/talk:$CIRCLE_BRANCH-onbuild
+
+  echo "==> pushing branch $CIRCLE_BRANCH"
+  docker push coralproject/talk:$CIRCLE_BRANCH
+  docker push coralproject/talk:$CIRCLE_BRANCH-onbuild
+}
+
 # build the repo, including the onbuild tagged versions.
 docker build -t coralproject/talk:latest -f Dockerfile .
 docker build -t coralproject/talk:latest-onbuild -f Dockerfile.onbuild .
@@ -58,11 +68,17 @@ then
     docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
   fi
 
-  # deploy based on the env
-  if [ -n "$CIRCLE_TAG" ]
+  if [ "$CIRCLE_BRANCH" = "master" ]
   then
-    deploy_tag
+
+    # deploy based on the env
+    if [ -n "$CIRCLE_TAG" ]
+    then
+      deploy_tag
+    else
+      deploy_latest
+    fi
   else
-    deploy_latest
+    deploy_branch
   fi
 fi

webpack.config.js

@@ -121,7 +121,9 @@ const config = {
       'graphql-anywhere': path.resolve(__dirname, 'client/coral-framework/graphql/anywhere'),
       'plugin-api': path.resolve(__dirname, 'plugin-api/'),
       plugins: path.resolve(__dirname, 'plugins/'),
-      pluginsConfig: pluginsPath
+      pluginsConfig: pluginsPath,
+      'lodash': path.resolve(__dirname, path.resolve(__dirname, 'node_modules/lodash-es')),
+      'lodash.isequal': path.resolve(__dirname, 'node_modules/lodash-es/isEqual'),
     },
     modules: [
       path.resolve(__dirname, 'plugins'),

yarn.lock

@@ -5387,7 +5387,7 @@ locate-path@^2.0.0:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
 
-lodash-es@^4.2.1:
+lodash-es@^4.16.6, lodash-es@^4.2.1:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.4.tgz#dcc1d7552e150a0640073ba9cb31d70f032950e7"