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

resolve conflicts with our requirement ExtensionClass = 4.1.2 fro… #200

Merged
merged 1 commit into from
Apr 6, 2016

Conversation

thet
Copy link
Member

@thet thet commented Mar 31, 2016

…m versions.cfg

@jensens
Copy link
Member

jensens commented Apr 1, 2016

how does it relates to the releases of this pkgs we're pinning to?

@thet
Copy link
Member Author

thet commented Apr 1, 2016

We have a version pin of Products.BTreeFolder2 = 2.14.0. The branch change in sources.cfg is OK for this one. The pin for Products.MailHost comes from http://dist.plone.org/versions/zope-2-13-24-versions.cfg and is Products.MailHost = 2.13.2. This version depends on ExtensionClass < 4.0dev: https://github.com/zopefoundation/Products.MailHost/blob/2.13/setup.py
Using the latest but unreleased Products.MailHost 2.14 line should be safe.

If we depend on P.MailHost 2.13.2 via Zope2 AND ExtensionClass = 4.1.2 via our own versions.cfg, I wonder how this could have been build successfully.

@thet
Copy link
Member Author

thet commented Apr 1, 2016

I have to say, I only got these dependency problems when doing a full source checkout with auto-checkout = *.

@thet thet merged commit 2dcdbaf into 5.1 Apr 6, 2016
@thet thet deleted the thet-extensionclass-conflicts branch April 6, 2016 22:35
mister-roboto pushed a commit that referenced this pull request Feb 27, 2019
Branch: refs/heads/master
Date: 2019-02-22T09:29:12+01:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.app.upgrade@9e6d23f

add bbb for CSSRegistryTool and JSRegistryTool to fix upgrade from 5.0 to 5.2

Files changed:
M plone/app/upgrade/__init__.py
M plone/app/upgrade/bbb.py
Repository: plone.app.upgrade

Branch: refs/heads/master
Date: 2019-02-22T09:31:27+01:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.app.upgrade@0c6623d

add changenote

Files changed:
A news/200.bugfix
Repository: plone.app.upgrade

Branch: refs/heads/master
Date: 2019-02-27T21:13:26+01:00
Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com>
Commit: plone/plone.app.upgrade@47bec04

Merge pull request #200 from plone/add_bbb_for_old_resourceregistry

add bbb for CSSRegistryTool and JSRegistryTool

Files changed:
A news/200.bugfix
M plone/app/upgrade/__init__.py
M plone/app/upgrade/bbb.py
mister-roboto pushed a commit that referenced this pull request Feb 27, 2019
Branch: refs/heads/master
Date: 2019-02-22T09:29:12+01:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.app.upgrade@9e6d23f

add bbb for CSSRegistryTool and JSRegistryTool to fix upgrade from 5.0 to 5.2

Files changed:
M plone/app/upgrade/__init__.py
M plone/app/upgrade/bbb.py
Repository: plone.app.upgrade

Branch: refs/heads/master
Date: 2019-02-22T09:31:27+01:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.app.upgrade@0c6623d

add changenote

Files changed:
A news/200.bugfix
Repository: plone.app.upgrade

Branch: refs/heads/master
Date: 2019-02-27T21:13:26+01:00
Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com>
Commit: plone/plone.app.upgrade@47bec04

Merge pull request #200 from plone/add_bbb_for_old_resourceregistry

add bbb for CSSRegistryTool and JSRegistryTool

Files changed:
A news/200.bugfix
M plone/app/upgrade/__init__.py
M plone/app/upgrade/bbb.py
mister-roboto pushed a commit that referenced this pull request Jun 22, 2019
Branch: refs/heads/master
Date: 2019-06-21T09:53:47+02:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.app.layout@c3c6eb7

Add support for Python 3.8 [pbauer]

Files changed:
A news/200.feature
M plone/app/layout/viewlets/common.py
M setup.py
Repository: plone.app.layout

Branch: refs/heads/master
Date: 2019-06-21T09:55:10+02:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.app.layout@d288614

Update 200.feature

Files changed:
M news/200.feature
Repository: plone.app.layout

Branch: refs/heads/master
Date: 2019-06-22T08:32:38+02:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.app.layout@003f002

Merge pull request #200 from plone/python38

Add support for Python 3.8

Files changed:
A news/200.feature
M plone/app/layout/viewlets/common.py
M setup.py
mister-roboto pushed a commit that referenced this pull request Sep 9, 2021
Branch: refs/heads/master
Date: 2021-09-09T16:52:44+02:00
Author: Peter Mathis (petschki) <peter.mathis@kombinat.at>
Commit: plone/plone.app.theming@4f1fb0d

Fix unclosed file

fixes #199

Files changed:
A news/199.bugfix
M src/plone/app/theming/utils.py
Repository: plone.app.theming

Branch: refs/heads/master
Date: 2021-09-09T18:04:36+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.app.theming@28d4365

Merge pull request #200 from plone/issue-199

Fix unclosed file

Files changed:
A news/199.bugfix
M src/plone/app/theming/utils.py
mister-roboto pushed a commit that referenced this pull request May 10, 2022
Branch: refs/heads/master
Date: 2022-05-10T21:32:46+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.app.discussion@245a2d9

Grant Site Administrators the same workflow permissions as Managers.

They were missing permissions on pending comments.
Fixes plone/plone.app.discussion#199

Files changed:
A news/199.bugfix
M plone/app/discussion/profiles/default/metadata.xml
M plone/app/discussion/profiles/default/workflows/comment_review_workflow/definition.xml
M plone/app/discussion/upgrades.zcml
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2022-05-10T21:36:50+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.app.discussion@1ea81e4

Increase metadata version to 2000.

We need to leave some room for another upgrade step in Plone 5.2.

Files changed:
M plone/app/discussion/profiles/default/metadata.xml
M plone/app/discussion/upgrades.zcml
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2022-05-11T01:51:34+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.app.discussion@0439e9e

Merge pull request #200 from plone/maurits-site-administrators-master

Grant Site Administrators same workflow permissions as Managers [master]

Files changed:
A news/199.bugfix
M plone/app/discussion/profiles/default/metadata.xml
M plone/app/discussion/profiles/default/workflows/comment_review_workflow/definition.xml
M plone/app/discussion/upgrades.zcml
mister-roboto pushed a commit that referenced this pull request Mar 15, 2024
Branch: refs/heads/master
Date: 2024-03-14T21:25:17+01:00
Author: Johannes Raggam (thet) <thetetet@gmail.com>
Commit: plone/plone.app.z3cform@c52dd4e

Add support for the "accept" attribute on file inputs.

If the widget's field - if there is one - has the "accept" attribute set (the
`NamedImage` field has `image/*` set by default) then this is rendered as an
`accept` attribute on the file input.

This would restrict the allowed file types before uploading while still being
checked on the server side.

Fixes: plone/plone.formwidget.namedfile#66
Depends on:
- plone/plone.namedfile#158
- plone/plone.formwidget.namedfile#67

Files changed:
A news/198.feature
M plone/app/z3cform/templates/file_input.pt
M plone/app/z3cform/templates/image_input.pt
M setup.py
Repository: plone.app.z3cform

Branch: refs/heads/master
Date: 2024-03-14T23:02:39+01:00
Author: Johannes Raggam (thet) <thetetet@gmail.com>
Commit: plone/plone.app.z3cform@c6e1d78

file input: Show accepted media types.

Files changed:
M plone/app/z3cform/templates/file_input.pt
M plone/app/z3cform/templates/image_input.pt
Repository: plone.app.z3cform

Branch: refs/heads/master
Date: 2024-03-15T12:41:28+01:00
Author: Johannes Raggam (thet) <thetetet@gmail.com>
Commit: plone/plone.app.z3cform@f7236d3

Update plone/app/z3cform/templates/image_input.pt

Co-authored-by: Maurits van Rees &lt;maurits@vanrees.org&gt;

Files changed:
M plone/app/z3cform/templates/image_input.pt
Repository: plone.app.z3cform

Branch: refs/heads/master
Date: 2024-03-15T12:41:38+01:00
Author: Johannes Raggam (thet) <thetetet@gmail.com>
Commit: plone/plone.app.z3cform@5d6d0e7

Update plone/app/z3cform/templates/image_input.pt

Co-authored-by: Maurits van Rees &lt;maurits@vanrees.org&gt;

Files changed:
M plone/app/z3cform/templates/image_input.pt
Repository: plone.app.z3cform

Branch: refs/heads/master
Date: 2024-03-15T12:41:47+01:00
Author: Johannes Raggam (thet) <thetetet@gmail.com>
Commit: plone/plone.app.z3cform@e4b11e6

Update plone/app/z3cform/templates/file_input.pt

Co-authored-by: Maurits van Rees &lt;maurits@vanrees.org&gt;

Files changed:
M plone/app/z3cform/templates/file_input.pt
Repository: plone.app.z3cform

Branch: refs/heads/master
Date: 2024-03-15T12:41:54+01:00
Author: Johannes Raggam (thet) <thetetet@gmail.com>
Commit: plone/plone.app.z3cform@b45fb30

Update plone/app/z3cform/templates/file_input.pt

Co-authored-by: Maurits van Rees &lt;maurits@vanrees.org&gt;

Files changed:
M plone/app/z3cform/templates/file_input.pt
Repository: plone.app.z3cform

Branch: refs/heads/master
Date: 2024-03-15T14:33:28+01:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.app.z3cform@dc8eaac

Depend on the just released plone.formwidget.namedfile 3.1.0.

Files changed:
M setup.py
Repository: plone.app.z3cform

Branch: refs/heads/master
Date: 2024-03-15T14:45:09+01:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.app.z3cform@4262f25

Configuring with plone/meta

Files changed:
A dependabot.yml
M .editorconfig
M .flake8
M .github/workflows/meta.yml
M .gitignore
M .meta.toml
M .pre-commit-config.yaml
M pyproject.toml
M tox.ini
Repository: plone.app.z3cform

Branch: refs/heads/master
Date: 2024-03-15T14:50:51+01:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.app.z3cform@8b5d2aa

dependencychecker: ignore plone.formwidget.namedfile.

z3c.dependencychecker says this dependency is not needed, but it is wrong:
it is used in widgets.zcml.

Files changed:
M .meta.toml
M pyproject.toml
Repository: plone.app.z3cform

Branch: refs/heads/master
Date: 2024-03-15T16:37:34+01:00
Author: Johannes Raggam (thet) <thetetet@gmail.com>
Commit: plone/plone.app.z3cform@f081ed7

Merge pull request #200 from plone/allowed_content_types

Add support for accept attribute on file input.

Files changed:
A dependabot.yml
A news/198.feature
M .editorconfig
M .flake8
M .github/workflows/meta.yml
M .gitignore
M .meta.toml
M .pre-commit-config.yaml
M plone/app/z3cform/templates/file_input.pt
M plone/app/z3cform/templates/image_input.pt
M pyproject.toml
M setup.py
M tox.ini
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.

2 participants