Commit graph

335 commits

Author SHA1 Message Date
Joel Collins
f109f76049 Merge branch 'electron-specific-code' into 'master'
Include custom title bar in Win and Linux

See merge request openflexure/openflexure-microscope-jsclient!32
2019-06-03 16:36:17 +00:00
Joel Collins
f35a06008c Added CSS to better style the electron menubar 2019-06-03 15:50:07 +01:00
Joel Collins
22d139ecf8 Added titlebar icon 2019-06-03 13:38:03 +01:00
Joel Collins
73b5011fea Removed old Vue icon asset 2019-06-03 13:37:54 +01:00
Joel Collins
b0687426dd Hide frame on Win and Linux 2019-06-03 10:24:24 +01:00
Joel Collins
1baf040b89 Show custom titlebar on Win and Linux 2019-06-03 10:24:15 +01:00
Joel Collins
3826bdb511 Lock tab tooltips to bottom alignment 2019-06-03 10:23:58 +01:00
Joel Collins
7e12758400 Added CET dependency 2019-06-03 10:23:45 +01:00
Joel Collins
dbb7d6fbf4 Merge branch 'electron-specific-code' into 'master'
Separate build targets for electron and web

See merge request openflexure/openflexure-microscope-jsclient!31
2019-06-03 08:52:38 +00:00
Joel Collins
793c8e2c7e Condensed build:app into package 2019-06-02 22:03:49 +01:00
Joel Collins
f1d3047109 Draft updated CI 2019-06-02 21:21:59 +01:00
Joel Collins
a154c9dd15 Ignore app dist folder 2019-06-02 21:21:48 +01:00
Joel Collins
814df5f27a Update electron app source directory 2019-06-02 21:15:41 +01:00
Joel Collins
396adca35f Separate app and web builds 2019-06-02 21:15:32 +01:00
Joel Collins
adfec0bbfe JS file for electron-renderer specific code 2019-06-02 21:15:15 +01:00
Joel Collins
4bdf940bdd Separate web and app targets 2019-06-02 21:15:02 +01:00
Joel Collins
200edd14b3 Merge branch 'auto-update' into 'master'
Updated choco CI

See merge request openflexure/openflexure-microscope-jsclient!30
2019-05-29 08:53:57 +00:00
Joel Collins
61e5860a08 Update to new CI format 2019-05-29 09:53:07 +01:00
Joel Collins
ab3c7756ca Only generate choco for deterministic tag URLs 2019-05-29 09:53:00 +01:00
Joel Collins
7e094b86ff Merge branch 'auto-update' into 'master'
Dark theme

See merge request openflexure/openflexure-microscope-jsclient!28
2019-05-28 14:38:11 +00:00
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
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
8a0320e2c4 Update CONTRIBUTING.md 2019-05-24 10:47:25 +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
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
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