Merge b70c4f5 into 7215df2

liqd · Apr 23, 2024 · 4256c8d · 4256c8d
2 parents 7215df2 + b70c4f5
commit 4256c8d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 Since version v2308 the format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 This project (not yet) adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v2404.1.2
+
+### Changed
+
+- update a4 to mB-v2404.1.2
+
+### Fixed
+
+- fix categories can't be saved without icon
+
 ## v2404.1.1
 
 ## Added

diff --git a/changelog/5600.md b/changelog/5600.md
diff --git a/package.json b/package.json
@@ -15,8 +15,9 @@
   "dependencies": {
     "@fortawesome/fontawesome-free": "6.5.1",
     "@maplibre/maplibre-gl-leaflet": "0.0.20",
+    "@react-leaflet/core": "^2.1.0",
     "acorn": "8.11.3",
-    "adhocracy4": "liqd/adhocracy4#mB-v2402.1",
+    "adhocracy4": "liqd/adhocracy4#mB-v2404.1.2",
     "autoprefixer": "10.4.17",
     "bootstrap": "5.2.3",
     "copy-webpack-plugin": "12.0.2",
@@ -42,6 +43,7 @@
     "react-cookie": "7.1.0",
     "react-dom": "18.2.0",
     "react-flip-move": "3.0.5",
+    "react-leaflet": "^4.2.1",
     "react-markdown": "9.0.1",
     "react-router-dom": "6.22.1",
     "react-slick": "0.30.2",

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -1,5 +1,5 @@
 # A4
-git+https://github.com/liqd/adhocracy4.git@mB-v2402.1#egg=adhocracy4
+git+https://github.com/liqd/adhocracy4.git@mB-v2404.1.2#egg=adhocracy4
 
 # Additional requirements
 beautifulsoup4==4.11.2