Commit Graph

258 Commits

Author SHA1 Message Date
giles 5eb36a4b05 Merge pull request 'this is a PR! it rocks!' (#24) from format-branch into master
continuous-integration/drone/push Build is failing Details
Reviewed-on: #24
2023-10-18 16:00:21 +00:00
giles 1cac52cb70 trycommitmessage
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/pr Build is passing Details
2023-10-18 16:58:38 +01:00
giles 913be7371f Merge pull request 'this is a PR! it rocks!' (#23) from format-branch into master
continuous-integration/drone/push Build is passing Details
Reviewed-on: #23
2023-10-18 15:53:52 +00:00
giles a54116c8a9 .
continuous-integration/drone/pr Build is passing Details
continuous-integration/drone/push Build is passing Details
2023-10-18 16:48:19 +01:00
giles d39a32ea5f .
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/pr Build is passing Details
2023-10-18 16:44:27 +01:00
giles c50fbe34db .
continuous-integration/drone/pr Build is passing Details
continuous-integration/drone/push Build is passing Details
2023-10-18 16:40:55 +01:00
giles c86a272294 .
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/pr Build is passing Details
continuous-integration/drone/promote/xml Build is passing Details
2023-10-18 15:41:04 +01:00
giles 267d88cedf .
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/pr Build is passing Details
2023-10-18 15:40:25 +01:00
giles 2212f55b16 .
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/pr Build is passing Details
continuous-integration/drone/promote/xml Build is passing Details
2023-10-18 15:34:15 +01:00
giles 9c3b3e66d8 .
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/pr Build is passing Details
continuous-integration/drone/promote/yml Build is passing Details
2023-10-18 15:32:21 +01:00
giles 3e45c60e17 .
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/pr Build is passing Details
continuous-integration/drone/promote/yml Build is failing Details
2023-10-18 15:30:57 +01:00
giles c341b18a82 .
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/pr Build is passing Details
continuous-integration/drone/promote/yml Build is failing Details
2023-10-18 15:26:00 +01:00
giles 3e3d0cb624 .
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/pr Build is passing Details
continuous-integration/drone/promote/yml Build is failing Details
2023-10-18 15:21:31 +01:00
giles 48b1564104 Merge pull request 'this is a PR! it rocks!' (#20) from format-branch into master
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/promote/yml Build is failing Details
Reviewed-on: #20
2023-10-18 14:19:13 +00:00
giles 4356cf4c8e .
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/pr Build is passing Details
2023-10-18 15:18:34 +01:00
giles 48e693a3f5 .
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/pr Build is passing Details
continuous-integration/drone/promote/yml Build is failing Details
2023-10-18 14:32:53 +01:00
giles b20d235e4b Merge pull request 'this is a PR! it rocks!' (#19) from format-branch into master
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/promote/yml Build encountered an error Details
Reviewed-on: #19
2023-10-18 13:29:46 +00:00
giles a41b0a8c35 . 2023-10-18 14:27:48 +01:00
giles 1489d72410 Merge pull request 'This is a PR! it rocks!' (#18) from format-branch into master
continuous-integration/drone Build is passing Details
Reviewed-on: #18
2023-10-18 13:20:22 +00:00
giles c0cb4b09d5 extra yml files added 2023-10-18 14:14:53 +01:00
giles d4b5b743b5 Merge pull request 'this is a PR! it rocks!' (#17) from product-development into master
Reviewed-on: #17
2023-10-17 21:31:02 +00:00
giles 14fe52de2a another unit 2023-10-17 22:28:21 +01:00
Giles Bradshaw 9de51db7be another unit 2023-10-17 21:26:43 +00:00
giles c6f64b62ef deployed 2023-10-17 22:24:32 +01:00
giles 126229be5a Merge pull request 'format-branch' (#16) from format-branch into master
Reviewed-on: #16
2023-10-17 19:53:28 +00:00
giles bdfce63019 a new model.. 2023-10-17 20:47:13 +01:00
Giles Bradshaw 53d65750e9 a new model.. 2023-10-17 19:44:35 +00:00
giles bd66404d0e deployed 2023-10-17 20:36:06 +01:00
giles 029bd7290c Merge pull request 'read me' (#15) from product-development into master
Reviewed-on: #15
2023-10-17 19:33:56 +00:00
giles 7d84f3764a read me 2023-10-17 20:33:14 +01:00
giles 830909d1b0 Merge pull request 'this is a PR! it rocks!' (#14) from product-development into master
Reviewed-on: #14
2023-10-17 19:28:44 +00:00
giles 9ee36b3694 more 2023-10-17 18:27:31 +01:00
giles 17152d8e9b added new phase to unit 2 2023-10-17 18:26:08 +01:00
Giles Bradshaw 841082d216 Added new phase to unit
new Phase1 added to unit2
2023-10-17 17:06:06 +00:00
giles f2ce9252c6 deployed 2023-10-17 17:26:28 +01:00
giles f8ae1cd15c Merge pull request 'Squashed commit of the following:' (#8) from product-development into master
Reviewed-on: #8
2023-10-17 16:21:56 +00:00
giles 626aa85192 Squashed commit of the following:
commit f979259bd8
Author: Giles Bradshaw <giles.bradshaw@sigyl.com>
Date:   Tue Oct 17 16:05:53 2023 +0000

    new unit!!

commit 3fd02d5ce4
Author: giles <giles.bradshaw@sigyl.com>
Date:   Tue Oct 17 16:44:48 2023 +0100

    deployed
2023-10-17 17:17:27 +01:00
giles 3fd02d5ce4 deployed 2023-10-17 16:44:48 +01:00
giles 1477d67f06 Merge pull request 'new-change' (#7) from new-change into master
Reviewed-on: #7
2023-10-17 15:41:57 +00:00
giles 470fd1b9fc Merge branch 'format-branch' into new-change 2023-10-17 16:39:04 +01:00
Giles Bradshaw fcccfed8e3 renamed phase11 to PHASE_ONE 2023-10-17 15:27:08 +00:00
giles 5cbc2a7aa2 Merge pull request 'name-change' (#6) from name-change into master
Reviewed-on: #6
2023-10-17 15:07:20 +00:00
giles d7ded0a204 . 2023-10-17 16:06:28 +01:00
giles ff53146480 still not right.. 2023-10-17 16:04:20 +01:00
giles 573f6b48f8 deployed 2023-10-17 15:53:14 +01:00
giles b28310d25e Merge pull request 'product-development' (#5) from product-development into master
Reviewed-on: #5
Reviewed-by: another-user <anotheruser@sigyl.com>
2023-10-17 14:47:55 +00:00
giles bc05e17a66 Merge branch 'master' into product-development 2023-10-17 15:47:26 +01:00
giles 10c2405ced parameter and instructions 2023-10-17 15:38:06 +01:00
giles 3dc3dda731 equipment model created
converted to yaml
2023-10-17 15:35:12 +01:00
Giles Bradshaw 5b95ca1d08 added parameter and instruction file 2023-10-17 12:23:57 +00:00