Commit graph

1846 commits

Author SHA1 Message Date
Joel Collins
58f1dcdb84 Code formatting 2020-06-01 14:32:13 +01:00
Joel Collins
143e0b5186 Added API origin override to loading error component 2020-06-01 14:28:39 +01:00
Joel Collins
261bb9fe1e Create but hide tour while not connected 2020-06-01 14:28:20 +01:00
Joel Collins
a5b80733d5 Switched static to master branch 2020-06-01 14:00:32 +01:00
Joel Collins
ddcf26d412 Merge branch 'frame' into 'master'
Only build locally-served interface

See merge request openflexure/openflexure-microscope-jsclient!54
2020-06-01 12:58:43 +00:00
Joel Collins
e46334e7dd Revert "Track dist"
This reverts commit 3299e3e77e352106842f631db8ca51e86a084468
2020-06-01 12:58:43 +00:00
Joel Collins
fc7eee4a8d Updated version number 2020-05-28 13:13:20 +01:00
Joel Collins
11d708016f Updated submodules 2020-05-28 13:02:48 +01:00
Joel Collins
b81cbcc038 Updated version 2020-05-28 13:01:56 +01:00
Joel Collins
eee596b15c Fixed capture resize in capture payload 2020-05-28 13:00:34 +01:00
Joel Collins
31aaff1d33 Upgraded to LabThings 0.6.4 2020-05-28 12:54:25 +01:00
Joel Collins
1bc0b3e8b3 Set default logging level to INFO 2020-05-28 11:26:49 +01:00
Joel Collins
c1bd691654 Removed pointless doc_response 2020-05-28 11:26:39 +01:00
Joel Collins
085d9c78ab Updated submodules 2020-05-27 16:03:16 +01:00
Joel Collins
46a1396476 Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-jsclient 2020-05-27 16:01:10 +01:00
Joel Collins
e9812707ee Updated version and dependencies 2020-05-27 16:01:00 +01:00
Joel Collins
0cbc466f8d Updated version and dependencies 2020-05-27 16:00:45 +01:00
Joel Collins
d906a3f200 Update README.md 2020-05-27 14:52:16 +00:00
Joel Collins
ca051243a1 Catch timeout errors when closing camera stream 2020-05-27 14:24:11 +01:00
Joel Collins
aa57331ce9 Updated submodules 2020-05-27 14:22:37 +01:00
Joel Collins
6d924c92ef Run modal callback even if it never shows 2020-05-27 14:19:32 +01:00
Joel Collins
83aefe87c3 Enter main app when modals have been closed 2020-05-27 14:18:42 +01:00
Joel Collins
1bfde1fb14 Removed unused globalSwitchTabPrimary 2020-05-27 14:18:22 +01:00
Joel Collins
959ade6967 Updated submodules 2020-05-27 13:43:23 +01:00
Joel Collins
55ac33796f Handle missing stage in calibration modal 2020-05-27 13:38:50 +01:00
Joel Collins
2616019af4 Removed broken updateSettings call 2020-05-27 13:38:40 +01:00
Joel Collins
bf3b141ec4 Fixed logging message 2020-05-27 13:19:32 +01:00
Joel Collins
5f6b1d6be0 Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server 2020-05-27 12:57:10 +01:00
Joel Collins
e9c1fe0507 Fixed logging import 2020-05-27 12:56:57 +01:00
Joel Collins
c055872cdb Remove audit from CI jobs 2020-05-26 15:37:54 +01:00
Joel Collins
55e423c159 Merge external CSM extension 2020-05-26 15:15:32 +01:00
Joel Collins
9e34cb495a Tidied up CI 2020-05-26 15:05:37 +01:00
Joel Collins
86e326a1e4 Updated submodules 2020-05-26 14:56:39 +01:00
Joel Collins
db50e42380 Updated version to 2.1.0 stable 2020-05-26 14:55:30 +01:00
Joel Collins
c72247fab6 Updated to 2.1.0 stable 2020-05-26 14:54:40 +01:00
Joel Collins
910d452e5a Updated version and dependencies 2020-05-26 14:51:34 +01:00
Joel Collins
e5c1eb433c Updated dependencies and version 2020-05-26 14:49:46 +01:00
Joel Collins
e1e553c1cd Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server 2020-05-26 14:45:04 +01:00
Joel Collins
5f9609e765 Merge remote-tracking branch 'origin/timeout-testing' 2020-05-26 13:39:20 +01:00
Joel Collins
e3359be025 Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server 2020-05-26 13:39:15 +01:00
Joel Collins
281b220e21 Changed default logging level back to INFO 2020-05-26 13:37:29 +01:00
Joel Collins
aed2a05dec Fixed typo 2020-05-26 13:28:20 +01:00
Joel Collins
a0702fbc69 Set logging level further up the script 2020-05-26 13:22:14 +01:00
Joel Collins
81546a1c8d Add timeout support 2020-05-26 13:18:09 +01:00
Joel Collins
ae55f3aa94 Updated static 2020-05-26 11:13:30 +01:00
Joel Collins
bdc270299e Added node installation info 2020-05-26 11:10:20 +01:00
Joel Collins
1819ca6a9c Switched to ActionView and PropertyView from decorators 2020-05-26 10:54:21 +01:00
Joel Collins
5f44edaa91 Removed "lite" build target 2020-05-26 10:44:51 +01:00
Joel Collins
952085fee7 Switch to View tab on connect 2020-05-26 10:09:24 +01:00
Joel Collins
6ddbb1f765 Code formatting 2020-05-26 10:03:26 +01:00