From ca0e511efdb65675225f17503260148f2c643945 Mon Sep 17 00:00:00 2001
From: Jonathan Labreuille <jonathan@mailpoet.com>
Date: Tue, 21 Jun 2016 16:47:25 +0200
Subject: [PATCH 1/2] removed ES6 syntax from non converted JS file - fixes
 #529 (Safari bug)

---
 assets/js/src/date.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/assets/js/src/date.js b/assets/js/src/date.js
index 498235dc4d..b0acf29aa3 100644
--- a/assets/js/src/date.js
+++ b/assets/js/src/date.js
@@ -68,7 +68,7 @@ define('date',
       });
     },
     convertFormat: function(format) {
-      const format_mappings = {
+      var format_mappings = {
         date: {
           D: 'ddd',
           l: 'dddd',
@@ -124,9 +124,9 @@ define('date',
 
       if (!format || format.length <= 0) return format;
 
-      const replacements = format_mappings['date'];
+      var replacements = format_mappings['date'];
 
-      let outputFormat = '';
+      var outputFormat = '';
 
       Object.keys(replacements).forEach(function(key) {
         if (format.indexOf(key) !== -1) {

From fd12bd557e9dd4cf59d7878fec0f7741a9b3c6f6 Mon Sep 17 00:00:00 2001
From: Jonathan Labreuille <jonathan@mailpoet.com>
Date: Wed, 22 Jun 2016 12:21:26 +0200
Subject: [PATCH 2/2] fixed 'Setup' link in homepage

---
 views/index.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/views/index.html b/views/index.html
index c179ae8a57..5fcb5f30ee 100644
--- a/views/index.html
+++ b/views/index.html
@@ -2,5 +2,9 @@
 
 <% block content %>
   <h1><%= 'Welcome!' %></h1>
-  <p><%= __(' %sSetup%s MailPoet and start sending.') | format('<a href="/wp-admin/admin.php?page=mailpoet-settings">', '</a>') | raw %></p>
+  <p><%= __(' %sSetup%s MailPoet and start sending.')
+    | format('<a href="%s">', '</a>')
+    | format(admin_url('admin.php?page=mailpoet-settings'))
+    | raw
+  %></p>
 <% endblock %>