Joel Collins
|
46f1442e53
|
Iterate version number
|
2019-05-28 15:37:15 +01:00 |
|
Joel Collins
|
17883e0567
|
Added dark-theme
|
2019-05-28 15:37:09 +01:00 |
|
Joel Collins
|
a7fc14d93f
|
Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server
|
2019-05-28 13:47:51 +01:00 |
|
Joel Collins
|
c52fb7d854
|
Updated lockfile
|
2019-05-28 13:47:42 +01:00 |
|
Joel Collins
|
1f2799d9e1
|
Merge branch 'joram-fix-test' into 'master'
Joram fixes
See merge request openflexure/openflexure-microscope-server!21
|
2019-05-28 12:17:29 +00:00 |
|
Joel Collins
|
5a509037da
|
Merge branch 'master' into 'stable'
Auto-update capability
See merge request openflexure/openflexure-microscope-jsclient!27
|
2019-05-28 11:46:24 +00:00 |
|
Joel Collins
|
bce35ef2d1
|
Merge branch 'auto-update' into 'master'
Auto update
See merge request openflexure/openflexure-microscope-jsclient!26
|
2019-05-28 11:45:13 +00:00 |
|
Joel Collins
|
d65329eafd
|
Fixed feed URL to stable branch
|
2019-05-28 12:05:48 +01:00 |
|
Joel Collins
|
63ef0d7af8
|
Fixed choco dependency
|
2019-05-28 12:02:56 +01:00 |
|
Joel Collins
|
cfb448e8d3
|
Update CI to new updatable builds
|
2019-05-28 12:00:02 +01:00 |
|
Joel Collins
|
ad805b91c0
|
Add updater to apps
|
2019-05-28 11:59:46 +01:00 |
|
Joel Collins
|
a4a2ada99b
|
Add electron-updater and new build scripts
|
2019-05-28 11:59:34 +01:00 |
|
Joel Collins
|
34cbc6c1ec
|
Switch to combined builder config
|
2019-05-28 11:59:05 +01:00 |
|
Joel Collins
|
e0f7f12c3b
|
Remove legacy setupEvents
|
2019-05-28 11:58:45 +01:00 |
|
Joel Collins
|
60c49a8331
|
Fixed setting Iterable vs Int backlash
|
2019-05-28 09:28:08 +01:00 |
|
Joel Collins
|
5e34b998dd
|
Fixed plugin calling old focus_rel method
|
2019-05-28 09:27:47 +01:00 |
|
Joel Collins
|
39e2e0baad
|
Re-implemented scan methods
|
2019-05-27 13:35:53 +01:00 |
|
Joel Collins
|
5a22d0d308
|
Re-added timeout parameters (previous commit broke)
|
2019-05-24 16:47:04 +01:00 |
|
Joel Collins
|
3b9ef670fe
|
Improved flake8 results
|
2019-05-24 16:32:20 +01:00 |
|
Joel Collins
|
fb606b189d
|
Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server
|
2019-05-24 14:55:29 +01:00 |
|
Joel Collins
|
febcc00f07
|
Updated some dependencies
|
2019-05-24 14:55:23 +01:00 |
|
Joel Collins
|
36d38bf000
|
Update CONTRIBUTING.md
|
2019-05-24 10:47:57 +00:00 |
|
Joel Collins
|
8a0320e2c4
|
Update CONTRIBUTING.md
|
2019-05-24 10:47:25 +00:00 |
|
Joel Collins
|
fd4de9540a
|
Merge branch '1.0.1-dev-cleanup' into 'master'
1.0.1 dev cleanup
See merge request openflexure/openflexure-microscope-server!20
|
2019-05-23 13:26:30 +00:00 |
|
Joel Collins
|
90a3a738af
|
Cleaned up camera locks
|
2019-05-23 14:25:57 +01:00 |
|
Joel Collins
|
8e35ef2b29
|
Added locked() method to check lock state
|
2019-05-23 14:25:26 +01:00 |
|
Joel Collins
|
2d0fe9a032
|
Iterated version number
|
2019-05-23 09:45:25 +00:00 |
|
Joel Collins
|
cd216f7990
|
Update CONTRIBUTING.md
|
2019-05-23 09:39:44 +00:00 |
|
Joel Collins
|
4ce98817a0
|
Update CONTRIBUTING.md
|
2019-05-23 09:37:41 +00:00 |
|
Joel Collins
|
dc0bd75039
|
Merge branch 'stable-ci' into 'master'
Run on push to stable branch
See merge request openflexure/openflexure-microscope-jsclient!25
|
2019-05-22 17:58:19 +00:00 |
|
Joel Collins
|
081774a134
|
Run on push to stable branch
|
2019-05-22 17:58:08 +00:00 |
|
Joel Collins
|
8d12a9b98c
|
Merge branch 'choco-ci-fix' into 'master'
Choco ci fix
See merge request openflexure/openflexure-microscope-jsclient!24
|
2019-05-20 14:02:08 +00:00 |
|
Joel Collins
|
74f6093245
|
Merge branch '1.0.1-dev-cleanup' into 'master'
1.0.1 dev - Renamed video_resolution to stream_resolution
See merge request openflexure/openflexure-microscope-server!19
|
2019-05-20 10:30:44 +00:00 |
|
Joel Collins
|
e30956d761
|
Renamed video_resolution to stream_resolution
|
2019-05-20 10:55:43 +01:00 |
|
Joel Collins
|
36ee715fcb
|
Updated dependencies
|
2019-05-20 10:38:51 +01:00 |
|
Joel Collins
|
805c17b509
|
Merge branch 'resolution-fix' into 'master'
Default resolution fix
See merge request openflexure/openflexure-microscope-server!18
|
2019-05-20 09:29:35 +00:00 |
|
Joel Collins
|
8c3cd48f4d
|
Automatically move old config file to new config file
|
2019-05-20 10:24:50 +01:00 |
|
Joel Collins
|
b0e724a706
|
Fixed naming of default config placeholder
|
2019-05-20 10:14:55 +01:00 |
|
Joel Collins
|
9fc4dfc628
|
Moved microscoperc.yaml to microscope_settings.yaml
|
2019-05-20 10:09:01 +01:00 |
|
Joel Collins
|
1fe8ea18d8
|
Default capture resolution to MAX_RESOLUTION
|
2019-05-20 10:06:42 +01:00 |
|
Joel Collins
|
78882ab4c5
|
Removed debug print
|
2019-05-20 10:06:15 +01:00 |
|
jtc42
|
9cddb16dd6
|
Removed NSIS target from appx config
|
2019-05-19 17:22:35 +01:00 |
|
jtc42
|
53bd4e21ca
|
Upgraded hash to SHA256
|
2019-05-19 17:02:12 +01:00 |
|
Joel Collins
|
dbc9e39473
|
Updated iconUrl to static file
|
2019-05-17 16:11:58 +01:00 |
|
Joel Collins
|
b246336b60
|
Removed old pwsh nupkg-builder
|
2019-05-17 16:11:48 +01:00 |
|
Joel Collins
|
b9fbfed530
|
Fixed nupkg generator from mod feedback
|
2019-05-17 16:05:02 +01:00 |
|
Joel Collins
|
7fea0cbd79
|
Simplified keynav debug statements
|
2019-05-17 16:04:41 +01:00 |
|
Joel Collins
|
998b914677
|
Update version in package-lock
|
2019-05-17 16:04:26 +01:00 |
|
Joel Collins
|
bc869794e4
|
Merge branch 'exif-capture-reload' into 'master'
Load capture objects from files. Remove YAML database.
See merge request openflexure/openflexure-microscope-server!17
|
2019-05-15 15:33:35 +00:00 |
|
Joel Collins
|
092181348b
|
Load capture objects from files. Remove YAML database.
|
2019-05-15 16:32:58 +01:00 |
|