-
-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Branch: refs/heads/4.x.x Date: 2024-12-17T08:50:30-08:00 Author: David Glick (davisagli) <[email protected]> Commit: plone/plone.volto@30fd433 test with Plone 6.0.13 Files changed: M .github/workflows/tests.yml M Makefile M plone-6.0.x.cfg Repository: plone.volto Branch: refs/heads/4.x.x Date: 2024-12-17T08:55:02-08:00 Author: David Glick (davisagli) <[email protected]> Commit: plone/plone.volto@637e2e4 update plone/setup-plone Files changed: M .github/workflows/tests.yml Repository: plone.volto Branch: refs/heads/4.x.x Date: 2024-12-17T08:58:00-08:00 Author: David Glick (davisagli) <[email protected]> Commit: plone/plone.volto@96d8a6d Also update Plone 5 version Files changed: M .github/workflows/tests.yml M Makefile M plone-5.2.x.cfg Repository: plone.volto Branch: refs/heads/4.x.x Date: 2024-12-17T09:05:41-08:00 Author: David Glick (davisagli) <[email protected]> Commit: plone/plone.volto@f1d47d8 Merge pull request #174 from plone/4.x-update-ci test with Plone 6.0.13 Files changed: M .github/workflows/tests.yml M Makefile M plone-5.2.x.cfg M plone-6.0.x.cfg
- Loading branch information
Showing
1 changed file
with
59 additions
and
8 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,17 +2,68 @@ Repository: plone.volto | |
|
|
||
|
|
||
| Branch: refs/heads/4.x.x | ||
| Date: 2024-12-17T08:45:26-08:00 | ||
| Author: Víctor Fernández de Alba (sneridagh) <sneridagh@gmail.com> | ||
| Commit: https://github.com/plone/plone.volto/commit/4a7593baa8094b1e8e3e0f495f85f98a2e926eff | ||
| Date: 2024-12-17T08:50:30-08:00 | ||
| Author: David Glick (davisagli) <david@glicksoftware.com> | ||
| Commit: https://github.com/plone/plone.volto/commit/30fd433d92c779afe8251f6f0b331f9d1fbdb75f | ||
|
|
||
| Merge pull request #173 from plone/172-preview-image-anywhere | ||
| test with Plone 6.0.13 | ||
|
|
||
| allow choosing preview images from a different language tree | ||
| Files changed: | ||
| M .github/workflows/tests.yml | ||
| M Makefile | ||
| M plone-6.0.x.cfg | ||
|
|
||
| b'diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml\nindex 18ae8a7..0cf8417 100644\n--- a/.github/workflows/tests.yml\n+++ b/.github/workflows/tests.yml\n@@ -6,11 +6,9 @@ jobs:\n strategy:\n fail-fast: false\n matrix:\n- python: [3.7, 3.8, 3.9, "3.10", "3.11"]\n- plone: ["6.0.6", "5.2.10"]\n+ python: [3.8, 3.9, "3.10", "3.11"]\n+ plone: ["6.0.13", "5.2.10"]\n exclude:\n- - plone: "6.0.6"\n- python: 3.7\n - plone: "5.2.10"\n python: 3.9\n - plone: "5.2.10"\ndiff --git a/Makefile b/Makefile\nindex ec7dc4b..828473c 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -16,7 +16,7 @@ RESET=`tput sgr0`\n YELLOW=`tput setaf 3`\n \n PLONE5=5.2.10\n-PLONE6=6.0.6\n+PLONE6=6.0.13\n \n CODE_QUALITY_VERSION=1.0.1\n LINT=docker run --rm -v "$(PWD)":/github/workspace plone/code-quality:${CODE_QUALITY_VERSION} check\ndiff --git a/plone-6.0.x.cfg b/plone-6.0.x.cfg\nindex 098e043..ff69a97 100644\n--- a/plone-6.0.x.cfg\n+++ b/plone-6.0.x.cfg\n@@ -1,6 +1,6 @@\n [buildout]\n extends =\n- https://dist.plone.org/release/6.0.6/versions.cfg\n+ https://dist.plone.org/release/6.0.13/versions.cfg\n base.cfg\n \n [instance]\n' | ||
|
|
||
| Repository: plone.volto | ||
|
|
||
|
|
||
| Branch: refs/heads/4.x.x | ||
| Date: 2024-12-17T08:55:02-08:00 | ||
| Author: David Glick (davisagli) <[email protected]> | ||
| Commit: https://github.com/plone/plone.volto/commit/637e2e48426c96cf47366c468a58510320e49012 | ||
|
|
||
| update plone/setup-plone | ||
|
|
||
| Files changed: | ||
| M .github/workflows/tests.yml | ||
|
|
||
| b'diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml\nindex 0cf8417..89c0fd1 100644\n--- a/.github/workflows/tests.yml\n+++ b/.github/workflows/tests.yml\n@@ -22,7 +22,7 @@ jobs:\n \n - name: Setup Plone ${{ matrix.plone }} with Python ${{ matrix.python }}\n id: setup\n- uses: plone/[email protected]\n+ uses: plone/[email protected]\n with:\n python-version: ${{ matrix.python }}\n plone-version: ${{ matrix.plone }}\n' | ||
|
|
||
| Repository: plone.volto | ||
|
|
||
|
|
||
| Branch: refs/heads/4.x.x | ||
| Date: 2024-12-17T08:58:00-08:00 | ||
| Author: David Glick (davisagli) <[email protected]> | ||
| Commit: https://github.com/plone/plone.volto/commit/96d8a6d8cbe6dc1ca7a898e5423fc186d38de345 | ||
|
|
||
| Also update Plone 5 version | ||
|
|
||
| Files changed: | ||
| M .github/workflows/tests.yml | ||
| M Makefile | ||
| M plone-5.2.x.cfg | ||
|
|
||
| b'diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml\nindex 89c0fd1..6cf2235 100644\n--- a/.github/workflows/tests.yml\n+++ b/.github/workflows/tests.yml\n@@ -7,13 +7,13 @@ jobs:\n fail-fast: false\n matrix:\n python: [3.8, 3.9, "3.10", "3.11"]\n- plone: ["6.0.13", "5.2.10"]\n+ plone: ["6.0.13", "5.2.15"]\n exclude:\n- - plone: "5.2.10"\n+ - plone: "5.2.15"\n python: 3.9\n- - plone: "5.2.10"\n+ - plone: "5.2.15"\n python: "3.10"\n- - plone: "5.2.10"\n+ - plone: "5.2.15"\n python: "3.11"\n \n steps:\ndiff --git a/Makefile b/Makefile\nindex 828473c..7bd7a39 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -15,7 +15,7 @@ GREEN=`tput setaf 2`\n RESET=`tput sgr0`\n YELLOW=`tput setaf 3`\n \n-PLONE5=5.2.10\n+PLONE5=5.2.15\n PLONE6=6.0.13\n \n CODE_QUALITY_VERSION=1.0.1\ndiff --git a/plone-5.2.x.cfg b/plone-5.2.x.cfg\nindex 82926b3..f70d4e3 100644\n--- a/plone-5.2.x.cfg\n+++ b/plone-5.2.x.cfg\n@@ -1,7 +1,7 @@\n [buildout]\n extends =\n base.cfg\n- http://dist.plone.org/release/5.2.10/versions.cfg\n+ http://dist.plone.org/release/5.2.15/versions.cfg\n find-links += http://dist.plone.org/thirdparty/\n \n [versions]\n' | ||
|
|
||
| Repository: plone.volto | ||
|
|
||
|
|
||
| Branch: refs/heads/4.x.x | ||
| Date: 2024-12-17T09:05:41-08:00 | ||
| Author: David Glick (davisagli) <[email protected]> | ||
| Commit: https://github.com/plone/plone.volto/commit/f1d47d888f0bfeffa83bd276ca6e662c4b992778 | ||
|
|
||
| Merge pull request #174 from plone/4.x-update-ci | ||
|
|
||
| test with Plone 6.0.13 | ||
|
|
||
| Files changed: | ||
| A news/172.bugfix | ||
| M src/plone/volto/behaviors/preview_link.py | ||
| M .github/workflows/tests.yml | ||
| M Makefile | ||
| M plone-5.2.x.cfg | ||
| M plone-6.0.x.cfg | ||
|
|
||
| b'diff --git a/news/172.bugfix b/news/172.bugfix\nnew file mode 100644\nindex 00000000..c4d213e8\n--- /dev/null\n+++ b/news/172.bugfix\n@@ -0,0 +1 @@\n+Allow setting `preview_image_link` to an image from a different language root folder. @davisagli\ndiff --git a/src/plone/volto/behaviors/preview_link.py b/src/plone/volto/behaviors/preview_link.py\nindex 17f05010..965ab244 100644\n--- a/src/plone/volto/behaviors/preview_link.py\n+++ b/src/plone/volto/behaviors/preview_link.py\n@@ -17,6 +17,16 @@\n from zope.schema import TextLine\n \n \n+# Allow choosing preview images from a different language tree in a multi-lingual site.\n+# See https://github.com/plone/plone.volto/issues/172\n+try:\n+ import plone.app.multilingual # noqa\n+\n+ VOCAB = "plone.app.multilingual.RootCatalog"\n+except ImportError:\n+ VOCAB = "plone.app.vocabularies.Catalog"\n+\n+\n @provider(IFormFieldProvider)\n class IPreviewLink(model.Schema):\n \n@@ -26,7 +36,7 @@ class IPreviewLink(model.Schema):\n "help_previewimage",\n default="Select an image that will be used in listing and teaser blocks.",\n ),\n- vocabulary="plone.app.vocabularies.Catalog",\n+ vocabulary=VOCAB,\n required=False,\n )\n \n' | ||
| b'diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml\nindex 18ae8a7..6cf2235 100644\n--- a/.github/workflows/tests.yml\n+++ b/.github/workflows/tests.yml\n@@ -6,16 +6,14 @@ jobs:\n strategy:\n fail-fast: false\n matrix:\n- python: [3.7, 3.8, 3.9, "3.10", "3.11"]\n- plone: ["6.0.6", "5.2.10"]\n+ python: [3.8, 3.9, "3.10", "3.11"]\n+ plone: ["6.0.13", "5.2.15"]\n exclude:\n- - plone: "6.0.6"\n- python: 3.7\n- - plone: "5.2.10"\n+ - plone: "5.2.15"\n python: 3.9\n- - plone: "5.2.10"\n+ - plone: "5.2.15"\n python: "3.10"\n- - plone: "5.2.10"\n+ - plone: "5.2.15"\n python: "3.11"\n \n steps:\n@@ -24,7 +22,7 @@ jobs:\n \n - name: Setup Plone ${{ matrix.plone }} with Python ${{ matrix.python }}\n id: setup\n- uses: plone/[email protected]\n+ uses: plone/[email protected]\n with:\n python-version: ${{ matrix.python }}\n plone-version: ${{ matrix.plone }}\ndiff --git a/Makefile b/Makefile\nindex ec7dc4b..7bd7a39 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -15,8 +15,8 @@ GREEN=`tput setaf 2`\n RESET=`tput sgr0`\n YELLOW=`tput setaf 3`\n \n-PLONE5=5.2.10\n-PLONE6=6.0.6\n+PLONE5=5.2.15\n+PLONE6=6.0.13\n \n CODE_QUALITY_VERSION=1.0.1\n LINT=docker run --rm -v "$(PWD)":/github/workspace plone/code-quality:${CODE_QUALITY_VERSION} check\ndiff --git a/plone-5.2.x.cfg b/plone-5.2.x.cfg\nindex 82926b3..f70d4e3 100644\n--- a/plone-5.2.x.cfg\n+++ b/plone-5.2.x.cfg\n@@ -1,7 +1,7 @@\n [buildout]\n extends =\n base.cfg\n- http://dist.plone.org/release/5.2.10/versions.cfg\n+ http://dist.plone.org/release/5.2.15/versions.cfg\n find-links += http://dist.plone.org/thirdparty/\n \n [versions]\ndiff --git a/plone-6.0.x.cfg b/plone-6.0.x.cfg\nindex 098e043..ff69a97 100644\n--- a/plone-6.0.x.cfg\n+++ b/plone-6.0.x.cfg\n@@ -1,6 +1,6 @@\n [buildout]\n extends =\n- https://dist.plone.org/release/6.0.6/versions.cfg\n+ https://dist.plone.org/release/6.0.13/versions.cfg\n base.cfg\n \n [instance]\n' | ||
|
|
||