Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev -> Staging #299

Merged
merged 27 commits into from
Jun 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
c4ca52a
PC-1122: Investigation results. Updated references to .net from 6.0 t…
Glenn-Clarke Jun 5, 2024
bc13349
PC-1122: Updated C# to 12. Reverted CLI SDK to 5.0
Glenn-Clarke Jun 5, 2024
64d43d7
PC-1122: Updated .Net CLI to 8.0
Glenn-Clarke Jun 7, 2024
4d1a51c
Merge pull request #285 from UKGovernmentBEIS/PC-1122-Investigation-i…
Glenn-Clarke Jun 19, 2024
d07af0a
Revert "PC-1122: Investigation into updating C# & .NET versions"
Glenn-Clarke Jun 21, 2024
2d1bc4f
Merge pull request #292 from UKGovernmentBEIS/revert-285-PC-1122-Inve…
Glenn-Clarke Jun 21, 2024
844c3a0
PC-1122: Investigation results. Updated references to .net from 6.0 t…
Glenn-Clarke Jun 5, 2024
f3a911f
PC-1122: Updated C# to 12. Reverted CLI SDK to 5.0
Glenn-Clarke Jun 5, 2024
dd16c20
PC-1122: Updated .Net CLI to 8.0
Glenn-Clarke Jun 7, 2024
c4679a5
PC-1050: Reverted port number changes
Glenn-Clarke Jun 5, 2024
8370288
PC-1122: Updated header dictionary adding to new method (headers.append)
Glenn-Clarke Jun 24, 2024
914442f
PC-1050: Updated migration name to fix build warning regarding all lo…
Glenn-Clarke Jun 24, 2024
71b1629
Merge pull request #293 from UKGovernmentBEIS/PC-1122-Investigation-i…
Glenn-Clarke Jun 24, 2024
92e65b6
Revert "Pc 1122 investigation into c# and .net update"
Glenn-Clarke Jun 24, 2024
a42980c
Merge pull request #294 from UKGovernmentBEIS/revert-293-PC-1122-Inve…
Glenn-Clarke Jun 24, 2024
34bcacf
PC-1122: Investigation results. Updated references to .net from 6.0 t…
Glenn-Clarke Jun 5, 2024
63cf654
PC-1122: Updated C# to 12. Reverted CLI SDK to 5.0
Glenn-Clarke Jun 5, 2024
b325142
PC-1122: Updated .Net CLI to 8.0
Glenn-Clarke Jun 7, 2024
9cd3c63
PC-1050: Reverted port number changes
Glenn-Clarke Jun 5, 2024
574388a
PC-1122: Updated header dictionary adding to new method (headers.append)
Glenn-Clarke Jun 24, 2024
3d3c099
PC-1050: Updated migration name to fix build warning regarding all lo…
Glenn-Clarke Jun 24, 2024
e3cd575
PC-1050: Fix to concurrency issue with cache dictionary
Glenn-Clarke Jun 24, 2024
07d65a9
Merge pull request #295 from UKGovernmentBEIS/PC-1122-Investigation-i…
Glenn-Clarke Jun 24, 2024
e58e8ad
PC-934: Copy text changes for July price cap change
Glenn-Clarke Jun 25, 2024
0bdf84d
Revert "PC:1122 investigation into c# and .net update"
Glenn-Clarke Jun 26, 2024
d921205
Merge pull request #297 from UKGovernmentBEIS/revert-295-PC-1122-Inve…
Glenn-Clarke Jun 26, 2024
ea715e0
Merge pull request #296 from UKGovernmentBEIS/PC-934-July-Energy-Pric…
Glenn-Clarke Jun 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions SeaPublicWebsite/Resources/SharedResources.cy.resx
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@
<value>Os ydych chi’n hoffi unrhyw un o’r argymhellion hyn, gallwch eu cadw yn eich cynllun gweithredu cyn bwrw ymlaen.</value>
</data>
<data name="CostsAndSavingsAreEstimatesWarningTextString" xml:space="preserve">
<value>Amcangyfrifon yw’r costau a’r arbedion a ddarparwn ac efallai na fyddant yr un fath yn ymarferol. Mae'r arbedion a ddangosir wedi’u seilio ar gap prisiau ynni Ebrill 2024 yn achos biliau nwy a thrydan, ac ar brisiau ynni RdSAP yn achos pob math arall o danwydd gwresogi. Wrth i brisiau ynni newid, felly bydd yr amcangyfrifon o arbedion.</value>
<value>Amcangyfrifon yw’r costau a’r arbedion a ddarparwn ac efallai na fyddant yr un fath yn ymarferol. Mae'r arbedion a ddangosir wedi’u seilio ar gap prisiau ynni Gorffennaf 2024 yn achos biliau nwy a thrydan, ac ar brisiau ynni RdSAP yn achos pob math arall o danwydd gwresogi. Wrth i brisiau ynni newid, felly bydd yr amcangyfrifon o arbedion.</value>
</data>
<data name="Getting back to your recommendations once you leave" xml:space="preserve">
<value>Mynd yn ôl at eich argymhellion ar ôl i chi adael</value>
Expand Down Expand Up @@ -1987,7 +1987,7 @@
<value>Sylwer</value>
</data>
<data name="FiguresForTypicalInstallationWarningTextString" xml:space="preserve">
<value>Sylwer Mae’r ffigurau hyn ar gyfer gosodiad arferol mewn cartref fel eich un chi. Bydd eich amgylchiadau, manylion y gosodiadau a phrisiau ynni yn effeithio ar y costau a’r arbedion a welwch. Mae'r arbedion a ddangosir wedi’u seilio ar gap prisiau ynni Ebrill 2024 yn achos biliau nwy a thrydan, ac ar brisiau ynni RdSAP yn achos pob math arall o danwydd gwresogi. Wrth i brisiau ynni newid, felly bydd yr amcangyfrifon o arbedion.</value>
<value>Sylwer Mae’r ffigurau hyn ar gyfer gosodiad arferol mewn cartref fel eich un chi. Bydd eich amgylchiadau, manylion y gosodiadau a phrisiau ynni yn effeithio ar y costau a’r arbedion a welwch. Mae'r arbedion a ddangosir wedi’u seilio ar gap prisiau ynni Gorffennaf 2024 yn achos biliau nwy a thrydan, ac ar brisiau ynni RdSAP yn achos pob math arall o danwydd gwresogi. Wrth i brisiau ynni newid, felly bydd yr amcangyfrifon o arbedion.</value>
</data>
<data name="1 minute" xml:space="preserve">
<value>1 funud</value>
Expand Down
4 changes: 2 additions & 2 deletions SeaPublicWebsite/Resources/SharedResources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -974,7 +974,7 @@
<value>If you like any of these recommendations, you can save them to your action plan before you move on.</value>
</data>
<data name="CostsAndSavingsAreEstimatesWarningTextString" xml:space="preserve">
<value>The costs and savings we provide are estimates and may not be the same in practice. The savings displayed are based on the April 2024 energy price cap for gas and electricity bills, and on the RdSAP energy prices for all other heating fuel types. As energy prices change, so will the estimates of savings.</value>
<value>The costs and savings we provide are estimates and may not be the same in practice. The savings displayed are based on the July 2024 energy price cap for gas and electricity bills, and on the RdSAP energy prices for all other heating fuel types. As energy prices change, so will the estimates of savings.</value>
</data>
<data name="Getting back to your recommendations once you leave" xml:space="preserve">
<value>Getting back to your recommendations once you leave</value>
Expand Down Expand Up @@ -2205,7 +2205,7 @@
<value>Note</value>
</data>
<data name="FiguresForTypicalInstallationWarningTextString" xml:space="preserve">
<value>These figures are for a typical installation in a home like yours. The costs and savings you experience will be affected by your circumstances, the details of the installations and energy prices. The savings displayed are based on the April 2024 energy price cap for gas and electricity bills, and on the RdSAP energy prices for all other heating fuel types. As energy prices change, so will the estimates of savings.</value>
<value>These figures are for a typical installation in a home like yours. The costs and savings you experience will be affected by your circumstances, the details of the installations and energy prices. The savings displayed are based on the July 2024 energy price cap for gas and electricity bills, and on the RdSAP energy prices for all other heating fuel types. As energy prices change, so will the estimates of savings.</value>
</data>
<data name="1 minute" xml:space="preserve">
<value>1 minute</value>
Expand Down
Loading