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

Backports 17.5.0 #5388

Merged
merged 3 commits into from
Nov 10, 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 Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ MAKEFLAGS+=--no-builtin-rules
# Project settings

INSTANCE_PORT=8080
DOCKER_IMAGE=plone/server-dev:6.0.7
DOCKER_IMAGE_ACCEPTANCE=plone/server-acceptance:6.0.7
DOCKER_IMAGE=plone/server-dev:6.0.8
DOCKER_IMAGE_ACCEPTANCE=plone/server-acceptance:6.0.8
KGS=
NODEBIN = ./node_modules/.bin
SCRIPTSPACKAGE = ./packages/scripts
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ On Plone 5, Volto is currently tested with the following packages pinned to spec
- plone.rest 2.0.0
- plone.volto 4.0.3


## Volto in Production

Volto is actively developed since 2017 and used in production since 2018 on the following websites:
Expand Down
5 changes: 3 additions & 2 deletions api/buildout.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[buildout]
index = https://pypi.org/simple/
extends =
http://dist.plone.org/release/6.0.6/versions.cfg
http://dist.plone.org/release/6.0.8/versions.cfg
version-constraints.cfg
versions.cfg
parts = instance plonesite site-packages test robot-server
Expand All @@ -16,8 +16,9 @@ show-picked-versions = true

[sources]
plone.volto = git https://github.com/plone/plone.volto.git branch=main
plone.rest = git git@github.com:plone/plone.rest.git branch=master
plone.rest = git git@github.com:plone/plone.rest.git branch=main
plone.restapi = git https://github.com/plone/plone.restapi.git pushurl=git@github.com:plone/plone.restapi.git branch=main
plone.app.linkintegrity = git https://github.com/plone/plone.app.linkintegrity.git pushurl=git@github.com:plone/plone.app.linkintegrity.git branch=master

[instance]
recipe = plone.recipe.zope2instance
Expand Down
2 changes: 1 addition & 1 deletion cypress/tests/core/content/content.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ describe('Add Content Tests', () => {
cy.findByLabelText('/my-page').children('td').eq(1).click();

cy.get('.top-menu-menu .delete').click();
cy.get('.modal.active').contains('View broken links list');
cy.get('.modal.active').contains('View links and references to this item');
cy.get('.actions').contains('Delete').click();
});

Expand Down
20 changes: 10 additions & 10 deletions locales/ca/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -1019,6 +1019,11 @@ msgstr ""
msgid "Deleted"
msgstr ""

#: components/manage/Contents/Contents
# defaultMessage: Deleting this item breaks {brokenReferences} {variation}.
msgid "Deleting this item breaks {brokenReferences} {variation}."
msgstr ""

#: components/manage/Widgets/QuerystringWidget
# defaultMessage: Depth
msgid "Depth"
Expand Down Expand Up @@ -3688,11 +3693,6 @@ msgstr "Aquesta és una còpia de treball de {title}"
msgid "This item is also a folder."
msgstr ""

#: components/manage/Contents/Contents
# defaultMessage: This item is referenced by other items. By deleting it {brokenReferences} {variation} will be broken.
msgid "This item is referenced by other items. By deleting it {brokenReferences} {variation} will be broken."
msgstr ""

#: components/manage/LockingToastsFactory/LockingToastsFactory
# defaultMessage: This item was locked by {creator} on {date}
msgid "This item was locked by {creator} on {date}"
Expand Down Expand Up @@ -4101,16 +4101,16 @@ msgstr "URL del vídeo"
msgid "View"
msgstr "veure"

#: components/manage/Contents/Contents
# defaultMessage: View broken links list
msgid "View broken links list"
msgstr ""

#: components/manage/History/History
# defaultMessage: View changes
msgid "View changes"
msgstr "Veure els canvis"

#: components/manage/Contents/Contents
# defaultMessage: View links and references to this item
msgid "View links and references to this item"
msgstr ""

#: components/manage/History/History
# defaultMessage: View this revision
msgid "View this revision"
Expand Down
20 changes: 10 additions & 10 deletions locales/de/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -1016,6 +1016,11 @@ msgstr ""
msgid "Deleted"
msgstr "Gelöscht"

#: components/manage/Contents/Contents
# defaultMessage: Deleting this item breaks {brokenReferences} {variation}.
msgid "Deleting this item breaks {brokenReferences} {variation}."
msgstr ""

#: components/manage/Widgets/QuerystringWidget
# defaultMessage: Depth
msgid "Depth"
Expand Down Expand Up @@ -3685,11 +3690,6 @@ msgstr "Das ist eine Arbeitskopie von {title}"
msgid "This item is also a folder."
msgstr ""

#: components/manage/Contents/Contents
# defaultMessage: This item is referenced by other items. By deleting it {brokenReferences} {variation} will be broken.
msgid "This item is referenced by other items. By deleting it {brokenReferences} {variation} will be broken."
msgstr ""

#: components/manage/LockingToastsFactory/LockingToastsFactory
# defaultMessage: This item was locked by {creator} on {date}
msgid "This item was locked by {creator} on {date}"
Expand Down Expand Up @@ -4098,16 +4098,16 @@ msgstr "Video URL"
msgid "View"
msgstr "Anzeigen"

#: components/manage/Contents/Contents
# defaultMessage: View broken links list
msgid "View broken links list"
msgstr ""

#: components/manage/History/History
# defaultMessage: View changes
msgid "View changes"
msgstr "Änderungen anzeigen"

#: components/manage/Contents/Contents
# defaultMessage: View links and references to this item
msgid "View links and references to this item"
msgstr ""

#: components/manage/History/History
# defaultMessage: View this revision
msgid "View this revision"
Expand Down
20 changes: 10 additions & 10 deletions locales/en/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -1010,6 +1010,11 @@ msgstr ""
msgid "Deleted"
msgstr ""

#: components/manage/Contents/Contents
# defaultMessage: Deleting this item breaks {brokenReferences} {variation}.
msgid "Deleting this item breaks {brokenReferences} {variation}."
msgstr ""

#: components/manage/Widgets/QuerystringWidget
# defaultMessage: Depth
msgid "Depth"
Expand Down Expand Up @@ -3679,11 +3684,6 @@ msgstr ""
msgid "This item is also a folder."
msgstr ""

#: components/manage/Contents/Contents
# defaultMessage: This item is referenced by other items. By deleting it {brokenReferences} {variation} will be broken.
msgid "This item is referenced by other items. By deleting it {brokenReferences} {variation} will be broken."
msgstr ""

#: components/manage/LockingToastsFactory/LockingToastsFactory
# defaultMessage: This item was locked by {creator} on {date}
msgid "This item was locked by {creator} on {date}"
Expand Down Expand Up @@ -4092,16 +4092,16 @@ msgstr ""
msgid "View"
msgstr ""

#: components/manage/Contents/Contents
# defaultMessage: View broken links list
msgid "View broken links list"
msgstr ""

#: components/manage/History/History
# defaultMessage: View changes
msgid "View changes"
msgstr ""

#: components/manage/Contents/Contents
# defaultMessage: View links and references to this item
msgid "View links and references to this item"
msgstr ""

#: components/manage/History/History
# defaultMessage: View this revision
msgid "View this revision"
Expand Down
20 changes: 10 additions & 10 deletions locales/es/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -1021,6 +1021,11 @@ msgstr "¿Eliminar este elemento?"
msgid "Deleted"
msgstr "Eliminado"

#: components/manage/Contents/Contents
# defaultMessage: Deleting this item breaks {brokenReferences} {variation}.
msgid "Deleting this item breaks {brokenReferences} {variation}."
msgstr ""

#: components/manage/Widgets/QuerystringWidget
# defaultMessage: Depth
msgid "Depth"
Expand Down Expand Up @@ -3690,11 +3695,6 @@ msgstr "Es una copia de trabajo de {title}"
msgid "This item is also a folder."
msgstr "Este elemento también es una carpeta."

#: components/manage/Contents/Contents
# defaultMessage: This item is referenced by other items. By deleting it {brokenReferences} {variation} will be broken.
msgid "This item is referenced by other items. By deleting it {brokenReferences} {variation} will be broken."
msgstr "Este elemento está referenciado por otros elementos. Al eliminarlo, {brokenReferences} {variation} se romperá."

#: components/manage/LockingToastsFactory/LockingToastsFactory
# defaultMessage: This item was locked by {creator} on {date}
msgid "This item was locked by {creator} on {date}"
Expand Down Expand Up @@ -4103,16 +4103,16 @@ msgstr "URL del vídeo"
msgid "View"
msgstr "Ver"

#: components/manage/Contents/Contents
# defaultMessage: View broken links list
msgid "View broken links list"
msgstr "Ver la lista de enlaces rotos"

#: components/manage/History/History
# defaultMessage: View changes
msgid "View changes"
msgstr "Mostrar los cambios"

#: components/manage/Contents/Contents
# defaultMessage: View links and references to this item
msgid "View links and references to this item"
msgstr ""

#: components/manage/History/History
# defaultMessage: View this revision
msgid "View this revision"
Expand Down
20 changes: 10 additions & 10 deletions locales/eu/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -1017,6 +1017,11 @@ msgstr ""
msgid "Deleted"
msgstr "Ezabatuta"

#: components/manage/Contents/Contents
# defaultMessage: Deleting this item breaks {brokenReferences} {variation}.
msgid "Deleting this item breaks {brokenReferences} {variation}."
msgstr ""

#: components/manage/Widgets/QuerystringWidget
# defaultMessage: Depth
msgid "Depth"
Expand Down Expand Up @@ -3686,11 +3691,6 @@ msgstr "Hau {title} elementuaren lan-bertsioa da"
msgid "This item is also a folder."
msgstr ""

#: components/manage/Contents/Contents
# defaultMessage: This item is referenced by other items. By deleting it {brokenReferences} {variation} will be broken.
msgid "This item is referenced by other items. By deleting it {brokenReferences} {variation} will be broken."
msgstr ""

#: components/manage/LockingToastsFactory/LockingToastsFactory
# defaultMessage: This item was locked by {creator} on {date}
msgid "This item was locked by {creator} on {date}"
Expand Down Expand Up @@ -4099,16 +4099,16 @@ msgstr "Bideoaren URLa"
msgid "View"
msgstr "Ikusi"

#: components/manage/Contents/Contents
# defaultMessage: View broken links list
msgid "View broken links list"
msgstr ""

#: components/manage/History/History
# defaultMessage: View changes
msgid "View changes"
msgstr "Aldaketak ikusi"

#: components/manage/Contents/Contents
# defaultMessage: View links and references to this item
msgid "View links and references to this item"
msgstr ""

#: components/manage/History/History
# defaultMessage: View this revision
msgid "View this revision"
Expand Down
20 changes: 10 additions & 10 deletions locales/fi/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -1021,6 +1021,11 @@ msgstr ""
msgid "Deleted"
msgstr "Poistettu"

#: components/manage/Contents/Contents
# defaultMessage: Deleting this item breaks {brokenReferences} {variation}.
msgid "Deleting this item breaks {brokenReferences} {variation}."
msgstr ""

#: components/manage/Widgets/QuerystringWidget
# defaultMessage: Depth
msgid "Depth"
Expand Down Expand Up @@ -3690,11 +3695,6 @@ msgstr ""
msgid "This item is also a folder."
msgstr ""

#: components/manage/Contents/Contents
# defaultMessage: This item is referenced by other items. By deleting it {brokenReferences} {variation} will be broken.
msgid "This item is referenced by other items. By deleting it {brokenReferences} {variation} will be broken."
msgstr ""

#: components/manage/LockingToastsFactory/LockingToastsFactory
# defaultMessage: This item was locked by {creator} on {date}
msgid "This item was locked by {creator} on {date}"
Expand Down Expand Up @@ -4103,16 +4103,16 @@ msgstr "Videon URL"
msgid "View"
msgstr "Näytä"

#: components/manage/Contents/Contents
# defaultMessage: View broken links list
msgid "View broken links list"
msgstr ""

#: components/manage/History/History
# defaultMessage: View changes
msgid "View changes"
msgstr "Näytä muutokset"

#: components/manage/Contents/Contents
# defaultMessage: View links and references to this item
msgid "View links and references to this item"
msgstr ""

#: components/manage/History/History
# defaultMessage: View this revision
msgid "View this revision"
Expand Down
20 changes: 10 additions & 10 deletions locales/fr/LC_MESSAGES/volto.po
Original file line number Diff line number Diff line change
Expand Up @@ -1027,6 +1027,11 @@ msgstr ""
msgid "Deleted"
msgstr "Supprimé"

#: components/manage/Contents/Contents
# defaultMessage: Deleting this item breaks {brokenReferences} {variation}.
msgid "Deleting this item breaks {brokenReferences} {variation}."
msgstr ""

#: components/manage/Widgets/QuerystringWidget
# defaultMessage: Depth
msgid "Depth"
Expand Down Expand Up @@ -3696,11 +3701,6 @@ msgstr "Il sagit d'une copie de travail de {title}"
msgid "This item is also a folder."
msgstr ""

#: components/manage/Contents/Contents
# defaultMessage: This item is referenced by other items. By deleting it {brokenReferences} {variation} will be broken.
msgid "This item is referenced by other items. By deleting it {brokenReferences} {variation} will be broken."
msgstr ""

#: components/manage/LockingToastsFactory/LockingToastsFactory
# defaultMessage: This item was locked by {creator} on {date}
msgid "This item was locked by {creator} on {date}"
Expand Down Expand Up @@ -4109,16 +4109,16 @@ msgstr "URL de la vidéo"
msgid "View"
msgstr "Vue"

#: components/manage/Contents/Contents
# defaultMessage: View broken links list
msgid "View broken links list"
msgstr ""

#: components/manage/History/History
# defaultMessage: View changes
msgid "View changes"
msgstr "Voir les changements"

#: components/manage/Contents/Contents
# defaultMessage: View links and references to this item
msgid "View links and references to this item"
msgstr ""

#: components/manage/History/History
# defaultMessage: View this revision
msgid "View this revision"
Expand Down
Loading