Merge remote-tracking branch 'origin/master' into dx-siteroot

CHANGES.rst

@@ -8,6 +8,16 @@ Changelog
 
 .. towncrier release notes start
 
+2.0.39 (2021-07-31)
+-------------------
+
+Bug fixes:
+
+
+- Added upgrade to 5213, Plone 5.2.5.
+  [maurits] (#525)
+
+
 2.0.38 (2021-03-02)
 -------------------
 

news/254.feature

@@ -0,0 +1,2 @@
+Protect @@historyview with Modify portal content permission. Fixes https://github.com/plone/Products.CMFPlone/issues/3297
+[pbauer]

news/255.feature

@@ -0,0 +1,2 @@
+Add relations controlpanel as part of https://github.com/plone/Products.CMFPlone/pull/3232
+[pbauer]

plone/app/upgrade/v52/configure.zcml

@@ -193,4 +193,18 @@
 
     </gs:upgradeSteps>
 
+    <gs:upgradeSteps
+        source="5212"
+        destination="5213"
+        profile="Products.CMFPlone:plone">
+        <!-- Plone 5.2.5 -->
+
+        <gs:upgradeStep
+            title="Miscellaneous"
+            description=""
+            handler="..utils.null_upgrade_step"
+            />
+
+    </gs:upgradeSteps>
+
 </configure>

plone/app/upgrade/v60/profiles/to_alpha1/actions.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<object name="portal_actions" meta_type="Plone Actions Tool"
+   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
+ <object name="object" meta_type="CMF Action Category">
+  <object name="history" meta_type="CMF Action" i18n:domain="plone">
+   <property name="permissions">
+    <element value="Modify portal content"/>
+   </property>
+  </object>
+ </object>
+</object>

plone/app/upgrade/v60/profiles/to_alpha1/controlpanel.xml

@@ -36,6 +36,12 @@
     url_expr="string:${portal_url}/@@member-fields" visible="True"
     i18n:attributes="title">
     <permission>Plone Site Setup: Users and Groups</permission>
-   </configlet>
-
+  </configlet>
+  <configlet title="Relations" action_id="inspectrelations"
+    icon_expr="string:share-fill"
+    appId="Relations" category="plone-content" condition_expr=""
+    url_expr="string:${portal_url}/@@inspect-relations" visible="True"
+    i18n:attributes="title">
+    <permission>Inspect Relations</permission>
+  </configlet>
 </object>

setup.py

@@ -2,7 +2,7 @@
 from setuptools import setup
 
 
-version = '2.0.39.dev0'
+version = '2.0.40.dev0'
 
 setup(
     name='plone.app.upgrade',
@@ -17,6 +17,7 @@
         "Framework :: Plone :: 5.0",
         "Framework :: Plone :: 5.1",
         "Framework :: Plone :: 5.2",
+        "Framework :: Plone :: 6.0",
         "Framework :: Plone :: Core",
         "Framework :: Zope2",
         "Framework :: Zope :: 4",
@@ -27,6 +28,7 @@
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
     ],
     keywords='Plone upgrade migration',
     author='Plone Foundation',