From 0a53aea4c91bb9394ec667a1c6f17f13e230e5d5 Mon Sep 17 00:00:00 2001
From: Martin <martin@moid.se>
Date: Fri, 21 Feb 2020 08:25:13 +0100
Subject: [PATCH 1/2] fix: height in safari (DHIS2-8277) (#303)

Fixes the height issue in Safari for DV (https://jira.dhis2.org/browse/DHIS2-8277) by explicitly setting the height of the app to 100%.
---
 adapter/src/styles.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/adapter/src/styles.js b/adapter/src/styles.js
index 4e4708c62..f40fcb1bb 100644
--- a/adapter/src/styles.js
+++ b/adapter/src/styles.js
@@ -11,5 +11,6 @@ export const styles = css`
     div.app-shell-app {
         flex: 1 1 auto;
         overflow: auto;
+        height: 100%;
     }
 `

From 27901dc92d8a789a1d8748019ef7b3369a518af5 Mon Sep 17 00:00:00 2001
From: "@dhis2-bot" <apps@dhis2.org>
Date: Fri, 21 Feb 2020 07:29:03 +0000
Subject: [PATCH 2/2] chore(release): cut 3.2.5 [skip ci]

## [3.2.5](https://github.com/dhis2/app-platform/compare/v3.2.4...v3.2.5) (2020-02-21)

### Bug Fixes

* height in safari (DHIS2-8277) ([#303](https://github.com/dhis2/app-platform/issues/303)) ([0a53aea](https://github.com/dhis2/app-platform/commit/0a53aea4c91bb9394ec667a1c6f17f13e230e5d5))
---
 CHANGELOG.md         | 7 +++++++
 adapter/package.json | 4 ++--
 cli/package.json     | 4 ++--
 package.json         | 2 +-
 shell/package.json   | 4 ++--
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e7cbab47..b53a02918 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [3.2.5](https://github.com/dhis2/app-platform/compare/v3.2.4...v3.2.5) (2020-02-21)
+
+
+### Bug Fixes
+
+* height in safari (DHIS2-8277) ([#303](https://github.com/dhis2/app-platform/issues/303)) ([0a53aea](https://github.com/dhis2/app-platform/commit/0a53aea4c91bb9394ec667a1c6f17f13e230e5d5))
+
 ## [3.2.4](https://github.com/dhis2/app-platform/compare/v3.2.3...v3.2.4) (2020-02-18)
 
 
diff --git a/adapter/package.json b/adapter/package.json
index cd7f4a3d3..4c8b25e3e 100644
--- a/adapter/package.json
+++ b/adapter/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/app-adapter",
-    "version": "3.2.4",
+    "version": "3.2.5",
     "repository": {
         "type": "git",
         "url": "https://github.com/amcgee/dhis2-app-platform",
@@ -21,7 +21,7 @@
         "moment": "^2.24.0"
     },
     "devDependencies": {
-        "@dhis2/cli-app-scripts": "3.2.4"
+        "@dhis2/cli-app-scripts": "3.2.5"
     },
     "scripts": {
         "build": "d2-app-scripts build"
diff --git a/cli/package.json b/cli/package.json
index 809c7a520..827e85fdc 100644
--- a/cli/package.json
+++ b/cli/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/cli-app-scripts",
-    "version": "3.2.4",
+    "version": "3.2.5",
     "repository": {
         "type": "git",
         "url": "https://github.com/amcgee/dhis2-app-platform",
@@ -29,7 +29,7 @@
         "@babel/preset-env": "^7.6.2",
         "@babel/preset-react": "^7.0.0",
         "@babel/preset-typescript": "^7.6.0",
-        "@dhis2/app-shell": "3.2.4",
+        "@dhis2/app-shell": "3.2.5",
         "@dhis2/cli-helpers-engine": "^1.5.0",
         "archiver": "^3.1.1",
         "babel-jest": "^24.9.0",
diff --git a/package.json b/package.json
index b5dc6c6c4..07d86a52e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "root",
-    "version": "3.2.4",
+    "version": "3.2.5",
     "private": true,
     "repository": {
         "type": "git",
diff --git a/shell/package.json b/shell/package.json
index c24c35905..557a16395 100644
--- a/shell/package.json
+++ b/shell/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/app-shell",
-    "version": "3.2.4",
+    "version": "3.2.5",
     "repository": {
         "type": "git",
         "url": "https://github.com/amcgee/dhis2-app-platform",
@@ -12,7 +12,7 @@
         "access": "public"
     },
     "dependencies": {
-        "@dhis2/app-adapter": "3.2.4",
+        "@dhis2/app-adapter": "3.2.5",
         "@dhis2/app-runtime": "^2.0.4",
         "@dhis2/d2-i18n": "^1.0.5",
         "@dhis2/ui-core": "^4.6.1",