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
0f4eec1df6
Merge pull request 'B2024-092 Add Initial Line/Ability to Disable to UI for South Texas' ( #463 ) from B2024-092 into Development
...
good for testing phase
2024-11-11 08:28:36 -05:00
4bc73f847c
B2024-092 Add Initial Line/Ability to Disable to UI for South Texas
2024-11-11 07:15:02 -05:00
e1271c16d9
Merge pull request 'B2024-090 If multiple tabs are left open, and Find is clicked before clicking on a tab, PROMS would crash.' ( #462 ) from B2024-090 into Development
...
good for testing phase
2024-11-08 15:43:30 -05:00
c7d2140e16
B2024-090 If multiple tabs are left open, and Find is clicked before clicking on a tab, PROMS would crash.
2024-11-08 15:37:49 -05:00
ac6ee6ff83
Merge pull request 'C2024-022 Add option to select by unit when generating a Time Critical Action Summary from the ribbon in a Parent document.' ( #461 ) from C2024-022 into Development
...
good for testing phase
2024-11-07 15:24:47 -05:00
1507cf31ce
C2024-022 Add option to select by unit when generating a Time Critical Action Summary from the ribbon in a Parent document.
2024-11-07 15:06:38 -05:00
aad04647ac
Merge pull request 'C2024-021 Update the tool tip on the Time Critical Action Summary option (Step Properties panel) to reflect the Time Critical Action Summary text rather than the Continuous Action Summary text.' ( #460 ) from C2024-021 into Development
...
good for testing phase
2024-11-07 10:54:58 -05:00
934d3977d8
C2024-021 Update the tool tip on the Time Critical Action Summary option (Step Properties panel) to reflect the Time Critical Action Summary text rather than the Continuous Action Summary text.
2024-11-07 10:08:26 -05:00
03b0e52bef
Merge pull request 'B2024-064 Improve user experience by providing more descriptive wording when cannot change the Applicability of a Step/Section.' ( #459 ) from B2024-064 into Development
...
good for testing phase
2024-11-07 09:20:47 -05:00
1da2b8e87c
B2024-064 Improve user experience by providing more descriptive wording when cannot change the Applicability of a Step/Section.
2024-11-07 09:13:40 -05:00
e3d16142ac
Merge pull request 'C2024-025 Remove the tall box characters from the search results.' ( #458 ) from C2024-025 into Development
...
Good for testing phase
2024-11-07 08:42:21 -05:00
b972e40a28
C2024-025 Remove the tall box characters from the search results.
2024-11-07 08:26:26 -05:00
c508255ab3
Merge pull request 'C2024-026 Add feature to the transitions panel to allow user to hold currently selected procedure/set in the panel.' ( #457 ) from C2024-026 into Development
...
good for testing phase
2024-11-05 13:21:31 -05:00
e9ec884eb9
C2024-026 Add feature to the transitions panel to allow user to hold currently selected procedure/set in the panel.
2024-11-05 10:59:01 -05:00
592d28e898
Merge pull request 'B2024-080 Add Image Thumbnails to Find Submenu items to be consistent with elsewhere in the application' ( #456 ) from B2024-080 into Development
...
Good for testing phase
2024-11-05 10:53:06 -05:00
b826fa6a20
B2024-080 Add Image Thumbnails to Find Submenu items to be consistent with elsewhere in the application
2024-11-05 10:48:52 -05:00
74c2a303da
Merge pull request 'B2024-089 Loic to clean up transitioning to a section that does not have a section number. Also added and updated comments.' ( #455 ) from B2024-089 into Development
...
Looks good to me.
Merging to Development - Ready for QA.
2024-11-04 16:46:34 -05:00
dcf50073e7
B2024-089 Loic to clean up transitioning to a section that does not have a section number. Also added and updated comments.
2024-11-04 14:39:41 -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
375871012c
Merge pull request 'F2024-084 - Adjusted tab spacing in Beaver Valley’s AOP format and added a space after the bullet in the Bulleted High-level step in the Beaver Valley SAMG format. For the AOP format needed to remove the general tab format setting TabPtsPerChar (tha…' ( #453 ) from F2024-084 into Development
...
Format only change
2024-11-01 10:15:00 -04:00
b7b67cce69
F2024-084 - Adjusted tab spacing in Beaver Valley’s AOP format and added a space after the bullet in the Bulleted High-level step in the Beaver Valley SAMG format. For the AOP format needed to remove the general tab format setting TabPtsPerChar (that affects all of the sub-step tab spacing) in order to have all of the AOP sub-step tab spacing the same as the EOP format.
2024-11-01 10:12:52 -04:00
6c22bff1fd
Merge pull request 'C2024-034 RO Editor – Enhancement for when “Standard Fields” are modified.' ( #452 ) from C2024-034 into Development
...
good for testing phase
2024-10-31 15:49:33 -04:00
0b12805d4a
C2024-034 RO Editor – Enhancement for when “Standard Fields” are modified.
2024-10-31 15:44:28 -04:00
4bac1a4628
Merge pull request 'C2024-035 RO Editor – Enhancement to Handle renaming of Setpoint Value.' ( #451 ) from C2024-035 into Development
...
good for testing phase
2024-10-31 15:17:38 -04:00
2cf164c445
C2024-035 RO Editor – Enhancement to Handle renaming of Setpoint Value.
2024-10-31 15:11:04 -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
11904e177b
Merge pull request 'B2024-077 When searching Referenced Objects Reports, pick the RO and select a procedure set and the selection panel refreshes and you lose your selection. If the set has to be selected first then it should be at the top of the report panel.' ( #449 ) from B2024-077 into Development
...
good for testing phase
2024-10-29 16:13:51 -04:00
527e6b5053
B2024-077 When searching Referenced Objects Reports, pick the RO and select a procedure set and the selection panel refreshes and you lose your selection. If the set has to be selected first then it should be at the top of the report panel.
...
Also fixed a small ancillary typo that I found while finding this.
2024-10-29 15:46:12 -04:00
053ebca267
Merge pull request 'C2024-033 RO Editor – Clarify wording presented to user when utilizing new Move RO feature in RO Editor.' ( #447 ) from C2024-033 into Development
...
ready for testing phase
2024-10-29 09:54:06 -04:00
5e7fae9d47
Merge pull request 'F2024-082 - Added Dump, Modulate, Observe, Return, Proceed, Direct to the replace words list in all of the Farley formats' ( #448 ) from F2024-082 into Development
...
format only change
2024-10-29 09:41:02 -04:00
0e4ce99612
F2024-082 - Added Dump, Modulate, Observe, Return, Proceed, Direct to the replace words list in all of the Farley formats
2024-10-29 09:40:00 -04:00
3c75637752
C2024-033 RO Editor – Clarify wording presented to user when utilizing new Move RO feature in RO Editor.
2024-10-29 07:54:50 -04:00
fb890ded1f
Merge pull request 'C2024-031 Option to Disable reopen closed tabs on PROMS reentry' ( #445 ) from C2024-031 into Development
...
good for testing phase
2024-10-28 14:40:05 -04:00
4399f31a83
Merge pull request 'F2024-079 - Set the flag to not uppercase the procedure and section titles in transitions in the background formats to make it consistent with the other Beaver Valley formats.' ( #446 ) from F2024-079 into Development
...
format only change
2024-10-28 14:24:51 -04:00
ca4b21e593
F2024-079 - Set the flag to not uppercase the procedure and section titles in transitions in the background formats to make it consistent with the other Beaver Valley formats.
2024-10-28 13:59:14 -04:00
23a4edb610
C2024-031 Option to Disable reopen closed tabs on PROMS reentry
2024-10-28 13:28:35 -04:00
accc1c622c
Merge pull request 'F2024-077 - Made the spacing between bullet tabs the step text consistent for bulleted sub-steps types and for multiple Cautions, Notes types' ( #444 ) from F2024-077_BVtabs into Development
...
format only changes
2024-10-25 15:05:17 -04:00
e50ea6a5db
F2024-077 - Made the spacing between bullet tabs the step text consistent for bulleted sub-steps types and for multiple Cautions, Notes types
2024-10-25 15:03:41 -04:00
04ce6f55db
Merge pull request 'CSM B2024-087 Fix RO Editor Inconsistencies' ( #443 ) from B2024-087 into Development
...
ready for testing phase
2024-10-25 14:39:24 -04:00
f0493e60d8
CSM B2024-087 Fix RO Editor Inconsistencies
...
Refresh issue in RO Definitions. Modify an In Use field item that is not one of the Standard items, choose Continue, choose OK in the Text Definition Field. when prompted if want to Update Local or Generic definitions:
1. Prompt should contain table name (previously was not for Setpoint items)
2. If Select "Yes", Should refresh to new field name when return to previous screen / click ok to go back to RO Definition.
2024-10-25 14:33:20 -04:00
13edc9c9ff
Merge pull request 'F2024-080 Add Initial Line/Ability to Disable to UI for South Texas' ( #442 ) from F2024-080 into Development
...
good for testing phase.
2024-10-25 10:12:10 -04:00
fd0ea4404b
F2024-080 Add Initial Line/Ability to Disable to UI for South Texas
2024-10-25 09:19:20 -04:00
df9d0f908a
Merge pull request 'C2024-030 RO Editor Enhancement to include table name / explain the scope of changing a field definition Local vs Generic' ( #441 ) from C2024-030 into Development
...
good for testing phase
2024-10-24 09:08:42 -04:00
779394ffd6
C2024-030 RO Editor Enhancement to include table name / explain the scope of changing a field definition Local vs Generic
...
When updating a field in a RO Definition, there is a prompt asking if changes should be Local or Generic --- Should change wording to explain that Local is local to that table (and include Table name in that wording)
2024-10-24 07:43:00 -04:00
a230ecef9b
Merge pull request 'Just added space to a comment to force a new check-in of these Farely fomrat files' ( #440 ) from General_Debugging into Development
...
no testing needed. This is to try to resolve a Git and build issue with Farley format files on developer machines.
2024-10-23 16:42:06 -04:00
061bcfdc0f
Just added space to a comment to force a new check-in of these Farely fomrat files
2024-10-23 16:37:04 -04:00
aced10498b
Merge pull request 'B2024-084 Fix Refresh Issue in RO Definitions.' ( #439 ) from B2024-084 into Development
...
good for testing phase
2024-10-23 16:09:42 -04:00
cd963d01e4
B2024-084 Fix Refresh Issue in RO Definitions.
...
Modify an In Use field item, choose Continue, choose OK in the Text Definition Field. Hit Cancel in the next two windows, then open the RO Definition back up and the change is still there in the "In Use" column but not the Menu Value. Close the RO Editor and re-open and the change was now gone as it's supposed to be.
2024-10-23 15:54:20 -04:00
458dd5fff4
Merge pull request 'B2024-085 Fix Object Reference Error when Getting Schema for a RO database in SQL' ( #438 ) from B2024-085 into Development
...
good for testing phase
2024-10-23 14:56:21 -04:00
0c342fa188
B2024-085 Fix Object Reference Error when Getting Schema for a RO database in SQL
...
After converting the Robinson ROs to SQL, upon changing an In Use field and clicking Continue, an "Error on Schema" message box displayed with an unhandled error exception.
2024-10-23 14:07:20 -04:00
43b13443ab
Merge pull request 'C2024-027 RO Editor – Add additional feature to allow Cut/Paste (Moving) a RO within the same table.' ( #437 ) from CSM-C2024-027 into Development
...
Good for testing phase
2024-10-23 13:38:10 -04:00
c867d4e4b1
C2024-027 RO Editor – Add additional feature to allow Cut/Paste (Moving) a RO within the same table.
2024-10-23 13:20:20 -04:00
0f541142cc
Merge pull request 'F2024-081- Removed the extra blank line after the Alternate High Level Step type. This was mistakenly changed during format cleanup. It is now restored to what it should be.' ( #436 ) from F2024-081_Catawba into Development
...
Format only changes.
2024-10-23 12:01:19 -04:00
b0c55d09b0
F2024-081- Removed the extra blank line after the Alternate High Level Step type. This was mistakenly changed during format cleanup. It is now restored to what it should be.
2024-10-23 11:59:55 -04:00
ee71431210
Merge pull request 'F2024-076 - Added a line before the continue message in the background formats. Centered the bottom continue message for the step editor sections – all formats' ( #435 ) from F2024-076_BV_ContinueMsg into Development
...
format only changes
2024-10-23 11:08:00 -04:00
a8196db676
F2024-076 - Added a line before the continue message in the background formats. Centered the bottom continue message for the step editor sections – all formats
2024-10-23 11:06:31 -04:00
8dc78d49eb
Merge pull request 'Delete .gitattributes' ( #434 ) from remove_gitattributes into Development
...
changes are good. This should allow us to compare format files again.
2024-10-17 09:27:10 -04:00
3999d1c49b
Merge pull request 'C2020-049-Add-the-ability-for-PROMS-to-remember-open-procedure-tabs-fixed-print' ( #433 ) from C2020-049-Add-the-ability-for-PROMS-to-remember-open-procedure-tabs-fixed-print into Development
...
good for testing phase
2024-10-17 09:25:22 -04:00
aceb928dba
Delete .gitattributes
...
remove gitattributes file
2024-10-17 09:17:01 -04:00
f17db695d3
C2020-049-Add-the-ability-for-PROMS-to-remember-open-procedure-tabs-fixed-print
2024-10-16 16:23:31 -04:00
214dd8ec08
Merge pull request 'GIT_ATTRIBUTE_FILE - adjusting GIT settings so should be able to see diff of xml files in GIT (and not just Visual Studio history)' ( #432 ) from GIT_ATTRIBUTE_FILE2 into Development
...
change approved - no testing needed for this.
2024-10-15 09:23:27 -04:00
2f974d7b52
Merge pull request 'C2024-029 RO Editor - Referenced Object Definition Form - Add check if items changed before prompting to possibly save' ( #431 ) from C2024-029 into Development
...
good for testing phase
2024-10-15 09:22:16 -04:00
9f1dce896f
GIT_ATTRIBUTE_FILE - adjusting GIT settings so should be able to see diff of xml files in GIT (and not just Visual Studio history)
2024-10-15 08:58:15 -04:00
a8294bb01a
C2024-029 RO Editor - Referenced Object Definition Form - Add check if items changed before prompting to possibly save
2024-10-15 08:40:12 -04:00
28e4bdda29
Merge pull request 'B2024-079 Consistency of adding_editing_removing fields in RO Editor - Referenced Object Definition Form' ( #430 ) from B2024-079 into Development
...
change are good. Ready for testing phase.
2024-10-14 16:36:39 -04:00
7d408df904
B2024-079 Consistency of adding_editing_removing fields in RO Editor - Referenced Object Definition Form
2024-10-14 16:17:19 -04:00
caec6adf8d
Merge pull request 'F2024-075 (Farley) Action verbs should be bolded no matter if title case or lower case - all formats' ( #429 ) from F2024-075_FarlyRplWrds into Development
...
Format only change. OK to test.
2024-10-14 14:08:11 -04:00
a38c0dbe33
F2024-075 (Farley) Action verbs should be bolded no matter if title case or lower case - all formats
2024-10-14 14:06:17 -04:00
d779d4ad50
Merge pull request 'GIT_ATTRIBUTE_FILE - adjusting GIT settings so should be able to see diff of xml files in GIT (and not just Visual Studio' ( #428 ) from GIT_ATRIBUTE_FILE into Development
...
No testing needed. This is just a Git configuration setting for the developers.
2024-10-10 16:30:22 -04:00
9b71ce0fee
GIT_ATTRIBUTE_FILE - adjusting GIT settings so should be able to see diff of xml files in GIT (and not just Visual Studio
2024-10-10 15:51:11 -04:00
8b18005b8e
Merge pull request 'B2024-078 Bad Transition preventing editing of a substep. Can enter changed text, but then when move to another textbox, original text returns.' ( #427 ) from B2024-078 into Development
...
changes good for testing phase.
2024-10-10 08:57:54 -04:00
a550ef1b50
B2024-078 Bad Transition preventing editing of a substep. Can enter changed text, but then when move to another textbox, original text returns.
2024-10-10 08:38:35 -04:00
63a60b32cc
Merge pull request 'F2024-074 For Farley, Include the Cover Page in the total page count of the procedures' ( #426 ) from F2024_074_FNP_CountCoverWithProcs into Development
...
format only change
2024-10-09 16:47:48 -04:00
ca4dc8d330
F2024-074 For Farley, Include the Cover Page in the total page count of the procedures
2024-10-09 16:45:38 -04:00
0a52aa5c53
Merge pull request 'C2024-024 Simple Selection of Fields to add to Return Values and Menu Values' ( #423 ) from C2024-024 into Development
...
file changes look good - ready for testing phase.
2024-10-09 14:02:53 -04:00
591fc03ca2
C2024-024 Simple Selection of Fields to add to Return Values and Menu Values
2024-10-09 13:12:29 -04:00
ebd7b1249f
Merge pull request 'C2024-023 Autocomplete on Group Definition Accessory Page Access Values.' ( #422 ) from C2024-023 into Development
...
Ok for testing phase
2024-10-08 15:17:31 -04:00
1b6eeaf4ad
C2024-023 Autocomplete on Group Definition Accessory Page Access Values.
2024-10-08 15:02:47 -04:00
1d3dac0e51
Merge pull request 'C2020-049-Add-the-ability-for-PROMS-to-remember-the-procedure-tabs-that-were-open-when-you-closed-PROMS-5' ( #421 ) from C2020-049-Add-the-ability-for-PROMS-to-remember-the-procedure-tabs-that-were-open-when-you-closed-PROMS-4 into Development
...
good for testing phase
2024-10-08 09:29:13 -04:00
48da58b681
C2020-049-Add-the-ability-for-PROMS-to-remember-the-procedure-tabs-that-were-open-when-you-closed-PROMS-5
2024-10-08 08:54:32 -04:00
68639eadf0
Merge pull request 'C2020-049-Add-the-ability-for-PROMS-to-remember-the-procedure-tabs-that-were-open-when-you-closed-PROMS-4' ( #420 ) from C2020-049-Add-the-ability-for-PROMS-to-remember-the-procedure-tabs-that-were-open-when-you-closed-PROMS-4 into Development
...
Looked Good. Ready for QA Testing.
2024-10-07 11:51:36 -04:00
dc77984c10
C2020-049-Add-the-ability-for-PROMS-to-remember-the-procedure-tabs-that-were-open-when-you-closed-PROMS-4
2024-10-07 11:40:26 -04:00
5b4e1cd694
C2020-049-Add-the-ability-for-PROMS-to-remember-the-procedure-tabs-that-were-open-when-you-closed-PROMS-4
2024-10-04 14:55:04 -04:00
3fbd974fa9
C2020-049-Add-the-ability-for-PROMS-to-remember-the-procedure-tabs-that-were-open-when-you-closed-PROMS-4
2024-10-04 14:38:59 -04:00
b457496297
Merge pull request 'B2024-076 Correct Linking / Numbering when utilizing Paste Replace with Enhanced Steps over unlinked steps' ( #419 ) from B2024-076 into Development
...
ready for testing phase
2024-10-04 13:20:09 -04:00
dd83491169
B2024-076 Correct Linking / Numbering when utilizing Paste Replace with Enhanced Steps over unlinked steps
2024-10-04 12:46:23 -04:00
a73a8fb993
Merge pull request 'C2020-049-Add-the-ability-for-PROMS-to-remember-the-procedure-tabs-that-were-open-when-you-closed-PROMS-2' ( #418 ) from C2020-049-Add-the-ability-for-PROMS-to-remember-the-procedure-tabs-that-were-open-when-you-closed-PROMS-2 into Development
...
Code looked good. Ready for QA Testing.
2024-10-04 09:42:55 -04:00
fb7a99653d
C2020-049-Add-the-ability-for-PROMS-to-remember-the-procedure-tabs-that-were-open-when-you-closed-PROMS-2
2024-10-03 15:11:15 -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
297d75a2b3
Merge pull request 'B2024-075 Correct Linking and Numbering when utilizing Paste Before and Paste After with Enhanced Steps as well as some related UI refresh issues.' ( #415 ) from B2024-075 into Development
...
Good for testing phase
2024-10-02 11:48:58 -04:00
47c5bb159a
B2024-075 Correct Linking and Numbering when utilizing Paste Before and Paste After with Enhanced Steps as well as some related UI refresh issues.
2024-10-02 11:31:04 -04:00
610b2d178c
Merge pull request 'C2017-031 Extend Copy / Paste Replace Functionality for Enhanced Background Steps' ( #414 ) from C2017-031 into Development
...
Code changes look good. OK for testing phase.
2024-09-30 15:14:10 -04:00
bb45e551a3
C2017-031 Extend Copy / Paste Replace Functionality for Enhanced Background Steps
2024-09-30 15:02:35 -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
77cf6177dc
Merge pull request 'F2023-136 Adjust formats to not count the cover page when calculating the page numbers for the Automatic Table of Contents.' ( #412 ) from F2023-136_Farley into Development
...
Format only changes - ready for testing
2024-09-27 10:41:26 -04:00
a830856df2
F2023-136 Adjust formats to not count the cover page when calculating the page numbers for the Automatic Table of Contents.
2024-09-27 10:34:16 -04:00
efe215f4d0
Merge pull request 'B2024-074 When Deleting annotations via the Administrative Tools -> Delete -> Delete Annotations, and checking if a procedure is checked out prior to deletion:' ( #411 ) from B2024-074 into Development
...
code changes look good. ready for testing phase
2024-09-24 11:04:40 -04:00
5e2e2f841c
B2024-074 When Deleting annotations via the Administrative Tools -> Delete -> Delete Annotations, and checking if a procedure is checked out prior to deletion:
...
1. If no Number for Procedure, Display Title.
2. If only deleting annotations from an individual procedure, verify can check out procedure.
2024-09-24 10:47:44 -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
9da436ab2d
Merge pull request 'B2024-070_072_Correct_Typos__Setpoint_ID__and__Category_of_Transitions' ( #408 ) from B2024-070_072 into Development
...
Reviewed-on: #408
2024-09-16 15:05:15 -04:00
5333b96c88
Merge pull request 'B2024-073 Correct Object Reference Error that can occur in debug mode when utilizing Edit item from the Debug toolbar at the bottom of the application. Note - this bug is only in Debug Mode / Is not customer facing.' ( #409 ) from B2024-073_DebugMode_EditItem_ActiveParent_ObjectReferenceError into Development
...
Reviewed-on: #409
2024-09-16 15:00:50 -04:00
6561a11661
B2024-073 Correct Object Reference Error that can occur in debug mode when utilizing Edit item from the Debug toolbar at the bottom of the application. Note - this bug is only in Debug Mode / Is not customer facing.
2024-09-16 13:10:52 -04:00
1c9334a52b
B2024-070_072_Correct_Typos__Setpoint_ID__and__Category_of_Transitions
2024-09-16 11:53:20 -04:00
2e00693a33
Merge pull request 'B2024-068_069_check_if_current_annotation_is_not_selected_before_removal_of_annotation' ( #407 ) from B2024-068_and_069 into Development
...
Ready for testing phase
2024-09-11 15:40:25 -04:00
8617ce4562
B2024-068_069_check_if_current_annotation_is_not_selected_before_removal_of_annotation
2024-09-11 15:34:22 -04:00
78416ef452
Merge pull request 'F2024-071, F2024-072, F2024-073 for Farley added Action Verbs bolding, sub-section attachment types, paginate attachmens with procedure' ( #406 ) from FarleyFormatChanges into Development
...
format only change
2024-09-11 14:36:36 -04:00
9ad50af4dd
F2024-071, F2024-072, F2024-073 for Farley added Action Verbs bolding, sub-section attachment types, paginate attachmens with procedure
2024-09-11 14:34:17 -04:00
a6f3d62a01
Merge pull request 'C2021-038-No-and_Cancel-button-2' ( #405 ) from C2021-038-No-and_Cancel-button-2 into Development
...
ready for testing phase.
2024-09-11 10:47:39 -04:00
a25b5fc6b8
C2021-038-No-and_Cancel-button-2
2024-09-10 17:54:54 -04:00
9e26e94e97
Merge pull request 'C2021-040-Change-dialog-box-when-canceling-import-procedure' ( #403 ) from C2021-040-Change-dialog-box-when-canceling-import-procedure into Development
...
ready for testing phase
2024-09-09 15:12:08 -04:00
a571cb5f15
C2021-040-Change-dialog-box-when-canceling-import-procedure
2024-09-09 14:58:03 -04:00
2e00c94d34
C2021-040-Change-dialog-box-when-canceling-import-procedure
2024-09-09 13:47:44 -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
f1506b9aee
Merge pull request 'C2021-034-Change-applicability-dialog-box-response-from-Yes_No_Cancel-to-Yes_No' ( #401 ) from C2021-034-Change-applicability-dialog-box-response-from-Yes_No_Cancel-to-Yes_No into Development
...
ready for testing phase
2024-09-06 08:37:45 -04:00
2805471301
C2021-034-Change-applicability-dialog-box-response-from-Yes_No_Cancel-to-Yes_No
2024-09-05 16:50:06 -04:00
89f55e091f
Merge pull request 'B2024-065-Print-dialog-initalize-to-Working-Default-Level-Setting' ( #400 ) from B2024-065-Print-dialog-initalize-to-Working-Default-Level-Setting into Development
...
ready for testing phase
2024-09-04 14:16:52 -04:00
da6c47d0ff
B2024-065-Print-dialog-initalize-to-Working-Default-Level-Setting
2024-09-04 11:59:48 -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
63cac73de3
Merge pull request 'B2024-063-Invalid-Format-message-box-displays-when-rev-date-empty-2' ( #398 ) from B2024-063-Invalid-Format-message-box-displays-when-rev-date-empty-2 into Development
...
OK for testing phase
2024-08-27 11:08:30 -04:00
c8ed5b0565
B2024-063-Invalid-Format-message-box-displays-when-rev-date-empty-2
2024-08-27 11:04:23 -04:00
c6342fea49
Merge pull request 'B2024-060-Adding-a-picture-PROMS-crashes' ( #396 ) from B2024-060-Adding-a-picture-PROMS-crashes into Development
...
Ok for testing phase
2024-08-27 10:33:56 -04:00
7a3748f7e0
B2024-060-Adding-a-picture-PROMS-crashes
2024-08-26 11:11:03 -04:00
516b479c0c
B2024-060-Adding-a-picture-PROMS-crashes
2024-08-26 10:00:31 -04:00
a43e059733
Merge pull request 'F2024-070 - Add “DEVIATION:” to the enhanced background template after “KNOWLOEDGE/ABILITY”' ( #395 ) from F2024-070_Catawba into Development
...
Format only change. ready for testing phase.
2024-08-22 11:26:17 -04:00
0ac79f4e46
F2024-070 - Add “DEVIATION:” to the enhanced background template after “KNOWLOEDGE/ABILITY”
2024-08-22 11:24:17 -04:00
c06744b3bb
B2024-060-Adding-a-picture-PROMS-crashes
2024-08-22 08:19:20 -04:00
218a2c17a2
Merge pull request 'B2024-061- Added a null reference check in the save annotation code. Need for when Admin deletes the annotation while a user modified the text of it' ( #394 ) from B2024-061 into Development
...
null reference check added to the code, tested locally before uploading
2024-08-21 11:45:10 -04:00
a629f6834b
B2024-061- Added a null reference check in the save annotation code. Need for when Admin deletes the annotation while a user modified the text of it
2024-08-21 11:37:37 -04:00
bf5337cf63
B2024-062 printing a procedure that is empty displays the Empty Procedure message. WhenOK button is clicked, PROMS will exit the Print function.. ( #393 )
...
B2024-062
When you attempt to print a procedure that is empty (i.e. none of the sections are applicable to the selected Child to print), the Empty Procedure message appears. When you click the OK button PROMS will now simply exit the Print function instead of displaying the “Try Again” message box.
Reviewed-on: #393
Reviewed-by: Paul Larsen <plarsen@volian.com >
Co-authored-by: John Jenko <jjenko@volian.com >
Co-committed-by: John Jenko <jjenko@volian.com >
2024-08-20 12:25:42 -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
7713f0cd63
Merge pull request 'B2024-059: Paste source section has bad links.' ( #391 ) from B2024-059 into Development
...
Reviewed-on: #391
Reviewed-by: Paul Larsen <plarsen@volian.com >
2024-08-15 10:10:13 -04:00
Kathy Ruffing
2711520666
B2024-059: Paste source section has bad links.
2024-08-15 06:51:02 -04:00
Kathy Ruffing
4a6c0ba447
Merge pull request 'B2024-058-RevisionDate-field-Print-dialog' ( #390 ) from B2024-058-RevisionDate-field-Print-dialog into Development
...
Reviewed-on: #390
Reviewed-by: Kathy Ruffing <kruffing@volian.com >
2024-08-14 12:04:36 -04:00
3f3281e2f4
B2024-058-RevisionDate-field-Print-dialog
2024-08-14 09:37:26 -04:00
0eadd3fe33
B2024-058-RevisionDate-field-Print-dialog
2024-08-13 14:01:38 -04:00
4bf42be80a
B2024-058-RevisionDate-field-Print-dialog
2024-08-13 10:05:05 -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
d7f829737a
B2024-058-RevisionDate-field-Print-dialog
2024-08-08 15:21:11 -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
4248d40917
B2024-058-RevisionDate-field-Print-dialog
2024-08-08 09:27: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
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
