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 |
|
Joel Collins
|
f8e647198a
|
Merge branch 'doc-fix' into 'master'
Fixed __init__ imports in stage module
See merge request openflexure/openflexure-microscope-server!16
|
2019-05-15 14:34:57 +00:00 |
|
Joel Collins
|
31c6c284ab
|
Fixed __init__ imports in stage module
|
2019-05-15 15:34:31 +01:00 |
|
Joel Collins
|
c5183f79b1
|
Merge branch 'log-route' into 'master'
Added route to download logfile
See merge request openflexure/openflexure-microscope-server!15
|
2019-05-15 14:30:59 +00:00 |
|
Joel Collins
|
63c0492022
|
Added route to download logfile
|
2019-05-15 15:30:28 +01:00 |
|
Joel Collins
|
d54a35e197
|
Merge branch 'sangaboard3-support' into 'master'
Initial support for SBv3 and MockStage
See merge request openflexure/openflexure-microscope-server!14
|
2019-05-15 12:26:50 +00:00 |
|
Joel Collins
|
ff534e6a51
|
Initial support for SBv3 and MockStage
|
2019-05-15 13:25:04 +01:00 |
|
Joel Collins
|
6888898f34
|
Merge branch 'split-ci' into 'master'
Split ci (0.2.5)
See merge request openflexure/openflexure-microscope-jsclient!23
|
2019-05-14 14:45:03 +00:00 |
|
Joel Collins
|
10c2f5d893
|
Merge branch 'master' into 'split-ci'
# Conflicts:
# package.json
|
2019-05-14 14:44:36 +00:00 |
|
Joel Collins
|
dbdf91844b
|
Iterated package version and fixed UIKit version
|
2019-05-14 15:19:00 +01:00 |
|
Joel Collins
|
ce19199c42
|
Renamed jobs
|
2019-05-14 15:06:13 +01:00 |
|
Joel Collins
|
d859bd203a
|
Prevent choco pack until win32 build finished
|
2019-05-14 14:54:02 +01:00 |
|
Joel Collins
|
cd2809d96a
|
Remove choco push from CI
|
2019-05-14 14:52:47 +01:00 |
|
Joel Collins
|
a256f5a791
|
Split build targets into CI jobs
|
2019-05-14 14:20:07 +01:00 |
|
Joel Collins
|
a866e10fc8
|
Removed AppImage target
|
2019-05-14 14:19:52 +01:00 |
|
Joel Collins
|
7bbca14d24
|
Merge branch '0.2.4-dev' into 'master'
Iterated version number
See merge request openflexure/openflexure-microscope-jsclient!22
|
2019-05-13 10:32:14 +00:00 |
|
Joel Collins
|
e17023b8a9
|
Iterated version number
|
2019-05-13 11:31:33 +01:00 |
|
Joel Collins
|
79442b8380
|
Merge branch 'no-tns-fixed' into 'master'
Removed NativeScript without breaking everything
See merge request openflexure/openflexure-microscope-jsclient!21
|
2019-05-12 20:43:50 +00:00 |
|