-
-
Notifications
You must be signed in to change notification settings - Fork 75
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
Checkout Products.GenericSetup and Zope2. [5.1] #288
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mister-roboto
pushed a commit
that referenced
this pull request
Apr 11, 2019
Branch: refs/heads/master Date: 2019-04-09T11:18:03+02:00 Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> Commit: plone/plone.app.dexterity@5e8a9c2 Revert "Revert "reflect moves from plone.app.widgets to plone.app.z3cform"" Files changed: A news/268.feature M plone/app/dexterity/factories.py M plone/app/dexterity/permissions.py M plone/app/dexterity/tests/test_permissions.py Repository: plone.app.dexterity Branch: refs/heads/master Date: 2019-04-11T11:14:08+02:00 Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> Commit: plone/plone.app.dexterity@7620845 make IFieldPermissionChecker bbb for 5.1 Files changed: M plone/app/dexterity/permissions.py Repository: plone.app.dexterity Branch: refs/heads/master Date: 2019-04-11T14:04:57+02:00 Author: Philip Bauer (pbauer) <bauer@starzel.de> Commit: plone/plone.app.dexterity@badd683 Merge pull request #288 from plone/revert-287-revert-286-jensens/fixPloneFormLayer Revert "Revert "reflect moves from plone.app.widgets to plone.app.z3cform"" Files changed: A news/268.feature M plone/app/dexterity/factories.py M plone/app/dexterity/permissions.py M plone/app/dexterity/tests/test_permissions.py
mister-roboto
pushed a commit
that referenced
this pull request
Apr 11, 2019
Branch: refs/heads/master Date: 2019-04-09T11:18:03+02:00 Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> Commit: plone/plone.app.dexterity@5e8a9c2 Revert "Revert "reflect moves from plone.app.widgets to plone.app.z3cform"" Files changed: A news/268.feature M plone/app/dexterity/factories.py M plone/app/dexterity/permissions.py M plone/app/dexterity/tests/test_permissions.py Repository: plone.app.dexterity Branch: refs/heads/master Date: 2019-04-11T11:14:08+02:00 Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> Commit: plone/plone.app.dexterity@7620845 make IFieldPermissionChecker bbb for 5.1 Files changed: M plone/app/dexterity/permissions.py Repository: plone.app.dexterity Branch: refs/heads/master Date: 2019-04-11T14:04:57+02:00 Author: Philip Bauer (pbauer) <bauer@starzel.de> Commit: plone/plone.app.dexterity@badd683 Merge pull request #288 from plone/revert-287-revert-286-jensens/fixPloneFormLayer Revert "Revert "reflect moves from plone.app.widgets to plone.app.z3cform"" Files changed: A news/268.feature M plone/app/dexterity/factories.py M plone/app/dexterity/permissions.py M plone/app/dexterity/tests/test_permissions.py
mister-roboto
pushed a commit
that referenced
this pull request
Apr 13, 2022
Branch: refs/heads/master Date: 2022-04-13T10:33:01+02:00 Author: Philip Bauer (pbauer) <bauer@starzel.de> Commit: plone/plone.app.upgrade@669f295 Add upgrade-profile for 6005 and reload tinyconfig to allow inline-mode Files changed: A plone/app/upgrade/v60/profiles/to6005/registry.xml M plone/app/upgrade/v60/configure.zcml M plone/app/upgrade/v60/profiles.zcml Repository: plone.app.upgrade Branch: refs/heads/master Date: 2022-04-13T10:54:36+02:00 Author: Philip Bauer (pbauer) <bauer@starzel.de> Commit: plone/plone.app.upgrade@0cacb11 add changenote Files changed: A news/288.bugfix Repository: plone.app.upgrade Branch: refs/heads/master Date: 2022-04-13T12:17:23+02:00 Author: Philip Bauer (pbauer) <bauer@starzel.de> Commit: plone/plone.app.upgrade@dc68f92 use plone.base interface Files changed: M plone/app/upgrade/v60/profiles/to6005/registry.xml Repository: plone.app.upgrade Branch: refs/heads/master Date: 2022-04-13T12:27:25+02:00 Author: Maurits van Rees (mauritsvanrees) <m.van.rees@zestsoftware.nl> Commit: plone/plone.app.upgrade@6b05e6c Merge pull request #288 from plone/tiny_inline_mode Add upgrade-profile for 6005 and reload tinyconfig to allow inline-mode Files changed: A news/288.bugfix A plone/app/upgrade/v60/profiles/to6005/registry.xml M plone/app/upgrade/v60/configure.zcml M plone/app/upgrade/v60/profiles.zcml
mister-roboto
pushed a commit
that referenced
this pull request
Jun 8, 2022
Branch: refs/heads/master Date: 2022-06-07T19:12:38+02:00 Author: Peter Holzer (agitator) <peter.holzer@agitator.com> Commit: plone/plonetheme.barceloneta@307b461 Global sections: add support for css variables and color modes primary, dark, light Files changed: M plonetheme/barceloneta/theme/index.html M scss/_sitenav.scss M scss/_variables.barceloneta.scss M scss/_variables.colors.plone.scss Repository: plonetheme.barceloneta Branch: refs/heads/master Date: 2022-06-07T19:14:29+02:00 Author: Peter Holzer (agitator) <peter.holzer@agitator.com> Commit: plone/plonetheme.barceloneta@52aa09b compile Files changed: M plonetheme/barceloneta/theme/css/barceloneta.css M plonetheme/barceloneta/theme/css/barceloneta.css.map M plonetheme/barceloneta/theme/css/barceloneta.min.css M plonetheme/barceloneta/theme/css/barceloneta.min.css.map Repository: plonetheme.barceloneta Branch: refs/heads/master Date: 2022-06-07T19:17:18+02:00 Author: Peter Holzer (agitator) <peter.holzer@agitator.com> Commit: plone/plonetheme.barceloneta@8d1947a add news Files changed: A news/288.feature Repository: plonetheme.barceloneta Branch: refs/heads/master Date: 2022-06-08T12:32:51+02:00 Author: Peter Holzer (agitator) <peter.holzer@agitator.com> Commit: plone/plonetheme.barceloneta@492c4bb css var usage improvements Files changed: M scss/_sitenav.scss M scss/_variables.barceloneta.scss Repository: plonetheme.barceloneta Branch: refs/heads/master Date: 2022-06-08T12:33:10+02:00 Author: Peter Holzer (agitator) <peter.holzer@agitator.com> Commit: plone/plonetheme.barceloneta@52d9fbc use barceloneta navbar Files changed: M plonetheme/barceloneta/theme/index.html Repository: plonetheme.barceloneta Branch: refs/heads/master Date: 2022-06-08T12:33:20+02:00 Author: Peter Holzer (agitator) <peter.holzer@agitator.com> Commit: plone/plonetheme.barceloneta@dbbecb8 compile Files changed: M plonetheme/barceloneta/theme/css/barceloneta.css M plonetheme/barceloneta/theme/css/barceloneta.css.map M plonetheme/barceloneta/theme/css/barceloneta.min.css M plonetheme/barceloneta/theme/css/barceloneta.min.css.map Repository: plonetheme.barceloneta Branch: refs/heads/master Date: 2022-06-08T12:34:59+02:00 Author: Peter Holzer (agitator) <peter.holzer@agitator.com> Commit: plone/plonetheme.barceloneta@991a41f update news Files changed: M news/288.feature Repository: plonetheme.barceloneta Branch: refs/heads/master Date: 2022-06-08T12:39:38+02:00 Author: Peter Mathis (petschki) <petschki@users.noreply.github.com> Commit: plone/plonetheme.barceloneta@1ad5f96 Merge pull request #288 from plone/nav-color-modes Nav color modes Files changed: A news/288.feature M plonetheme/barceloneta/theme/css/barceloneta.css M plonetheme/barceloneta/theme/css/barceloneta.css.map M plonetheme/barceloneta/theme/css/barceloneta.min.css M plonetheme/barceloneta/theme/css/barceloneta.min.css.map M plonetheme/barceloneta/theme/index.html M scss/_sitenav.scss M scss/_variables.barceloneta.scss M scss/_variables.colors.plone.scss
mister-roboto
pushed a commit
that referenced
this pull request
Aug 8, 2024
Branch: refs/heads/master Date: 2024-08-02T16:20:19+02:00 Author: Manuel Reinhardt (reinhardt) <reinhardt@syslab.com> Commit: plone/plone.app.content@2524e28 getVocabulary: Call scrub_html on individual items, but check for script/html first Fixes JSONDecodeError when terms contain incomplete HTML Files changed: A news/288.bugfix M plone/app/content/browser/vocabulary.py M plone/app/content/tests/test_widgets.py Repository: plone.app.content Branch: refs/heads/master Date: 2024-08-06T08:23:33+02:00 Author: Manuel Reinhardt (reinhardt) <reinhardt@syslab.com> Commit: plone/plone.app.content@6fb696a getVocabulary: Remove check for scrub_html There is now a similar check inside scrub_html, see plone/Products.PortalTransforms#66 Files changed: M plone/app/content/browser/vocabulary.py Repository: plone.app.content Branch: refs/heads/master Date: 2024-08-07T13:11:41+02:00 Author: Manuel Reinhardt (reinhardt) <reinhardt@syslab.com> Commit: plone/plone.app.content@b44635d Rename test method Co-authored-by: Maurits van Rees <maurits@vanrees.org> Files changed: M plone/app/content/tests/test_widgets.py Repository: plone.app.content Branch: refs/heads/master Date: 2024-08-08T08:47:57+02:00 Author: Manuel Reinhardt (reinhardt) <reinhardt@syslab.com> Commit: plone/plone.app.content@6c1e1f2 Extend and explain test Co-authored-by: Maurits van Rees <maurits@vanrees.org> Files changed: M plone/app/content/tests/test_widgets.py Repository: plone.app.content Branch: refs/heads/master Date: 2024-08-08T12:17:01+02:00 Author: Maurits van Rees (mauritsvanrees) <maurits@py76.be> Commit: plone/plone.app.content@0cebad3 Merge pull request #288 from plone/getVocabulary-incomplete-html getVocabulary: Call scrub_html on individual items Files changed: A news/288.bugfix M plone/app/content/browser/vocabulary.py M plone/app/content/tests/test_widgets.py
mister-roboto
pushed a commit
that referenced
this pull request
Aug 8, 2024
Branch: refs/heads/master Date: 2024-08-02T16:20:19+02:00 Author: Manuel Reinhardt (reinhardt) <reinhardt@syslab.com> Commit: plone/plone.app.content@2524e28 getVocabulary: Call scrub_html on individual items, but check for script/html first Fixes JSONDecodeError when terms contain incomplete HTML Files changed: A news/288.bugfix M plone/app/content/browser/vocabulary.py M plone/app/content/tests/test_widgets.py Repository: plone.app.content Branch: refs/heads/master Date: 2024-08-06T08:23:33+02:00 Author: Manuel Reinhardt (reinhardt) <reinhardt@syslab.com> Commit: plone/plone.app.content@6fb696a getVocabulary: Remove check for scrub_html There is now a similar check inside scrub_html, see plone/Products.PortalTransforms#66 Files changed: M plone/app/content/browser/vocabulary.py Repository: plone.app.content Branch: refs/heads/master Date: 2024-08-07T13:11:41+02:00 Author: Manuel Reinhardt (reinhardt) <reinhardt@syslab.com> Commit: plone/plone.app.content@b44635d Rename test method Co-authored-by: Maurits van Rees <maurits@vanrees.org> Files changed: M plone/app/content/tests/test_widgets.py Repository: plone.app.content Branch: refs/heads/master Date: 2024-08-08T08:47:57+02:00 Author: Manuel Reinhardt (reinhardt) <reinhardt@syslab.com> Commit: plone/plone.app.content@6c1e1f2 Extend and explain test Co-authored-by: Maurits van Rees <maurits@vanrees.org> Files changed: M plone/app/content/tests/test_widgets.py Repository: plone.app.content Branch: refs/heads/master Date: 2024-08-08T12:17:01+02:00 Author: Maurits van Rees (mauritsvanrees) <maurits@py76.be> Commit: plone/plone.app.content@0cebad3 Merge pull request #288 from plone/getVocabulary-incomplete-html getVocabulary: Call scrub_html on individual items Files changed: A news/288.bugfix M plone/app/content/browser/vocabulary.py M plone/app/content/tests/test_widgets.py
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In #287 I am testing Plone 4.3.
Here I am testing Plone 5.1.
If both pass, 5.0 seems safe too.