From 1aae9594f682d026643718975a2ff2b2f741480f Mon Sep 17 00:00:00 2001 From: Mara Karagianni Date: Thu, 27 Jun 2024 17:14:49 +0300 Subject: [PATCH] release v2406.4 --- CHANGELOG.md | 13 +++++++++++++ changelog/2719.md | 8 -------- changelog/2720.md | 3 --- changelog/2721.md | 3 --- package.json | 2 +- requirements/base.txt | 2 +- 6 files changed, 15 insertions(+), 16 deletions(-) delete mode 100644 changelog/2719.md delete mode 100644 changelog/2720.md delete mode 100644 changelog/2721.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 3363a79b7..a0e78c298 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file. Since version v2306 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). +## v2406.4 +### Changed + +- update a4 to aplus-v2406.4 +- added djangos cookie settings to the language cookie in our custom middleware + +### Fixed + +- fix mixed language when changing the language via the indicator as a logged in + user +- add missing blocktrans to account deletion email so it can be translated. +- add missing template for password_set view + ## v2406.3 ### Changed diff --git a/changelog/2719.md b/changelog/2719.md deleted file mode 100644 index 4ccdd2e35..000000000 --- a/changelog/2719.md +++ /dev/null @@ -1,8 +0,0 @@ -### Fixed - -- fix mixed language when changing the language via the indicator as a logged in - user - -### Changed - -- added djangos cookie settings to the language cookie in our custom middleware diff --git a/changelog/2720.md b/changelog/2720.md deleted file mode 100644 index b99b2f586..000000000 --- a/changelog/2720.md +++ /dev/null @@ -1,3 +0,0 @@ -### Fixed - -- add missing blocktrans to account deletion email so it can be translated. diff --git a/changelog/2721.md b/changelog/2721.md deleted file mode 100644 index 02ad1ea1c..000000000 --- a/changelog/2721.md +++ /dev/null @@ -1,3 +0,0 @@ -### Fixed - -- add missing template for password_set view diff --git a/package.json b/package.json index d71474515..a320f3709 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "@fortawesome/fontawesome-free": "5.15.4", "@maplibre/maplibre-gl-leaflet": "0.0.20", "@react-leaflet/core": "^2.1.0", - "adhocracy4": "git+https://github.com/liqd/adhocracy4#aplus-v2406.3", + "adhocracy4": "git+https://github.com/liqd/adhocracy4#aplus-v2406.4", "autoprefixer": "10.4.19", "bootstrap": "5.2.3", "css-loader": "7.1.2", diff --git a/requirements/base.txt b/requirements/base.txt index 45946a37e..a4131275f 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,5 +1,5 @@ # A4 -git+https://github.com/liqd/adhocracy4.git@aplus-v2406.3#egg=adhocracy4 +git+https://github.com/liqd/adhocracy4.git@aplus-v2406.4#egg=adhocracy4 # Additional requirements brotli==1.1.0