From 901f04ef40e6db8d50937ededea23aee4ddadad5 Mon Sep 17 00:00:00 2001 From: ntr Date: Sun, 15 Sep 2019 15:44:10 +1000 Subject: [PATCH 1/2] v1.4.5 --- VERSION | 2 +- acp/package.json | 2 +- client/package.json | 2 +- ops/package.json | 2 +- server/Cargo.toml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index e1df5de7..03e5161d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.4.4 \ No newline at end of file +1.4.5 \ No newline at end of file diff --git a/acp/package.json b/acp/package.json index da7908ae..2d6bcc99 100644 --- a/acp/package.json +++ b/acp/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.4.4", + "version": "1.4.5", "description": "", "main": "index.js", "scripts": { diff --git a/client/package.json b/client/package.json index 7c875711..f03cab0e 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.4.4", + "version": "1.4.5", "description": "", "main": "index.js", "scripts": { diff --git a/ops/package.json b/ops/package.json index 642d45e1..5314c598 100755 --- a/ops/package.json +++ b/ops/package.json @@ -1,6 +1,6 @@ { "name": "mnml-ops", - "version": "1.4.4", + "version": "1.4.5", "description": "", "main": "index.js", "scripts": { diff --git a/server/Cargo.toml b/server/Cargo.toml index 67096284..d3970fb5 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mnml" -version = "1.4.4" +version = "1.4.5" authors = ["ntr "] [dependencies] From 21170285c2e65aa30ca81e43e6e5666ccd14af47 Mon Sep 17 00:00:00 2001 From: ntr Date: Sun, 15 Sep 2019 16:00:24 +1000 Subject: [PATCH 2/2] hide timer when instance not in progress --- client/src/components/instance.ctrl.jsx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/client/src/components/instance.ctrl.jsx b/client/src/components/instance.ctrl.jsx index faa38afb..329eea45 100644 --- a/client/src/components/instance.ctrl.jsx +++ b/client/src/components/instance.ctrl.jsx @@ -76,11 +76,13 @@ function Controls(args) { background: displayColour, }; - const timer = ( -
-
 
-
- ); + const timer = instance.phase !== 'InProgress' + ? null + : ( +
+
 
+
+ ); const ready = instance.phase !== 'Finished' ?