9d5cc43d71
Merge pull request 'Development' ( #543 ) from Development into master
...
Merging dev into master after successful testing.
2025-05-01 11:25:49 -04:00
bc1370ab29
Merge pull request 'Development' ( #540 ) from Development into master
...
Merging changes from Development into master after successful testing.
2025-04-23 15:13:56 -04:00
eaf2b14cfc
Merge pull request 'Development' ( #535 ) from Development into master
...
Merging all changes from development into master after successful testing.
2025-03-26 09:25:11 -04:00
1cf7d81aa5
Merge pull request 'Development' ( #530 ) from Development into master
...
Merging all changes through B2025-017 from dev into master after successful testing.
2025-03-04 10:24:28 -05:00
f11a9536f0
Merge pull request 'Development' ( #524 ) from Development into master
...
Merging all changes through B2025-015 from development into master after successful testing.
2025-02-20 15:33:44 -05:00
c7bdcf0104
Merge pull request 'Development' ( #516 ) from Development into master
...
Merging changes from development into master after successful testing
2025-02-11 15:25:38 -05:00
df026499d5
Merge pull request 'Development' ( #512 ) from Development into master
...
Merging all changes from development into master after successful testing.
2025-02-10 09:20:43 -05:00
a3aa4157b8
Merge pull request 'Development' ( #508 ) from Development into master
...
Merging all changes through B2025-012 from development into master after successful testing.
2025-02-05 10:50:35 -05:00
8f3268e1bc
Merge pull request 'Development' ( #504 ) from Development into master
...
Merging all changes from development into master after successful testing.
2025-01-30 15:55:02 -05:00
5721d440e9
Merge branch 'master' of https://git.volian.com/Volian/SourceCode
2025-01-21 10:42:15 -05:00
505c396283
Merge pull request 'Development' ( #489 ) from Development into master
...
Merging from development into master after successful testing.
2025-01-21 10:41:15 -05:00
643e6bc94f
Merge pull request 'Development' ( #486 ) from Development into master
...
Merging all items through B2025-003 from development in master after successful testing.
2025-01-09 15:02:16 -05:00
76502e6d97
Merge pull request 'Development' ( #481 ) from Development into master
...
Merging all changes through F2024-087 after successful testing.
2024-12-11 11:52:34 -05:00
851a0b3810
Merge pull request 'Development' ( #464 ) from Development into master
...
Merging all items through B2024-092 from development into master after successful testing.
2024-11-11 11:39:01 -05:00
fd8dbb4c8b
Merge pull request 'Development' ( #454 ) from Development into master
...
Merging all changes from development into master after successful testing.
2024-11-01 14:18:00 -04:00
4ffd994c5e
Merge pull request 'Development' ( #450 ) from Development into master
...
Merging all development items into master after successful testing.
2024-10-31 09:11:59 -04:00
a34828113a
Merge pull request 'Development' ( #416 ) from Development into master
...
Merging C2017-031 and B2024-075 from development into master after successful testing.
2024-10-03 12:08:30 -04:00
461329468c
Merge pull request 'Development' ( #413 ) from Development into master
...
Merging F2023-136 and F2024-074 in master after successful testing
2024-09-27 14:27:22 -04:00
35de5df04d
Merge pull request 'Development' ( #410 ) from Development into master
...
Merging all items through B2024-03 from development into master after successful testing.
2024-09-17 12:03:23 -04:00
4f0548fd60
Merge pull request 'Development' ( #402 ) from Development into master
...
Merging C2021-034 and B2024-065 into master after successful testing.
2024-09-06 09:56:37 -04:00
5c1d96cc51
Merge pull request 'Development' ( #399 ) from Development into master
...
Merging all fixes through B2024-063 from development into master after successful testing.
2024-08-27 15:58:15 -04:00
57049c0c52
Merge pull request 'Development' ( #392 ) from Development into master
...
Merging B2024-059 and B2024-058 from development into master after successful testing.
2024-08-15 14:55:27 -04:00
31326e1c91
Merge pull request 'Development' ( #389 ) from Development into master
...
Merging all changes through F2024-069 from development into master after successful testing.
2024-08-09 13:06:40 -04:00
3c60994a0a
Merge pull request 'Development' ( #373 ) from Development into master
...
Merging all changes through B2024-053 from development into master after successful testing.
2024-08-01 08:37:23 -04:00
773cc42346
Merge pull request 'Development' ( #362 ) from Development into master
...
Merging B2024-046 and B2024-047 from development into master after successful testing.
2024-07-25 10:44:42 -04:00
f46a1f39dc
Merge pull request 'Development' ( #359 ) from Development into master
...
Merging B2024-042 from development into master after successful testing.
2024-07-22 11:14:19 -04:00
b7175bf77f
Merge pull request 'Development' ( #357 ) from Development into master
...
Merging C2024-005 from development into master after successful testing.
2024-07-18 15:41:20 -04:00
ec22232aa8
Merge pull request 'Development' ( #356 ) from Development into master
...
Merging all items through B2024-041 from development into master after successful testing.
2024-07-18 09:51:54 -04:00
f303cd2236
Merge pull request 'Development' ( #348 ) from Development into master
...
Merging F2024-065 and F2024-066 from development into master after successful testing.
2024-07-03 10:45:41 -04:00
f40cef4416
Merge pull request 'Development' ( #346 ) from Development into master
...
Merging F2024-064 from development into master after successful testing.
2024-07-01 11:54:15 -04:00
fbca97d38d
Merge pull request 'Development' ( #344 ) from Development into master
...
Merging C2024-013 from development into master after successful testing.
2024-06-25 15:55:32 -04:00
28bd2cba5c
Merge pull request 'Development' ( #342 ) from Development into master
...
Merging C2022-029 from development into master after successful testing.
2024-06-20 11:36:59 -04:00
4b35f73bbf
Merge pull request 'Development' ( #340 ) from Development into master
...
Merging C2024-004 from development into master after successful testing.
2024-06-19 16:23:23 -04:00
f4706eb126
Merge pull request 'Development' ( #338 ) from Development into master
...
Merging C2019-047 from development into master after successful testing.
2024-06-17 08:38:34 -04:00
21bcb90558
Merge pull request 'Development' ( #335 ) from Development into master
...
Merging B2024-036 and F2024-063 from development into master after successful testing.
2024-06-06 14:51:13 -04:00
ae48ac0cae
Merge pull request 'Development' ( #332 ) from Development into master
...
Merging changes through B2024-035 from development into master after successful testing.
2024-05-30 08:08:28 -04:00
cb4979d5bc
Merge pull request 'Development' ( #327 ) from Development into master
...
Merging F2024-061 from development into master after successful testing.
2024-05-20 14:11:12 -04:00
7d3ae74e1f
Merge pull request 'Development' ( #325 ) from Development into master
...
Merging F2024-060 from development into master after successful testing.
2024-05-16 15:32:13 -04:00
9d680aa500
Merge pull request 'Development' ( #323 ) from Development into master
...
Merging C2024-001 from development into master after successful testing.
2024-05-16 14:17:17 -04:00
0d50b1c2fe
Merge pull request 'Development' ( #321 ) from Development into master
...
Merging all items through B2024-030 from development into master after successful testing.
2024-05-15 08:33:58 -04:00
75e034863f
Merge pull request 'Development' ( #315 ) from Development into master
...
Merging all changes through B2024-026 from development into master after successful testing.
2024-05-09 14:01:48 -04:00
3b42de1571
Merge pull request 'F2024-059_Callaway' ( #311 ) from F2024-059_Callaway into master
...
Format only changes
2024-05-07 16:00:36 -04:00
668472286e
Merge pull request 'Development' ( #307 ) from Development into master
...
Merging all changes through C2023-006 into master after successful testing.
2024-04-26 09:21:44 -04:00
e00d34c99d
Merge pull request 'Development' ( #300 ) from Development into master
...
Merging C2024-008 and C2024-007 from development into master after successful testing.
2024-04-17 14:57:22 -04:00
9fb496dfb3
Merge pull request 'Development' ( #297 ) from Development into master
...
Merging F2024-053 from development into master after successful testing.
2024-04-11 09:23:34 -04:00
f4eaa4a3ef
Merge pull request 'Development' ( #295 ) from Development into master
...
Merging F2024-052 from development into master after successful testing.
2024-04-08 11:11:43 -04:00
5d50ed6bdf
Merge pull request 'Development' ( #292 ) from Development into master
...
Merging F2024-051, B2024-021, F2024-049, F2024-050 and F2024-045 after successful testing.
2024-04-05 10:54:57 -04:00
d7ace4eaf9
Merge pull request 'Development' ( #287 ) from Development into master
...
Merging F2024-047, F2024-048, B2024-017 and B2024-019 from development into master after successful testing.
2024-04-04 11:36:56 -04:00
16a4d335ea
Merge pull request 'Development' ( #282 ) from Development into master
...
Merging all items through B2024-018 from development into master after successful testing.
2024-03-27 13:39:46 -04:00
ba69bb0772
Merge pull request 'Development' ( #275 ) from Development into master
...
Merging F2024-037 and CSLA updates into master after successful testing.
2024-03-20 16:07:27 -04:00
455940caa2
Merge pull request 'Development' ( #271 ) from Development into master
...
Merging F2024-040 into master after successful testing.
2024-03-18 10:00:30 -04:00
439344757e
Merge pull request 'Development' ( #269 ) from Development into master
...
Merging F2024-044, F2024-043, and F2024-019 in master after successful testing.
2024-03-15 09:33:57 -04:00
ad912691c9
Merge pull request 'Development' ( #265 ) from Development into master
...
Merging F2024-016, F2024-032, B2024-013, F2024-025, F2024-027 & F2024-028 into master after successful testing.
2024-03-12 14:01:12 -04:00
237144aff6
Merge pull request 'Development' ( #259 ) from Development into master
...
Merging B2024-014 from development into master after successful testing.
2024-03-04 15:02:18 -05:00
810332d558
Merge pull request 'Development' ( #256 ) from Development into master
...
Merging F2024-020 from development into master. No testing required since formats are under development.
2024-02-29 13:23:48 -05:00
f8431d0ba1
Merge pull request 'Development' ( #252 ) from Development into master
...
Merging F2024-022 from development into master. No testing required since formats are under development.
2024-02-29 09:23:51 -05:00
57c3bfa16a
Merge pull request 'Development' ( #250 ) from Development into master
...
Merging C2023-003 and F2024-026 into master after successful testing.
2024-02-28 11:56:15 -05:00
61f1077608
Merge pull request 'Development' ( #248 ) from Development into master
...
Merging F2024-029, B2024-009, F2024-023, B2024-011, B2024-012 and F2024-017 from development into master after successful testing.
2024-02-27 14:21:22 -05:00
8877e968b9
Merge pull request 'Development' ( #239 ) from Development into master
...
Merging F2024-018, B2024-008, B2024-007, and F2024-015 from development into master after successful testing.
2024-02-22 08:22:26 -05:00
4575c90bee
Merge pull request 'Development' ( #233 ) from Development into master
...
Merging updated formats from development into master after successful testing.
2024-02-14 16:07:57 -05:00
21279a87ae
Merge pull request 'Development' ( #231 ) from Development into master
...
Merging B2024-006 from development into master after successful testing.
2024-02-14 08:19:09 -05:00
3d5ad4a17e
Merge pull request 'Development' ( #229 ) from Development into master
...
Merging C2024-002 and F2024-013 from development into master after successful testing.
2024-02-09 11:30:41 -05:00
9bb7b044a8
Merge pull request 'Development' ( #226 ) from Development into master
...
Merging F2024-010, F2024-011, F2024-008, B2024-002, F2024-012 and B2024-005 from development into master after successful testing.
2024-02-08 11:38:49 -05:00
dc8f2f7561
Merge pull request 'Development' ( #219 ) from Development into master
...
Merging C2022-009 into master after successful testing.
2024-02-02 13:53:22 -05:00
829dbf84da
Merge pull request 'Development' ( #217 ) from Development into master
...
Merging F2024-005 and B2024-004 from development into master after successful testing
2024-01-31 08:34:00 -05:00
7b156c17f8
Merge pull request 'Development' ( #212 ) from Development into master
...
Merging all changes up through F2024-006 from development into master after successful testing.
2024-01-24 11:30:40 -05:00
cbf7cbc164
Merge pull request 'Development' ( #198 ) from Development into master
...
Merging F2024-002 and F2023-112 from development into master. No testing required since formats are under development.
2024-01-08 15:24:15 -05:00
b04faa816e
Merge pull request 'Development' ( #196 ) from Development into master
...
Merging F2023-126, F2024-001, C2022-009, C2023-024 and C2023-023 from development into Master after successful testing.
2024-01-03 10:54:22 -05:00
517ebe2902
Merge pull request 'Development' ( #189 ) from Development into master
...
Initial check-in of Vogtle Background formats. No testing required since formats are under development.
2023-12-15 15:48:55 -05:00
03d0d314e3
Merge pull request 'Development' ( #187 ) from Development into master
...
Merging B2023-115 from development into master after successful testing.
2023-12-12 15:31:06 -05:00
3e804c5cce
Merge pull request 'Development' ( #185 ) from Development into master
...
Merging F2023-133 into from development into master. No testing required since formats are under development.
2023-12-11 10:08:22 -05:00
ee2b8b538e
Merge pull request 'Development' ( #183 ) from Development into master
...
Merging PROMSFixes from development into master after minor changes to UpdateFormatList.
2023-12-08 14:51:21 -05:00
fdfd34fe92
Merge pull request 'Development' ( #181 ) from Development into master
...
Merging F2023-151 from development into master. No testing required since formats are under development.
2023-12-07 15:55:16 -05:00
2d6fb6523b
Merge pull request 'Development' ( #179 ) from Development into master
...
Merging F2023-133 from development into master. No testing required since formats are under development.
2023-12-07 11:44:31 -05:00
3084bf3982
Merge pull request 'Development' ( #177 ) from Development into master
...
Merging B2023-115 and F2023-150 from development into master. No testing required since formats are under development.
2023-12-06 09:08:18 -05:00
5ba51e8392
Merge pull request 'Development' ( #174 ) from Development into master
...
Merging F2023-149 from development into master. No testing required since formats are under development.
2023-12-05 16:30:39 -05:00
fb5eb43e34
Merge pull request 'Development' ( #172 ) from Development into master
...
Merging F2023-124 from development into master. No testing required since formats are under development.
2023-12-04 11:22:59 -05:00
b154056276
Merge pull request 'Development' ( #170 ) from Development into master
...
Merging F2023-119 from development into master. No testing required since formats are under development.
2023-12-01 15:36:22 -05:00
c67b8f9ca1
Merge pull request 'Development' ( #168 ) from Development into master
...
Merging F2023-146 from development to master. No testing required since formats are under development.
2023-12-01 10:02:50 -05:00
95e4181360
Merge pull request 'Development' ( #166 ) from Development into master
...
Merging F2023-148, F2023-148, and B2023-120 from development into Master. No testing required since formats are under development.
2023-11-30 14:38:49 -05:00
32dffbe56b
Merge pull request 'Development' ( #162 ) from Development into master
...
Merging B2023-116, B2023-117, and F2023-143 from development to master after successful testing.
2023-11-29 15:58:44 -05:00
6b3c8d373b
Merge pull request 'F2023-143_Vogtle3&4_Alrm_Footer' ( #159 ) from F2023-143_Vogtle3&4_Alrm_Footer into master
...
Format only change.
Vogtle 3&4 formats under development. This change will be tested as data in entered into PROMS by Volian
2023-11-27 16:23:44 -05:00
db29107f47
Merge pull request 'Development' ( #156 ) from Development into master
...
Merging F2023-142 and B2022-046 in from development to master after successful testing.
2023-11-14 08:45:47 -05:00
355537f2ab
Merge pull request 'Development' ( #153 ) from Development into master
...
Merging F2023-140, F2023-123, B2023-007, B2023-108, F2023-139, F2023-138 and B2023-103
2023-11-09 10:33:40 -05:00
0729ef0c21
Merge pull request 'Development' ( #147 ) from Development into master
...
Merging F2023-139 from development into master after successful testing.
2023-10-26 10:10:33 -04:00
6fe82bfd0f
Merge pull request 'Development' ( #145 ) from Development into master
...
Merging F2023-138 from development into master after successful testing.
2023-10-25 14:40:15 -04:00
39bf072363
Merge pull request 'Development' ( #142 ) from Development into master
...
Merging B2023-103 from development into master after successful testing.
2023-10-23 15:28:31 -04:00
da7c384fd8
Merge pull request 'Development' ( #139 ) from Development into master
...
Merging C2023-017, C2023-019, B2023-104, B2023-101 and B2023-102 from development into master after successful testing.
2023-10-18 10:37:59 -04:00
95130fd9a0
Merge pull request 'Development' ( #133 ) from Development into master
...
Merging C2023-018 from development into master after successful testing.
2023-10-11 09:26:45 -04:00
978e2344a3
Merge pull request 'Development' ( #131 ) from Development into master
...
Merging C2023-016 and C2023-017 from development into master after successful testing.
2023-10-06 10:56:34 -04:00
c9bf45602c
Merge pull request 'Development' ( #128 ) from Development into master
...
Merging F2023-137 and B2023-100 from development into master. F2023-137 does not require testing since formats are under development. B2023-100 tested successfully.
2023-10-02 11:52:22 -04:00
aa160b2036
Merge pull request 'Development' ( #124 ) from Development into master
...
Merging B2023-099 from development into master after successful testing.
2023-09-28 15:58:27 -04:00
f82b32d351
Merge pull request 'Development' ( #122 ) from Development into master
...
Merging B2023-097 and B2023-098 from development into master after successful testing.
2023-09-26 14:58:05 -04:00
e519dc9a57
Merge pull request 'Development' ( #120 ) from Development into master
...
Merging B2023-094 from development into master after successful testing.
2023-09-22 13:24:17 -04:00
f020c37db9
Merge pull request 'Development' ( #118 ) from Development into master
...
Merged B2023-096 from development into master after successful testing.
2023-09-15 11:50:57 -04:00
5a4ec3b6b1
Merge pull request 'Development' ( #117 ) from Development into master
...
Merging F2023-135 and B2023-093 from development into master after successful testing.
2023-09-14 15:58:52 -04:00
2602d6c9d2
Merge pull request 'Development' ( #113 ) from Development into master
...
Merging C2023-015 from development into master.
2023-09-12 09:23:57 -04:00
ff403583d7
Merge pull request 'Development' ( #111 ) from Development into master
...
Merging B2023-091 and B2023-078 from development into master.
2023-08-30 16:07:17 -04:00
c5577cc2bd
Merge pull request 'Development' ( #108 ) from Development into master
...
Merging F2023-134 from development into master. No testing required since formats are under development.
2023-08-24 15:01:12 -04:00
78be6e5dc1
Merge pull request 'Development' ( #106 ) from Development into master
...
Merging GitAutomation from Development into Master.
2023-08-24 09:13:06 -04:00
b954a41375
Merge pull request 'Development' ( #104 ) from Development into master
...
Merging B2023-089 and F2023-131 from Development into Master. No testing required since formats are under development.
2023-08-24 09:05:31 -04:00
0100a11cfe
Merge pull request 'Development' ( #101 ) from Development into master
...
Merging F2023-125 from development into master. No testing required since formats are under development.
2023-08-23 08:19:00 -04:00
04cf2e8534
Merge pull request 'Development' ( #99 ) from Development into master
...
Merging F2023-130 from Development into Master. No testing required since formats are under development.
2023-08-22 15:04:22 -04:00
be00724818
Merge pull request 'Development' ( #97 ) from Development into master
...
Merging B2023-088 from development into master. No testing required since formats are under development.
2023-08-22 10:52:09 -04:00
274d93c61a
Merge pull request 'Development' ( #94 ) from Development into master
...
Merging F2023-122 from development into master. No testing required since formats are under development.
2023-08-22 08:53:57 -04:00
7dc4c30436
Merge pull request 'Development' ( #92 ) from Development into master
...
Merging F2023-127 from development into master. No testing required since formats are under development.
2023-08-22 08:33:56 -04:00
028ef4bc31
Merge pull request 'Development' ( #89 ) from Development into master
...
Merging F2023-128 and F2023-129 from development into master. No testing required since formats are under development.
2023-08-21 11:46:01 -04:00
42124d65c7
Merge pull request 'Development' ( #87 ) from Development into master
...
Merging F2023-118, F2023-120 and F2023-121 from development into master. No testing required since formats are under development.
2023-08-16 10:13:52 -04:00
