From abc821112bfbbd17adfcad4f088ae6645cdd9441 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Dec 2020 18:52:18 +0000
Subject: [PATCH 1/2] Bump ini from 1.3.5 to 1.3.7

Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7)

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 816a6e17..0c2bcbbe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -66,7 +66,7 @@
     },
     "ansi-colors": {
       "version": "1.1.0",
-      "resolved": "http://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
       "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
       "dev": true,
       "requires": {
@@ -5815,11 +5815,6 @@
           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
           "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
         },
-        "ini": {
-          "version": "1.3.5",
-          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-          "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
-        },
         "inquirer": {
           "version": "3.3.0",
           "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
@@ -11658,10 +11653,9 @@
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
     "ini": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
-      "dev": true
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz",
+      "integrity": "sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ=="
     },
     "inquirer": {
       "version": "0.12.0",

From edace7b002fb69f102a62fdeabaf055343acf5b3 Mon Sep 17 00:00:00 2001
From: Bevan Kay <bevanjkay@gmail.com>
Date: Thu, 7 Jan 2021 16:10:47 +1100
Subject: [PATCH 2/2] Add ability to sync all-day Google Calendar Events

---
 application/controllers/Google.php | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/application/controllers/Google.php b/application/controllers/Google.php
index c84a4846..e2bfbbd4 100644
--- a/application/controllers/Google.php
+++ b/application/controllers/Google.php
@@ -184,7 +184,20 @@ class Google extends EA_Controller {
 
                 if ($google_event->getStart()->getDateTime() === $google_event->getEnd()->getDateTime())
                 {
-                    continue; // Skip all day events
+                    $event_start = new DateTime($google_event->getStart()->getDate());
+                    date_time_set($event_start, 0, 0);
+                    $event_start->setTimezone($provider_timezone);
+                    $event_end = new DateTime($google_event->getEnd()->getDate());
+                    date_modify($event_end, '-1 day');
+                    date_time_set($event_end, 23, 59);
+                    $event_end->setTimezone($provider_timezone);
+                }
+                else
+                {
+                    $event_start = new DateTime($google_event->getStart()->getDateTime());
+                    $event_start->setTimezone($provider_timezone);
+                    $event_end = new DateTime($google_event->getEnd()->getDateTime());
+                    $event_end->setTimezone($provider_timezone);
                 }
 
                 $results = $CI->appointments_model->get_batch(['id_google_calendar' => $google_event->getId()]);
@@ -194,10 +207,6 @@ class Google extends EA_Controller {
                     continue;
                 }
 
-                $event_start = new DateTime($google_event->getStart()->getDateTime());
-                $event_start->setTimezone($provider_timezone);
-                $event_end = new DateTime($google_event->getEnd()->getDateTime());
-                $event_end->setTimezone($provider_timezone);
 
                 // Record doesn't exist in the Easy!Appointments, so add the event now.
                 $appointment = [