Commit Graph

584 Commits

Author SHA1 Message Date
giles 585b9b689c develop/tags -> build/tags 2023-10-23 19:46:18 +00:00
giles 70f06c38d9 Merge pull request 'package.json' (#202) from develop/tags into master
convert-to-xml / deploy (push) Failing after 20s Details
Reviewed-on: #202
2023-10-23 19:43:19 +00:00
giles c93c4c9643 Merge branch 'master' into develop/tags
build-develop-branch / build-branch (push) Successful in 36s Details
build-develop-branch / if_merged (pull_request) Successful in 22s Details
build-develop-branch / delete-develop (pull_request) Successful in 12s Details
2023-10-23 19:43:08 +00:00
gilesb ce2c52cb58 package.json
build-develop-branch / build-branch (push) Successful in 39s Details
2023-10-23 20:41:13 +01:00
giles e9f141cd1a Merge pull request 'package.json' (#201) from develop/tags into master
Reviewed-on: #201
2023-10-23 19:37:20 +00:00
giles 86eb6afb2b Merge branch 'master' into develop/tags
build-develop-branch / build-branch (push) Has been cancelled Details
build-develop-branch / delete (pull_request) Successful in 14s Details
build-develop-branch / if_merged (pull_request) Failing after 14s Details
2023-10-23 19:37:04 +00:00
gilesb 99e06995ea package.json
build-develop-branch / build-branch (push) Successful in 39s Details
2023-10-23 20:36:17 +01:00
giles eb9b79ef61 Merge pull request 'added vesion bump' (#200) from develop/tags into master
Reviewed-on: #200
2023-10-23 19:29:49 +00:00
giles 8751cb50e5 Merge branch 'master' into develop/tags
build-develop-branch / build-branch (push) Has been cancelled Details
build-develop-branch / delete (pull_request) Successful in 14s Details
build-develop-branch / if_merged (pull_request) Failing after 12s Details
2023-10-23 19:29:37 +00:00
gilesb 24aa5f15a5 added vesion bump
build-develop-branch / build-branch (push) Successful in 39s Details
2023-10-23 20:28:48 +01:00
giles b02706f7dd Merge pull request 'added vesion bump' (#199) from develop/tags into master
Reviewed-on: #199
2023-10-23 19:22:36 +00:00
giles f57167a0fc Merge branch 'master' into develop/tags
build-develop-branch / build-branch (push) Successful in 34s Details
build-develop-branch / delete (pull_request) Successful in 15s Details
build-develop-branch / if_merged (pull_request) Failing after 12s Details
2023-10-23 19:21:14 +00:00
gilesb 8ed4494bab added vesion bump
build-develop-branch / build-branch (push) Has been cancelled Details
2023-10-23 20:20:34 +01:00
giles 9b952cfc23 Merge pull request 'added vesion bump' (#197) from develop/tags into master
Reviewed-on: #197
2023-10-23 19:18:02 +00:00
giles 1e71c022a2 Merge branch 'master' into develop/tags
build-develop-branch / build-branch (push) Successful in 36s Details
build-develop-branch / delete (pull_request) Successful in 14s Details
build-develop-branch / if_merged (pull_request) Has been skipped Details
2023-10-23 19:17:34 +00:00
gilesb fff44b0ca1 added vesion bump
build-develop-branch / build-branch (push) Successful in 39s Details
2023-10-23 20:16:49 +01:00
giles 37a2df176d Merge pull request 'added vesion bump' (#195) from develop/tags into master
Reviewed-on: #195
2023-10-23 19:14:37 +00:00
giles b3e188a153 Merge branch 'master' into develop/tags
build-develop-branch / build-branch (push) Successful in 37s Details
build-develop-branch / delete (pull_request) Successful in 14s Details
build-develop-branch / if_merged (pull_request) Has been skipped Details
2023-10-23 19:14:22 +00:00
gilesb fb67f80238 added vesion bump
build-develop-branch / build-branch (push) Successful in 40s Details
2023-10-23 20:13:37 +01:00
giles 602ac08e43 Merge pull request 'added vesion bump' (#194) from develop/tags into master
Reviewed-on: #194
Reviewed-by: giles <giles.bradshaw@sigyl.com>
2023-10-23 19:09:36 +00:00
giles 17e7f97ff8 Merge branch 'master' into develop/tags
build-develop-branch / build-branch (push) Failing after 32s Details
build-develop-branch / delete (pull_request) Successful in 16s Details
build-develop-branch / if_merged (pull_request) Failing after 16s Details
2023-10-23 19:09:05 +00:00
gilesb 336a4b29ea added vesion bump
build-develop-branch / build-branch (push) Successful in 38s Details
2023-10-23 20:07:40 +01:00
giles f483ee2df7 Merge pull request 'Merge pull request 'tags i hope' (#192) from develop/tags into masterReviewed-on: #192' (#193) from develop/tags into master
Reviewed-on: #193
2023-10-23 18:50:29 +00:00
gilesb e81c4e1c47 fetching tags
build-develop-branch / build-branch (push) Successful in 38s Details
build-develop-branch / delete (pull_request) Successful in 14s Details
build-develop-branch / if_merged (pull_request) Successful in 16s Details
2023-10-23 19:49:17 +01:00
giles 575f668269 Merge pull request 'tags i hope' (#192) from develop/tags into master
build-develop-branch / build-branch (push) Successful in 34s Details
Reviewed-on: #192
2023-10-23 18:41:27 +00:00
giles b7be7ec26a Merge branch 'master' into develop/tags
build-develop-branch / build-branch (push) Successful in 35s Details
build-develop-branch / delete (pull_request) Successful in 14s Details
build-develop-branch / if_merged (pull_request) Successful in 13s Details
2023-10-23 18:40:40 +00:00
gilesb c5658e6cef tags i hope
build-develop-branch / build-branch (push) Successful in 39s Details
2023-10-23 19:38:39 +01:00
giles 1dc7dc2f6a Merge pull request 'tags i hope' (#191) from develop/tags into master
Reviewed-on: #191
2023-10-23 18:36:34 +00:00
giles 113ec74fac Merge branch 'master' into develop/tags
build-develop-branch / build-branch (push) Successful in 37s Details
build-develop-branch / delete (pull_request) Successful in 13s Details
build-develop-branch / if_merged (pull_request) Successful in 14s Details
2023-10-23 18:35:39 +00:00
gilesb 9752dbcd11 tags i hope
build-develop-branch / build-branch (push) Successful in 38s Details
2023-10-23 19:34:23 +01:00
giles cdc24587c0 Merge pull request 'tags i hope' (#190) from develop/tags into master
Reviewed-on: #190
2023-10-23 18:33:51 +00:00
gilesb b121f80f3c tags i hope
build-develop-branch / build-branch (push) Successful in 37s Details
2023-10-23 19:31:54 +01:00
giles bd2be6e8f0 Merge pull request 'rebase32' (#189) from develop/rebase-32 into master
Reviewed-on: #189
2023-10-23 18:05:08 +00:00
gilesb 63ba502246 removed xml
build-develop-branch / build-branch (push) Successful in 39s Details
build-develop-branch / delete (pull_request) Successful in 14s Details
build-develop-branch / if_merged (pull_request) Successful in 13s Details
2023-10-23 19:03:34 +01:00
gilesb 3eedf55bca removed xml
build-develop-branch / build-branch (push) Successful in 38s Details
2023-10-23 19:00:29 +01:00
gilesb fe1d870c72 rebase32
build-develop-branch / build-branch (push) Successful in 35s Details
2023-10-23 17:51:08 +00:00
gilesb e4e5fa3bb7 rebase31 2023-10-23 17:51:08 +00:00
gilesb 2c9853613b rebase30 2023-10-23 17:51:08 +00:00
gilesb d2a5bb2f92 rebase29 2023-10-23 17:51:08 +00:00
gilesb 8933c9b265 rebase28 2023-10-23 17:51:08 +00:00
gilesb b4c50e923f rebase27 2023-10-23 17:51:08 +00:00
gilesb a3aeef2f0d rebase26 2023-10-23 17:51:08 +00:00
gilesb 31ab815716 ... 2023-10-23 17:51:08 +00:00
gilesb 858eb0ee57 ... 2023-10-23 17:51:08 +00:00
gilesb fef87a3c51 .. 2023-10-23 17:51:08 +00:00
giles 76c7be1491 Merge pull request 'Merge remote-tracking branch 'origin/build/rebase-21' into build/rebase-21' (#180) from develop/rebase-22 into master
Reviewed-on: #180
2023-10-23 17:12:24 +00:00
giles 2365957c91 build/rebase-22 -> develop/rebase-22
build-develop-branch / build-branch (push) Successful in 35s Details
build-develop-branch / delete (pull_request) Successful in 13s Details
build-develop-branch / if_merged (pull_request) Successful in 11s Details
2023-10-23 17:10:37 +00:00
batch-bot a531c1debc develop/rebase-21 -> build/rebase-21
build-develop-branch / build-branch (push) Failing after 29s Details
2023-10-23 17:05:27 +00:00
giles 8396d9a537 Merge pull request '..' (#177) from develop/rebase-15 into master
Reviewed-on: #177
2023-10-23 17:05:27 +00:00
gilesb e4e0b3317b ... 2023-10-23 17:05:27 +00:00