Merge branch 'develop' into 258877-Azure-AD

eea · Mar 18, 2024 · f3aafef · f3aafef
2 parents c95a7e2 + c6bd655
commit f3aafef
Show file tree

Hide file tree

Showing 4 changed files with 186 additions and 139 deletions.
diff --git a/jsconfig.json b/jsconfig.json
@@ -162,6 +162,9 @@
             ],
             "@eeacms/volto-toolbar-actions": [
                 "addons/volto-toolbar-actions/src"
+            ],
+            "@eeacms/volto-controlpanel": [
+                "addons/volto-controlpanel/src"
             ]
         },
         "baseUrl": "src"

diff --git a/mrs.developer.json b/mrs.developer.json
@@ -427,5 +427,13 @@
     "package": "@eeacms/volto-toolbar-actions",
     "path": "src",
     "branch": "develop"
+  },
+  "volto-controlpanel": {
+    "develop": true,
+    "url": "git@github.com:eea/volto-controlpanel.git",
+    "https": "https://github.com/eea/volto-controlpanel.git",
+    "package": "@eeacms/volto-controlpanel",
+    "path": "src",
+    "branch": "develop"
   }
 }
diff --git a/package.json b/package.json
@@ -48,7 +48,6 @@
     "@eeacms/volto-eea-kitkat",
     "@eeacms/volto-editing-progress",
     "@eeacms/volto-workflow-progress",
-    "@eeacms/volto-toolbar-actions",
     "@eeacms/volto-embed",
     "@eeacms/volto-datablocks",
     "@eeacms/volto-plotlycharts",
@@ -164,19 +163,18 @@
   "resolutions": {
     "@plone-collective/volto-authomatic": "2.0.1",
     "@eeacms/volto-embed": "9.1.1",
-    "@eeacms/volto-datablocks": "6.4.0",
-    "@eeacms/volto-datahub": "1.0.32",
-    "@eeacms/volto-eea-design-system": "1.23.2",
-    "@eeacms/volto-eea-kitkat": "22.1.0",
+    "@eeacms/volto-datablocks": "6.4.1",
+    "@eeacms/volto-datahub": "1.0.33",
+    "@eeacms/volto-eea-design-system": "1.23.3",
+    "@eeacms/volto-eea-kitkat": "23.0.1",
     "@eeacms/volto-eea-map": "3.3.1",
     "@eeacms/volto-eea-website-policy": "1.13.0",
-    "@eeacms/volto-eea-website-theme": "1.29.0",
+    "@eeacms/volto-eea-website-theme": "1.31.0",
     "@eeacms/volto-globalsearch": "1.1.0",
-    "@eeacms/volto-plotlycharts": "9.0.2",
+    "@eeacms/volto-plotlycharts": "9.1.0",
     "@eeacms/volto-redmine-helpdesk": "0.2.0",
-    "@eeacms/volto-searchlib": "0.7.3",
+    "@eeacms/volto-searchlib": "0.8.0",
     "@eeacms/volto-tableau": "7.2.1",
-    "@eeacms/volto-toolbar-actions": "1.0.3",
     "@eeacms/volto-workflow-progress": "4.1.1",
     "@eeacms/volto-block-data-figure": "7.1.0",
     "@eeacms/volto-editing-progress": "0.4.0",
@@ -188,24 +186,23 @@
   "dependencies": {
     "@eeacms/volto-block-data-figure": "7.1.0",
     "@eeacms/volto-citation": "0.1.5",
-    "@eeacms/volto-datablocks": "6.4.0",
-    "@eeacms/volto-datahub": "1.0.32",
+    "@eeacms/volto-datablocks": "6.4.1",
+    "@eeacms/volto-datahub": "1.0.33",
     "@eeacms/volto-editing-progress": "0.4.0",
-    "@eeacms/volto-eea-design-system": "1.23.2",
-    "@eeacms/volto-eea-kitkat": "22.1.0",
+    "@eeacms/volto-eea-design-system": "1.23.3",
+    "@eeacms/volto-eea-kitkat": "23.0.1",
     "@eeacms/volto-eea-map": "3.3.1",
     "@eeacms/volto-eea-website-policy": "1.13.0",
-    "@eeacms/volto-eea-website-theme": "1.29.0",
+    "@eeacms/volto-eea-website-theme": "1.31.0",
     "@eeacms/volto-embed": "9.1.1",
     "@eeacms/volto-globalsearch": "1.1.0",
-    "@eeacms/volto-plotlycharts": "9.0.2",
+    "@eeacms/volto-plotlycharts": "9.1.0",
     "@eeacms/volto-redmine-helpdesk": "0.2.0",
-    "@eeacms/volto-searchlib": "0.7.3",
+    "@eeacms/volto-searchlib": "0.8.0",
     "@eeacms/volto-tableau": "7.2.1",
-    "@eeacms/volto-toolbar-actions": "1.0.3",
     "@eeacms/volto-workflow-progress": "4.1.1",
     "@plone-collective/volto-authomatic": "2.0.1",
-    "@plone/volto": "16.31.3",
+    "@plone/volto": "16.31.4",
     "volto-subsites": "4.0.0"
   },
   "devDependencies": {