From 7589f321dae8ef6e5eec3f6834070437395295f2 Mon Sep 17 00:00:00 2001 From: petschki Date: Tue, 24 Oct 2023 12:57:58 +0200 Subject: [PATCH] [fc] Repository: plonetheme.barceloneta Branch: refs/heads/master Date: 2023-10-24T12:57:17+02:00 Author: Peter Mathis (petschki) Commit: https://github.com/plone/plonetheme.barceloneta/commit/057a21630d6d88805f1ce0a9d0ebfe8715c10b67 Preparing release 3.2.0a1 Files changed: M CHANGES.md M setup.py D news/350.feature Repository: plonetheme.barceloneta Branch: refs/heads/master Date: 2023-10-24T12:57:58+02:00 Author: Peter Mathis (petschki) Commit: https://github.com/plone/plonetheme.barceloneta/commit/fbca577587a003f3ac262fd6957485557b1358ab Back to development: 3.2.0a2 Files changed: M setup.py --- last_commit.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/last_commit.txt b/last_commit.txt index 4164de986f..29dc667e05 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,32 +1,32 @@ -Repository: plone.staticresources +Repository: plonetheme.barceloneta Branch: refs/heads/master -Date: 2023-10-24T12:54:13+02:00 +Date: 2023-10-24T12:57:17+02:00 Author: Peter Mathis (petschki) -Commit: https://github.com/plone/plone.staticresources/commit/a299dc5e758ff9f4e1df544298314aa4de384b5e +Commit: https://github.com/plone/plonetheme.barceloneta/commit/057a21630d6d88805f1ce0a9d0ebfe8715c10b67 -Preparing release 2.2.0a1 +Preparing release 3.2.0a1 Files changed: -M CHANGES.rst +M CHANGES.md M setup.py -D news/307.feature +D news/350.feature -b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex 0572b42cf..27d3e5659 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.0a1 (2023-10-24)\n+--------------------\n+\n+New features:\n+\n+\n+- Update TinyMCE to version 6.\n+ [petschki] (#307)\n+\n+\n 2.1.7 (2023-09-19)\n ------------------\n \ndiff --git a/news/307.feature b/news/307.feature\ndeleted file mode 100644\nindex e88ea4477..000000000\n--- a/news/307.feature\n+++ /dev/null\n@@ -1,2 +0,0 @@\n-Update TinyMCE to version 6.\n-[petschki]\ndiff --git a/setup.py b/setup.py\nindex e3ee30c59..a98b8d500 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -11,7 +11,7 @@\n \n setup(\n name="plone.staticresources",\n- version="2.1.8.dev0",\n+ version="2.2.0a1",\n description="Static resources for Plone",\n long_description=long_description,\n long_description_content_type="text/x-rst",\n' +b'diff --git a/CHANGES.md b/CHANGES.md\nindex c55ed6e9..25881c8f 100644\n--- a/CHANGES.md\n+++ b/CHANGES.md\n@@ -9,6 +9,15 @@\n \n \n \n+## 3.2.0a1 (2023-10-24)\n+\n+\n+### New features:\n+\n+- Upgrade TinyMCE styles to version 6\n+ [petschki] #350\n+\n+\n ## 3.1.6 (2023-10-24)\n \n \ndiff --git a/news/350.feature b/news/350.feature\ndeleted file mode 100644\nindex b2cd242b..00000000\n--- a/news/350.feature\n+++ /dev/null\n@@ -1,2 +0,0 @@\n-Upgrade TinyMCE styles to version 6\n-[petschki]\ndiff --git a/setup.py b/setup.py\nindex fbf61090..312fe81a 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -3,7 +3,7 @@\n from setuptools import setup\n \n \n-version = "3.1.7.dev0"\n+version = "3.2.0a1"\n \n long_description = f"{Path(\'README.md\').read_text()}\\n{Path(\'CHANGES.md\').read_text()}"\n \n' -Repository: plone.staticresources +Repository: plonetheme.barceloneta Branch: refs/heads/master -Date: 2023-10-24T12:54:57+02:00 +Date: 2023-10-24T12:57:58+02:00 Author: Peter Mathis (petschki) -Commit: https://github.com/plone/plone.staticresources/commit/b4c85f7eb6de9c488eedbaa23009193c84f8f3f4 +Commit: https://github.com/plone/plonetheme.barceloneta/commit/fbca577587a003f3ac262fd6957485557b1358ab -Back to development: 2.2.0a2 +Back to development: 3.2.0a2 Files changed: M setup.py -b'diff --git a/setup.py b/setup.py\nindex a98b8d500..bdf56dda2 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.0a1",\n+ version="2.2.0a2.dev0",\n description="Static resources for Plone",\n long_description=long_description,\n long_description_content_type="text/x-rst",\n' +b'diff --git a/setup.py b/setup.py\nindex 312fe81a..ea4450a1 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -3,7 +3,7 @@\n from setuptools import setup\n \n \n-version = "3.2.0a1"\n+version = "3.2.0a2.dev0"\n \n long_description = f"{Path(\'README.md\').read_text()}\\n{Path(\'CHANGES.md\').read_text()}"\n \n'