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.

Sign up for GitHub

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

Jump to bottom

Apply types controlpanel fix to master. #2992

Merged
merged 7 commits into from
Nov 26, 2019
Merged

Apply types controlpanel fix to master. #2992

merged 7 commits into from
Nov 26, 2019

Conversation

thomasmassmann
Copy link
Member

This change was already merged with b0648a6 into 5.1.x, but is missing in 5.2.x.

This will close #2986 and #1547.

ericof and others added 6 commits November 6, 2019 14:26
@ericof
Fix #1318: Always install default content types on Plone site creation (
7ecc812 
#2971)

* Fix #1318: Always install default content types on Plone site creation

* Update changelog entry
@nazrulworld
Now PasswordResetView::getErrors is called, before trying to reset pa…
1858ea5 
…ssword.

Issue: #2917
@nazrulworld
changes log added in news directory
140b86e
@ale-rt
Merge pull request #2982 from nazrulworld/5.2.x
a2ebf1d 
Fix #2917: Now PasswordResetView::getErrors is called
@thomasmassmann
Cherrypick b0648a6:
340af73 
#Merge pull request #2663 from plone/cekk_fix_content_controlpanel

Do not save type settings in "content-controlpanel" when switching between types.
@thomasmassmann
Add changelog.
0cee75d
@jensens
Copy link
Member

jensens commented Nov 26, 2019

@jenkins-plone-org please run jobs

@jensens
Copy link
Member

jensens commented Nov 26, 2019

ops, no Jenkins for master?
ok, I merge this since it works on the other two.

@jensens jensens merged commit 6a8afc8 into master Nov 26, 2019
@jensens jensens deleted the 2986-contenttypes-controlpanel branch November 26, 2019 10:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jensens jensens Awaiting requested review from jensens

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Content Settings controlpanel saves changes without notice when changing content type selection
5 participants
@thomasmassmann @jensens @ericof @nazrulworld @ale-rt