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

Plone 6.0.7 #1706

Merged
merged 9 commits into from
Sep 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions base.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ parts =
dependencies
update-translations
find-untranslated
sphinxbuilder
sphinx-python
# sphinxbuilder
# sphinx-python
deploy-to-heroku
omelette
zpretty
Expand Down
1 change: 1 addition & 0 deletions news/1706.internal
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Upgrade buildout: Plone 6.0.6 -> 6.0.7 and Plone 5.2.12 -> 5.2.14 @tisto
6 changes: 3 additions & 3 deletions plone-5.2.x.cfg
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[buildout]
extends =
https://dist.plone.org/release/5.2.12/versions.cfg
https://dist.plone.org/release/5.2.14/versions.cfg
base.cfg

[versions]
black = 22.3.0

# Use the newest plone.rest
plone.rest = 3.0.0
# we need the newest plone.rest release
plone.rest = 3.0.1
2 changes: 1 addition & 1 deletion plone-6.0.x.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[buildout]
extends =
https://dist.plone.org/release/6.0.6/versions.cfg
https://dist.plone.org/release/6.0.7/versions.cfg
base.cfg

[buildout:python37]
Expand Down
2 changes: 1 addition & 1 deletion requirements-5.2.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
-r https://dist.plone.org/release/5.2.12/requirements.txt
-r https://dist.plone.org/release/5.2.14/requirements.txt
zpretty
2 changes: 1 addition & 1 deletion requirements-6.0.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-r https://dist.plone.org/release/6.0.6/requirements.txt
-r https://dist.plone.org/release/6.0.7/requirements.txt
2 changes: 1 addition & 1 deletion src/plone/restapi/services/users/update.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,6 @@ def set_member_portrait(self, user, portrait):
# frontend
scaled = data

portrait = Image(id=safe_id, file=scaled, title="")
portrait = Image(id=safe_id, file=scaled, title="", content_type=content_type)
membertool = getToolByName(self, "portal_memberdata")
membertool._setPortrait(portrait, safe_id)
4 changes: 2 additions & 2 deletions src/plone/restapi/tests/http-examples/registry_get_list.resp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Content-Type: application/json
"batching": {
"@id": "http://localhost:55001/plone/@registry",
"first": "http://localhost:55001/plone/@registry?b_start=0",
"last": "http://localhost:55001/plone/@registry?b_start=2850",
"last": "http://localhost:55001/plone/@registry?b_start=2950",
"next": "http://localhost:55001/plone/@registry?b_start=25"
},
"items": [
Expand Down Expand Up @@ -423,5 +423,5 @@ Content-Type: application/json
"value": "The person that created an item"
}
],
"items_total": 2875
"items_total": 2972
}