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

Barceloneta LTS #3244

Merged
merged 200 commits into from
Feb 13, 2021
Merged

Barceloneta LTS #3244

merged 200 commits into from
Feb 13, 2021

Conversation

petschki
Copy link
Member

No description provided.

thet and others added 30 commits October 26, 2019 18:10
Fix TTW Bundle compilation broken.
#2971)

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

* Update changelog entry
Apply types controlpanel fix to master.
…n reset (#2994)

* Test if events fired after auto login have the correct principal

* At this point the user is not logged in yet, so we get it from the membership_tool.

* Update changelog

* Remove adapter registration for IUserLoggedInEvent

* Fix unregistering of adapter

* Deal with cases where username/email were not the userid
Require Zope[wsgi] for Python 3 because of Paste
make setup.py reflect to be Plone 6 and Py3 only
Removed related news snippets.
There are now no differences between master and 5.2.x, except basically in setup.py.

[ci skip]
Include Hotfix 20200121 with tests
The isURLInPortal check that is done to avoid linking to an external
site could be tricked into accepting malicious links.
[6.0] Improve tests for the workflow tool method listWFStatesByTitle
…inportal-master

Merge PloneHotfix20200121 isURLInPortal and password strength [master]
causes double translation text. Same message is on line 350
@petschki petschki linked an issue Feb 12, 2021 that may be closed by this pull request
6 tasks
@petschki
Copy link
Member Author

@jenkins-plone-org please run jobs

Copy link
Member

@ale-rt ale-rt left a comment

Choose a reason for hiding this comment

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

"Not-an-Alpine-City-Sprint" Sprint participants agreed to merge the Barceloneta work early to speed up Plone 6 development

@ale-rt
Copy link
Member

ale-rt commented Feb 13, 2021

@ale-rt
Copy link
Member

ale-rt commented Feb 13, 2021

Or @jensens ^

@ale-rt
Copy link
Member

ale-rt commented Feb 13, 2021

Note: I would squash the commits

@ale-rt
Copy link
Member

ale-rt commented Feb 13, 2021

@jenkins-plone-org please run jobs

1 similar comment
@ale-rt
Copy link
Member

ale-rt commented Feb 13, 2021

@jenkins-plone-org please run jobs

@ale-rt ale-rt merged commit 954942a into master Feb 13, 2021
@ale-rt ale-rt deleted the barceloneta-lts branch February 13, 2021 12:20
@@ -0,0 +1,131 @@
# -*- coding: utf-8 -*-
from lxml import etree
Copy link
Sponsor Member

Choose a reason for hiding this comment

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

@petschki It seems CMFPlone has lxml as an undeclared dependency. This is one of the imports that currently causes trouble. Though, this undeclared dependency has been added some time ago here:

946f3b3#r60340299

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.

Update markup of templates in Products.CMFPlone to Bootstrap 5