Joel Collins
cda5cdbb44
Switched away from using JSONify
2020-04-24 16:05:01 +01:00
Joel Collins
4fffa1fcba
Update deps
2020-04-24 16:04:46 +01:00
Joel Collins
07c4399bbf
Further layout improvements
2020-04-24 11:19:46 +01:00
Joel Collins
a992f88aea
Fixed padding on bigger buttons
2020-04-24 11:19:38 +01:00
Joel Collins
20d477248a
Update deps
2020-04-24 10:50:05 +01:00
Joel Collins
d940722851
Merge branch 'improved-settings-layout' into 'master'
...
Improved settings layout
See merge request openflexure/openflexure-microscope-jsclient!48
2020-04-23 16:58:20 +00:00
Joel Collins
6fa77e04e3
Updated settings to a navbar layout
2020-04-23 17:30:04 +01:00
Joel Collins
b871be48a4
Updated dev deps
2020-04-23 17:29:36 +01:00
Joel Collins
abd291f1e0
Base OFM JSON encoder on LabThings encoder
2020-04-23 14:25:19 +01:00
Richard Bowman
be85d07210
Attempt to start the stream if it's stopped.
2020-04-23 11:22:14 +01:00
Richard Bowman
5a4aae8ed1
Added helpful errors if the stream has stopped
2020-04-23 11:15:10 +01:00
Richard Bowman
161c17812e
Removed vestigial global statement
...
There was a global declaration for the modules
np and logging, probably left over from running
this code in the dodgy console plugin. I've
removed it as it's ugly, dodgy, and no longer
needed.
2020-04-23 11:10:36 +01:00
Joel Collins
3c27b5a6e6
Merge branch 'enable-ipv6' into 'master'
...
Enable ipv6
See merge request openflexure/openflexure-microscope-server!53
2020-04-23 09:45:25 +00:00
Richard Bowman
6213620031
Enable ipv6
...
Setting the listen address to :: puts flask into ipv6 mode.
This makes it compatible with ipv6 and, thanks
to the system automatically translating ipv4
into ipv6, it is completely compatible with ipv4
as well.
2020-04-23 10:42:49 +01:00
Joel Collins
bcd6f426cc
Merge branch 'actions-aint-actions' into 'master'
...
The "actions" endpoint shouldn't be tagged
See merge request openflexure/openflexure-microscope-server!52
2020-04-23 08:42:48 +00:00
Richard Bowman
102264c4be
The "actions" endpoint shouldn't be tagged
...
The actions endpoint (responds only to GET, lists the actions)
is not itself an action.
The ``@tag("actions")`` causes LabThings to try to include
it as an action, which fails.
Removing the tag makes the server run again -
but maybe I've broken something else here?
2020-04-23 08:09:21 +01:00
Joel Collins
7fc202aea1
Merge branch 'click_to_move' into 'master'
...
Click to move
See merge request openflexure/openflexure-microscope-jsclient!47
2020-04-14 10:36:56 +00:00
Joel Collins
3c2f4d1eec
Merge branch 'stage-calibration' into 'master'
...
Stage calibration
See merge request openflexure/openflexure-microscope-server!43
2020-04-14 10:36:45 +00:00
Richard Bowman
aebec9b116
Merge branch 'master' into click_to_move
2020-04-10 15:32:10 +01:00
Richard Bowman
70d4c7e950
Merge branch 'master' into stage-calibration
2020-04-10 15:16:25 +01:00
Joel Collins
4a62d9c7c0
Merge branch '2.0.X-hotfix-b' into 'master'
...
Documentation fix
See merge request openflexure/openflexure-microscope-server!51
2020-04-07 11:03:26 +00:00
Joel Collins
f292ff3e43
Revert "Added sleeps to check for blank capture fix"
...
This reverts commit 32ddcd5d13
2020-04-07 11:03:26 +00:00
Joel Collins
62e9b49bae
Rearranged connect panel
2020-04-06 15:15:10 +01:00
Joel Collins
3c7cd43e38
Switched to alt for letter keycombos (avoid conflict with capitalisation)
2020-04-06 15:01:08 +01:00
Joel Collins
1a8b4be3ae
Updated audit fix
2020-04-06 14:56:50 +01:00
Joel Collins
1d05f0d6d4
Update dependencies
2020-04-06 14:56:06 +01:00
Joel Collins
ca1560a00f
Audit fix
2020-04-06 14:52:33 +01:00
Joel Collins
bd6343a753
Bigger default window
2020-04-06 14:50:10 +01:00
Joel Collins
5f7d683cd1
Force tour opacity override
2020-04-06 14:50:04 +01:00
Joel Collins
5aa92efed2
Minor tour style improvements
2020-04-06 14:36:28 +01:00
Joel Collins
e98282db63
Fixed disabling pointer events
2020-04-06 14:35:00 +01:00
Joel Collins
79620b4d9c
Show mDNS devices first if running electron
2020-04-06 14:32:58 +01:00
Joel Collins
a8bdea5b5b
Only show nearby if running electron
2020-04-06 14:31:22 +01:00
Joel Collins
33848fb1f5
Ignore all clicks during tour
2020-04-06 14:15:48 +01:00
Joel Collins
e5943df108
Tweaked tour highlight style
2020-04-06 14:13:19 +01:00
Joel Collins
30fc1c499d
Merge branch 'guided-tour' into 'master'
...
Guided tour
See merge request openflexure/openflexure-microscope-jsclient!46
2020-04-06 12:33:05 +00:00
Joel Collins
1d5e97bce7
Keyboard shortcut to restart tour
2020-04-06 13:07:18 +01:00
Joel Collins
72c30f7186
Added guided tour on first start
2020-04-06 12:20:08 +01:00
Joel Collins
50b70a3ea3
Refactored panelLeft to appContent
2020-04-06 10:20:37 +01:00
Joel Collins
e42835ff8c
Add default padding to web components
2020-04-06 10:18:00 +01:00
Joel Collins
13d18b4101
Removed medscan extension (now in separate repo)
2020-04-01 11:39:09 +01:00
Joel Collins
a5d5b6cda2
Removed example component from default extensions
2020-04-01 10:31:50 +01:00
Joel Collins
c1205fff3e
Added step progress to section titles
2020-04-01 10:26:21 +01:00
Joel Collins
19c4f02f8d
Added basic wizard content
2020-04-01 10:25:20 +01:00
Joel Collins
26086aaea7
Started drafting medscan extension
2020-03-31 16:25:04 +01:00
Joel Collins
0c695a377c
Fixed debug app for example custom element
2020-03-31 16:24:41 +01:00
Joel Collins
a9239ab898
Added debug serve command
2020-03-31 13:52:17 +01:00
Joel Collins
3e21cd4680
Merge branch 'hotfix-2.0.x' into 'master'
...
Hotfix 2.0.1
See merge request openflexure/openflexure-microscope-server!49
2020-03-31 10:11:06 +00:00
Joel Collins
6f4791ec57
Merge branch 'master' into 'hotfix-2.0.x'
...
# Conflicts:
# openflexure_microscope/api/app.py
# poetry.lock
# pyproject.toml
2020-03-31 10:10:33 +00:00
Joel Collins
63e19916be
Updated dependencies and version
2020-03-31 11:01:13 +01:00
