From c1b5be82b761fd3fb6831e95b9c2d113c140af7c Mon Sep 17 00:00:00 2001 From: Erik Quinn Date: Sun, 1 Dec 2019 11:46:42 -0500 Subject: [PATCH 1/3] ARCH - Prepare CHANGELOG and set beta version for upcoming sprint --- CHANGELOG.md | 7 +++++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36e9c9a856..06d5f0bf73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# 6.16.0 (January 1, 2020) +### New Features + +### Bugfixes + +### Enhancements & Refactors + # 6.15.0 (December 1, 2019) ### New Features - #1105 - Add in-sim Airport Guide accessible via footer button diff --git a/package-lock.json b/package-lock.json index ef11c500b7..38ef74463e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "openscope", - "version": "6.15.0", + "version": "6.16.0-BETA", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index eae9f514af..1f9af34c0b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openscope", - "version": "6.15.0", + "version": "6.16.0-BETA", "description": "An ATC simulator in HTML5", "engines": { "node": "11.3.0", From 2ccd4581b9877a7613f8407cbdff7f8490a7ae84 Mon Sep 17 00:00:00 2001 From: oobayly <3430117+oobayly@users.noreply.github.com> Date: Mon, 2 Dec 2019 10:27:16 +0000 Subject: [PATCH 2/3] hotifx/1480 - Ensure controls-menu above stripView Resolves #1480 --- src/assets/style/module/controls/_controls.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/style/module/controls/_controls.less b/src/assets/style/module/controls/_controls.less index 2578b2b451..1261cbdd44 100644 --- a/src/assets/style/module/controls/_controls.less +++ b/src/assets/style/module/controls/_controls.less @@ -3,7 +3,7 @@ margin: 0; padding: 0; overflow: hidden; - z-index: 2; + z-index: 125; } .control-item { From 697e87acff1339bed6db21886600f942c0c01c62 Mon Sep 17 00:00:00 2001 From: Erik Quinn Date: Mon, 2 Dec 2019 23:01:49 -0500 Subject: [PATCH 3/3] hotfix/1480 - Add changelog entry --- CHANGELOG.md | 8 +++----- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06d5f0bf73..e80629dfb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,7 @@ -# 6.16.0 (January 1, 2020) -### New Features - -### Bugfixes +# 6.15.1 (December 2, 2020) +### Hotfixes +- #1480 - Ensure settings menu appears above flight strip bay -### Enhancements & Refactors # 6.15.0 (December 1, 2019) ### New Features diff --git a/package-lock.json b/package-lock.json index 38ef74463e..c7706db3b1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "openscope", - "version": "6.16.0-BETA", + "version": "6.15.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 1f9af34c0b..cc42c55f59 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openscope", - "version": "6.16.0-BETA", + "version": "6.15.1", "description": "An ATC simulator in HTML5", "engines": { "node": "11.3.0",