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

Develop #326

Merged
merged 262 commits into from
Apr 3, 2024
Merged

Develop #326

merged 262 commits into from
Apr 3, 2024

Conversation

rhernandez-intertech
Copy link
Collaborator

No description provided.

rhernandez-intertech and others added 30 commits January 10, 2024 09:40
@rhernandez-intertech
added key ID to charts
b18f762
@rhernandez-intertech
table reformatted
526b662
@nbintertech
fix vulns
7f001c0
@esserhr
Updated web.yml - add dynamic node setup based on version set in pack…
a3781dd 
…age.json
@esserhr
Updated package.json - add node/npm engine versions
59a0990
@rhernandez-intertech
year recap graph errors fixed
4c74995
@nbintertech
Merge pull request #133 from ORNL-AMO/issue-131
ed9aa25 
Issue 131: Clean up UI on select projects page
@nbintertech
Merge pull request #136 from ORNL-AMO/updates
5ea7fe6 
Update package-lock
@nbintertech
Merge pull request #134 from ORNL-AMO/issue-130
1e4a896 
Issue 130: Year Recap graph responsiveness and error
@nbintertech
Reorganized year recap, various renaming, add hiddenSpending key
6c859a2
@nbintertech
remove debuggers
ad533a7
@rhernandez-intertech
Merge pull request #141 from ORNL-AMO/pre-2.0-updates
1fcad2c 
Issue 140 - Improve dev experience
@esserhr
Merge pull request #137 from ORNL-AMO/integrate-cicd
7d8eb8d 
Add automated building and deployment process
@rhernandez-intertech
carbon replaced with GHG
394bbce
@esserhr
Updated web.yml - use npm install instead of ci
1962c1c
@esserhr
Updated web.yml - allow eslint warnings during builds
2ab4f82
@esserhr
Merge pull request #149 from ORNL-AMO/integrate-cicd
aa28f1e 
Pipeline build step fixes
@nbintertech
Merge pull request #148 from ORNL-AMO/issue-135
036209a 
issue 135: Replace 'Carbon Savings' with 'GHG Reduction'
@nbintertech
Add financing start year
7073c05
@nbintertech
Remove semicolon rules
9bd6c47
@nbintertech
Add GHG/Carbon savings milestone mechanic
d1e3044
@rhernandez-intertech
Merge pull request #151 from ORNL-AMO/financing-150
4884f65 
Issue 150 - Add financing start year
@rhernandez-intertech
Merge pull request #152 from ORNL-AMO/update-linter0rules
070cda5 
Eslint Remove semicolon rules
@nbintertech
Strict mode off, remove quotes, inferrable types rules
54a90a3
@nbintertech
Merge pull request #156 from ORNL-AMO/eslint-updates
aec4bea 
More Eslint changes
@nbintertech
Merge branch 'financing-feat' of https://github.com/ORNL-AMO/Choose-Y…
ea4a8f0 
…our-Own-Adventure into financing-feat
@nbintertech
Merge branch 'financing-feat' into issue-146
908a32e
@nbintertech
Display capital funding rewards at Year recap
4448215
@rhernandez-intertech
Merge pull request #158 from ORNL-AMO/issue-146
c57e645 
Issue 146 - Display Capital Funding rewards at year recap
@nbintertech
Break up dialog components
03c0948
nbintertech and others added 29 commits March 27, 2024 16:44
@nbintertech
Fix negative projected costs being added
24b82ef
@nbintertech
Merge pull request #308 from ORNL-AMO/hotfix-project
5056043 
Hotfix projected financing
@nbintertech
Move end of game results calcs to app.tsx, hide animations, finish st…
8cfe17d 
…yling
@rhernandez-intertech
fixes to projects
597d2ee
@rhernandez-intertech
Merge pull request #310 from ORNL-AMO/issue-279-c
38c6933 
Issue 279 - Finish Win/Lose pages
@rhernandez-intertech
Merge pull request #311 from ORNL-AMO/issue-299
cde2903 
Issues 299 306 309
@nbintertech
Add in animations and cleanup transitions
45e74e7
@nbintertech
Merge pull request #312 from ORNL-AMO/issue-279-c
f79ec81 
Add in animations and cleanup transitions
@rhernandez-intertech
2 year interval now default
e71015b
@rhernandez-intertech
Merge pull request #313 from ORNL-AMO/issue-299
9000509 
2 year interval now default
@rhernandez-intertech
project tweaks
396578f
@rhernandez-intertech
Merge pull request #314 from ORNL-AMO/issue-299
63147f2 
project tweaks
@nbintertech
Rewrite stats, readability chagnes, add kg per year
0aae0d0
@nbintertech
Merge pull request #315 from ORNL-AMO/issue-279-c
67b9fae 
Issue 279 - Rewrite stats, readability changes, add kg per year
@nbintertech
Set bg images to bottom, up arrow sizing
eb11d95
@nbintertech
Merge pull request #316 from ORNL-AMO/issue-279-c
055a17c 
Set bg images to bottom, up arrow sizing
@rhernandez-intertech
floating bar in YearRecap
29f5520
@nbintertech
Final changes to loseGame, styling, stat changes
1050c7b
@nbintertech
Merge pull request #318 from ORNL-AMO/issue-279-c
de9acf1 
Final changes to loseGame, styling, stat changes
@rhernandez-intertech
fixes to Year Recap floating bar
ca2dd24
@nbintertech
Merge pull request #317 from ORNL-AMO/issue-294
a30233a 
issue 294
@nbintertech
Use carbon savings per tonne stat
f6709a2
@nbintertech
Merge pull request #319 from ORNL-AMO/issue-279-d
7f56711 
Issue 279 - Use carbon savings per tonne stat
@rhernandez-intertech
fix to renewable project compare close bug
9ddae34
@rhernandez-intertech
Merge pull request #321 from ORNL-AMO/issue-320
dc44658 
Issue 320
@nbintertech
mark cap funding used on solar carpot
7148c35
@nbintertech
Merge branch 'develop' into resolve-develop-confs
9346f26
@rhernandez-intertech
Merge pull request #324 from ORNL-AMO/resolve-develop-confs
c289b8f 
Resolve develop confs
@rhernandez-intertech
Merge pull request #325 from ORNL-AMO/hotfix-capital-gunding
2747924 
Mark cap funding used on solar carpot
@rhernandez-intertech rhernandez-intertech merged commit e649ea0 into main Apr 3, 2024
3 checks passed
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.
3 participants
@rhernandez-intertech @nbintertech @esserhr