From 9ddc6c35fdae3dae448826ac748adb3ccc9f0d5e Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 19 Apr 2017 11:59:07 -0300
Subject: [PATCH 1/4] Action labels default.css, temporary fix

---
 client/coral-embed-stream/style/default.css | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css
index 51028949b..b99b109ac 100644
--- a/client/coral-embed-stream/style/default.css
+++ b/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;
+  }
+}
\ No newline at end of file

From 4ac71c884bb40eaa540fb64ef89a1ced138eba1e Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 19 Apr 2017 18:10:16 -0600
Subject: [PATCH 2/4] added --force to rebuild native modules

---
 Dockerfile.onbuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile.onbuild b/Dockerfile.onbuild
index 34c321448..06d006b42 100644
--- a/Dockerfile.onbuild
+++ b/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
\ No newline at end of file

From 50219922d585a4281690c7f4d940a3ea7a4182fe Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 20 Apr 2017 09:35:32 -0600
Subject: [PATCH 3/4] Switched to lock at node 7.8

---
 Dockerfile   | 2 +-
 INSTALL.md   | 4 ++--
 package.json | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 90c08057f..73885d628 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:7.9
+FROM node:7.8
 
 # Create app directory
 RUN mkdir -p /usr/src/app
diff --git a/INSTALL.md b/INSTALL.md
index 18244f635..49033acc8 100644
--- a/INSTALL.md
+++ b/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!_
diff --git a/package.json b/package.json
index 1b09c78c8..6c725a852 100644
--- a/package.json
+++ b/package.json
@@ -182,6 +182,6 @@
     "webpack": "^2.3.1"
   },
   "engines": {
-    "node": "^7.9.0"
+    "node": "^7.8.0"
   }
 }

From 3ff9313b03e901fa1e772779afd1e6d69ec87e48 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 21 Apr 2017 01:18:51 +0700
Subject: [PATCH 4/4] Fix ignored users when not logged in

---
 graph/resolvers/root_query.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/graph/resolvers/root_query.js b/graph/resolvers/root_query.js
index b26ecabca..4dcb7ea11 100644
--- a/graph/resolvers/root_query.js
+++ b/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];