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
Joel Collins
1a2822f709
Remove unused console log
2020-05-19 10:47:44 +01:00
Joel Collins
1ffd2b16a8
Added button to delete an entire scan
2020-05-19 10:43:30 +01:00
Joel Collins
bc1df9542d
Remove timeout from task submitter
2020-05-18 16:23:01 +01:00
Joel Collins
5d6f85c374
Improved version mismatch message
2020-05-18 16:22:51 +01:00
Joel Collins
b8c0ca257c
Fixed rule expansion for LabThings 0.6.2
2020-05-18 15:39:34 +01:00
Joel Collins
49d677a56b
Fix distribution version error in metadata
2020-05-18 15:31:46 +01:00
Joel Collins
764683977c
Merge branch 'frame' into 'master'
...
eV submodule and tar distribution
Closes #136
See merge request openflexure/openflexure-microscope-server!60
2020-05-18 14:20:51 +00:00
Joel Collins
81e8171517
Merge branch 'master' into 'frame'
...
# Conflicts:
# poetry.lock
2020-05-18 14:20:40 +00:00
Joel Collins
0f912cb064
Update LabThings to 6.0.2. Closes #136
2020-05-18 15:18:12 +01:00
Joel Collins
5c8d38b0e1
Move pynpm to dev dependencies
2020-05-18 14:55:41 +01:00
Joel Collins
35a5a45ae7
Remove lite builds from CI
2020-05-18 14:04:43 +01:00
Joel Collins
ec4c8ef02e
Merge branch 'frame' into 'master'
...
eV submodule & new distribution system
See merge request openflexure/openflexure-microscope-server!59
2020-05-18 09:54:18 +00:00
Joel Collins
79259b3fc9
Revert "Remove CI file from frame branch"
...
This reverts commit dac3632c28
2020-05-18 09:54:18 +00:00
