Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Development #698

Merged
djankowski merged 14 commits from Development into master 2026-01-29 08:46:52 -05:00
Conversation 0 Commits 14 Files Changed 10 +111 -45
djankowski commented 2026-01-29 08:45:56 -05:00
Owner
Copy Link

Merging dev into master after successful testing.

Merging dev into master after successful testing.
djankowski added 14 commits 2026-01-29 08:45:56 -05:00
B2026-006 – Summary of Changes report generation enhancements d186e2702c
Merge pull request 'B2026-006 – Summary of Changes report generation enhancements' (#691) from B2026-006 into Development 3c693baab0 
good for testing
B2026-006 Try to force designer update 43a27c16a6 
It looks like when pulled into development -- changes to DisplayHistory.designer were not pulling down locally / compiling in when not on the computer they were originally made on. Made an update that hopefully should force this file to recompile.
Merge pull request 'B2026-006 Try to force designer update' (#692) from B2026-006 into Development a4ea200e38 
good for testing
B2026-003 Imported memory handling in the FlexGrid (table) code for when we are replacing many RO values in table cells 258b1d2d1f
Merge pull request 'B2026-003 Imported memory handling in the FlexGrid (table) code for when we are replacing many RO values in table cells' (#693) from B2026-003_crash_fixing_ROs_in_table into Development 7e2a41b6cb 
Looks Good. Ready for QA.
B2026-007 PROMS Security - don't error when add a user to a group but no group selected/C2026-004 – Add a messagebox when create group aa0e919713
Merge pull request 'B2026-007 PROMS Security - don't error when add a user to a group but no group selected/C2026-004 – Add a messagebox when create group' (#694) from B2026-007_C2026-004 into Development b2428a4211 
good for testing
C2026-006 Change Title bar on Add/Edit User c76808e11e
Merge pull request 'C2026-006 Change Title bar on Add/Edit User' (#695) from C2026-006 into Development d6e4239573 
good for testing phase
F2026-003 Adjustments to the Vogtle Units 3&4 background step format that were needed for Jeff’s procedure importer tool 53cf35014c
Merge pull request 'F2026-003 Adjustments to the Vogtle Units 3&4 background step format that were needed for Jeff’s procedure importer tool' (#696) from F2026-003_VogtleBckGndChanges into Development 69e45e9ae8 
format only change.
B2026-009 For Vogtle Units 3&4, fixed bug where a double asterisk was place next to a continuous action RNO on the edit screen and printed with the CAS box shifted to the left. 63a74e1aef
Merge pull request 'B2026-009 For Vogtle Units 3&4, fixed bug where a double asterisk was place next to a continuous action RNO on the edit screen and printed with the CAS box shifted to the left.' (#697) from B2026-009_VogtleCAS into Development f43d1e5f47 
Looks Good. Ready for QA!
djankowski merged commit 892b84690e into master 2026-01-29 08:46:52 -05:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
djankowski jjenko lbutler mschill mvickers plarsen
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Volian/SourceCode#698
Delete Branch "Development"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?