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.

Sign up for GitHub

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

Jump to bottom

fixes for mac #1929

Merged
merged 2 commits into from
Dec 9, 2024
Merged

fixes for mac #1929

merged 2 commits into from
Dec 9, 2024

Conversation

dguittet
Copy link
Collaborator

@dguittet dguittet commented Nov 26, 2024 •
edited
Loading

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
Copy link
Collaborator Author

dguittet commented Dec 2, 2024

@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 approved these changes Dec 6, 2024
View reviewed changes
Copy link
Collaborator

@cpaulgilman cpaulgilman left a comment

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
1 of 8 checks passed
@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
@cpaulgilman @dguittet @brtietz
UI fixes 2024 (#1926)
137893c 
* 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
Reviewers

@cpaulgilman cpaulgilman cpaulgilman approved these changes

Assignees
No one assigned
Labels
added to release notes PR and/or issue has been added to release notes for a public release
Projects
None yet
Milestone
SAM Fall 2024 Release
Development

Successfully merging this pull request may close these issues.
2 participants
@dguittet @cpaulgilman