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
25cc62c7c6
Merge pull request 'F2024-069-Procedure-Set-Specific-Information-dialog-ajustments' ( #388 ) from F2024-069-Procedure-Set-Specific-Information-dialog-ajustments into Development
...
changes good. ready for testing
2024-08-08 14:13:28 -04:00
47596c7bca
Merge pull request 'F2024-067 - Updates to VCSummer for time sensitive stes (clock)' ( #387 ) from F2024-067 into Development
...
format change ready for testing
2024-08-08 14:12:05 -04:00
7129853902
F2024-069-Procedure-Set-Specific-Information-dialog-ajustments
2024-08-08 13:33:16 -04:00
Kevin Laskey
f08466f702
Merge pull request 'B2024-038: tree view menuing for paste/replace of sections' ( #386 ) from B2024-038 into Development
...
Reviewed-on: #386
Reviewed-by: Kevin Laskey <klaskey@volian.com >
2024-08-08 10:18:27 -04:00
Kathy Ruffing
7cf28366f4
B2024-038: tree view menuing for paste/replace of sections
2024-08-08 09:01:31 -04:00
037c82e22e
Merge pull request 'F2024-068-VCS-Deviation-Format' ( #385 ) from F2024-068-VCS-Deviation-Format into Development
...
ok for testing phase
2024-08-08 08:29:10 -04:00
6de13b12f9
F2024-068-VCS-Deviation-Format
2024-08-07 21:59:59 -04:00
cf69aa93e6
Merge pull request 'B2024-057 - Updated sizes of tooltips in delete area of admin' ( #384 ) from B2024-057 into Development
...
OK for testing
2024-08-07 15:22:41 -04:00
Kevin Laskey
4b915b78b6
B2024-057 - Updated sizes of tooltips in delete area of admin
2024-08-07 14:37:31 -04:00
Kevin Laskey
a891a62ffa
F2024-067 - Updates to VCSummer for time sensitive stes (clock)
2024-08-07 14:15:57 -04:00
7a768484a1
Merge pull request 'B2024-057' ( #382 ) from B2024-057 into Development
...
approved, ready for testing
2024-08-06 11:18:30 -04:00
Kevin Laskey
5f7af3309d
B2024-054 - Update Annotation tooltip
2024-08-06 11:17:17 -04:00
Kevin Laskey
1f3a1dabbc
B2024-055 - Update tooltips for the labels on delete annotations and delete folders
2024-08-06 10:58:04 -04:00
Kevin Laskey
4b61495960
B2024-057 - updated curors
2024-08-06 10:48:05 -04:00
Kevin Laskey
d091a37171
B2024-055 - Update tooltips on admin delete functions
2024-08-06 10:29:06 -04:00
Kevin Laskey
189b78d7d3
B2024-057 - Added check to see if anything is checked out for annotations and folder delete from admin area.
2024-08-06 09:14:36 -04:00
8ee7a31b97
Merge pull request 'C2024-018 - Update to use results pane' ( #381 ) from C2024-018 into Development
...
approved and ready for testing phase
2024-08-05 15:29:46 -04:00
Kevin Laskey
055be66421
C2024-018 - Update to use results pane
2024-08-05 15:24:43 -04:00
86a3e56a27
Merge pull request 'C2024-018 - Updated fixes per Michelle testing. Added some confirmation messages' ( #380 ) from C2024-018 into Development
...
changes approved. - ready for testing phase
2024-08-05 12:12:05 -04:00
Kevin Laskey
0db98e4182
C2024-018 - Updated fixes per Michelle testing. Added some confirmation messages
2024-08-05 11:12:21 -04:00
3102596a3d
Merge pull request 'C2021-059_deleteFolders' ( #379 ) from C2021-059_deleteFolders into Development
...
code changes look good. - on to testing phase
2024-08-02 14:05:24 -04:00
Kevin Laskey
41aa195785
C2021-059 - Added extra code to ensure delect sets parent tree items deslected
2024-08-02 13:08:19 -04:00
Kevin Laskey
954186265e
C2021-059 - Patch in auto checkbox filling for delete tree.
2024-08-02 12:56:12 -04:00
Kevin Laskey
33cced07c6
C2021-059 Added veProms connection to remove the node in the main tree
2024-08-02 10:31:50 -04:00
Kevin Laskey
afbf6f360d
C2021-059 - Updates to get build moving after custom merging
2024-08-02 10:13:05 -04:00
Kevin Laskey
df2be585a1
C2021-059 - Moved updates to branch
2024-08-01 15:54:28 -04:00
Kevin Laskey
c81f527cb8
C2021-059 - Update Proms Fixes
2024-08-01 15:05:42 -04:00
0f67382c27
Merge pull request 'B2024-054_Update_Tool_tip_text_for_delete_annotations' ( #375 ) from B2024-054_Update_Tool_tip_text_for_delete_annotations into Development
...
changes look good - onto testing phase
2024-08-01 11:07:59 -04:00
b42b8ddfa3
B2024-054_Update_Tool_tip_text_for_delete_annotations
2024-08-01 10:42:53 -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
f3efd409c6
Merge pull request 'B2024-053_Submitted_for_Admin_Tools-Delete' ( #372 ) from B2024-053_Submitted_for_Admin_Tools-Delete into Development
...
passed code review - on to testing phase.
2024-07-31 14:41:13 -04:00
9011b134d6
B2024-053_Submitted_for_Admin_Tools-Delete
2024-07-31 14:34:49 -04:00
7c33bad362
Merge pull request 'B2024-052-In-Annotations-pop-up-no-Annotation-type-should-be-selected-by-default' ( #371 ) from B2024-052-In-Annotations-pop-up-no-Annotation-type-should-be-selected-by-default into Development
...
changes look good - onto testing phase
2024-07-31 09:49:30 -04:00
Kevin Laskey
e49a4d674f
Merge pull request 'B2024-045, B2024-049, B2024-050 crash on paste/replace' ( #370 ) from B2024-045 into Development
...
Reviewed-on: #370
Reviewed-by: Kevin Laskey <klaskey@volian.com >
2024-07-31 09:48:50 -04:00
7872f192ed
B2024-052-In-Annotations-pop-up-no-Annotation-type-should-be-selected-by-default
2024-07-31 09:23:34 -04:00
Kathy Ruffing
870bba0aa6
B2024-045, B2024-049, B2024-050 crash on paste/replace
2024-07-31 07:21:30 -04:00
35c7b2b0cf
Merge pull request 'B2024-051 Added null checks in the MultiUser.cs file to handle when a user as access to a procedure set that no longer exists.' ( #369 ) from B2024-051 into Development
...
Reviewed-on: #369
2024-07-30 15:46:21 -04:00
9e6c8acca4
B2024-051 Added null checks in the MultiUser.cs file to handle when a user as access to a procedure set that no longer exists.
2024-07-30 14:48:34 -04:00
099bbdd328
Merge pull request 'B2024-043-Fix-User-Tab2' ( #368 ) from B2024-043-Fix-User-Tab2 into Development
...
changes look good. onto the testing phase
2024-07-30 10:38:31 -04:00
720c5db2d0
B2024-043-Fix-User-Tab2
2024-07-30 10:09:40 -04:00
659833c5bf
Merge pull request 'C2024-016-Annotations-Delete-Info-to-results-panel' ( #366 ) from C2024-016-Annotations-Delete-Info-to-results-panel into Development
...
changes OK. ready to create test exe.
2024-07-29 14:12:10 -04:00
5ea9bcdd8b
C2024-016-Annotations-Delete-Info-to-results-panel
2024-07-29 12:52:29 -04:00
3ec7c11797
Merge pull request 'C2024-017 Removed old (not implemented) format variables and settings from the format files and removed incomplete references to them in the C# code. Also added descriptions of the used format variables in the C# code that hooks the XML format files t…' ( #364 ) from C2024-017_RemoveUnUsedFormatItems into Development
...
format cleanup. any code changes were to add comments (description of format variables) and to remove commented out and un-used code.
2024-07-26 14:57:56 -04:00
7f899175d1
C2024-017 Removed old (not implemented) format variables and settings from the format files and removed incomplete references to them in the C# code. Also added descriptions of the used format variables in the C# code that hooks the XML format files to the PROMS C# logic.
2024-07-26 14:54:11 -04:00
112edd1c8a
Merge pull request 'B2024-048-Annotations-Cleanup-tools-tips' ( #363 ) from B2024-048-Annotations-Cleanup-tools-tips into Development
...
changes are good. ready for testing phase
2024-07-26 10:57:20 -04:00
819c1bbec4
B2024-048-Annotations-Cleanup-tools-tips
2024-07-26 09:38:25 -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
6b6968561b
B2024-048-Annotations-Cleanup-tools-tips
2024-07-25 08:13:20 -04:00
24fbb69e25
Merge pull request 'B2024-047-Fix-Size-Treeview-In-Link-Tab-Admin-Tools' ( #361 ) from B2024-047-Fix-Size-Treeview-In-Link-Tab-Admin-Tools into Development
...
ready for testing phase
2024-07-24 16:28:04 -04:00
79751732a3
B2024-047-Fix-Size-Treeview-In-Link-Tab-Admin-Tools
2024-07-24 16:11:52 -04:00
e6e62ed2c8
Merge pull request 'B2024-046-Set-Default-Tab-In-Admin-Tools' ( #360 ) from B2024-046-Set-Default-Tab-In-Admin-Tools into Development
...
change looks good to continue with testing phase.
2024-07-24 10:44:56 -04:00
8f2cbf4081
B2024-046-Set-Default-Tab-In-Admin-Tools
2024-07-24 10:37:59 -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
Kathy Ruffing
c25f501909
Merge pull request 'B2024-042 - When replacing a procedure, this change will now replace the procedure correctly and add it to the tree node, previously it would replace th eprocedure, then add a whole new procedure to the node, incorrectly using the copy procedure which …' ( #358 ) from B2024-042 into Development
...
Reviewed-on: #358
Reviewed-by: Kathy Ruffing <kruffing@volian.com >
2024-07-22 09:45:17 -04:00
Kevin Laskey
bf72a6bf78
B2024-042 - Update TreeNodeReplace section when adding a node to working draft (remove unneeded code)
2024-07-22 09:39:13 -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
Kevin Laskey
a1380dbb8a
B2024-042 - When replacing a procedure, this change will now replace the procedure correctly and add it to the tree node, previously it would replace th eprocedure, then add a whole new procedure to the node, incorrectly using the copy procedure which appended "copy of".
2024-07-18 14:06:01 -04:00
Kathy Ruffing
501798a8cb
Merge pull request 'C2024-005-Annotations-Cleanup-2' ( #355 ) from C2024-005-Annototions-Cleanup-2 into Development
...
Reviewed-on: #355
Reviewed-by: Kathy Ruffing <kruffing@volian.com >
Code reviewed successfully
2024-07-18 11:39:12 -04:00
a240bc2c19
C2024-005-Annotations-Cleanup-2
2024-07-18 11:31:49 -04:00
a804a3866a
C2024-005-Annotations-Cleanup-2
2024-07-18 11:12:30 -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
069ffb80e9
C2024-005-Annotations-Cleanup-2
2024-07-17 14:28:24 -04:00
Kevin Laskey
5255080291
Merge pull request 'B2022-118: search of multi value ROs fails' ( #354 ) from B2022-118 into Development
...
Reviewed-on: #354
2024-07-17 10:56:40 -04:00
Kathy Ruffing
ae35d9f0d7
B2022-118: search of multi value ROs fails
2024-07-17 10:11:43 -04:00
afbd653611
Merge pull request 'B2024-041 - Update PromsFixes SQL file to acocunt for replacing vs pasting procs' ( #352 ) from B2024-041_v2 into Development
...
good for testing phase
2024-07-16 16:27:35 -04:00
Kevin Laskey
9a55111e1e
B2024-041 - Update PromsFixes SQL file to acocunt for replacing vs pasting procs
2024-07-16 16:20:21 -04:00
422a3053b7
Merge pull request 'B2024-039 Customer reported that transitions to standard text get converted to text when the Refresh Transitions is done from the Admin Tools' ( #350 ) from B2024-039_BNPP_StdtxtTrans into Development
...
format only changes
2024-07-12 14:16:22 -04:00
feb74ee09f
B2024-039 Customer reported that transitions to standard text get converted to text when the Refresh Transitions is done from the Admin Tools
2024-07-12 14:14:23 -04:00
7cebb2b7f1
Merge pull request 'B2024-037: Bug fix for copy/replace functionality on procedures and steps.' ( #349 ) from B2024-037 into Development
...
changes look good. OK for testing phase.
2024-07-11 10:54:10 -04:00
Kevin Laskey
8097c6283c
B2024-037 - Update versioning on proms fixes
2024-07-11 10:30:31 -04:00
Kevin Laskey
8f08ef5ee4
B2024-037 - Slight clean up on parentedititme
2024-07-11 08:45:18 -04:00
Kevin Laskey
fd26f16776
B2024-037 Include proms sql fixes for copy replace functionality
2024-07-10 14:53:20 -04:00
Kevin Laskey
21a83df99d
B2024-037 - Fixes made for replacing procs and steps via paste/replace functionality.
2024-07-10 12:15:14 -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
616acf0e37
Merge pull request 'F2024-065 - Turned off the CapRoIfLastLower flag in all of the Beaver Valley formats F2024-066 - Turned off the Replace Words feature in EOP, “without Issue Number”, and the SAMG Background formats' ( #347 ) from F2024-065-066-BeaverValley into Development
...
Format only changes
2024-07-03 10:08:45 -04:00
3cff87cf97
F2024-065 - Turned off the CapRoIfLastLower flag in all of the Beaver Valley formats F2024-066 - Turned off the Replace Words feature in EOP, “without Issue Number”, and the SAMG Background formats
2024-07-03 10:01:03 -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
Kathy Ruffing
9202d903a5
Merge pull request 'F2024-064: underline and spacing of section titles' ( #345 ) from F2024-064 into Development
...
Reviewed-on: #345
2024-07-01 09:27:34 -04:00
Kathy Ruffing
a9a9a56c09
F2024-064: underline and spacing of section titles
2024-07-01 09:15:42 -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
aee7819a9c
Merge pull request 'C2024-013: On print dialog, disable Merge button if creating hyperlinks' ( #343 ) from C2024-013 into Development
...
code changed reviewed and can proceed to testing phase
2024-06-25 13:42:33 -04:00
Kathy Ruffing
d3bc1c4725
C2024-013: On print dialog, disable Merge button if creating hyperlinks
2024-06-25 12:14:26 -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
