Commit graph

  • 235aa984f9 Updated docs jtc42 2019-06-07 13:37:20 +01:00
  • 722edeb4de Enabled extglob in CI script Joel Collins 2019-06-06 16:02:08 +01:00
  • 2bc8595e48 Update CI to allow beta*.yml artifacts Joel Collins 2019-06-06 15:43:42 +01:00
  • e2eb051c31 Control custom title bar using store value Joel Collins 2019-06-06 14:43:25 +01:00
  • bc8096fe7a Added electron-store for persistent app settings Joel Collins 2019-06-06 14:42:57 +01:00
  • f17d1e71f9 Fixed stage settings payload structure Joel Collins 2019-06-06 11:28:22 +01:00
  • 104d7c0345 Minor reformat Joel Collins 2019-06-06 11:28:11 +01:00
  • fdbba08b66 Merge branch 'config-overhaul' into 'master' Joel Collins 2019-06-05 16:55:27 +00:00
  • 4aba270365 Added state key for server package version Joel Collins 2019-06-05 17:54:39 +01:00
  • 28f6702353 Shifted version number to match server Joel Collins 2019-06-05 17:53:53 +01:00
  • a6a918827c Added version mismatch warning Joel Collins 2019-06-05 17:48:50 +01:00
  • ee91e11853 Updated API to run with server 1.1.x Joel Collins 2019-06-05 17:48:41 +01:00
  • 2850eecf7a Add modal dialog method Joel Collins 2019-06-05 17:48:19 +01:00
  • 341d2ae845 Allow package version to be used in application Joel Collins 2019-06-05 17:47:36 +01:00
  • 15c9c0e321 Up to 1.1.0 beta 1 Joel Collins 2019-06-05 16:06:09 +01:00
  • 0f8070b64a Smarter server teardown procedure Joel Collins 2019-06-05 16:04:32 +01:00
  • ea253f8085 Smarter application of picamera settings Joel Collins 2019-06-05 16:04:14 +01:00
  • 9b30d1d38f Completely overhauled config system Joel Collins 2019-06-05 16:03:58 +01:00
  • cc343e2a8c Overhaul config module to only handle loading/saving Joel Collins 2019-06-05 16:03:42 +01:00
  • 65a28cc0f4 Default to new camera and stage settings slip Joel Collins 2019-06-05 16:03:17 +01:00
  • 0d8396b3e4 Fixed Microscope and camera arguments Joel Collins 2019-06-04 14:04:07 +01:00
  • 41d9ab51ad Restructured camera attaching Joel Collins 2019-06-04 14:03:46 +01:00
  • f7ba68b443 Converted base camera into an ABC Joel Collins 2019-06-04 14:03:30 +01:00
  • 3cf166226b Converted config dict into properties/attributes Joel Collins 2019-06-04 14:03:16 +01:00
  • 5e6372835e Added extra debug log Joel Collins 2019-06-04 14:02:53 +01:00
  • 1d6ae5c9da Manage transition to new camera settings structure Joel Collins 2019-06-04 13:02:58 +01:00
  • f109f76049 Merge branch 'electron-specific-code' into 'master' Joel Collins 2019-06-03 16:36:17 +00:00
  • f35a06008c Added CSS to better style the electron menubar Joel Collins 2019-06-03 15:50:07 +01:00
  • 22d139ecf8 Added titlebar icon Joel Collins 2019-06-03 13:38:03 +01:00
  • 73b5011fea Removed old Vue icon asset Joel Collins 2019-06-03 13:37:54 +01:00
  • b0687426dd Hide frame on Win and Linux Joel Collins 2019-06-03 10:24:24 +01:00
  • 1baf040b89 Show custom titlebar on Win and Linux Joel Collins 2019-06-03 10:24:15 +01:00
  • 3826bdb511 Lock tab tooltips to bottom alignment Joel Collins 2019-06-03 10:23:58 +01:00
  • 7e12758400 Added CET dependency Joel Collins 2019-06-03 10:23:45 +01:00
  • dbb7d6fbf4 Merge branch 'electron-specific-code' into 'master' Joel Collins 2019-06-03 08:52:38 +00:00
  • 793c8e2c7e Condensed build:app into package Joel Collins 2019-06-02 22:03:49 +01:00
  • f1d3047109 Draft updated CI Joel Collins 2019-06-02 21:21:59 +01:00
  • a154c9dd15 Ignore app dist folder Joel Collins 2019-06-02 21:21:48 +01:00
  • 814df5f27a Update electron app source directory Joel Collins 2019-06-02 21:15:41 +01:00
  • 396adca35f Separate app and web builds Joel Collins 2019-06-02 21:15:32 +01:00
  • adfec0bbfe JS file for electron-renderer specific code Joel Collins 2019-06-02 21:15:15 +01:00
  • 4bdf940bdd Separate web and app targets Joel Collins 2019-06-02 21:15:02 +01:00
  • 70be245c2a Ensure stream recording at start of fast_up_down_up_autofocus Joel Collins 2019-05-30 10:43:46 +01:00
  • 200edd14b3 Merge branch 'auto-update' into 'master' Joel Collins 2019-05-29 08:53:57 +00:00
  • 61e5860a08 Update to new CI format Joel Collins 2019-05-29 09:53:07 +01:00
  • ab3c7756ca Only generate choco for deterministic tag URLs Joel Collins 2019-05-29 09:53:00 +01:00
  • 5d7fa03cbd Iterated version number Joel Collins 2019-05-29 09:43:27 +01:00
  • c107125377 Skip loading invalid captures into array Joel Collins 2019-05-29 09:32:14 +01:00
  • 2c4fa4aead Return empty dict if capture is corrupt Joel Collins 2019-05-29 09:29:46 +01:00
  • 9ab1da34ff Handle corrupt captures Joel Collins 2019-05-29 09:28:42 +01:00
  • 96070b17f5 Merge branch 'master' into 'stable' Joel Collins 2019-05-28 14:41:23 +00:00
  • 7e094b86ff Merge branch 'auto-update' into 'master' Joel Collins 2019-05-28 14:38:11 +00:00
  • 46f1442e53 Iterate version number Joel Collins 2019-05-28 15:37:15 +01:00
  • 17883e0567 Added dark-theme Joel Collins 2019-05-28 15:37:09 +01:00
  • a7fc14d93f Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server Joel Collins 2019-05-28 13:47:51 +01:00
  • c52fb7d854 Updated lockfile Joel Collins 2019-05-28 13:47:42 +01:00
  • 1f2799d9e1 Merge branch 'joram-fix-test' into 'master' Joel Collins 2019-05-28 12:17:29 +00:00
  • 5a509037da Merge branch 'master' into 'stable' Joel Collins 2019-05-28 11:46:24 +00:00
  • bce35ef2d1 Merge branch 'auto-update' into 'master' Joel Collins 2019-05-28 11:45:13 +00:00
  • d65329eafd Fixed feed URL to stable branch Joel Collins 2019-05-28 12:05:48 +01:00
  • 63ef0d7af8 Fixed choco dependency Joel Collins 2019-05-28 12:02:56 +01:00
  • cfb448e8d3 Update CI to new updatable builds Joel Collins 2019-05-28 12:00:02 +01:00
  • ad805b91c0 Add updater to apps Joel Collins 2019-05-28 11:59:46 +01:00
  • a4a2ada99b Add electron-updater and new build scripts Joel Collins 2019-05-28 11:59:34 +01:00
  • 34cbc6c1ec Switch to combined builder config Joel Collins 2019-05-28 11:59:05 +01:00
  • e0f7f12c3b Remove legacy setupEvents Joel Collins 2019-05-28 11:58:45 +01:00
  • 60c49a8331 Fixed setting Iterable vs Int backlash Joel Collins 2019-05-28 09:28:08 +01:00
  • 5e34b998dd Fixed plugin calling old focus_rel method Joel Collins 2019-05-28 09:27:47 +01:00
  • 39e2e0baad Re-implemented scan methods Joel Collins 2019-05-27 13:35:53 +01:00
  • 5a22d0d308 Re-added timeout parameters (previous commit broke) Joel Collins 2019-05-24 16:47:04 +01:00
  • 3b9ef670fe Improved flake8 results Joel Collins 2019-05-24 16:32:20 +01:00
  • fb606b189d Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server Joel Collins 2019-05-24 14:55:29 +01:00
  • febcc00f07 Updated some dependencies Joel Collins 2019-05-24 14:55:23 +01:00
  • 36d38bf000 Update CONTRIBUTING.md Joel Collins 2019-05-24 10:47:57 +00:00
  • 8a0320e2c4 Update CONTRIBUTING.md Joel Collins 2019-05-24 10:47:25 +00:00
  • fd4de9540a Merge branch '1.0.1-dev-cleanup' into 'master' Joel Collins 2019-05-23 13:26:30 +00:00
  • 90a3a738af Cleaned up camera locks Joel Collins 2019-05-23 14:25:57 +01:00
  • 8e35ef2b29 Added locked() method to check lock state Joel Collins 2019-05-23 14:25:26 +01:00
  • 2d0fe9a032 Iterated version number Joel Collins 2019-05-23 09:45:25 +00:00
  • cd216f7990 Update CONTRIBUTING.md Joel Collins 2019-05-23 09:39:44 +00:00
  • 4ce98817a0 Update CONTRIBUTING.md Joel Collins 2019-05-23 09:37:41 +00:00
  • dc0bd75039 Merge branch 'stable-ci' into 'master' Joel Collins 2019-05-22 17:58:19 +00:00
  • 081774a134 Run on push to stable branch Joel Collins 2019-05-22 17:58:08 +00:00
  • 8d12a9b98c Merge branch 'choco-ci-fix' into 'master' Joel Collins 2019-05-20 14:02:08 +00:00
  • 74f6093245 Merge branch '1.0.1-dev-cleanup' into 'master' Joel Collins 2019-05-20 10:30:44 +00:00
  • e30956d761 Renamed video_resolution to stream_resolution Joel Collins 2019-05-20 10:55:43 +01:00
  • 36ee715fcb Updated dependencies Joel Collins 2019-05-20 10:38:51 +01:00
  • 805c17b509 Merge branch 'resolution-fix' into 'master' Joel Collins 2019-05-20 09:29:35 +00:00
  • 8c3cd48f4d Automatically move old config file to new config file Joel Collins 2019-05-20 10:24:50 +01:00
  • b0e724a706 Fixed naming of default config placeholder Joel Collins 2019-05-20 10:14:55 +01:00
  • 9fc4dfc628 Moved microscoperc.yaml to microscope_settings.yaml Joel Collins 2019-05-20 10:09:01 +01:00
  • 1fe8ea18d8 Default capture resolution to MAX_RESOLUTION Joel Collins 2019-05-20 10:06:42 +01:00
  • 78882ab4c5 Removed debug print Joel Collins 2019-05-20 10:06:15 +01:00
  • 9cddb16dd6 Removed NSIS target from appx config jtc42 2019-05-19 17:22:35 +01:00
  • 53bd4e21ca Upgraded hash to SHA256 jtc42 2019-05-19 17:02:12 +01:00
  • dbc9e39473 Updated iconUrl to static file Joel Collins 2019-05-17 16:11:58 +01:00
  • b246336b60 Removed old pwsh nupkg-builder Joel Collins 2019-05-17 16:11:48 +01:00
  • b9fbfed530 Fixed nupkg generator from mod feedback Joel Collins 2019-05-17 16:05:02 +01:00
  • 7fea0cbd79 Simplified keynav debug statements Joel Collins 2019-05-17 16:04:41 +01:00
  • 998b914677 Update version in package-lock Joel Collins 2019-05-17 16:04:26 +01:00