Skip to content

fixes for mac#1929

Merged
dguittet merged 2 commits into
ui-fixes-2024from
ui-fixes-2024-2
Dec 9, 2024
Merged

fixes for mac#1929
dguittet merged 2 commits into
ui-fixes-2024from
ui-fixes-2024-2

Conversation

@dguittet

@dguittet dguittet commented Nov 26, 2024

Copy link
Copy Markdown
Collaborator

Fixes the following for Mac, for #1926

  1. image
  2. image
  3. image
  4. image
  5. image
  6. image
  7. image
  8. image
  9. image
  10. image
  11. image
  12. image
  13. image
  14. image

@dguittet dguittet requested a review from cpaulgilman November 26, 2024 21:21
@dguittet

dguittet commented Dec 2, 2024

Copy link
Copy Markdown
Collaborator Author

@cpaulgilman The windows CI is failing because of the step to find matching branches in the other repos. There are no matching branches in lk, wex, ssc, for either this ui-fixes-2024-2 or ui-fixes-2024, the branch I'm merging into. The error handling in Windows is causing a hard stop. This problem isn't related to the UI changes

image

@cpaulgilman cpaulgilman left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Thanks for checking these. Please merge into ui-fixes-2024 and I'll do some final checking before merging that into Develop.

@dguittet dguittet merged commit 258dea2 into ui-fixes-2024 Dec 9, 2024
@dguittet dguittet deleted the ui-fixes-2024-2 branch December 9, 2024 15:32
cpaulgilman added a commit that referenced this pull request Dec 9, 2024
* initial MSPT fixes

* IPH UI fixes

* UI fixes for Linux

* IPH MSLF UI fixes

* Revert to ^2 and ^3 to be consistent with ^4

* fixes for mac (#1929)

Co-authored-by: Paul Gilman <cpaulgilman@gmail.com>

* Remove unused UI form for IPH electricity purchases

---------

Co-authored-by: Darice L Guittet <dguittet@nrel.gov>
Co-authored-by: Brian Mirletz <brian.mirletz@nrel.gov>
@cpaulgilman cpaulgilman added this to the SAM Fall 2024 Release milestone Dec 10, 2024
@cpaulgilman cpaulgilman added the added to release notes PR and/or issue has been added to release notes for a public release label Dec 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

added to release notes PR and/or issue has been added to release notes for a public release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants