From 93ca0bf79dca4652dc4b25ed10ad9449d99fc8d9 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Tue, 11 Apr 2017 16:14:02 -0300
Subject: [PATCH 1/3] fixed flash messages

---
 client/coral-embed/src/index.js                | 4 +++-
 client/coral-framework/actions/notification.js | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/coral-embed/src/index.js b/client/coral-embed/src/index.js
index 21c176500..722f4ca8e 100644
--- a/client/coral-embed/src/index.js
+++ b/client/coral-embed/src/index.js
@@ -2,6 +2,7 @@ import pym from 'pym.js';
 
 import {stringify} from 'querystring';
 
+// TODO: Styles should live in a separate file
 const snackbarStyles = {
   position: 'fixed',
   cursor: 'default',
@@ -20,7 +21,8 @@ const snackbarStyles = {
   opacity: 0,
   transform: 'translate(-50%, 20px)',
   bottom: 0,
-  boxSizing: 'border-box'
+  boxSizing: 'border-box',
+  fontFamily: 'Helvetica, \'Helvetica Neue\', Verdana, sans-serif'
 };
 
 // This function should return value of window.Coral
diff --git a/client/coral-framework/actions/notification.js b/client/coral-framework/actions/notification.js
index cb1aee5dd..37679972d 100644
--- a/client/coral-framework/actions/notification.js
+++ b/client/coral-framework/actions/notification.js
@@ -1,4 +1,4 @@
-import {pym} from '../../coral-framework';
+import pym from '../services/PymConnection';
 
 export const addNotification = (notifType, text) => {
   pym.sendMessage('coral-alert', `${notifType}|${text}`);

From c5520e3fb66e67ac61aa9445d23a413b167ab280 Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Tue, 11 Apr 2017 12:22:05 -0700
Subject: [PATCH 2/3] Adds missing template.

---
 services/email/suspension.html.ejs | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 services/email/suspension.html.ejs

diff --git a/services/email/suspension.html.ejs b/services/email/suspension.html.ejs
new file mode 100644
index 000000000..b36560ec5
--- /dev/null
+++ b/services/email/suspension.html.ejs
@@ -0,0 +1 @@
+<%= body %>

From 3a3b89b03b24ba19f154c98f4da41b057540900f Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Tue, 11 Apr 2017 14:59:02 -0600
Subject: [PATCH 3/3] Fixed bugs with plugin install

---
 package.json | 2 +-
 plugins.js   | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index f4e2eb725..d974a78d4 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "e2e": "NODE_ENV=test nightwatch",
     "poste2e": "NODE_ENV=test scripts/poste2e.sh",
     "embed-start": "NODE_ENV=development yarn build && ./bin/cli serve --jobs",
-    "heroku-postbuild": "yarn build"
+    "heroku-postbuild": "./bin/cli plugins reconcile && yarn build"
   },
   "config": {
     "pre-git": {
diff --git a/plugins.js b/plugins.js
index 02cdb58e1..65e80dee5 100644
--- a/plugins.js
+++ b/plugins.js
@@ -124,7 +124,12 @@ function itteratePlugins(plugins) {
 // Add each plugin folder to the allowed import path so that they can import our
 // internal dependancies.
 Object.keys(plugins).forEach((type) => itteratePlugins(plugins[type]).forEach((plugin) => {
-  amp.enableForDir(path.dirname(plugin.path));
+
+  // The plugin may be remote, and therefore not installed. We check here if the
+  // plugin path is available before trying to monkeypatch it's require path.
+  if (plugin.path) {
+    amp.enableForDir(path.dirname(plugin.path));
+  }
 }));
 
 /**