Merge tag '1.4.5' into develop

1.4.5
This commit is contained in:
ntr 2019-09-15 17:26:42 +10:00
commit 8cbaf2d597
6 changed files with 12 additions and 10 deletions

View File

@ -1 +1 @@
1.4.4 1.4.5

View File

@ -1,6 +1,6 @@
{ {
"name": "mnml-client", "name": "mnml-client",
"version": "1.4.4", "version": "1.4.5",
"description": "", "description": "",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {

View File

@ -1,6 +1,6 @@
{ {
"name": "mnml-client", "name": "mnml-client",
"version": "1.4.4", "version": "1.4.5",
"description": "", "description": "",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {

View File

@ -76,11 +76,13 @@ function Controls(args) {
background: displayColour, background: displayColour,
}; };
const timer = ( const timer = instance.phase !== 'InProgress'
<div class="timer-container"> ? null
<div class="timer" style={timerStyles} >&nbsp;</div> : (
</div> <div class="timer-container">
); <div class="timer" style={timerStyles} >&nbsp;</div>
</div>
);
const ready = instance.phase !== 'Finished' const ready = instance.phase !== 'Finished'
? <button class="ready" onClick={() => sendReady()}>Ready</button> ? <button class="ready" onClick={() => sendReady()}>Ready</button>

View File

@ -1,6 +1,6 @@
{ {
"name": "mnml-ops", "name": "mnml-ops",
"version": "1.4.4", "version": "1.4.5",
"description": "", "description": "",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {

View File

@ -1,6 +1,6 @@
[package] [package]
name = "mnml" name = "mnml"
version = "1.4.4" version = "1.4.5"
authors = ["ntr <ntr@smokestack.io>"] authors = ["ntr <ntr@smokestack.io>"]
[dependencies] [dependencies]