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

Consolidated #2427 and #2497 (functional components) #2855

Merged
merged 8 commits into from
May 18, 2020

Conversation

Vultraz
Copy link
Contributor

@Vultraz Vultraz commented Apr 29, 2020

Consolidated the two for easier review. The latter had some stuff (moving route props) that's now covered in #2827, and I figured out what to do with the nonexistent innerRef in #2731. Should be good to go.

@changeset-bot
Copy link

changeset-bot bot commented Apr 29, 2020

🦋 Changeset is good to go

Latest commit: 0c5a11d

We got this.

This PR includes changesets to release 1 package
Name Type
@keystonejs/app-admin-ui Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@Vultraz
Copy link
Contributor Author

Vultraz commented May 1, 2020

Added EditFilterPopup.

@Vultraz
Copy link
Contributor Author

Vultraz commented May 2, 2020

Added AnimateHeight.

@tomasztunik
Copy link
Contributor

merged #2910 affects refactor of AnimateHeight

@Vultraz
Copy link
Contributor Author

Vultraz commented May 6, 2020

@tomasztunik resolved conflict 👍

@timleslie
Copy link
Contributor

@Vultraz Sorry for the delay on this one, it's a bit more complex so I had Joss take a look, but it all looks good. And as I type this I see you've resolved the merge :-)

@Vultraz
Copy link
Contributor Author

Vultraz commented May 18, 2020

@timleslie talk about timing 😂

@timleslie timleslie merged commit ba363d9 into keystonejs:master May 18, 2020
@github-actions github-actions bot mentioned this pull request May 18, 2020
@Vultraz Vultraz deleted the admin-ui-consolidate branch May 18, 2020 02:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants