Merge tag '1.4.5' into develop
1.4.5
This commit is contained in:
commit
8cbaf2d597
@ -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": {
|
||||||
|
|||||||
@ -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": {
|
||||||
|
|||||||
@ -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} > </div>
|
: (
|
||||||
</div>
|
<div class="timer-container">
|
||||||
);
|
<div class="timer" style={timerStyles} > </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>
|
||||||
|
|||||||
@ -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": {
|
||||||
|
|||||||
@ -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]
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user