From 96fc8eba7444e44d71da66900f79b4593d33955e Mon Sep 17 00:00:00 2001 From: petschki Date: Wed, 18 Dec 2024 13:23:01 +0100 Subject: [PATCH] [fc] Repository: plone.staticresources Branch: refs/heads/master Date: 2024-12-18T13:21:45+01:00 Author: Peter Mathis (petschki) Commit: https://github.com/plone/plone.staticresources/commit/2262a7123dc66a7b025550ef91ec19df7b063115 Preparing release 2.2.0b3 Files changed: M CHANGES.rst M setup.py D news/362.bugfix Repository: plone.staticresources Branch: refs/heads/master Date: 2024-12-18T13:23:01+01:00 Author: Peter Mathis (petschki) Commit: https://github.com/plone/plone.staticresources/commit/bf5fd3f4cb194243d7e83be965cd954557d16752 Back to development: 2.2.0b4 Files changed: M setup.py --- last_commit.txt | 44 ++++++++++++++------------------------------ 1 file changed, 14 insertions(+), 30 deletions(-) diff --git a/last_commit.txt b/last_commit.txt index ec0006003b..515164516e 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,48 +1,32 @@ -Repository: Products.CMFPlone +Repository: plone.staticresources Branch: refs/heads/master -Date: 2024-12-18T11:46:44+01:00 +Date: 2024-12-18T13:21:45+01:00 Author: Peter Mathis (petschki) -Commit: https://github.com/plone/Products.CMFPlone/commit/234fb423fb84352d363b37155f1f6a748399c78b +Commit: https://github.com/plone/plone.staticresources/commit/2262a7123dc66a7b025550ef91ec19df7b063115 -Fix robottests for pat-contentbrowser with new component registry +Preparing release 2.2.0b3 Files changed: -M Products/CMFPlone/tests/robot/test_contentbrowser.robot +M CHANGES.rst +M setup.py +D news/362.bugfix -b'diff --git a/Products/CMFPlone/tests/robot/test_contentbrowser.robot b/Products/CMFPlone/tests/robot/test_contentbrowser.robot\nindex 28190b084d..10c712b678 100644\n--- a/Products/CMFPlone/tests/robot/test_contentbrowser.robot\n+++ b/Products/CMFPlone/tests/robot/test_contentbrowser.robot\n@@ -237,12 +237,12 @@ I edit the Link\n # --- THEN ------------------------------------------------------------------\n \n a image is selected as related item\n- image is releated item //div[contains(@class, "content-browser-selected-items")]/div[1]/img /asset-folder/mixed/files/images/image-2/@@images/image/mini\n+ image is releated item //div[contains(@class, "content-browser-selected-items")]/div[1]/div/img /asset-folder/mixed/files/images/image-2/@@images/image/mini\n \n \n two images are selected as related item\n- image is releated item //div[contains(@class, "content-browser-selected-items")]/div[1]/img /asset-folder/mixed/files/images/image-1/@@images/image/mini\n- image is releated item //div[contains(@class, "content-browser-selected-items")]/div[2]/img /asset-folder/mixed/files/images/image-2/@@images/image/mini\n+ image is releated item //div[contains(@class, "content-browser-selected-items")]/div[1]/div/img /asset-folder/mixed/files/images/image-1/@@images/image/mini\n+ image is releated item //div[contains(@class, "content-browser-selected-items")]/div[2]/div/img /asset-folder/mixed/files/images/image-2/@@images/image/mini\n \n the document contain the internal link\n Element exists //div[@id="parent-fieldname-text"]//a href /plone/doc\n' +b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex 4718d43ca..ddd1fbb26 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -8,6 +8,16 @@ Changelog\n \n .. towncrier release notes start\n \n+2.2.0b3 (2024-12-18)\n+--------------------\n+\n+Bug fixes:\n+\n+\n+- Update `mockup=5.2.0-beta.2`. See https://github.com/plone/mockup/releases/tag/5.2.0-beta.2\n+ [petschki] (#362)\n+\n+\n 2.2.0b2 (2024-11-11)\n --------------------\n \ndiff --git a/news/362.bugfix b/news/362.bugfix\ndeleted file mode 100644\nindex eee7e015f..000000000\n--- a/news/362.bugfix\n+++ /dev/null\n@@ -1,2 +0,0 @@\n-Update `mockup=5.2.0-beta.2`. See https://github.com/plone/mockup/releases/tag/5.2.0-beta.2\n-[petschki]\ndiff --git a/setup.py b/setup.py\nindex b23377c26..e4435ce2f 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -11,7 +11,7 @@\n \n setup(\n name="plone.staticresources",\n- version="2.2.0b3.dev0",\n+ version="2.2.0b3",\n description="Static resources for Plone",\n long_description=long_description,\n long_description_content_type="text/x-rst",\n' -Repository: Products.CMFPlone +Repository: plone.staticresources Branch: refs/heads/master -Date: 2024-12-18T11:48:36+01:00 +Date: 2024-12-18T13:23:01+01:00 Author: Peter Mathis (petschki) -Commit: https://github.com/plone/Products.CMFPlone/commit/944df0e01a4bf14569d406f050afe75d6c7a6a09 +Commit: https://github.com/plone/plone.staticresources/commit/bf5fd3f4cb194243d7e83be965cd954557d16752 -changenote +Back to development: 2.2.0b4 Files changed: -A news/4082.tests +M setup.py -b'diff --git a/news/4082.tests b/news/4082.tests\nnew file mode 100644\nindex 0000000000..96e8275a7e\n--- /dev/null\n+++ b/news/4082.tests\n@@ -0,0 +1,2 @@\n+Update for `pat-contentbrowser` with new component registry.\n+[petschki]\n' - -Repository: Products.CMFPlone - - -Branch: refs/heads/master -Date: 2024-12-18T13:03:25+01:00 -Author: Peter Mathis (petschki) -Commit: https://github.com/plone/Products.CMFPlone/commit/6c19cc421078ab3f4616565c2ec95daa20218e71 - -Merge pull request #4082 from plone/petschki-contentbrowser-component-updates - -Fix robottests for `pat-contentbrowser` with new component registry - -Files changed: -A news/4082.tests -M Products/CMFPlone/tests/robot/test_contentbrowser.robot - -b'diff --git a/Products/CMFPlone/tests/robot/test_contentbrowser.robot b/Products/CMFPlone/tests/robot/test_contentbrowser.robot\nindex 28190b084d..10c712b678 100644\n--- a/Products/CMFPlone/tests/robot/test_contentbrowser.robot\n+++ b/Products/CMFPlone/tests/robot/test_contentbrowser.robot\n@@ -237,12 +237,12 @@ I edit the Link\n # --- THEN ------------------------------------------------------------------\n \n a image is selected as related item\n- image is releated item //div[contains(@class, "content-browser-selected-items")]/div[1]/img /asset-folder/mixed/files/images/image-2/@@images/image/mini\n+ image is releated item //div[contains(@class, "content-browser-selected-items")]/div[1]/div/img /asset-folder/mixed/files/images/image-2/@@images/image/mini\n \n \n two images are selected as related item\n- image is releated item //div[contains(@class, "content-browser-selected-items")]/div[1]/img /asset-folder/mixed/files/images/image-1/@@images/image/mini\n- image is releated item //div[contains(@class, "content-browser-selected-items")]/div[2]/img /asset-folder/mixed/files/images/image-2/@@images/image/mini\n+ image is releated item //div[contains(@class, "content-browser-selected-items")]/div[1]/div/img /asset-folder/mixed/files/images/image-1/@@images/image/mini\n+ image is releated item //div[contains(@class, "content-browser-selected-items")]/div[2]/div/img /asset-folder/mixed/files/images/image-2/@@images/image/mini\n \n the document contain the internal link\n Element exists //div[@id="parent-fieldname-text"]//a href /plone/doc\ndiff --git a/news/4082.tests b/news/4082.tests\nnew file mode 100644\nindex 0000000000..96e8275a7e\n--- /dev/null\n+++ b/news/4082.tests\n@@ -0,0 +1,2 @@\n+Update for `pat-contentbrowser` with new component registry.\n+[petschki]\n' +b'diff --git a/setup.py b/setup.py\nindex e4435ce2f..9a255d670 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -11,7 +11,7 @@\n \n setup(\n name="plone.staticresources",\n- version="2.2.0b3",\n+ version="2.2.0b4.dev0",\n description="Static resources for Plone",\n long_description=long_description,\n long_description_content_type="text/x-rst",\n'