[ST-1513] Merge a+ v2601.2 and unreleased

.github/ci_base/Dockerfile

@@ -0,0 +1,43 @@
+# ci-base/Dockerfile
+FROM ubuntu:24.04
+
+# Install the OS dependencies
+RUN apt update && \
+    apt install -y \
+        gdal-bin \
+        libsqlite3-mod-spatialite \
+        postgresql-client \
+        postgresql \
+        postgresql-contrib \
+        postgresql-16-postgis-3 \
+        curl \
+        unzip \
+        sudo \
+        jq \
+        nodejs \
+        npm \
+        git \
+        python3 \
+        python3-venv \
+        libmagic1 \
+        libmagic-dev && \
+    rm -rf /var/lib/apt/lists/*
+
+# Install uv system-wide
+RUN curl -LsSf https://astral.sh/uv/install.sh | sh && \
+    cp /root/.local/bin/uv /usr/local/bin/uv
+
+# Configure PostgreSQL
+RUN service postgresql start && \
+    sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';" && \
+    sudo -u postgres createdb django && \
+    sudo -u postgres createdb django_test && \
+    sudo -u postgres psql -d django -c "CREATE EXTENSION IF NOT EXISTS postgis;" && \
+    sudo -u postgres psql -d django_test -c "CREATE EXTENSION IF NOT EXISTS postgis;"
+
+# Additional tools that are always needed
+# RUN npm install -g some-global-node-tool # Example for Node-Tools
+# RUN pip install poetry # Example for Python-Tools
+
+# Set the working directory
+WORKDIR /app

.github/workflows/build_ci_base.yaml

@@ -0,0 +1,43 @@
+name: Build and Push CI Base Image
+
+on:
+  push:
+    paths:
+      - '.github/ci_base/**'
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write 
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Log in to the GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ghcr.io/${{ github.repository }}/ci-base # Our Image-Name
+          tags: |
+            type=raw,value=latest
+            type=sha,format=short,prefix=
+            # Optional: type=ref,event=branch # Für Branch-Namen als Tags
+
+      - name: Build and Push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          # The overall context. If you nedd to do more then just build the Dockerfile use another context and use file: pathToDockerfile for the Dockerfile.
+          context: .github/ci_base/
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/django.yml

@@ -9,85 +9,118 @@ on:
 jobs:
   build:
     runs-on: ubuntu-24.04
-    services:
-      postgres:
-        image: postgres:16
-        env:
-          POSTGRES_PASSWORD: postgres
-        ports:
-          - 5432:5432
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
+    # Use your self-built image as container for the entire job
+    container: ghcr.io/${{ github.repository }}/ci-base:latest
     steps:
       - uses: actions/checkout@v4
+      - name: Start PostgreSQL
+        run: |
+          sudo service postgresql start
+
       - name: Set up Python ${{ matrix.python-version }}
+        id: setup-python
         uses: actions/setup-python@v5
         with:
           python-version: '3.12'
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20.x'
-      - name: Setup Postgres
-        env:
-          PGPASSWORD: postgres
-          PGHOSTADDR: 127.0.0.1
-        run: |
-          psql -c 'create database django;' -U postgres
-          psql -c 'create database django_test;' -U postgres
-      - name: Cache node modules
+
+      - name: Cache node packages
         uses: actions/cache@v4
         env:
-          cache-name: cache-node-modules
+          cache-name: cache-node-packages
         with:
           path: ~/.npm
           key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }}
           restore-keys: |
             ${{ runner.os }}-build-${{ env.cache-name }}-
             ${{ runner.os }}-build-
             ${{ runner.os }}-
-      - name: Cache pip packages
+      - name: Cache node Modules
+        id: cache-node-modules
+        uses: actions/cache@v4
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-node_modules-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node_modules-
+
+      - name: Cache uv packages
         uses: actions/cache@v4
         env:
-          cache-name: cache-pip-packages
+          cache-name: cache-uv-packages
         with:
-          path: ~/.cache/pip
+          path: ~/.cache/uv
           key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/requirements/dev.txt') }}
           restore-keys: |
             ${{ runner.os }}-build-${{ env.cache-name }}-
             ${{ runner.os }}-build-
             ${{ runner.os }}-
-      - name: check a4 hashes equal
+
+      - name: Cache testmon data
+        id: cache-testmon
+        uses: actions/cache@v4
+        with:
+          path: .testmondata
+          key: ${{ runner.os }}-testmon-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/requirements/dev.txt', 'adhocracy-plus/config/settings/*.py', 'pytest.ini') }}
+          restore-keys: |
+            ${{ runner.os }}-testmon-${{ steps.setup-python.outputs.python-version }}-
+
+      - name: Checks
         run: |
+          echo "node_modules cache hit: ${{ steps.cache-node-modules.outputs.cache-hit }}"
+          ls -la node_modules 2>/dev/null || echo "node_modules directory does not exist"
+          echo "testmon cache hit: ${{ steps.cache-testmon.outputs.cache-hit }}"
+          ls -la .testmondata || true
           ./scripts/a4-check.sh
-      - name: Install Dependencies
+
+      - name: Install Python Dependencies
         run: |
-          npm install
-          npm run build
-          pip install -r requirements/dev.txt
-          pip install coveralls
+          uv pip install -r requirements/dev.txt --system
+          uv pip install coveralls --system
+
       - name: Run Tests
         env:
           PGPASSWORD: postgres
           PGHOSTADDR: 127.0.0.1
         run: |
           python manage.py collectstatic > /dev/null
-          DJANGO_SETTINGS_MODULE='adhocracy-plus.config.settings.travis' py.test --cov
           isort --diff -c adhocracy-plus tests
           python manage.py makemigrations --dry-run --check --noinput
           flake8 adhocracy-plus tests --exclude migrations,settings
+
+          if [ "${{ github.ref }}" = "refs/heads/main" ] && [ "${{ github.event_name }}" = "push" ]; then
+            py.test --ds=adhocracy-plus.config.settings.travis --cov
+          elif [ "${{ github.event_name }}" = "pull_request" ]; then
+            py.test --ds=adhocracy-plus.config.settings.travis --testmon --cov
+          fi
+
       - name: Coveralls
         env:
+          COVERALLS_SERVICE_NAME: github-actions
           GITHUB_TOKEN: ${{ secrets.COV }}
         run: |
+          git config --global --add safe.directory /__w/adhocracy-plus/adhocracy-plus
+          git config --global user.name "GitHub Actions"
+          git config --global user.email "actions@github.com"
           coveralls
+
+      - name: Install NPM Dependencies
+        run: |
+          if [ -d node_modules ] && [ -f package-lock.json ]; then
+            echo "node_modules cache hit - skipping npm ci"
+          else
+            echo "node_modules cache miss - running npm ci"
+            npm ci --prefer-offline --no-audit --no-fund
+          fi
+
+      - name: Build NPM 
+        run: |
+          npm run build
+
       - name: Run Frontend Tests
         run: |
           npm test
           npm run lint
+
       - name: Deploy
         if: github.ref == 'refs/heads/main'
         env:

CHANGELOG.md

@@ -6,7 +6,102 @@ Since version v2306 the format is based on [Keep a Changelog](https://keepachang
 This project (not yet) adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
-## v2505.1
+## Unreleased A+
+
+### Changed
+
+- Notification message_templates stored in English, translated at runtime
+- Notification date format always returns DD.MM.YYYY without time
+
+### Fixed
+
+- Fix duplicate notifications bug
+- Fix email variable interpolation
+
+### Fixed
+
+- Interpolation and translation for ModeratorInvite notification
+
+## v2601.2
+
+### Fixed
+
+- Moderator feedback text
+- ModeratorInvitation links
+- Translations
+
+## v2601.1
+
+### Added
+
+- Notification System
+- Use django-polymorphic via adhocracy4
+- Map-based participation modules have a split mode to display ideas next to the map
+- Alert when following project telling user to check email notification settings
+
+### Changed
+
+- Captcha using Prosopo
+- Hide profile pages for inactive accounts (ST-1088)
+- Add visibility toggle to password fields [ST1153]
+- Updated to Django 5.2
+- Improve comment icons styling in SCSS
+- Update translation files for all languages
+- Make title-3 class consistent with h3 browser defaults for improved accessibility
+
+### Fixed
+
+- Follow project button not working on small screens
+- Rotated icons for reporting or sharing comments
+- Pagination button styles
+- Notification text for ModerationFeedback notifications
+
+## v2508.2
+
+### Fixed
+
+- Fix flatpickr configuration to disable native mobile calendars
+- Fix Poll bug, question deletion now works
+
+## v2508.1
+
+### Fixed
+
+- Remove identifier from dashboard item labels
+
+## v2507.1
+
+### Changed
+
+- Change labels of links to manual, 'Help Center', and direct to new a+ manual
+- phase date selection: use flatpickr's ui on mobile instead of native- Disabled languages other than English and German
+- Update make postgresql-create|start|stop for linux OS
+- Update README with manual setup of postgreSQL
+- Deps: Upgraded Django to Version 5.1- **BREAKING CHANGE** A database with geospatial support is now required (e.g spatialite, postgresql with postgis)
+- Use the new `PointSerializerMixin` Project Serializer
+- project admin model to GIS admin model to render the map in the django-admin dashboard
+- Updated dependencies to Django 5.0- MapFilterAndSort: Change Map / List buttons to toggler- poll module diagrams
+- poll documentation
+- Update README.md to include libmagic installation step for MacOS
+
+### Removed
+
+- Removed env variable MANUAL_URL - no longer used- API url `api/login` as it is not in used anymore, we use `api/token` instead. See [docs](https://github.com/liqd/adhocracy-plus/blob/main/docs/authentication.md)
+
+### Added
+
+- captcha required for all SSO social signups- docs for upgrades
+- wiki diagrams links for the modules technical diagrams
+- Added moderator feedback form textarea character limit of 500- postgresql documentation
+- poll, question, answer, vote relation diagram
+
+### Fixed
+
+- Conditional display of dashboard project module menu's "Location" uses identifier instead of label, so translation doesn't break it
+- dashboard/phases: Prevent accidental selection of entire page when using date picker
+
+
+## Roots v2505.1
 
 ### Added
 

Makefile

@@ -196,23 +196,26 @@ release:
 
 .PHONY: postgres-start
 postgres-start:
-	sudo -u postgres PGDATA=pgsql PGPORT=5556 /usr/lib/postgresql/12/bin/pg_ctl start
+	sudo systemctl start postgresql
 
 .PHONY: postgres-stop
 postgres-stop:
-	sudo -u postgres PGDATA=pgsql PGPORT=5556 /usr/lib/postgresql/12/bin/pg_ctl stop
+	sudo systemctl stop postgresql
 
 .PHONY: postgres-create
 postgres-create:
-	if [ -d "pgsql" ]; then \
-		echo "postgresql has already been initialized"; \
-	else \
-		sudo install -d -m 774 -o postgres -g $(USER) pgsql; \
-		sudo -u postgres /usr/lib/postgresql/12/bin/initdb pgsql; \
-		sudo -u postgres PGDATA=pgsql PGPORT=5556 /usr/lib/postgresql/12/bin/pg_ctl start; \
-		sudo -u postgres PGDATA=pgsql PGPORT=5556 /usr/lib/postgresql/12/bin/createuser -s django; \
-		sudo -u postgres PGDATA=pgsql PGPORT=5556 /usr/lib/postgresql/12/bin/createdb -O django django; \
+	@if ! command -v psql > /dev/null 2>&1; then \
+		echo "PostgreSQL is not installed. Please install it with 'sudo apt install postgresql'"; \
+		exit 1; \
 	fi
+	@if ! sudo systemctl is-active --quiet postgresql; then \
+		echo "PostgreSQL service is not running. Starting it..."; \
+		sudo systemctl start postgresql; \
+		sleep 2; \
+	fi
+	sudo -u postgres createuser --createdb --no-createrole --no-superuser django || true
+	sudo -u postgres createdb --owner=django --encoding=UTF8 django || true
+	sudo -u postgres psql -U postgres -d django -c "CREATE EXTENSION postgis;" || true
 
 .PHONY: local-a4
 local-a4: