diff --git a/last_commit.txt b/last_commit.txt index d9c6390580..9c044bb63f 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -2,77 +2,64 @@ Repository: Products.CMFPlone Branch: refs/heads/master -Date: 2023-11-30T21:46:59+01:00 -Author: 1letter (1letter) <1letter@gmx.de> -Commit: https://github.com/plone/Products.CMFPlone/commit/dcb0c5352a21073b0754152531fea9078af8ddaa +Date: 2023-11-24T18:42:38+01:00 +Author: Johannes Raggam (thet) +Commit: https://github.com/plone/Products.CMFPlone/commit/dae2875d768a1163ac1eaa0747c922534f0b8e05 -Update wording in template +Correct the behavior interface for lead image in the syndication adapter. Files changed: -M Products/CMFPlone/browser/templates/plone-overview.pt +A news/3875.bugfix +M Products/CMFPlone/browser/syndication/adapters.py -b'diff --git a/Products/CMFPlone/browser/templates/plone-overview.pt b/Products/CMFPlone/browser/templates/plone-overview.pt\nindex d84963c36b..5d45f555e3 100644\n--- a/Products/CMFPlone/browser/templates/plone-overview.pt\n+++ b/Products/CMFPlone/browser/templates/plone-overview.pt\n@@ -92,7 +92,7 @@\n i18n:translate=""\n tal:condition="view/has_volto"\n href="${action}?site_id=Plone${site_number}&classic=1"\n- >Create Classic Plone site\n+ >Create Classic Plone UI site\n \n

\n- The \'Create Classic Plone site\' button creates a Plone site configured\n+ The \'Create Classic UI Plone site\' button creates a Plone site configured\n for HTML based output, as was already supported by previous Plone versions.\n Please consult our\n -Commit: https://github.com/plone/Products.CMFPlone/commit/f1615fe42f421c7dfca94beda2164bb4a80568a2 +Date: 2023-12-04T13:18:45+01:00 +Author: Jens W. Klein (jensens) +Commit: https://github.com/plone/Products.CMFPlone/commit/70ac85e4cafdf88baf66126ee86772291970481d -add News +Merge branch 'master' into fix-leadimage-61 Files changed: A news/3873.bugfix - -b'diff --git a/news/3873.bugfix b/news/3873.bugfix\nnew file mode 100644\nindex 0000000000..417c0825f6\n--- /dev/null\n+++ b/news/3873.bugfix\n@@ -0,0 +1,2 @@\n+Fix label in plone overview install chooser. Fix for #3872\n+[1letter]\n' - -Repository: Products.CMFPlone - - -Branch: refs/heads/master -Date: 2023-12-01T10:21:56+01:00 -Author: 1letter (1letter) <1letter@gmx.de> -Commit: https://github.com/plone/Products.CMFPlone/commit/efe385265e6724dd627595ddda64df6b55ac0c5a - -Fix Label - -Files changed: +A news/3876.bugfix +M Products/CMFPlone/browser/admin.py +M Products/CMFPlone/browser/syndication/adapters.py +M Products/CMFPlone/browser/syndication/settings.py M Products/CMFPlone/browser/templates/plone-overview.pt - -b'diff --git a/Products/CMFPlone/browser/templates/plone-overview.pt b/Products/CMFPlone/browser/templates/plone-overview.pt\nindex 5d45f555e3..035f0b4856 100644\n--- a/Products/CMFPlone/browser/templates/plone-overview.pt\n+++ b/Products/CMFPlone/browser/templates/plone-overview.pt\n@@ -92,7 +92,7 @@\n i18n:translate=""\n tal:condition="view/has_volto"\n href="${action}?site_id=Plone${site_number}&classic=1"\n- >Create Classic Plone UI site\n+ >Create Classic UI Plone site\n Create Classic Plone site\n+ >Create Classic UI Plone site\n \n

\n- The \'Create Classic Plone site\' button creates a Plone site configured\n+ The \'Create Classic UI Plone site\' button creates a Plone site configured\n for HTML based output, as was already supported by previous Plone versions.\n Please consult our\n -Commit: https://github.com/plone/Products.CMFPlone/commit/5fe9d3177d2f248ca4dad50a8e74f6cf8ae7df84 +Date: 2023-12-04T20:57:38+01:00 +Author: Johannes Raggam (thet) +Commit: https://github.com/plone/Products.CMFPlone/commit/70e77605bf56571a43cce9c194a543f7e437140c -Update News - -Files changed: -M news/3873.bugfix - -b'diff --git a/news/3873.bugfix b/news/3873.bugfix\nindex 417c0825f6..e201ecd08b 100644\n--- a/news/3873.bugfix\n+++ b/news/3873.bugfix\n@@ -1,2 +1 @@\n-Fix label in plone overview install chooser. Fix for #3872\n-[1letter]\n+Corrected the name in a button and help text to "Classic UI" when creating a Plone site. @1letter\n' - -Repository: Products.CMFPlone +Merge pull request #3875 from plone/fix-leadimage-61 - -Branch: refs/heads/master -Date: 2023-12-01T06:03:57-05:00 -Author: Steve Piercy (stevepiercy) -Commit: https://github.com/plone/Products.CMFPlone/commit/e8a11f5441d24d33ebafb35131e43f849893dedb - -Merge pull request #3883 from plone/1letter-fix#3873 - -1letter fix#3873 +Correct the behavior interface for lead image in the syndication adaper. Files changed: -A news/3873.bugfix -M Products/CMFPlone/browser/templates/plone-overview.pt +A news/3875.bugfix +M Products/CMFPlone/browser/syndication/adapters.py -b'diff --git a/Products/CMFPlone/browser/templates/plone-overview.pt b/Products/CMFPlone/browser/templates/plone-overview.pt\nindex d84963c36b..035f0b4856 100644\n--- a/Products/CMFPlone/browser/templates/plone-overview.pt\n+++ b/Products/CMFPlone/browser/templates/plone-overview.pt\n@@ -92,7 +92,7 @@\n i18n:translate=""\n tal:condition="view/has_volto"\n href="${action}?site_id=Plone${site_number}&classic=1"\n- >Create Classic Plone site\n+ >Create Classic UI Plone site\n \n

\n- The \'Create Classic Plone site\' button creates a Plone site configured\n+ The \'Create Classic UI Plone site\' button creates a Plone site configured\n for HTML based output, as was already supported by previous Plone versions.\n Please consult our\n