Commit graph

1928 commits

Author SHA1 Message Date
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
Joel Collins
677b08d509 Restructured scan extension 2020-05-22 11:20:12 +01:00
Joel Collins
43c16f1b76 Added an extension that literally just raises an exception 2020-05-22 11:01:44 +01:00
Joel Collins
efac711da9 Actually fixed exception logging 2020-05-22 11:01:32 +01:00
Joel Collins
41f3b96e3a Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server 2020-05-22 10:59:19 +01:00
Joel Collins
87c4547667 Fixed handle_extension_error name 2020-05-22 10:56:23 +01:00
Joel Collins
877b2210ed Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server 2020-05-22 10:35:30 +01:00
Joel Collins
661281b3d0 Added basic issue templates 2020-05-22 10:35:21 +01:00
Joel Collins
b8a8160644 Fixed log view file path 2020-05-22 10:23:13 +01:00
Joel Collins
cf04fc36fc Added catch-all 410 response for API v1 routes 2020-05-22 10:17:05 +01:00
Joel Collins
a6ac76757b Merge branch 'fix-click-to-move-scaling' into 'master'
Account for scale-to-fit in image stream

See merge request openflexure/openflexure-microscope-jsclient!53
2020-05-22 08:50:58 +00:00
Richard Bowman
b0903f93ff Account for scale-to-fit in image stream
Clicking the image was being scaled incorrectly, because the code assumed the image filled
the <img> element.  However, with CSS scale-to-fit
(content-fit: contain), that's not a good assumption.
This commit adds logic to scale the click coordinates properly.
2020-05-21 14:08:23 +01:00
Joel Collins
0a2c1c18fb Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server 2020-05-20 17:48:49 +01:00
Joel Collins
d9527685d6 Updated to LabThings 0.6.3 2020-05-20 17:47:16 +01:00
Joel Collins
4a553040d3 Fixed logging and split access and root file handlers 2020-05-20 17:46:44 +01:00
Joel Collins
e8bcb4bc31 Updated submodules 2020-05-20 11:13:45 +01:00
Joel Collins
1ca40c3207 Disable background close for calibration modal 2020-05-20 10:34:54 +01:00
Joel Collins
d1f0594d9d Updated submodules 2020-05-19 15:26:46 +01:00
Joel Collins
31b84e8477 Added initial calibration modal wizard 2020-05-19 15:24:08 +01:00