deps/a4: add ref a4 main and migrate polymorphic for follow alerts (#2991)

Author: partizipation

adhocracy-plus/assets/scss/components/_alerts.scss

@@ -32,7 +32,8 @@ $messages-margin-bottom: 25px;
     position: absolute;
     top: 0;
     right: 0;
-    padding: 0.5rem;
+    margin: 0;
+    padding: 5px 8px;
     background: transparent;
     border: none;
     cursor: pointer;

adhocracy-plus/assets/scss/components/_follow.scss

@@ -2,6 +2,11 @@
     .alert {
         margin-top: $r-spacer;
     }
+    
+    a .fas.fa-external-link-alt {
+        margin-left: 0.25em;
+        text-decoration: none !important;
+    }
 }
 
 .a4-btn--follow:before,

adhocracy-plus/config/settings/base.py

@@ -129,10 +129,10 @@
     "csp.middleware.CSPMiddleware",
     "django_cloudflare_push.middleware.push_middleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
-    "apps.users.middleware.SetUserLanguageCookieMiddleware",
     "django.middleware.locale.LocaleMiddleware",
     "django.middleware.common.CommonMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "apps.users.middleware.SetUserLanguageCookieMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "wagtail.contrib.redirects.middleware.RedirectMiddleware",
     "allauth.account.middleware.AccountMiddleware",

apps/activities/migrations/0004_alter_activity_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.1.11 on 2025-10-29 15:59
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("a4_candy_activities", "0003_alter_activity_description"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="activity",
+            options={"base_manager_name": "objects"},
+        ),
+    ]

apps/interactiveevents/migrations/0007_alter_extrafieldsinteractiveevent_options.py

@@ -0,0 +1,20 @@
+# Generated by Django 5.1.11 on 2025-10-29 15:59
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "a4_candy_interactive_events",
+            "0006_alter_extrafieldsinteractiveevent_live_stream",
+        ),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="extrafieldsinteractiveevent",
+            options={"base_manager_name": "objects"},
+        ),
+    ]

package.json

@@ -19,7 +19,7 @@
     "@maplibre/maplibre-gl-leaflet": "0.0.22",
     "@prosopo/procaptcha-wrapper": "^2.6.11",
     "@react-leaflet/core": "^2.1.0",
-    "adhocracy4": "liqd/adhocracy4#d175c853b41ce3ae7a397ff6d837be3334e5aaea", 
+    "adhocracy4": "git+https://github.com/liqd/adhocracy4.git#main",
     "autoprefixer": "10.4.20",
     "bootstrap": "5.2.3",
     "css-loader": "7.1.2",

requirements/base.txt

@@ -1,5 +1,5 @@
 # A4
-git+https://github.com/liqd/adhocracy4.git@d175c853b41ce3ae7a397ff6d837be3334e5aaea#egg=adhocracy4
+git+https://github.com/liqd/adhocracy4.git@main#egg=adhocracy4
 
 # Additional requirements
 brotli==1.1.0