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

Recompile plone bundles fixing #2512 #2515

Merged
merged 1 commit into from Sep 26, 2018

Conversation

sunew
Copy link
Contributor

@sunew sunew commented Sep 14, 2018

after plone/mockup#863, fixing #2512

@frapell
Copy link
Sponsor Member

frapell commented Sep 14, 2018

@sunew First, plone/mockup#863 should be merged to master, and then you can bring in the "latest mockup master" into CMFPlone.

Doing it like this, means that work is done with plone/mockup#863 which we do not know yet, and also we could be missing stuff from master that has been merged already...

@sunew
Copy link
Contributor Author

sunew commented Sep 14, 2018

@frapell agreed

@sunew sunew changed the title Recompile plone bundles fixing #2512 [WIP] Recompile plone bundles fixing #2512 Sep 14, 2018
@sunew sunew force-pushed the sunew-recompile-resources-datatables-inline2 branch from e6a3df9 to 1bef09d Compare September 26, 2018 09:02
@sunew sunew changed the title [WIP] Recompile plone bundles fixing #2512 Recompile plone bundles fixing #2512 Sep 26, 2018
Copy link
Sponsor Member

@jensens jensens left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jensens
Copy link
Sponsor Member

jensens commented Sep 26, 2018

@sunew which are the packages belonging together in one merge? this one and plone/plone.app.upgrade#171 ?

@jensens
Copy link
Sponsor Member

jensens commented Sep 26, 2018

also, we need the same for master?

@sunew
Copy link
Contributor Author

sunew commented Sep 26, 2018

@jensens yes. comming up

@sunew
Copy link
Contributor Author

sunew commented Sep 26, 2018

@jensens

which are the packages belonging together in one merge? this one and plone/plone.app.upgrade#171 ?

yes
mockup has been merged already

@sunew sunew merged commit 968fe2e into 5.1.x Sep 26, 2018
@sunew sunew deleted the sunew-recompile-resources-datatables-inline2 branch September 26, 2018 10:13
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

3 participants