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

rebase develop #157

Merged
merged 186 commits into from
May 23, 2024
Merged

rebase develop #157

merged 186 commits into from
May 23, 2024

Conversation

MatthewSteen
Copy link
Member

@MatthewSteen MatthewSteen commented May 17, 2024 •
edited
Loading

Updating develop before making it the default branch.

Couldn't rebase here, so had to locally using...

git checkout develop
git rebase master

pflaumingo and others added 30 commits July 8, 2020 09:30
@pflaumingo
Merge pull request #95 from NREL/develop
f605d84 
Develop
Updated the CHANGELOG
55b318d
Updated the CHANGELOG version
b042f38
@axelstudios
v0.1.19
9506785
Updated the systems analysis report
a7bceec
default debug to false on the reports
88be579
Updating Changelog.md
4fd7d0d
@axelstudios
v0.1.20
4208238
Update reporting bundle
95acca1
Merge branch 'master' of https://github.com/NREL/gbxml-to-openstudio
9e7686d
Updated the changelog
1eb7598
@axelstudios
v1.0.0
ca0a094
Updating to the latest reporting measure
8ae7dbb
Updated the CHANGELOG.md
29ffc9f
Updated the CHANGELOG.md
b08ba60
@axelstudios
v1.0.1
547abd5
@axelstudios
Added 2023 build
038922f
Updated the design of the loads report
1d3bc20
Fixing bundle from using fixed data
48984f0
@axelstudios
v1.0.2
d3f725e
Updated the reporting bundle
8656ebd
Merge branch 'master' of https://github.com/NREL/gbxml-to-openstudio
45dc4f6
@pflaumingo
Update CHANGELOG.md
18e1cb5
@axelstudios
v1.0.3
80220ec
@axelstudios
v1.0.4
2f19a4a
@MatthewSteen
fix by using openstudio-standards thermal_zone_get_occupancy_schedule…
eeb833a 
… method
@MatthewSteen
comment out puts
2ae8156
@MatthewSteen
remove use of thermal_zone_get_occupancy_schedule function in favor o…
53efcb9 
…f the one from openstudio-standards
@MatthewSteen
remove thermal_zone_get_occupancy_schedule function
40b9f48
@MatthewSteen
set thermal zone name to element id
b1ab5f1
MatthewSteen and others added 28 commits January 30, 2024 13:55
@MatthewSteen
mv old unused aip files
6d91a2f
@MatthewSteen
remove design day defaults to match openstudio-extension-gem file
a263791
@MatthewSteen
fix
8881a8a
@MatthewSteen
Revert "remove add_xml_output_control_style and gbxml_to_openstudio_c…
5c6fcf6 
…leanup"
@MatthewSteen
Merge pull request #145 from NREL/revert-138-remove/postprocess_measures
3c85848
@MatthewSteen
Revert "add gbxml postprocess measure"
2ae49cb
@MatthewSteen
Merge pull request #146 from NREL/revert-127-add/gbxml_postprocess
5b39584
@MatthewSteen
Revert "measure actions"
508fa14
@MatthewSteen
Revert "energyplus action"
af15675
@MatthewSteen
Merge pull request #147 from NREL/revert-139-energyplus-action
f194d9a
@MatthewSteen
Merge pull request #148 from NREL/revert-142-measure-actions
3994320
@MatthewSteen
Revert "mv old unused aip files"
6f81729 
This reverts commit 6d91a2f.
@MatthewSteen
Revert "mv aip files into dir"
35d14a3 
This reverts commit 56fb907.
@MatthewSteen
Revert "update AIP version"
f342746 
This reverts commit 36c211f.
@MatthewSteen
Revert "v1.2.0"
7c73fb9 
This reverts commit 8547b99.
@MatthewSteen
Revert "Update test_gbxml_with_openstudio.yml to 3.7.0 image"
c74e0dc 
This reverts commit b968f2a.
@MatthewSteen
Revert "Update .env for OS 3.7.0"
3db22a5 
This reverts commit 521ecd9.
@MatthewSteen
Revert "1.1.8 AIP files for new curves.rb file"
46c7f69 
This reverts commit 4e82c43.
@MatthewSteen
Revert "v1.1.8"
cb8b704 
This reverts commit f0eeca2.
@MatthewSteen
v1.1.8 (#149)
30231c4
@MatthewSteen
Merge pull request #144 from NREL/revit-218565
a9cdb8c
@MatthewSteen
update AIP files
01752e3
@MatthewSteen
add AIP for 2026
0245431
@MatthewSteen
Merge pull request #152 from NREL/1.1.9
49022e2
@MatthewSteen
update AIP
3505bf3
@MatthewSteen
Merge pull request #153 from NREL/2022-v1.1.9
58a72b7
@MatthewSteen
update MSI files
4c50c8d
@MatthewSteen
Merge pull request #156 from NREL/msi-allow-downgrade
10214b3
@MatthewSteen MatthewSteen merged commit 10214b3 into develop May 23, 2024
7 checks passed
@MatthewSteen MatthewSteen changed the title develop rebase develop May 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@MatthewSteen @pflaumingo @axelstudios @anchapin @tijcolem @jmarrec @eringold