5f8011d4e0
Merge pull request '~Fixed DocStyle indexes since we added new pagestyle references' ( #33 ) from F2023-083 into Development
...
Merged into Development (no code review needed)
2023-07-19 16:20:01 -04:00
5fff20b107
~Fixed DocStyle indexes since we added new pagestyle references
2023-07-19 16:18:25 -04:00
4413fbc934
Merge pull request 'Development' ( #32 ) from Development into master
...
Merging changes from F2023-083 relating to UI from Development into Master.
2023-07-19 15:42:43 -04:00
7535c36cad
Merge pull request '~Changed display name of PSI window from "VS Summer" to "Vogtle"' ( #31 ) from F2023-083 into Development
...
Merged into Development (no code review needed)
2023-07-19 15:39:24 -04:00
74d4c80a4f
~Changed display name of PSI window from "VS Summer" to "Vogtle"
2023-07-19 15:38:18 -04:00
6768468a60
Merge pull request '~Adjustments made to the format files for UI puroses' ( #30 ) from F2023-083 into Development
...
Merged into Development (no code review needed)
2023-07-19 15:34:52 -04:00
9243b011fd
~Adjustments made to the format files for UI puroses
2023-07-19 15:33:12 -04:00
2f7fbaea54
Merge pull request 'Development' ( #29 ) from Development into master
...
Merging F2023-098 and F2023-083 from Development into master.
2023-07-19 14:39:23 -04:00
7f401d74ba
Merge pull request 'F2023-083: Copied 2 column format PSI changes into alarm format' ( #28 ) from F2023-083 into Development
...
Merging into Development (no code review needed)
2023-07-19 14:36:09 -04:00
d9092f4f18
Fixed merge conflict
2023-07-19 14:34:15 -04:00
71a4350259
Fixing merge conflict
2023-07-19 14:27:46 -04:00
a7aed0ddf3
~Copied 2 column format PSI data into alarm format
2023-07-19 14:03:11 -04:00
16876375df
Merge pull request 'F2023-083' ( #24 ) from F2023-083 into Development
...
Merging into Development (no code review needed)
2023-07-19 13:01:32 -04:00
deeb7ff3fa
Merge pull request 'F2023-098: Vogtle 3/4 Alarm - add proc applicability. Code change also' ( #23 ) from F2023-098 into Development
...
Merging changes into Development after successful code review
2023-07-19 12:51:05 -04:00
a8d13bb998
~Added PSI information to coverpage and modified PSI dialog box with corresponding fields
...
~Added second Cover Page pagestyle to support differences in PSI for Unit 3 and Unit 4
2023-07-19 12:43:59 -04:00
411445901e
F2023-098: Vogtle 3/4 Alarm - add proc applicability. Code change also
2023-07-19 10:24:27 -04:00
ceda31c80e
~Added table to printed cover page
2023-07-18 12:05:18 -04:00
c558e9908c
Merge pull request 'Development' ( #22 ) from Development into master
...
Merging F2023-089 and F2023-090 into Master
2023-07-14 10:51:19 -04:00
db7775fbae
Merge pull request 'F2023-089, F2023-090 - Vogtle 3&4 Alarms' ( #21 ) from VogtleAlarms into Development
...
Merging F2023-089 and F2023-090 into development. No testing is required since formats are currently under development.
2023-07-14 10:42:37 -04:00
8e0b0ce2a7
F2023-089, F2023-090 - Vogtle 3&4 Alarms
...
~ Left justify OR and AND separators
~ Center Single Line Note and Caution
2023-07-14 10:32:15 -04:00
74594adcdb
Merge pull request 'Development' ( #20 ) from Development into master
...
Merging F2023-078 from Development into Master
2023-07-13 11:28:03 -04:00
9d6df6c80b
Merge pull request 'F2023-078 - Alarm Point table in Editor' ( #19 ) from VogtleAlarms into Development
...
Ready for merge into Development
2023-07-13 11:08:23 -04:00
9c6fb2e12d
Merge pull request 'Development' ( #18 ) from Development into master
...
Merging development into Master for F2023-076
2023-07-12 16:05:03 -04:00
93c8844fd2
F2023-078 - Alarm Point table in Editor
...
F2023-079 - Adjust Change Bar position on Alarm Point page
F2023-080 - fix page header of second page of Alarm Point page
F2023-082 - Vogle Alarm format, Span cautions and notes across the page width. Also separate Note/Caution for Front Matter
F2023-085 - Vogtle Alarms - Add RO_LookUp calls to pagelist to automatically generate Alarm Point Table
F2023-086 - Add a Word section type called "Deleted Alarm Point" for alarm points that were removed
2023-07-12 15:55:55 -04:00
5865e0c39d
Merge pull request 'F2023-076: Transitions resolving with extra parens' ( #17 ) from F2023-076 into Development
...
John reviewed code successfully
2023-07-11 10:30:43 -04:00
1d3d1a9a3c
F2023-076: Transitions resolving with extra parens
2023-07-11 09:11:22 -04:00
dd28160d17
Merge pull request 'Development' ( #16 ) from Development into master
...
Merging F2023-077 and B2023-076 from development into master
2023-07-10 15:55:42 -04:00
312a3d5ae9
Merge pull request '~Added "Universal No" symbol to base format as required by Vogtle Unit 3 & 4' ( #15 ) from F2023-077 into Development
...
Merging F2023-077 into development.
2023-07-10 12:02:40 -04:00
efbbe19d12
~Added "Universal No" symbol to base format as required by Vogtle Unit 3 & 4
2023-07-10 10:35:21 -04:00
a4ceb1a42d
Merge pull request '~Added option for selecting all procedure sets when performing a global search' ( #14 ) from B2023-076 into Development
...
Merging B2023-076 into Development
2023-07-10 09:33:40 -04:00
c14434690d
Merge pull request 'Development' ( #13 ) from Development into master
...
Merging initial check in of Vogtle formats from Development branch to Master.
2023-07-07 16:03:08 -04:00
4879a923d7
Merge pull request 'Initial check in of formats for Vogtle Units 2 and 3' ( #12 ) from SouthernNuclearFormat into Development
...
Merging initial check in of Vogtle formats from SouthernNuclearFormat branch to development.
2023-07-07 16:01:24 -04:00
05247bc026
Initial check in of formats for Vogtle Units 2 and 3
2023-07-07 15:48:15 -04:00
97d5956c02
~Added option for selecting all procedure sets when performing a global search
2023-07-07 15:08:48 -04:00
45741b1720
Merge pull request 'Development' ( #10 ) from Development into master
...
Merging C2023-010 from Development into Master.
2023-07-06 15:21:12 -04:00
50d462e806
Merge pull request '~Added code to handle UI issues when selecting child nodes of a selected node' ( #9 ) from C2023-010 into Development
...
Reviewed-on: 7/6/2023. Great documentation of the code change. Feel this is ready for testing.
2023-07-06 10:59:22 -04:00
f215800b1e
~Added code to handle UI issues when selecting child nodes of a selected node
...
~Added code to ensure that the correct step types were added to the search list, and that the list was maintained when specific nodes were deselected
2023-07-05 15:49:57 -04:00
185263dc22
Merge pull request 'Development' ( #8 ) from Development into master
...
Merging .NET 4.6.2 from Dev to master.
2023-06-29 11:39:23 -04:00
bc7460d801
Merge pull request 'B2022-144 added logic to process individual procedures to check for bad RO Links' ( #7 ) from B2022-144_CheckROLinks into Development
...
Merging changes to test executable for generic purposes relating to the Administrative Tools.
2023-06-28 11:41:14 -04:00
376a462c2d
B2022-144 added logic to process dividual procedures to check for bad RO Links
...
Also fixed a build issue for the controls library
2023-06-28 10:08:33 -04:00
480f742838
Merge pull request 'DotNet4.6.2' ( #6 ) from DotNet4.6.2 into Development
...
Reviewed-on: Looks Great
2023-06-22 15:18:04 -04:00
be0c910432
~ Set to build using DotNet Ver 4.6.2
...
~ Upped the minor revision number of PROMS to 2.1 and RO Editor to 2.2
2023-06-22 14:37:29 -04:00
719ee03ba4
Merge pull request 'Development' ( #5 ) from Development into master
...
Reviewed-on: Looks good
2023-06-21 17:20:56 -04:00
c47a628aea
Merge pull request 'Additional Reference Updates' ( #4 ) from VSStoGIT_Bindings into Development
...
Reviewed-on: Looks good
2023-06-21 17:20:29 -04:00
a4db26f764
Additional Reference Updates
2023-06-21 17:18:15 -04:00
55785bdf9e
Merge pull request 'Development' ( #3 ) from Development into master
...
Reviewed-on: looks good
2023-06-21 16:39:32 -04:00
3866095240
Merge pull request 'VSStoGIT_Bindings' ( #2 ) from VSStoGIT_Bindings into Development
...
Reviewed-on: looks good.
2023-06-21 16:33:33 -04:00
59641b3ebb
Removed VSS Bindings from all projects
2023-06-21 16:22:17 -04:00
01e15bf58b
Removed VSS Bindings from all projects
2023-06-21 16:16:01 -04:00
9a397e5f50
Updated git ignore file to include SQL backup files
2023-06-21 11:21:08 -04:00
