Commit graph

2096 commits

Author SHA1 Message Date
Joel Collins
1c7b27a29f Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server into master 2020-11-06 10:41:50 +00:00
Joel Collins
5a32e8a488 Changed default pollInterval to 1s 2020-11-06 10:39:25 +00:00
Joel Collins
013aebd97a Added picamera import checker 2020-11-06 10:36:31 +00:00
Joel Collins
b98522a424 Changed reload to 60s timeout 2020-11-06 10:36:24 +00:00
Joel Collins
eae3124959 Fixed ignored kwargs 2020-11-06 10:36:10 +00:00
Joel Collins
fcd9fa4990 Fixed duplicated polling timers 2020-11-06 10:32:47 +00:00
Joel Collins
4c61f0c847 Reduced long-term lock usage 2020-11-06 10:27:22 +00:00
Joel Collins
ac382b7fab Allow running tasks to be resumed 2020-11-06 10:27:00 +00:00
Joel Collins
5feba6ad26 Fixed GPU preview requests happening regardless of settings 2020-11-06 10:23:51 +00:00
Joel Collins
368f86c4a5 2.8.0-beta.0 2020-11-03 16:13:02 +00:00
Joel Collins
32cf2de96e Formatting 2020-11-03 16:11:37 +00:00
Joel Collins
86732b8782 Fixed reloading timestamp in new format 2020-11-03 16:11:30 +00:00
Joel Collins
b69c90345f Removed full capture metadata from top-level resource list 2020-11-03 15:45:00 +00:00
Joel Collins
982154ce22 Updated client to simplify capture data 2020-11-03 15:40:28 +00:00
Joel Collins
6c51da5394 Simplified build_captures_from_exif 2020-11-02 15:51:52 +00:00
Joel Collins
c58827a0cf 2.7.0 2020-10-30 11:19:21 +00:00
Joel Collins
37c5e20a23 Fixed View import 2020-10-29 14:14:01 +00:00
Joel Collins
3ba9718434 Added download attribute to log file downloader 2020-10-29 14:10:29 +00:00
Joel Collins
ee8a2fc415 Code formatting 2020-10-29 14:06:36 +00:00
Joel Collins
f1d0ea5b28 Added API LogFileView 2020-10-29 14:06:15 +00:00
Joel Collins
654f7229bd Upgraded to LabThings 1.1.2 2020-10-29 10:51:58 +00:00
Joel Collins
9dd8004984 Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server into master 2020-10-28 17:32:14 +00:00
Joel Collins
21b150b81a Added logger tab 2020-10-28 17:32:10 +00:00
Joel Collins
46120ea625 Added extra divider 2020-10-28 17:32:04 +00:00
Joel Collins
7f53ff21a8 Code formatting 2020-10-28 17:29:37 +00:00
Joel Collins
279cc03193 Fixed tab bar scrolling 2020-10-28 17:29:23 +00:00
Joel Collins
1f12154876 Fixed thumbnail generation for video_port captures 2020-10-28 16:02:08 +00:00
Joel Collins
32ec2b463d Fixed thumbnail data fallback 2020-10-28 15:41:06 +00:00
Joel Collins
3cfbb40655 Removed pointless GPU preview log 2020-10-28 15:40:51 +00:00
Joel Collins
da490fdfcd Separated move_and_measure locks 2020-10-28 15:40:29 +00:00
Joel Collins
ce57d37dc9 Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server 2020-10-28 10:47:15 +00:00
Joel Collins
353450dd56 Fixed capture link generator when passed a dict 2020-10-28 10:47:10 +00:00
Joel Collins
f9da19fb7f Merge branch 'geometry-change-bug-fixes' into 'master'
Geometry change bug fixes

See merge request openflexure/openflexure-microscope-server!78
2020-10-27 17:17:58 +00:00
Joel Collins
3099db201f Merge branch 'jsclient-refactor' into 'master'
JS Client refactor and gallery pages

See merge request openflexure/openflexure-microscope-server!80
2020-10-27 17:16:23 +00:00
Joel Collins
76094b2cc2 Code formatting 2020-10-27 17:11:41 +00:00
Joel Collins
81ca64e0d8 Properly set up ESLint 2020-10-27 17:05:57 +00:00
Joel Collins
e1cca30deb Added pagination to gallery 2020-10-27 16:37:11 +00:00
Joel Collins
e3a45b84d8 Fixed gallery overflow 2020-10-27 16:36:40 +00:00
Joel Collins
89b1f9dac9 Fixed incorrect import 2020-10-27 16:36:30 +00:00
Samuel McDermott
2f08bd37d3 Use application/json for put 2020-10-27 16:16:58 +00:00
Joel Collins
eff03bfa2c Rearranged main components 2020-10-27 14:52:27 +00:00
Joel Collins
250fd07e9a Code formatting and linting 2020-10-27 14:14:59 +00:00
Joel Collins
13b4c84783 Fixed node_modules exclusion from Black 2020-10-27 14:12:41 +00:00
Joel Collins
10d264c526 Always use builtin JPEG thumbnails 2020-10-27 14:05:24 +00:00
Joel Collins
09849ce064 Explicit JPEG thumbnail on capture 2020-10-27 14:04:55 +00:00
Joel Collins
9ff0aa331b 2.6.5 2020-10-26 15:43:55 +00:00
Joel Collins
729e473ea0 Close #186 2020-10-26 15:41:59 +00:00
Joel Collins
7a12dfb44b 2.6.4 2020-10-26 15:11:33 +00:00
Joel Collins
601e51d9b9 Code formatting 2020-10-26 14:58:09 +00:00
Joel Collins
ef4e825b9c Merge branch 'temporary' into 'master'
Added a spiral scan option

See merge request openflexure/openflexure-microscope-server!75
2020-10-26 14:54:23 +00:00