djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
9b59810c89
Merge pull request 'F2024-006 Fixed pagination logic to that step text at the bottom of an Alarm Point page does not print on top of the bottom continue message' ( #210 ) from Vogtle3&4 into Development
...
Merging F2024-006 into development after successful code review.
2024-01-24 08:40:57 -05:00
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
140d7c72e0
Merge pull request 'F2023-133: adjust alarm point title size font adjustment amount (from 410 to 405)' ( #184 ) from GenWork into Development
...
Merging F2023-133 into Development.
2023-12-11 10:05:59 -05:00
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
bf3ddcc122
Merge pull request 'C2023-019 Added a message box to install the latest PROMSFixes for when PROMS opens a database that does not have the needed Stored Procedures that allow for displaying only the formats related to that plant.' ( #135 ) from C2023-019_Cant_Load_db_Old_PROMSFixes into Development
...
Merging C2023-019 into Development after successful code review.
2023-10-17 09:25:14 -04:00
djankowski
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
djankowski
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
djankowski
8ce9380afe
Merge pull request 'C2023-016 – Expanded Find/Replace to search through all of the step editor sections in the same procedure.' ( #129 ) from C2023-016_Find-Replace-all-step-sections into Development
...
Merging C2023-016 into development after successful code review
2023-10-06 10:13:07 -04:00
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
1cf3a52afa
Merge pull request 'B2023-078 When using the split screen PROMS was crashing when the user closed a procedure tab on the other split screen side which didn’t have the current editing focus. PROMS was trying to reposition to the procedure tab that had editing focus, we…' ( #110 ) from B2023-078 into Development
...
Merging B2023-078 into Development.
2023-08-30 13:26:14 -04:00
djankowski
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
djankowski
78be6e5dc1
Merge pull request 'Development' ( #106 ) from Development into master
...
Merging GitAutomation from Development into Master.
2023-08-24 09:13:06 -04:00
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
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
djankowski
e2581bf8dd
Merge pull request 'Development' ( #79 ) from Development into master
...
Merging F2023-117 from development into master. No testing required since formats are under development.
2023-08-10 11:50:12 -04:00
djankowski
38ad6d49fe
Merge pull request 'Development' ( #77 ) from Development into master
...
Merging F2023-116 from development into master. No testing required since formats are under development.
2023-08-10 08:27:56 -04:00
djankowski
d7b0e99c4a
Merge pull request 'Development' ( #75 ) from Development into master
...
Merging F2023-083 and F2023-115 from development into master. No testing is required since formats are under development.
2023-08-09 12:16:06 -04:00
djankowski
2e4d35f2c4
Merge pull request 'Development' ( #73 ) from Development into master
...
Merging F2023-082 and F2023-114 from development into master. No testing required since formats are under development.
2023-08-08 17:17:54 -04:00
djankowski
ded2d5fb66
Merge pull request 'Development' ( #71 ) from Development into master
...
Merging B2023-080 into Development. No testing required since formats are under development.
2023-08-08 12:29:01 -04:00
djankowski
2ad06e937f
Merge pull request 'B2023-080 Vogtle pagination issues - format flag only' ( #70 ) from B2023-080 into Development
...
Merging B2023-080 into Development. No testing required since formats are under development.
2023-08-08 12:26:48 -04:00
djankowski
d93874f667
Merge pull request 'Development' ( #69 ) from Development into master
...
Merging F2023-096 from development into master. No testing is required since formats are under development.
2023-08-07 15:33:52 -04:00
djankowski
a63fa8eb6b
Merge pull request 'Development' ( #67 ) from Development into master
...
Merging F2023-106 from development into master. No testing require since formats are under development.
2023-08-07 14:31:23 -04:00
djankowski
5460644837
Merge pull request 'Development' ( #65 ) from Development into master
...
Merging F2023-113 from development into Master. No testing required since formats are under development.
2023-08-07 11:05:30 -04:00
djankowski
f904492136
Merge pull request 'Development' ( #63 ) from Development into master
...
Merging F2023-088 from development into master. No testing required since formats are under development.
2023-08-07 09:33:28 -04:00
djankowski
5b09ae581c
Merge pull request 'Development' ( #61 ) from Development into master
...
Merging F2023-109 from development into master. No testing required since formats are under development.
2023-08-07 08:26:28 -04:00
djankowski
a1464936be
Merge pull request 'Development' ( #59 ) from Development into master
...
Merging F2023-110 from development into Master. No testing require since formats are under development.
2023-08-04 09:40:46 -04:00
djankowski
c5c8b3d72f
Merge pull request 'Development' ( #57 ) from Development into master
...
Merging B2023-079 and F2023-108 from Development into Master. No testing required since formats are under development.
2023-08-03 09:11:38 -04:00
djankowski
e03defc3f2
Merge pull request 'F20923-091: Added bulleted HLS to 2-cloumn format' ( #55 ) from Development into master
...
Merging F20923-091 from development into Master. No testing required since formats is under development.
2023-08-01 13:17:24 -04:00
djankowski
268c7fe8b0
Merge pull request 'Development' ( #54 ) from Development into master
...
Merging F2023-093 and F2023-107 from developing into master. No testing require since formats are under development.
2023-08-01 11:35:44 -04:00
djankowski
35fde9ec4b
Merge pull request 'Development' ( #52 ) from Development into master
...
Merging F2023-093 from development into Master. No testing require since formats are under development.
2023-07-31 11:55:09 -04:00
djankowski
4ad7e852f5
Merge pull request 'Development' ( #50 ) from Development into master
...
Merging F2023-104 and F2023-105 from development into master. No testing required since formats are under development.
2023-07-27 16:17:18 -04:00
djankowski
dca9b471f0
Merge pull request 'Development' ( #48 ) from Development into master
...
Merging F2023-095 and F2023-103 from development into master. No Testing required since formats are under development.
2023-07-27 11:39:46 -04:00
djankowski
957850f7cc
Merge pull request 'Development' ( #46 ) from Development into master
...
Merging F2023-081 and F2023-087 from development into Master
2023-07-26 09:49:07 -04:00
djankowski
073e1fc21e
Merge pull request 'Development' ( #44 ) from Development into master
...
Merging F2023-102 from Development into master
2023-07-25 16:19:17 -04:00
djankowski
a94ce9c091
Merge pull request 'Merge into Master from Development. No code review needed due to development being format changes' ( #42 ) from Development into master
...
Merging F2023-094 from development into Master. No testing required since formats are under development.
2023-07-25 15:53:45 -04:00
djankowski
53807d67cd
Merge pull request 'Development' ( #41 ) from Development into master
...
Merging F2023-100 and F2023-101 from Development into Master.
2023-07-25 09:10:27 -04:00
djankowski
2c3cf7f163
Merge pull request 'F2023-100 F2023-101 Vogtle Alarms' ( #40 ) from F2023-100_F2023-101 into Development
...
Merging F2023-100 and F2023-101 into development. No testing is require since formats are under development.
2023-07-25 09:02:58 -04:00
djankowski
fbfb570c59
Merge pull request 'Development' ( #39 ) from Development into master
...
Merging continued worked for F2023-083 to add "Effective Date" to PSI and cover page. Removed "Document Number" from PSI. No testing required as formats are under development.
2023-07-20 16:25:30 -04:00
djankowski
5915ca3e47
Merge pull request 'Development' ( #36 ) from Development into master
...
Merging F2023-098: Continued. Readd Proc_Appl = true from Development into Master.
2023-07-20 10:07:47 -04:00
djankowski
69046b28bf
Merge pull request 'Development' ( #34 ) from Development into master
...
Merging Index changes for F2023-083 from Development into Master.
2023-07-19 16:22:27 -04:00
djankowski