Commit graph

4253 commits

Author SHA1 Message Date
Joel Collins
da9238fff3 Add build and deployment info to readme 2019-08-23 14:40:56 +00:00
Joel Collins
36d73efd69 Run build on merge request, not on tags, deploy ONLY on stable merge 2019-08-23 14:36:53 +00:00
Joel Collins
96282d4f0f Revert "Deployment to server requires manual action within 1 week"
This reverts commit 891fc2edeb
2019-08-23 14:31:32 +00:00
Joel Collins
e7553eef80 1.1.3-alpha.0 for testing 2019-08-23 14:21:41 +00:00
Joel Collins
891fc2edeb Deployment to server requires manual action within 1 week 2019-08-23 14:20:31 +00:00
Joel Collins
b6c7c8c525 Update to group-level SSH key 2019-08-22 10:39:55 +00:00
Joel Collins
b72a652b1f Update .gitlab-ci.yml to new build deployment system 2019-08-22 10:19:06 +00:00
Joel Collins
563fe0f6f0 Merge branch 'stable' into 'master'
Sync with stable

See merge request openflexure/openflexure-microscope-jsclient!40
2019-08-22 10:03:42 +00:00
Joel Collins
09fd132a29 Merge branch 'master' into 'stable'
v1.1.2

See merge request openflexure/openflexure-microscope-jsclient!39
2019-08-21 13:44:13 +00:00
Joel Collins
f9c205c75f Revert "Add version to artifact names"
This reverts commit 116fb5c731
2019-08-21 13:20:07 +00:00
Joel Collins
5f0852a4ab Revert .gitlab-ci.yml 2019-08-21 13:02:59 +00:00
Joel Collins
dd63a21064 Merge branch 'ssh-deploy' into 'master'
Use openflexure.bath.ac.uk as update server

See merge request openflexure/openflexure-microscope-jsclient!38
2019-08-21 13:00:28 +00:00
Joel Collins
59fc68467f Iterate version to test auto-update 2019-08-21 12:22:58 +00:00
Joel Collins
7b8eec8f4b Update publish URL 2019-08-21 11:09:22 +00:00
Joel Collins
f3a1b839b9 Remove setFeedURL 2019-08-21 11:08:55 +00:00
Joel Collins
047d4be570 Test using actual release-builds 2019-08-21 10:38:35 +00:00
Joel Collins
a9bde40964 Install rsync into deploy stage 2019-08-21 10:30:10 +00:00
Joel Collins
bff6a570d5 Attempt rsync test 2019-08-21 10:26:34 +00:00
Joel Collins
116fb5c731 Add version to artifact names 2019-08-21 10:11:50 +00:00
Joel Collins
513a404544 Update deploy stage 2019-08-21 10:06:54 +00:00
Joel Collins
2dbf593102 Update to test SSH deployment 2019-08-21 10:06:21 +00:00
Joel Collins
0f4db3f5d4 Only draw CET by default on Windows 2019-08-19 10:06:05 +01:00
Joel Collins
6a172911bd Updated electron-builder 2019-08-08 11:19:32 +01:00
Joel Collins
be141b2be1 Merge branch 'master' into 'deltastage'
v1.1.2 fixes

See merge request openflexure/openflexure-microscope-server!33
2019-08-08 10:12:50 +00:00
Joel Collins
d13341dd5b Iterated version number 2019-08-08 11:06:53 +01:00
Joel Collins
8d70577d1a Merge branch 'master' into 'stable'
Remove nightly builds

See merge request openflexure/openflexure-microscope-jsclient!36
2019-08-08 09:53:40 +00:00
Joel Collins
7f59220992 Remove nightly builds 2019-08-08 09:53:18 +00:00
Joel Collins
d1d6a08fa6 Merge branch 'master' into 'stable'
v1.1.1

See merge request openflexure/openflexure-microscope-jsclient!35
2019-08-08 09:47:50 +00:00
Joel Collins
9cf86216d2 Iterated version number 2019-08-08 10:46:29 +01:00
Joel Collins
e603b34267 Added extra docs 2019-08-08 10:41:44 +01:00
Joel Collins
9891cbf5ff Increase gain form step size 2019-08-08 10:41:08 +01:00
Joel Collins
cfdbdd7e74 Only render default plugin forms if plugin is enabled 2019-08-08 10:32:20 +01:00
Joel Collins
61c8d00d95 Fixed camera setting paload 2019-08-08 10:31:59 +01:00
Joel Collins
3467fe7759 Added extra type checking when applying pi camera config 2019-08-08 10:14:57 +01:00
Joel Collins
5e7e2abc62 Fixed broken z scaling 2019-08-07 17:38:08 +01:00
Joel Collins
e1df36e8c5 Improved step scaling 2019-08-07 17:18:37 +01:00
Joel Collins
d12f0a5362 First draft of delta stage 2019-08-06 18:00:37 +01:00
Joel Collins
18a4a9e560 Added method to zero positions 2019-08-06 18:00:23 +01:00
Joel Collins
2d34389e16 Use githack for icon 2019-07-17 17:06:33 +00:00
Joel Collins
0ccf094cca Remove debs from nightly builds 2019-07-16 16:07:38 +00:00
Joel Collins
57832f94a8 Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server 2019-07-16 17:02:57 +01:00
Joel Collins
8c0ab3cff6 Updated CLI URL 2019-07-16 17:02:50 +01:00
Joel Collins
60697aae3e Allow nightly builds. Make web artifacts temporary 2019-07-16 15:41:27 +00:00
Joel Collins
6e37a8b72f Iterated version number 2019-07-16 15:03:16 +01:00
Joel Collins
e6811f972f Tidied up closing a bit more 2019-07-16 14:51:11 +01:00
Joel Collins
2a7362b5e6 Handle device closing a bit more sensibly 2019-07-16 14:39:08 +01:00
Joel Collins
769a260e0b Remove __del__ from SangaStage class 2019-07-16 14:38:36 +01:00
Joel Collins
5424883a38 Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server
ESI and schema docs update
2019-07-16 11:15:38 +01:00
Joel Collins
29e1569e2d Fixed attaching devices in plugin tests 2019-07-16 11:15:04 +01:00
Joel Collins
78859b0766 Added rope to dev dependencies 2019-07-16 11:13:13 +01:00