Commit graph

281 commits

Author SHA1 Message Date
Joel Collins
beb05f6736 Merge branch 'webapp-in-ci' into 'master'
Add .tar.gz webapp to build

See merge request openflexure/openflexure-microscope-jsclient!18
2019-05-12 17:50:22 +00:00
Joel Collins
271d2a9c42 Add .tar.gz webapp to build 2019-05-12 14:39:54 +00:00
Joel Collins
5d1f9a38e8 Merge branch 'uikit-fix' into 'master'
Fix UiKit spinning button bug

See merge request openflexure/openflexure-microscope-jsclient!17
2019-05-12 14:31:37 +00:00
jtc42
f62e9a868e Fix UiKit spinning button bug 2019-05-10 22:14:19 +01:00
Joel Collins
d2b3452827 Merge branch '0.2.3-ci-fix' into 'master'
Fixed nuspec version builder

See merge request openflexure/openflexure-microscope-jsclient!16
2019-05-10 11:14:38 +00:00
Joel Collins
bf7c3bcd91 Fixed nuspec version builder 2019-05-10 12:13:25 +01:00
Joel Collins
b0ee00b097 Merge branch 'armhf-deb-fix' into 'master'
(0.2.2 stable) Armhf deb fix

See merge request openflexure/openflexure-microscope-jsclient!15
2019-05-10 10:40:19 +00:00
Joel Collins
e47a26d050 Package version 0.2.2 2019-05-10 11:39:20 +01:00
Joel Collins
b344d5be7f Cache node_modules 2019-05-10 11:26:36 +01:00
Joel Collins
a52a549ff2 No deploy from web 2019-05-10 11:22:18 +01:00
Joel Collins
5c90a93a8a Fixed linux icons 2019-05-10 11:21:44 +01:00
Joel Collins
12256c8136 Alpha 3 2019-05-10 11:17:53 +01:00
Joel Collins
259d941e24 Merge branch 'clean-store-fix' into 'master'
Cleaned store mutations and actions

Closes #28

See merge request openflexure/openflexure-microscope-jsclient!14
2019-05-10 08:58:58 +00:00
Joel Collins
a5c8b3cc4e Cleaned store mutations and actions 2019-05-10 09:58:01 +01:00
Joel Collins
363dfa87a3 Merge branch 'localstorage-mixin-fix' into 'master'
Moved localstorage parser to mixin

Closes #7

See merge request openflexure/openflexure-microscope-jsclient!13
2019-05-10 08:34:20 +00:00
Joel Collins
29ad537aad Moved localstorage parser to mixin 2019-05-10 09:32:41 +01:00
Joel Collins
f87e6d55e9 Merge branch 'beforeunload-fix' into 'master'
Beforeunload fix (fixes issue 24)

See merge request openflexure/openflexure-microscope-jsclient!12
2019-05-10 08:15:15 +00:00
Joel Collins
ab72165db7 Close GPU preview on exit 2019-05-10 09:12:45 +01:00
Joel Collins
a78a73678b Override fpm to set arch to armhf 2019-05-09 20:25:14 +01:00
Joel Collins
59fba035d4 Merge branch 'split-builder-config' into 'master'
Split builder config

See merge request openflexure/openflexure-microscope-jsclient!11
2019-05-09 11:43:59 +00:00
Joel Collins
e1d562fef4 Renamed vuex settings to globalSettings 2019-05-08 17:56:11 +01:00
Joel Collins
56e43ae77f Moved movelock out of vuex 2019-05-08 17:50:10 +01:00
Joel Collins
d83470a901 Removed ARM target from Linux build 2019-05-08 17:28:43 +01:00
Joel Collins
516023d284 Added app category 2019-05-08 17:28:29 +01:00
jtc42
6cd2bb6661 Removed old config 2019-05-08 12:42:34 +01:00
jtc42
977ab0290f Split builder config 2019-05-07 19:27:22 +01:00
Joel Collins
8e05e3c618 Add CONTRIBUTING 2019-05-07 11:11:09 +00:00
Joel Collins
b562c9b563 Add retry 2019-05-06 17:36:26 +01:00
Joel Collins
a2f955f33f Allow manual triggering of CI jobs 2019-05-06 17:30:57 +01:00
Joel Collins
45852698d0 Split applying choco API key before push 2019-05-06 17:29:03 +01:00
Joel Collins
eae4e36cbe Iterate to alpha 2 for testing 2019-05-06 17:05:13 +01:00
Joel Collins
86c8439e4e Add choco push to deploy CI 2019-05-06 17:05:04 +01:00
Joel Collins
90e2816c40 Remove old installer generators 2019-05-06 17:04:48 +01:00
Joel Collins
8c2a8cf5f8 Only run CI for tagged releases 2019-05-06 15:35:45 +00:00
Joel Collins
a4898d7591 Merge branch 'master' into 'master'
CI to build nupkg

See merge request openflexure/openflexure-microscope-jsclient!10
2019-05-06 15:34:45 +00:00
Joel Collins
a47fbfce1c Merge branch 'master' into 'master'
# Conflicts:
#   .gitlab-ci.yml
2019-05-06 15:34:00 +00:00
Joel Collins
57ee303f42 Remove tag restriction for debugging 2019-05-06 16:13:45 +01:00
Joel Collins
002e154abe Rearranged deply pack debug 2019-05-06 16:12:15 +01:00
Joel Collins
d5ba398880 Try to fix choco pack tools path error 2019-05-06 16:11:10 +01:00
Joel Collins
6a1b3e26bc Fixed tools path for linux builds 2019-05-06 15:51:00 +01:00
Joel Collins
47d11001a4 Fixed artifact URL 2019-05-06 15:32:37 +01:00
Joel Collins
733400737f Debugging deploy 2019-05-06 15:29:02 +01:00
Joel Collins
0d28c287a5 Fixed artifact paths in build stage 2019-05-06 15:10:31 +01:00
Joel Collins
dbcac749a3 Moved nuspec to build stage, pack to deploy stage 2019-05-06 15:03:33 +01:00
Joel Collins
5071bb62a4 Enabled unofficial choco builds 2019-05-06 14:52:16 +01:00
Joel Collins
9a5868e817 Moved CI to choco on linux image 2019-05-06 14:29:25 +01:00
jtc42
6ac0c58fc2 Moved to choco linux 2019-05-06 11:54:59 +01:00
jtc42
2e5c312998 Added debug line 2019-05-06 11:54:52 +01:00
jtc42
4b9b955e3f First draft of deploy CI stage 2019-05-06 11:28:51 +01:00
jtc42
76c59dd510 Include nupkg in artifacts 2019-05-06 11:23:08 +01:00