Commit Graph

  • 1c9334a52b B2024-070_072_Correct_Typos__Setpoint_ID__and__Category_of_Transitions mschill 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 John Jenko 2024-09-11 15:40:25 -04:00
  • 8617ce4562 B2024-068_069_check_if_current_annotation_is_not_selected_before_removal_of_annotation mschill 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 John Jenko 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 John Jenko 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 John Jenko 2024-09-11 10:47:39 -04:00
  • a25b5fc6b8 C2021-038-No-and_Cancel-button-2 Paul Larsen 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 John Jenko 2024-09-09 15:12:08 -04:00
  • a571cb5f15 C2021-040-Change-dialog-box-when-canceling-import-procedure Paul Larsen 2024-09-09 14:58:03 -04:00
  • 2e00c94d34 C2021-040-Change-dialog-box-when-canceling-import-procedure Paul Larsen 2024-09-09 13:47:44 -04:00
  • 4f0548fd60 Merge pull request 'Development' (#402) from Development into master Devin Jankowski 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 John Jenko 2024-09-06 08:37:45 -04:00
  • 2805471301 C2021-034-Change-applicability-dialog-box-response-from-Yes_No_Cancel-to-Yes_No Paul Larsen 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 John Jenko 2024-09-04 14:16:52 -04:00
  • da6c47d0ff B2024-065-Print-dialog-initalize-to-Working-Default-Level-Setting Paul Larsen 2024-09-04 11:59:48 -04:00
  • 5c1d96cc51 Merge pull request 'Development' (#399) from Development into master Devin Jankowski 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 John Jenko 2024-08-27 11:08:30 -04:00
  • c8ed5b0565 B2024-063-Invalid-Format-message-box-displays-when-rev-date-empty-2 Paul Larsen 2024-08-27 11:04:23 -04:00
  • 6128632186 B2024-063-Invalid-Format-message-box-displays-when-rev-date-empty B2024-063-Invalid-Format-message-box-displays-when-rev-date-empty Paul Larsen 2024-08-27 10:58:04 -04:00
  • c6342fea49 Merge pull request 'B2024-060-Adding-a-picture-PROMS-crashes' (#396) from B2024-060-Adding-a-picture-PROMS-crashes into Development John Jenko 2024-08-27 10:33:56 -04:00
  • 5db6a984f3 B2024-063-Invalid-Format-message-box-displays-when-rev-date-empty Paul Larsen 2024-08-27 09:17:32 -04:00
  • 7a3748f7e0 B2024-060-Adding-a-picture-PROMS-crashes Paul Larsen 2024-08-26 11:11:03 -04:00
  • 516b479c0c B2024-060-Adding-a-picture-PROMS-crashes Paul Larsen 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 John Jenko 2024-08-22 11:26:17 -04:00
  • 0ac79f4e46 F2024-070 - Add “DEVIATION:” to the enhanced background template after “KNOWLOEDGE/ABILITY” John Jenko 2024-08-22 11:24:17 -04:00
  • c06744b3bb B2024-060-Adding-a-picture-PROMS-crashes Paul Larsen 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 John Jenko 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 John Jenko 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) John Jenko 2024-08-20 12:25:42 -04:00
  • e5d5528b19 B2024-062 printing a procedure that is empty displays the Empty Procedure message. WhenOK button is clicked, PROMS will exit the Print function.. B2024-062_EmptyProcedure John Jenko 2024-08-20 10:34:14 -04:00
  • 57049c0c52 Merge pull request 'Development' (#392) from Development into master Devin Jankowski 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 Paul Larsen 2024-08-15 10:10:13 -04:00
  • 2711520666 B2024-059: Paste source section has bad links. Kathy Ruffing 2024-08-15 06:51:02 -04:00
  • 4a6c0ba447 Merge pull request 'B2024-058-RevisionDate-field-Print-dialog' (#390) from B2024-058-RevisionDate-field-Print-dialog into Development Kathy Ruffing 2024-08-14 12:04:36 -04:00
  • 3f3281e2f4 B2024-058-RevisionDate-field-Print-dialog Paul Larsen 2024-08-14 09:37:26 -04:00
  • 0eadd3fe33 B2024-058-RevisionDate-field-Print-dialog Paul Larsen 2024-08-13 14:01:38 -04:00
  • 4bf42be80a B2024-058-RevisionDate-field-Print-dialog Paul Larsen 2024-08-13 10:05:05 -04:00
  • 31326e1c91 Merge pull request 'Development' (#389) from Development into master Devin Jankowski 2024-08-09 13:06:40 -04:00
  • d7f829737a B2024-058-RevisionDate-field-Print-dialog Paul Larsen 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 John Jenko 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 John Jenko 2024-08-08 14:12:05 -04:00
  • 7129853902 F2024-069-Procedure-Set-Specific-Information-dialog-ajustments Paul Larsen 2024-08-08 13:33:16 -04:00
  • f08466f702 Merge pull request 'B2024-038: tree view menuing for paste/replace of sections' (#386) from B2024-038 into Development Kevin Laskey 2024-08-08 10:18:27 -04:00
  • 4248d40917 B2024-058-RevisionDate-field-Print-dialog Paul Larsen 2024-08-08 09:27:27 -04:00
  • 7cf28366f4 B2024-038: tree view menuing for paste/replace of sections Kathy Ruffing 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 John Jenko 2024-08-08 08:29:10 -04:00
  • 6de13b12f9 F2024-068-VCS-Deviation-Format Paul Larsen 2024-08-07 21:59:59 -04:00
  • 99965c30f4 B2024-068-VCS-Deviation-Format B2024-068-VCS-Deviation-Format Paul Larsen 2024-08-07 16:53:56 -04:00
  • cf69aa93e6 Merge pull request 'B2024-057 - Updated sizes of tooltips in delete area of admin' (#384) from B2024-057 into Development John Jenko 2024-08-07 15:22:41 -04:00
  • 4b915b78b6 B2024-057 - Updated sizes of tooltips in delete area of admin Kevin Laskey 2024-08-07 14:37:31 -04:00
  • a891a62ffa F2024-067 - Updates to VCSummer for time sensitive stes (clock) Kevin Laskey 2024-08-07 14:15:57 -04:00
  • 7a768484a1 Merge pull request 'B2024-057' (#382) from B2024-057 into Development John Jenko 2024-08-06 11:18:30 -04:00
  • 5f7af3309d B2024-054 - Update Annotation tooltip Kevin Laskey 2024-08-06 11:17:17 -04:00
  • 1f3a1dabbc B2024-055 - Update tooltips for the labels on delete annotations and delete folders Kevin Laskey 2024-08-06 10:58:04 -04:00
  • 4b61495960 B2024-057 - updated curors Kevin Laskey 2024-08-06 10:48:05 -04:00
  • d091a37171 B2024-055 - Update tooltips on admin delete functions Kevin Laskey 2024-08-06 10:29:06 -04:00
  • 189b78d7d3 B2024-057 - Added check to see if anything is checked out for annotations and folder delete from admin area. Kevin Laskey 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 John Jenko 2024-08-05 15:29:46 -04:00
  • 055be66421 C2024-018 - Update to use results pane Kevin Laskey 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 John Jenko 2024-08-05 12:12:05 -04:00
  • 0db98e4182 C2024-018 - Updated fixes per Michelle testing. Added some confirmation messages Kevin Laskey 2024-08-05 11:12:21 -04:00
  • 3102596a3d Merge pull request 'C2021-059_deleteFolders' (#379) from C2021-059_deleteFolders into Development John Jenko 2024-08-02 14:05:24 -04:00
  • 41aa195785 C2021-059 - Added extra code to ensure delect sets parent tree items deslected Kevin Laskey 2024-08-02 13:08:19 -04:00
  • 954186265e C2021-059 - Patch in auto checkbox filling for delete tree. Kevin Laskey 2024-08-02 12:56:12 -04:00
  • 33cced07c6 C2021-059 Added veProms connection to remove the node in the main tree Kevin Laskey 2024-08-02 10:31:50 -04:00
  • afbf6f360d C2021-059 - Updates to get build moving after custom merging Kevin Laskey 2024-08-02 10:13:05 -04:00
  • df2be585a1 C2021-059 - Moved updates to branch Kevin Laskey 2024-08-01 15:54:28 -04:00
  • c81f527cb8 C2021-059 - Update Proms Fixes Kevin Laskey 2024-08-01 15:05:42 -04:00
  • c05e493579 C2021-059 Attempting to resolve conflicts try 1 C2024-005 Kevin Laskey 2024-08-01 14:52:38 -04:00
  • 2714973c16 2021-059 - Matchicng Paul's Changes Kevin Laskey 2024-08-01 14:49:14 -04:00
  • 5f86d8c629 C2021-059 - Update designer to avoid conflict Kevin Laskey 2024-08-01 14:41:34 -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 John Jenko 2024-08-01 11:07:59 -04:00
  • 977ea6f5fc C2021-059 - Update proms sql fixes with correct numbers Kevin Laskey 2024-08-01 11:01:28 -04:00
  • b42b8ddfa3 B2024-054_Update_Tool_tip_text_for_delete_annotations Paul Larsen 2024-08-01 10:42:53 -04:00
  • a8bbda1281 C2024-005 - Completed some updates for nested folder selection (parent unselect) Kevin Laskey 2024-08-01 09:23:30 -04:00
  • 3c60994a0a Merge pull request 'Development' (#373) from Development into master Devin Jankowski 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 John Jenko 2024-07-31 14:41:13 -04:00
  • 9011b134d6 B2024-053_Submitted_for_Admin_Tools-Delete Paul Larsen 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 John Jenko 2024-07-31 09:49:30 -04:00
  • e49a4d674f Merge pull request 'B2024-045, B2024-049, B2024-050 crash on paste/replace' (#370) from B2024-045 into Development Kevin Laskey 2024-07-31 09:48:50 -04:00
  • 7872f192ed B2024-052-In-Annotations-pop-up-no-Annotation-type-should-be-selected-by-default Paul Larsen 2024-07-31 09:23:34 -04:00
  • 870bba0aa6 B2024-045, B2024-049, B2024-050 crash on paste/replace Kathy Ruffing 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 Paul Larsen 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. John Jenko 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 John Jenko 2024-07-30 10:38:31 -04:00
  • 720c5db2d0 B2024-043-Fix-User-Tab2 Paul Larsen 2024-07-30 10:09:40 -04:00
  • da1b061eb1 C2024-005 - Added orphan record clearing progress bar, confirmation message Kevin Laskey 2024-07-30 08:54:13 -04:00
  • 4644699df0 C20240-005 - Deleting Folder additions Kevin Laskey 2024-07-29 15:57:54 -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 John Jenko 2024-07-29 14:12:10 -04:00
  • 5ea9bcdd8b C2024-016-Annotations-Delete-Info-to-results-panel Paul Larsen 2024-07-29 12:52:29 -04:00
  • be3a5f64db C2024-016-Write-Info-to-Results-Window-Delete-Annotations C2024-016-Write-Info-to-Results-Window-Delete-Annotations Paul Larsen 2024-07-29 12:33:15 -04:00
  • d00d69b7af C2024-016-Write-Info-to-Results-Window-Delete-Annotations Paul Larsen 2024-07-29 11:12:11 -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 John Jenko 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. John Jenko 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 John Jenko 2024-07-26 10:57:20 -04:00
  • 819c1bbec4 B2024-048-Annotations-Cleanup-tools-tips Paul Larsen 2024-07-26 09:38:25 -04:00
  • ff940005f9 C2024-016-Write-Info-to-Results-Window-Delete-Annotations Paul Larsen 2024-07-26 09:20:50 -04:00
  • 773cc42346 Merge pull request 'Development' (#362) from Development into master Devin Jankowski 2024-07-25 10:44:42 -04:00
  • 6b6968561b B2024-048-Annotations-Cleanup-tools-tips Paul Larsen 2024-07-25 08:13:20 -04:00
  • 10ecad47b2 C2024-016-Write-Info-to-Results-Window-Delete-Annotations Paul Larsen 2024-07-24 17:25:34 -04:00