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

Move additional v2 commits #1728

Merged
merged 5 commits into from
Mar 16, 2022
Merged

Move additional v2 commits #1728

merged 5 commits into from
Mar 16, 2022

Conversation

ozamosi
Copy link
Contributor

@ozamosi ozamosi commented Mar 16, 2022

This cherry-picks the commits that were merged into the v2 branch in #1701 and #1700, and puts them on top of the main branch. After this, every single thing that was done in v2 should now be in main.

I've resolved one conflict in index.ts from the Fix linting errors commit, everything else is literally just cherry-picked.

jpellizzari and others added 5 commits March 16, 2022 11:08
* initial page setup

* it does not work

* page complete

* not sure how chartRes got deleted but I put it back in

* cluster = default

* add last updated at values where blank

* timestamp import
@ozamosi ozamosi merged commit 3f816c7 into main Mar 16, 2022
@ozamosi ozamosi deleted the move-additional-v2-commits branch March 21, 2022 11:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants