Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

task/sync-master-develop-after-release #4543

Merged
merged 406 commits into from
Dec 19, 2022

Conversation

VWSCoronaDashboard26
Copy link
Contributor

Summary

This pull request brings develop up-to-date with some changes that did make it into master but not develop.

VWSCoronaDashboard1 and others added 30 commits October 28, 2021 18:18
Co-authored-by: VWSCoronaDashboard1 <[email protected]>

Co-authored-by: VWSCoronaDashboard1 <[email protected]>
* Fix

* Formatting

* Remove console

Co-authored-by: VWSCoronaDashboard1 <[email protected]>

Co-authored-by: VWSCoronaDashboard1 <[email protected]>
* fix: correct pointer-events property assignment

* remove unused import
…#3788)

* Change layout based on media query

* Add comment

* Update text

* Get rid of the ids
* Make the total vaccinations in sync with the graph last value

* Fix typescript error
# Conflicts:
#	Dockerfile
#	packages/app/src/components/spark-bars.tsx
#	packages/app/src/domain/restrictions/restriction-icons.ts
#	packages/app/src/domain/topical/mini-tile-selector-layout.tsx
#	packages/app/src/pages/index.tsx
#	packages/app/src/pages/landelijk/intensive-care-opnames.tsx
#	packages/app/src/pages/landelijk/vaccinaties.tsx
#	packages/app/src/pages/landelijk/ziekenhuis-opnames.tsx
#	packages/cms/src/components/restriction-icon/restriction-icons.ts
#	packages/cms/src/schemas/documents/pages/topical-page.ts
#	yarn.lock
* Resolve public folder dynamically

* Add to utils

Co-authored-by: VWSCoronaDashboard1 <[email protected]>

Co-authored-by: VWSCoronaDashboard1 <[email protected]>
Co-authored-by: VWSCoronaDashboard1 <[email protected]>
* Add timeline events to VR situations over time

* Type elements title utils

* Add missing display titles

* Add timeline events to reproduction

* Find elements on metricProperty as well

* Add timeline events to nursing home positive tests

* Sort metric names & properties in elements script

* Type get elements logic

* Add timeline events to disability care infected

* Add timeline events to deceased

* Add timeline events to IC admission per age

* Add timeline events to hospital admissions per age

* Add timeline events to positive tests per age

* Add timeline events to nursing home deceased

* Add timeline events to VR nursing home deceased

* Add timeline events to elderly tested & deceased

* Fix wrong element metricnames on VR & GM topical
# Conflicts:
#	packages/app/src/domain/hospital/admissions-per-age-group/admissions-per-age-group.tsx
#	packages/app/src/domain/situations/situations-over-time-chart.tsx
#	packages/app/src/domain/tested/infected-per-age-group/infected-per-age-group.tsx
#	packages/app/src/pages/api/data/timeseries/[...param].ts
#	packages/app/src/pages/veiligheidsregio/[code]/brononderzoek.tsx
# Conflicts:
#	packages/cms/src/lokalize/key-mutations.csv
* Let menu button link to main area index

* Add todo
@VWSCoronaDashboard26 VWSCoronaDashboard26 merged commit 1d6d002 into develop Dec 19, 2022
@VWSCoronaDashboard26 VWSCoronaDashboard26 deleted the task/sync-master-develop-after-release branch December 19, 2022 10:43
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.