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

Covid19Mirai 2.9.6 #249

Merged
merged 44 commits into from
Aug 22, 2023
Merged

Covid19Mirai 2.9.6 #249

merged 44 commits into from
Aug 22, 2023

Conversation

GuidoMaggio
Copy link
Member

GuidoMaggio and others added 30 commits March 15, 2022 14:10
* Updated COVID19 package
fixed related problems

* Correction on tests and large variables
improvement table
added data for global page in rds
- updated to Covid19datahub 3.0.2 (#217)
Merge branch 'master' of https://github.com/miraisolutions/Covid19 into develop

# Conflicts:
#	inst/datahub/DATA.rds
#	inst/datahub/Selected_Country.rds
#	inst/datahub/Top_Countries.rds
Merge branch 'master' of https://github.com/miraisolutions/Covid19 into develop

# Conflicts:
#	inst/datahub/DATA.rds
#	inst/datahub/Selected_Country.rds
#	inst/datahub/Top_Countries.rds
- Fixed tests (#221)
Merge branch 'master' into develop

# Conflicts:
#	DESCRIPTION
#	NEWS.md
#	inst/datahub/DATA.rds
#	inst/datahub/Selected_Country.rds
#	inst/datahub/Top_Countries.rds
* Covid19Mirai 2.8.1 (#223)
* Fixed tests (#221)
* v2 updated
* Update wf
* Updated renv
* R 4.0.3
Merge branch 'master' of https://github.com/miraisolutions/Covid19 into develop

# Conflicts:
#	DESCRIPTION
#	NEWS.md
#	inst/datahub/DATA.rds
#	inst/datahub/Selected_Country.rds
#	inst/datahub/Top_Countries.rds
### Covid19Mirai 2.9.1
- Update to R 4.0.3 and GH Actions update (#218)
Merge branch 'master' of https://github.com/miraisolutions/Covid19 into develop

# Conflicts:
#	.github/workflows/ci-cd.yml
#	DESCRIPTION
#	NEWS.md
#	inst/datahub/DATA.rds
#	inst/datahub/Selected_Country.rds
#	inst/datahub/Top_Countries.rds
#	renv.lock
#	renv/activate.R
Merge branch 'master' of https://github.com/miraisolutions/Covid19 into develop

# Conflicts:
#	DESCRIPTION
#	NEWS.md
#	inst/datahub/DATA.rds
#	inst/datahub/Selected_Country.rds
#	inst/datahub/Top_Countries.rds
#	renv/activate.R
Merge branch 'master' of https://github.com/miraisolutions/Covid19 into develop

# Conflicts:
#	DESCRIPTION
#	NEWS.md
#	inst/datahub/DATA.rds
#	inst/datahub/Selected_Country.rds
#	inst/datahub/Top_Countries.rds
GuidoMaggio and others added 13 commits February 1, 2023 11:07
- Relaxed test on Swiss data, due to missing test data (#239)
Merge branch 'master' of https://github.com/miraisolutions/Covid19 into develop

# Conflicts:
#	DESCRIPTION
#	NEWS.md
#	inst/datahub/DATA.rds
#	inst/datahub/Selected_Country.rds
#	inst/datahub/Top_Countries.rds
Merge branch 'master' of https://github.com/miraisolutions/Covid19 into develop

# Conflicts:
#	DESCRIPTION
#	NEWS.md
#	inst/datahub/DATA.rds
#	inst/datahub/Selected_Country.rds
#	inst/datahub/Top_Countries.rds
* renv lock, rsconnect update
* updated workflow
Merge branch 'master' of https://github.com/miraisolutions/Covid19 into develop

# Conflicts:
#	DESCRIPTION
#	NEWS.md
#	inst/datahub/DATA.rds
#	inst/datahub/Selected_Country.rds
#	inst/datahub/Top_Countries.rds
@GuidoMaggio GuidoMaggio added the bug Something isn't working label Aug 22, 2023
@GuidoMaggio GuidoMaggio self-assigned this Aug 22, 2023
Merge branch 'master' of https://github.com/miraisolutions/Covid19 into develop

# Conflicts:
#	renv.lock
@GuidoMaggio GuidoMaggio merged commit 25db486 into master Aug 22, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant