Merge branch 'master' into login-popup

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:7.9
+FROM node:7.8
 
 # Create app directory
 RUN mkdir -p /usr/src/app

Dockerfile.onbuild

@@ -3,12 +3,12 @@ FROM coralproject/talk:latest
 # Bundle app source
 ONBUILD COPY . /usr/src/app
 
-# At this stage, we need to install the development dependancies again because 
+# At this stage, we need to install the development dependancies again because
 # we need to have webpack available. We then build the new dependancies and
 # clear out the development dependancies again. After this we of course need to
 # clear out the yarn cache, this saves quite a lot of size.
 ONBUILD RUN NODE_ENV=development yarn install --frozen-lockfile && \
             NODE_ENV=production  cli plugins reconcile && \
             NODE_ENV=production  yarn build && \
-            NODE_ENV=production  yarn install --production && \
+            NODE_ENV=production  yarn install --production --force && \
             yarn cache clean

INSTALL.md

@@ -174,8 +174,8 @@ and testing purposes.
 
 There are some runtime requirements for running Talk from source:
 
-- [Node](https://nodejs.org/) v7.9 or later
-- [Yarn](https://yarnpkg.com/) v0.22.0 or later
+- [Node](https://nodejs.org/) ~7.8
+- [Yarn](https://yarnpkg.com/) ^0.22.0
 
 _Please be sure to check the versions of these requirements. Incorrect versions
 of these may lead to unexpected errors!_

client/coral-embed-stream/style/default.css

@@ -475,3 +475,19 @@ button.comment__action-button[disabled],
 .coral-load-more-replies button.coral-load-more, .coral-new-comments  button.coral-load-more{
   width: initial;
 }
+
+@media (min-device-width : 300px) and (max-device-width : 420px) {
+  .commentActionsLeft.comment__action-container .coral-plugin-likes-button-text,
+  .commentActionsLeft.comment__action-container > div span {
+    display: none;
+  }
+
+  .commentActionsLeft.comment__action-container .coral-plugin-replies-reply-button {
+    visibility: collapse;
+    margin-left: -30px;
+  }
+
+  .commentActionsLeft.comment__action-container .coral-plugin-replies-reply-button .coral-plugin-replies-icon {
+    visibility: visible;
+  }
+}

graph/resolvers/root_query.js

@@ -84,6 +84,9 @@ const RootQuery = {
   },
 
   myIgnoredUsers: async (_, args, {user, loaders: {Users}}) => {
+    if (!user) {
+      return null;
+    }
 
     // get currentUser again since context.user was out of date when running test/graph/mutations/ignoreUser
     const currentUser = (await Users.getByQuery({ids: [user.id], limit: 1}))[0];

package.json

@@ -182,6 +182,6 @@
     "webpack": "^2.3.1"
   },
   "engines": {
-    "node": "^7.9.0"
+    "node": "^7.8.0"
   }
 }