From 854ab89777f582586d8c941e30589d7cb6a8db18 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 May 2023 01:47:02 +0200
Subject: [PATCH 01/49] =?UTF-8?q?=E2=AC=86(deps):=20Bump=20xlsxwriter=20fr?=
 =?UTF-8?q?om=203.1.0=20to=203.1.1=20(#655)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [xlsxwriter](https://github.com/jmcnamara/XlsxWriter) from 3.1.0 to 3.1.1.
- [Changelog](https://github.com/jmcnamara/XlsxWriter/blob/main/Changes)
- [Commits](https://github.com/jmcnamara/XlsxWriter/compare/RELEASE_3.1.0...RELEASE_3.1.1)

---
updated-dependencies:
- dependency-name: xlsxwriter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 1b93102b8..9f169ad54 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -29,4 +29,4 @@ channels-redis==4.1.0
 bleach[css]==6.0.0
 Pillow==9.5.0
 uuid==1.30
-XlsxWriter==3.1.0
+XlsxWriter==3.1.1

From 1a244ebcc9c8c02a21e25a961fc1a0667b6749f6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 May 2023 15:18:48 +0200
Subject: [PATCH 02/49] =?UTF-8?q?=E2=AC=86(deps):=20Bump=20xlsxwriter=20fr?=
 =?UTF-8?q?om=203.1.1=20to=203.1.2=20(#656)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [xlsxwriter](https://github.com/jmcnamara/XlsxWriter) from 3.1.1 to 3.1.2.
- [Changelog](https://github.com/jmcnamara/XlsxWriter/blob/main/Changes)
- [Commits](https://github.com/jmcnamara/XlsxWriter/compare/RELEASE_3.1.1...RELEASE_3.1.2)

---
updated-dependencies:
- dependency-name: xlsxwriter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 9f169ad54..c9887b682 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -29,4 +29,4 @@ channels-redis==4.1.0
 bleach[css]==6.0.0
 Pillow==9.5.0
 uuid==1.30
-XlsxWriter==3.1.1
+XlsxWriter==3.1.2

From 9c9d505ef5cb407ed43a15a8d1e3cb965ee88a5e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Jun 2023 15:33:57 +0200
Subject: [PATCH 03/49] =?UTF-8?q?=E2=AC=86(deps):=20Bump=20django-extensio?=
 =?UTF-8?q?ns=20from=203.2.1=20to=203.2.3=20(#658)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [django-extensions](https://github.com/django-extensions/django-extensions) from 3.2.1 to 3.2.3.
- [Release notes](https://github.com/django-extensions/django-extensions/releases)
- [Changelog](https://github.com/django-extensions/django-extensions/blob/main/CHANGELOG.md)
- [Commits](https://github.com/django-extensions/django-extensions/compare/3.2.1...3.2.3)

---
updated-dependencies:
- dependency-name: django-extensions
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index c9887b682..95ae0984c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ django-cleanup==7.0.0
 django-constance[database]==2.9.1
 django-decorator-include==3.0
 # (See this page for a list of all management commands: https://django-extensions.readthedocs.io/en/latest/command_extensions.html)
-django-extensions==3.2.1
+django-extensions==3.2.3
 django-ical==1.9.1
 django-multiselectfield==0.1.12
 django-phonenumber-field[phonenumbers]==7.1.0

From 1b91770ef80e6a37d741c7e709a9a2f7537e64cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jun 2023 09:13:51 +0200
Subject: [PATCH 04/49] =?UTF-8?q?=E2=AC=86(deps):=20Bump=20django-ical=20f?=
 =?UTF-8?q?rom=201.9.1=20to=201.9.2=20(#659)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [django-ical](https://github.com/jazzband/django-ical) from 1.9.1 to 1.9.2.
- [Release notes](https://github.com/jazzband/django-ical/releases)
- [Changelog](https://github.com/jazzband/django-ical/blob/master/CHANGES.rst)
- [Commits](https://github.com/jazzband/django-ical/compare/1.9.1...1.9.2)

---
updated-dependencies:
- dependency-name: django-ical
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 95ae0984c..fec755d94 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ django-constance[database]==2.9.1
 django-decorator-include==3.0
 # (See this page for a list of all management commands: https://django-extensions.readthedocs.io/en/latest/command_extensions.html)
 django-extensions==3.2.3
-django-ical==1.9.1
+django-ical==1.9.2
 django-multiselectfield==0.1.12
 django-phonenumber-field[phonenumbers]==7.1.0
 django-simple-history==3.3.0

From 7e4a80c451f8282bedac710d4b4a1ab189c261c1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jun 2023 09:15:16 +0200
Subject: [PATCH 05/49] =?UTF-8?q?=E2=AC=86(deps):=20Bump=20django-cleanup?=
 =?UTF-8?q?=20from=207.0.0=20to=208.0.0=20(#660)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [django-cleanup](https://github.com/un1t/django-cleanup) from 7.0.0 to 8.0.0.
- [Changelog](https://github.com/un1t/django-cleanup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/un1t/django-cleanup/compare/7.0.0...8.0.0)

---
updated-dependencies:
- dependency-name: django-cleanup
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index fec755d94..6a7d68774 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@
 Django==4.1.7
 django-hosts==5.2
 django-ckeditor==6.5.1
-django-cleanup==7.0.0
+django-cleanup==8.0.0
 django-constance[database]==2.9.1
 django-decorator-include==3.0
 # (See this page for a list of all management commands: https://django-extensions.readthedocs.io/en/latest/command_extensions.html)

From 7af17f13145a6316c5dc7173b4dc1444398f7c8b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Jun 2023 19:56:59 +0200
Subject: [PATCH 06/49] =?UTF-8?q?=E2=AC=86(deps):=20Bump=20django-ckeditor?=
 =?UTF-8?q?=20from=206.5.1=20to=206.6.1=20(#661)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [django-ckeditor](https://github.com/django-ckeditor/django-ckeditor) from 6.5.1 to 6.6.1.
- [Changelog](https://github.com/django-ckeditor/django-ckeditor/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/django-ckeditor/django-ckeditor/compare/6.5.1...6.6.1)

---
updated-dependencies:
- dependency-name: django-ckeditor
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 6a7d68774..fe8d57272 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 # Django-related packages
 Django==4.1.7
 django-hosts==5.2
-django-ckeditor==6.5.1
+django-ckeditor==6.6.1
 django-cleanup==8.0.0
 django-constance[database]==2.9.1
 django-decorator-include==3.0

From e2ebadd76a51a45e6593d9be50cfeaa6788cd473 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Jul 2023 19:07:20 +0200
Subject: [PATCH 07/49] =?UTF-8?q?=E2=AC=86(deps):=20Bump=20pillow=20from?=
 =?UTF-8?q?=209.5.0=20to=2010.0.0=20(#663)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [pillow](https://github.com/python-pillow/Pillow) from 9.5.0 to 10.0.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/9.5.0...10.0.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index fe8d57272..e626ddf13 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -27,6 +27,6 @@ channels-redis==4.1.0
 
 # Misc. packages
 bleach[css]==6.0.0
-Pillow==9.5.0
+Pillow==10.0.0
 uuid==1.30
 XlsxWriter==3.1.2

From 9165bc4424604a05fe91ad67accc552d704d0e69 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 31 Jul 2023 20:12:09 +0200
Subject: [PATCH 08/49] =?UTF-8?q?=E2=AC=86(deps):=20Bump=20django-ckeditor?=
 =?UTF-8?q?=20from=206.6.1=20to=206.7.0=20(#666)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [django-ckeditor](https://github.com/django-ckeditor/django-ckeditor) from 6.6.1 to 6.7.0.
- [Changelog](https://github.com/django-ckeditor/django-ckeditor/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/django-ckeditor/django-ckeditor/compare/6.6.1...6.7)

---
updated-dependencies:
- dependency-name: django-ckeditor
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index e626ddf13..aa1bfb7cf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 # Django-related packages
 Django==4.1.7
 django-hosts==5.2
-django-ckeditor==6.6.1
+django-ckeditor==6.7.0
 django-cleanup==8.0.0
 django-constance[database]==2.9.1
 django-decorator-include==3.0

From e7f3242d421a675013ae2125e2af0f600f375ac1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Aug 2023 16:42:01 +0000
Subject: [PATCH 09/49] =?UTF-8?q?=E2=AC=86(deps):=20Bump=20django-constanc?=
 =?UTF-8?q?e[database]=20from=202.9.1=20to=203.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [django-constance[database]](https://github.com/jazzband/django-constance) from 2.9.1 to 3.1.0.
- [Release notes](https://github.com/jazzband/django-constance/releases)
- [Changelog](https://github.com/jazzband/django-constance/blob/master/docs/changes.rst)
- [Commits](https://github.com/jazzband/django-constance/compare/2.9.1...3.1.0)

---
updated-dependencies:
- dependency-name: django-constance[database]
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index aa1bfb7cf..350e597e2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ Django==4.1.7
 django-hosts==5.2
 django-ckeditor==6.7.0
 django-cleanup==8.0.0
-django-constance[database]==2.9.1
+django-constance[database]==3.1.0
 django-decorator-include==3.0
 # (See this page for a list of all management commands: https://django-extensions.readthedocs.io/en/latest/command_extensions.html)
 django-extensions==3.2.3

From 989e5c84f5500eb3f8a3170e013e58b02711285d Mon Sep 17 00:00:00 2001
From: Anders <6058745+ddabble@users.noreply.github.com>
Date: Fri, 25 Aug 2023 17:30:12 +0000
Subject: [PATCH 10/49] Removed constance database app from installed apps

...as mentioned in `django-constance`'s changelog for v3.0.0:
https://django-constance.readthedocs.io/en/latest/changes.html#v3-0-0-2023-07-27.

As a side note, I found it weird that the tests passed, even though this
non-existent app was enabled in the settings. However, through a little
bit of experimentation, I found out that it seems like Django doesn't
care whether the modules listed in `INSTALLED_APPS` are actually apps
- i.e. that they contain a file (named `apps.py` by default) containing
a subclass of `AppConfig`.
---
 src/web/settings.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/web/settings.py b/src/web/settings.py
index c0a118ee0..5b8f8acd2 100644
--- a/src/web/settings.py
+++ b/src/web/settings.py
@@ -102,7 +102,6 @@
 INSTALLED_APPS = [
     # `django-constance` should be listed before project apps (see https://django-constance.readthedocs.io/en/stable/#configuration)
     'constance',
-    'constance.backends.database',
     # App used for things regarding the whole project or across other apps
     # (Should be listed first, to be able to override things like management commands)
     'web.apps.WebConfig',

From f8d5d59fc12fcaf2b85ce3aa45bfc0d2b4b45fe6 Mon Sep 17 00:00:00 2001
From: Anders <6058745+ddabble@users.noreply.github.com>
Date: Fri, 25 Aug 2023 17:37:00 +0000
Subject: [PATCH 11/49] Removed database extra from django-constance

The `[database]` extra was removed in `django-constance` v3.0.0, in this
commit:
https://github.com/jazzband/django-constance/commit/2cb2ccd0634dc9d48b9f8cd1ed5234cfc96ade67#diff-60f61ab7a8d1910d86d9fda2261620314edcae5894d5aaa236b821c7256badd7.
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 350e597e2..e5c0d4b68 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ Django==4.1.7
 django-hosts==5.2
 django-ckeditor==6.7.0
 django-cleanup==8.0.0
-django-constance[database]==3.1.0
+django-constance==3.1.0
 django-decorator-include==3.0
 # (See this page for a list of all management commands: https://django-extensions.readthedocs.io/en/latest/command_extensions.html)
 django-extensions==3.2.3

From 48578eb1a57e05e79a01e44cf7509f2f60ad87c3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Sep 2023 19:07:05 +0200
Subject: [PATCH 12/49] =?UTF-8?q?=E2=AC=86(deps):=20Bump=20social-auth-app?=
 =?UTF-8?q?-django=20from=205.2.0=20to=205.3.0=20(#671)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [social-auth-app-django](https://github.com/python-social-auth/social-app-django) from 5.2.0 to 5.3.0.
- [Release notes](https://github.com/python-social-auth/social-app-django/releases)
- [Changelog](https://github.com/python-social-auth/social-app-django/blob/master/CHANGELOG.md)
- [Commits](https://github.com/python-social-auth/social-app-django/compare/5.2.0...5.3.0)

---
updated-dependencies:
- dependency-name: social-auth-app-django
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index e5c0d4b68..c9117e963 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,7 +14,7 @@ django-simple-history==3.3.0
 sorl-thumbnail==12.9.0
 
 # Packages related to authentication and other "social" stuff
-social-auth-app-django==5.2.0
+social-auth-app-django==5.3.0
 # This is already a requirement of `social-auth-app-django`, but it's listed here to provide the `openidconnect` extra
 # (see https://python-social-auth.readthedocs.io/en/stable/installing.html#using-the-extras-options)
 social-auth-core[openidconnect]==4.4.2

From e1e8acaf2818910d4745ae9b92e2041ea081e4d6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Sep 2023 19:10:01 +0200
Subject: [PATCH 13/49] =?UTF-8?q?=F0=9F=91=B7(deps):=20Bump=20tibdex/githu?=
 =?UTF-8?q?b-app-token=20from=201.8.0=20to=201.8.2=20(#673)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [tibdex/github-app-token](https://github.com/tibdex/github-app-token) from 1.8.0 to 1.8.2.
- [Release notes](https://github.com/tibdex/github-app-token/releases)
- [Commits](https://github.com/tibdex/github-app-token/compare/b62528385c34dbc9f38e5f4225ac829252d1ea92...0d49dd721133f900ebd5e0dff2810704e8defbc6)

---
updated-dependencies:
- dependency-name: tibdex/github-app-token
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/_reusable_add-content-to-project.yml | 2 +-
 .github/workflows/label-deployment-pull-request.yml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/_reusable_add-content-to-project.yml b/.github/workflows/_reusable_add-content-to-project.yml
index 2b1a7e5b4..3b25b0f40 100644
--- a/.github/workflows/_reusable_add-content-to-project.yml
+++ b/.github/workflows/_reusable_add-content-to-project.yml
@@ -42,7 +42,7 @@ jobs:
     steps:
       - name: Generate token
         id: generate_token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92 # v1.8.0
+        uses: tibdex/github-app-token@0d49dd721133f900ebd5e0dff2810704e8defbc6 # v1.8.2
         with:
           app_id: ${{ secrets.MAKE_BOT_APP_ID }}
           private_key: ${{ secrets.MAKE_BOT_APP_PEM }}
diff --git a/.github/workflows/label-deployment-pull-request.yml b/.github/workflows/label-deployment-pull-request.yml
index 06e8b4a0b..d923bb2d2 100644
--- a/.github/workflows/label-deployment-pull-request.yml
+++ b/.github/workflows/label-deployment-pull-request.yml
@@ -25,7 +25,7 @@ jobs:
     steps:
       - name: Generate token
         id: generate_token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92 # v1.8.0
+        uses: tibdex/github-app-token@0d49dd721133f900ebd5e0dff2810704e8defbc6 # v1.8.2
         with:
           app_id: ${{ secrets.MAKE_BOT_APP_ID }}
           private_key: ${{ secrets.MAKE_BOT_APP_PEM }}

From c463a8987a2a973cb7b1273ecceb6e7cb36961e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Sep 2023 19:12:35 +0200
Subject: [PATCH 14/49] =?UTF-8?q?=F0=9F=91=B7(deps):=20Bump=20actions/chec?=
 =?UTF-8?q?kout=20from=203=20to=204=20(#672)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml | 2 +-
 .github/workflows/python.yml          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 6a741a3e4..91eb44597 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -34,7 +34,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install System Dependencies
         # Retries installing files 3 times, as the GitHub Actions CI is occasionally unreliable
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index ac9da9bbc..995d6d65d 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -12,7 +12,7 @@ jobs:
         python-version: [ "3.10", "3.11" ]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4

From 3db8d5ccfebc16d74b83369ec209de8b5da23067 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 15 Sep 2023 16:55:55 +0000
Subject: [PATCH 15/49] =?UTF-8?q?=E2=AC=86(deps):=20Bump=20django-simple-h?=
 =?UTF-8?q?istory=20from=203.3.0=20to=203.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [django-simple-history](https://github.com/jazzband/django-simple-history) from 3.3.0 to 3.4.0.
- [Release notes](https://github.com/jazzband/django-simple-history/releases)
- [Changelog](https://github.com/jazzband/django-simple-history/blob/master/CHANGES.rst)
- [Commits](https://github.com/jazzband/django-simple-history/compare/3.3.0...3.4.0)

---
updated-dependencies:
- dependency-name: django-simple-history
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index c9117e963..4caaf57cb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ django-extensions==3.2.3
 django-ical==1.9.2
 django-multiselectfield==0.1.12
 django-phonenumber-field[phonenumbers]==7.1.0
-django-simple-history==3.3.0
+django-simple-history==3.4.0
 sorl-thumbnail==12.9.0
 
 # Packages related to authentication and other "social" stuff

From 1b893f51301958272e6f7205945af82a149ac0fb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 16:34:32 +0000
Subject: [PATCH 16/49] =?UTF-8?q?=F0=9F=91=B7(deps):=20Bump=20tibdex/githu?=
 =?UTF-8?q?b-app-token=20from=201.8.2=20to=202.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [tibdex/github-app-token](https://github.com/tibdex/github-app-token) from 1.8.2 to 2.1.0.
- [Release notes](https://github.com/tibdex/github-app-token/releases)
- [Commits](https://github.com/tibdex/github-app-token/compare/0d49dd721133f900ebd5e0dff2810704e8defbc6...3beb63f4bd073e61482598c45c71c1019b59b73a)

---
updated-dependencies:
- dependency-name: tibdex/github-app-token
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/_reusable_add-content-to-project.yml | 2 +-
 .github/workflows/label-deployment-pull-request.yml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/_reusable_add-content-to-project.yml b/.github/workflows/_reusable_add-content-to-project.yml
index 3b25b0f40..1a55d92fb 100644
--- a/.github/workflows/_reusable_add-content-to-project.yml
+++ b/.github/workflows/_reusable_add-content-to-project.yml
@@ -42,7 +42,7 @@ jobs:
     steps:
       - name: Generate token
         id: generate_token
-        uses: tibdex/github-app-token@0d49dd721133f900ebd5e0dff2810704e8defbc6 # v1.8.2
+        uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2.1.0
         with:
           app_id: ${{ secrets.MAKE_BOT_APP_ID }}
           private_key: ${{ secrets.MAKE_BOT_APP_PEM }}
diff --git a/.github/workflows/label-deployment-pull-request.yml b/.github/workflows/label-deployment-pull-request.yml
index d923bb2d2..357615555 100644
--- a/.github/workflows/label-deployment-pull-request.yml
+++ b/.github/workflows/label-deployment-pull-request.yml
@@ -25,7 +25,7 @@ jobs:
     steps:
       - name: Generate token
         id: generate_token
-        uses: tibdex/github-app-token@0d49dd721133f900ebd5e0dff2810704e8defbc6 # v1.8.2
+        uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2.1.0
         with:
           app_id: ${{ secrets.MAKE_BOT_APP_ID }}
           private_key: ${{ secrets.MAKE_BOT_APP_PEM }}

From 6621e51902137ea5620f86ec3ed3b4ea8393820f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 5 Oct 2023 16:35:55 +0000
Subject: [PATCH 17/49] =?UTF-8?q?=E2=AC=86(deps):=20Bump=20django-phonenum?=
 =?UTF-8?q?ber-field[phonenumbers]=20from=207.1.0=20to=207.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [django-phonenumber-field[phonenumbers]](https://github.com/stefanfoulis/django-phonenumber-field) from 7.1.0 to 7.2.0.
- [Release notes](https://github.com/stefanfoulis/django-phonenumber-field/releases)
- [Changelog](https://github.com/stefanfoulis/django-phonenumber-field/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/stefanfoulis/django-phonenumber-field/compare/7.1.0...7.2.0)

---
updated-dependencies:
- dependency-name: django-phonenumber-field[phonenumbers]
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index c9117e963..c39577916 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ django-decorator-include==3.0
 django-extensions==3.2.3
 django-ical==1.9.2
 django-multiselectfield==0.1.12
-django-phonenumber-field[phonenumbers]==7.1.0
+django-phonenumber-field[phonenumbers]==7.2.0
 django-simple-history==3.3.0
 sorl-thumbnail==12.9.0
 

From e82580be66f4f219124066af40c3367e7b282a7c Mon Sep 17 00:00:00 2001
From: Gunvor4 <Gunvor4@users.noreply.github.com>
Date: Thu, 5 Oct 2023 18:54:17 +0200
Subject: [PATCH 18/49] Fixed translation of apply button in English header
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixed the translation of the former "søk verv" button in the English header. The button now has the English title "apply to MAKE"
---
 src/locale/nb/LC_MESSAGES/django.mo | Bin 53721 -> 53765 bytes
 src/locale/nb/LC_MESSAGES/django.po |  20 ++++++++++++--------
 src/web/settings.py                 |   2 +-
 src/web/templates/web/header.html   |   2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/locale/nb/LC_MESSAGES/django.mo b/src/locale/nb/LC_MESSAGES/django.mo
index b05aa27f6a429a348cb586169b42a232eeb4dc39..c098d9c25ecbd39e3cd4d857990b029674e911d5 100644
GIT binary patch
delta 14455
zcmZA72YgT0|HttwkwJ!t5QGe3&mcC5h*5h}n~1$fP~&TFHKI~`?=AMIy=rUK{881a
zpHgZRZMFZ`+d26?`uN{RPoL*}&bepZb8nLVez#V+Ph9Qpx)+%K3x{iwo8#od*Flam
z-Q9666jIc2-jy@)_n4h>w(`ajn3HmC48;W0{o`zWne_m2t8*Pop<e~Z$&9fW=r}H?
z2^k*(iP#bcpf{ewDtHY`U_eF3;U6cKe|g{tR7Yb`?US(xE=GSmi(YsGS&wrc1Mneg
zyw~W<_>NP_ae~1QGhjYcgA%BYDq$GbL0{~NYB$t67DFgc$BeiR{cxu(A4T<Z9yQV1
zHvUj$jsGhdt>~?-_<-6<@5*Lk`7j6ND%O^mo$>(8iqmX)xh?O<V#F_F9{hk>P&nJE
zi4;ZcNF{U~ArnJ}$L{=t1u>|qSwR)lO6%HkbJUh5U~%k)O>iN`<1-A$QZbGbflW~>
z9)jAL(Ww5Wq8?px4EwJJYiz@<7)E(7Y71{5hs5~_^W!_zSqO`DoHE!Do8kmyZ09EO
zj}u(Y9L`ploAMwmi*qm%&te!ptLAc?C^CL=j^l|jm<4O1wyHH|!XB6thocVBJk(iO
zgL!Z#s{M6a{t<PbS9Q}a*cypiP!xt@yo-!hnt=Im0IH)DRKvBXN3$Qbg_kfJ-a>8R
z3#%LZuV);DnpimMzGA3}#G%em6D)weQ9Iz8N2WHJT^NBMY(-cNbI4*)D{O_D@d#80
z3$Y{~$6WXdb?5?Wnt`gKCfLf_6Z26XiJIU_WP&bd8yTH}lc)(?L>;o{SQOu)RuWmu
zJemrq_VrOKYk@jcT~QtP$AUNtJ#j5|#x1Bv7r<(@lM(pw{Vz&JuTcfmj2mKl?1cI*
zbhVB~56bgV11?6jUyC|3`;bj=E?|2M{KPD10D4hQ##Xop`KCFqF_QD=6t82xTuo8W
z-i4a!=cpAdLp|HIw!9NH@P6bVJLhp4`qlmTEpxs^cgo+QcIYOm-^Zx?-r918dW@wH
zNp><i-BGA#Sr4PJ2ZrD>%!mh3J8~NJNbaGY`76|+jHqw=DUX^!Q`7=lqIR@Bs-FZK
z?^~beuNe-pfr+S&XP_^xz%IBIwRKq<I8J%&je4Kg;HP*Oi(=V^=EIbLv6SaxG5p4s
z(=~FO=9J@*IXhoAV*fSJPXx3BFHs*1zsBa76+y*IV>fJoG;#KzI`HE2R}Pz@c5DXf
z3>-&&ki7Xi$y&(A)tQ8>#W{(ZNT92kc@Mjzwr~n&#bv0i+l@YW2%q6uRJ%Rg?T;5R
z0PkXde1>|9+P5&@l`*LL&oKy>p(e5mW6<@I4Brr^R7=Oni%F={x)AlOR-zwn!9#cu
zv*9qFhdQ2xYPTG<lbcY_dLIVjVblVyU?#ka`i?v`ahK!618hei7(3z+q|W&c+hU2<
zW<oPi1J6Tsyb1L>eubLINz|dcj@r3fsDZynP3$S^{`aW2CZLVZ3eUd@8LeO}X22P!
zna;Q6wYGk{jUPm<@I1QV6<hxehEcwUh4F7Jh=o{%CfvlDi0XeBW@mh73K@N3S732G
ziMrtx>KS{oJ(^fn%#2~ELluSUs6T3@V=zC?K;4&$+3`5W;T`ONq3uomXmn|ynPix(
zvmCWmf1x*KptV*Sh*dEd>tYMk8Ci*Hw-I?EoK(~VJvuthQ4Gc`coWs`DQd!RP!sg%
z#Qy7W1$8nV=0Q!MFltB2VJU2ldZsf`E1iexU^!~QZK$(w3^mXhjKnLbNBagfj(!lR
ze}622A)Q@jhII*OCpusm9Ecid9Tvw_EP_9vI`&U6hpsfL!+1=>#u$cYQ9JY)HK7-%
zGw~iPVPqFG;f^jcnqgOT#{sAthG2RejavD5)cZRPb=sGqp6zzj%Fdy7<OXWsN2rPY
ziaPawVpa@HH1UF{_O56$dPec6j#{Bs-qn@|Vh+k<P#rC_<sGOUJCEx4o{hi8T$KI0
znuQcW^;ZV9&{&MXx=4R6r;n|efSSN8^uQ&k6|6!HupPAnr)~Wm)J{FXa`*&uW1emt
zOpHafe~2~k9csc=yPF+sjP82>JCpIGqAO~peJ}(kqn_m|TRvgS_c4<AKR5s*dl=`V
z9*K8P^EO4G&dewrgd4CJ=I&)a!F91T<2zHy<j2FP!|@|(=Hb1~uT0UX`ZlPEjl*zU
ziqUw)mfv6=%GvsuU(qU{?(2kli>9C+;X%}W*U+UEd-pXf&4UFf$60%#8qP&^d=?Ai
zFBpp1`k56)qqaB!Kfw*y0AFD<jO%a8DcFeeBaFjx1K9t{WIkgb2jX5VgM}&RZRmjB
zn1DI4H-3CHn4a<~EQ#w;kKz`Nz`E@BXLtrR@wma}OeLZg+zT_}#KG*pp8aeB8ZZUD
za1m<YRhS7kqc0vpA3TTJf$LZlUt<Z37-A;a7y~Hx!6+P!I@H@yXJn79zw9F8PvCou
z$LFZ6DU)P=91q1n%8O7d-in%VDr%w!tjAFc_!{-I;*u@jL_f-Ru{1tGy?&uX&1>q4
zB~yezJLIuAQ!y+4fx01Jn3+&K7Nk5Gi{W<E%J12@&u|kjgNk=X9p+g!ejfEUy+`d_
z4xUdIz5nIOXhrp`O;J128nu!h*b)cX`tzu*y=Lnl+W0ffLHsr9(fM-_^r(VS&pIzE
zUfh<;VHLgqabz^m7}S<dv*o#{8yBOtaGkB+Z9R+{;1uf7T(#xzFo^OGsAvAx)_<_|
zZX?Zo{^+asKPMRtQ~-5jDb$U%P&2NNnqUhX?}*x=uBbyf1ldYw9A?M)m<_j~?mvyX
z|1zrGE!3HMhOS^T&L}frc2q?uro$*y2c=Oftc-e8)oi>rYNCx%_q9X~&=a*|qiuW!
zs@*cojB8MD)!tF;zXmu%K+p6FYDEuF@n2Che{19EMw<!vqw2GwItoP%SR8c*Dx)Uc
z0@bb!YGPeb{SQMeWa4P{UpLOM6$?=}tV5lJ?Y7}Q)C!KEIzDB~Ut<X6E2y{TDQfH8
z=r<?ku$DnR;)bXRw?_5T(?v!D^+O$|p{NOsN6mB&YHOFGR<Hv#!BeP?E}?ero{c|8
z?btii0B&Q<#Jx}}_Os<6TXy9nqk$t(0~JF}AQm;T2B?l&pmv}QYJg6tmG?reY%*%=
z=b{GMjOsTP)!z|R{32@N-y-!c=SMQ?@C9nXKTuyNx3MN3i5j>#>c%ptLllpNu?1>^
zV^IT5vi0+9d@X9nHlf~{U04oJU?#o)f079!;4{t)Pz1G-N;okcf2Uy~%6G<_XY4V-
z)Q6y+aWv}wM%MnQ*KjuK?b?79@feoJzfcp2o`{U^#4CeMu|0N1?Zh#xhUZW-_L*dU
zaj1@Nl*gjBcmjIjY%GQ;sIzkl^=Pi4cHlp#L;47{gMXn*8UM*<Md7FqP({>MH?-vr
z7(sb3>JZLHO?abqzpX!uy8j94{(r2QrkJx8hI&M$Q0-!;u>V>?a{?aN$yRj3{FFyx
zIIhAxc+!@C#!$-MQ_XKk1yJ?%QSts*24`U*Jc%0cSJcGar<pSoIF0>3Pav3p8azbZ
z@D9~5&vdi3QJ8^pdGy9Otblc~6;8xByoZ`d#0>M(G9J~w4`#$9)I!Ii&e&v^tyqC-
zxEXb*cB2Nof;vREQ4@QKIt#gGn#0r#+fts1n!ppRjm17Uhcd}JAESxy!2<XcwNtL3
zS>`vC(x{mwqP_#Y&>u%zXQIAri_sTTQD^5U=EZ9^{yVB;_u1ydlm~q%m$t^B?yHNm
zb2;s7U?fIT@j2>-R2x5Hy^7kAho~KShMCY~jyY6WQTOFVZFLFM7FR?qq#5ebBw%5j
zgkgIBcaUjD;3{e*`RAHLR|nNWFI0RYs)G$!6fa;Ye2-dj(PXp5by2U`SkwelFf*=0
zJ;MDMhz~JX@Bi;)ywHE188{oNTn;tU7}O0t(GN%2`stX3ax!XX)}hYO4lIHPP>=Kx
zw#28Xe&W9{@s{Y)vusC3Gwz8xd}B}pEy7&5!NyOcI(&c{=w}ST7pRG(n{R&q&x(nZ
zJD~1Ag<8-L*an|q4Ax9x|8*KCrI;CSMLomYm=7PJCgS_0IdnNu9Th-rX$g$SYRGYL
zCZWEV!3)f9!=GYy%Iz>KCZQ%g19c{rEMWh0kl9Qi3{RuJbdRt!dM`B3zB1}ibwqX8
z3xjY1>JcqKoq>~>4IiRA{(+wOw=H`tG7HFn>Myg4j8>8h)v!2ffN0dp8(>Fli|z3+
zmd9L+%@?jYHl;ibi{m{kiGEAWcc3b&JQ=m+`!E6D;iu?oyVM+tJ(!!oIn0SaqYjnZ
zGV^oZ7u!=Vh#GJ**1|ie0rD=lA0&*WJQHK^62_wc3iCH&Lu^C&3v8nI|2HyW1mahk
zt?Pn%RwGb5G6!`gzQpfvH3qAGm5C>#4&O4Ih^ZKk6;_*P+#2;7_CWPJ9OG~nR@3``
zjf_?jw8l)NE$WbsL_MPks6#Ug_uz8W1X`{&9rr^`&}E&D9+Xp1XJLtr??O%FDCWZ}
z`0@Au-^p|%;J(iM*X~}}N)1q3UTD2}6jM+g&P5%*4d{hmp(c15-SGx`;vLk^{D6AR
ze@8u9_YGzTLeZte)QOB%x)8OJHK-584phe{QLoE&>yM}vzCsQ79@XvxmO%fF=5N2M
zSdsE)sI#>jHSupy?H_Ms|Fxp`1oC6RCUZkM%td)1>V{dU0av4L+=!a^LDa-vqYt`o
zHb31mq1u&0ovqra!`K}M;d<14xwi29wM9j?nExIhgWi<Cur9?6l-FT(+<~9q8(SZ<
z)zsI<hQyno240C5F%@;_#%?o@Dg||RmZ285*F{EKeF62%?xQ+*gn98TMq$Wy(?NaI
zgqou-cCh8%s2xhO<&mfzorD>23;N?eTRwvYDZ8$b(GL8H`VeK>VcypW)RuNeHSCK8
zFa>pbk6>o}3H|Ub_Ct@IX3K}*$DKq?cqx{~^;jG4A`5mo`BF{8qL`kFXw<2$h+0vc
zjn_tPWql091Ps9>)I{cDCR~l0&@R+gAGhAd0Lm||?z^-=o_`P--5CBcz}L)L88!3T
zm;;-j4rOm!o{Ab^6$ar!48<#`i9JU>BA?x6C$n24QIEDHhA_U<jEtU9f7HxJpa!0b
zSuhzj@H)(jCs8|d8?{s4qh7Pem>u)-mEy;QQyKMk-NYLB9918^*G#+ty0qn8$*7}V
zSQH0g5nPT@cmcEG->97k+Gjo_#c?#{PjCdD#bAuzZ^~`43gw$P9J3uT{m#bHln)(X
z|4Wd0K|qEdH1BmI)XJx#wrUAR;4#!zKSX^{-k~O#?U31_+89PT5p`H6q7Lg8ERWxy
z&Wi70GqKRa?0*gdZ3)OE)Cy*!PW^hUgjX>S`h8`7hbxKUlv|_fN1(QNFSf!DSPxqq
zA>k@i{15DaO^=%Y9Wd2JrYeDS$IKSRVg<?v&>df+9?d({1fApNaOFguk+N70W3e9&
z!{PWChhpaw<`<OPs59en((H&2>V8)g8GU#vp$3dY4OkQP{x(1zqL!!+NMF=<VHAeq
zR4k6`Q4_y`k(l|E+3K<wO}RFz-_fZ4CLxF2<t!niXR--n@G!>V2aLej(`Mk#n4a<g
z)P$2z6C7oogj&EX^u%Oz!-c5+mtY~>hI#N7M(F+ji;PZt=o#~0K<l7R`$5#!Ud33<
zaMnzy4(6xa8}nhZjqkVdJ2vii&fH%Rb@)1BZd`!5a4&i?zVj^^FT8^u_z?A_`Y-AO
z@&~p?udmGxbVg6g-B90+zL)`rTgO{xVn*UA)|Kc@d5bOYL03G1V>aM<-gJ~1HK7pH
z4S7+|zNn2?vhnKHdZ<U!95s>FsKeR?HPO+ig-t{soQ@eW<vjbZfmRZb8&NCYiMsIw
z>WlcbE#E{R%J)(2e?k2$c!fHQo)^rADW5eKHK8`B0TWT*mHwzhIN<{OubD0)paFNI
z4$C1-hnG+TUO^qMyQp^G+xX9@mAyhu<UMKt--~7;;iz~Ns$IN|*Fo)Q8y6X^q$jH3
zK-7Q}ZF~;u5iCGoTxsLmP!rjU+Oe-t_gzLU=niVYH>gMRC#oOkk}-qT6-Y)MhoH8o
zpsgrvt&AF|hP585!=|W-w?b`wN7Mpbs894<48e8Q6R4fNkDBmrNIx#e?XsDX7it9o
zsMjwS`e7+l$FZmmnxdX*BC35q%!DIQ3z%-5kDA~L)J|+bEo7T5@A+8f`5z*qj!vKk
zzKs6(6KbWeQ60Ru<$r8_`YYx=&Vp)R5_PCzPy@BVOxO;!kUlm(!p6s8M!o-YZG$DK
zm2E<O`F7j#4OE8@FaRH;27HfE=zY~pv?8iL2Gvg^)P1c{JJSjEMeL2$uphcK!yRPw
zWjcnM>3!5s!DpzqU^VFz-O1I<s=V&e^?*ic;j83zZ`$>xI<S|<($$v6w~1GG<N1F=
z;3v`>0t+xRsh;g^FL@u^K{aBFZ9YHoI;8O=T`NgHllD`en|8xVgUK%;{fD%bx^l#H
ztv5LTCB91Ee_itpAGhT%@|#FmxS=VHCX=E`y3XQklXYI;G13^@@lx`h)ZZXAAn7V<
zokN?KHop<?rsXyM3DP4Q=te^wq9{@g(!Vc%+h!{cvV*FAo{cxPjWgQvKa_irzNVZ9
zqq(Q4y)PKI5OWnK(}+}*w1I}(N$W`asGLaB)sFNjX$ox`U?TO$kza6~>m*&9NnXVB
z(q=f8ro4ufMEZiH>r?8|uEAuMr(^%WqOq<~wz30eAeFcAVi-aF3>;4yOZtnXYZmRs
z;abw~#N0{qNsVp&Wa5oT1t}M?u>qLCecAC#H-5k`AQMO+?J8sQBZ)6e3tGdig_188
z4Rgg&DnKh;boB9hV*LeYkVe?v+R-jQ`TC@E_8!~RX-O=J)RUxdX?@aLQXi6D^joBA
z_MR}>1d+e1SMGiCgR)s%y(vzkiQfHC@|SQJW~J$mSeJ4n>Uu!BLRv_<J@u!^_aon&
zl#R52n7+0}NXtmNsuFvL`j&i4DnYp-ZFLRPE37MyKsaeUmBmQ9KDUjgVSi$W@tKYF
zp!^;AWRfo_yS=9#`D>&-++T&1g?vNm(%Jfalv5NZy(fQK<4>ouB!!O`c~9GTw2kGW
zyv|lH$1%h&;1N<I@~ucUNk39PiofDq>`c<t+N%6e^08QhK2MUbY}U`|rf`mm^jMtK
zmHbpYksQ|MRz9r%yH?OPgm?uT$xr#d&6gk_M!qlVx<k5X^XpOn`;_Ysf-_0+6sD5S
zlmEgFMAkV(tUc*-Vk0Q)50U$nn^8{1(xk)0W>9WMK9H1lePi?d;q>vUP5EnbTd)qv
zThCvA0WGo()hYw|g7^w6ViHa#H6i~L|9zEZ&`?rl8((BA3sWvhygW(QD1$S`TG(1l
z&wn<J{~+D7!KLJ1lFw#uUSZ>ZVn-XZAt!{k`$)Q6c!`vkbcQs6wx1E#ukSf1>uN%*
z!N2-wspsE}RDj?Cwcsj4;|P1h2FeNKcj6@4e2M)?{}4Muszl6>bcK8#EI{4AuYttI
zQRha|<wkiPcCuwxGKKCGR+6TWFGQ+pD<_cG)r%BGtOBV8`Rt@tbX1D;8+nKL2Uu<I
zJ7LX7{d3iGc^I57)OEG>gtUHsmJ_&1+CfU@rZ`gCb&8n&;(3RKh|feHTlp>d>m+Z|
z?z9`QH|+)y(^c2@RofJu{%UXY4>kU20x2~555ZgZCe^nl<s_b&bc1|)(ofX)M}J}w
zr1O+dQr6|7tZO&1o46UZyb8pN+q#jIQ;6?JT_bd8bWO5Wv3BQ%hUDkk8`Y*Z`AoL_
z9p%4m+sovCAbC*dhhb@P>k#~#_&21Qq-~T-kv<{0Dst0aG8w2Ch|f^hLGqQUn@)Zf
zX%Tr{dx(EQ(sd5|5bt5jiajN@Cia4u{^;pTilQ8Z^ROXC;sDY^{Rp2z!yyFw5zzIs
z?d(tdoN^+mFLlc(*Tk`E#MRv3<R;#ZcxO^4lCD}9PWnJyWztj=c77pWhxo7fnv{0_
zoFVo`+s+wExz@)9yn5Ku=40_Fjk^B7_G^fLMygI-H_}Av>r$>_+pQvhjP!=Oyrkiz
zSnBkDA#n~+k<m7sL%uArNu<uCUX=TgbTua3v-u|2lk|w#6U<4POdnY>hLm=FPrf?^
zFWY~Nt!Pa74t3R3&Ov%>Z)$@BD3>I)CzT+LwKtE(T-1M0%!mB%m?wEhbQV`na{ncj
zqqY*MDEYy(XhUjCIqgay(~<IX(oE_);8(<2kUvg-F8NoavgD(&AaPy37*BdlKA1XP
zvndCV-=?Q{#>77UAO3@=s7iS)m1l7%$&0jvq^qsrfB)`6`xdlai1l%ftr<mrJNaqE
zd*g4Eb(N;9tCoR(hw*onEtJ7T+d!di+?4w9H?2;Ticr%5cM-jfei(_mCXnAm%4dqs
zHESD8&wW{KIUY07ZloP$hm8-z#Wp{Vy5i*B@gfH3Cv8Ss>A}q%$;a3ZLdbtceh~VS
z(ysZozFu0u`UCf0Ak8ABT?1{V2C>IBeo(P|1^aYL=-#7mV(QCsEj%;!9v(ipUwHj$
zb!()?S53^|SFL~le}#6|>QX(h>4|;4!jlpQCONhGb?MbJv2Wkx9n-U?mYu$;=Klfl
CafjCc

delta 14401
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
Ry6fw@J!|f&G2>XB{{w*YXp;Z{

diff --git a/src/locale/nb/LC_MESSAGES/django.po b/src/locale/nb/LC_MESSAGES/django.po
index 27dbc0ac9..0b706b015 100644
--- a/src/locale/nb/LC_MESSAGES/django.po
+++ b/src/locale/nb/LC_MESSAGES/django.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAKE NTNU website\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-05-07 21:15+0200\n"
+"POT-Creation-Date: 2023-10-05 18:43+0200\n"
 "PO-Revision-Date: 2018-10-09 14:05+0200\n"
 "Last-Translator: Sindre Stephansen <sindre@sindrestephansen.com>\n"
 "Language-Team: Norwegian Bokmål <dev@makentnu.no>\n"
@@ -3052,31 +3052,31 @@ msgstr ""
 msgid "One or more languages have no content."
 msgstr "Ett eller flere språk mangler innhold."
 
-#: src/web/settings.py:307
+#: src/web/settings.py:306
 msgid ""
-"Determines whether the “Søk verv” button in the navigation menu in the "
+"Determines whether the “Apply to MAKE” button in the navigation menu in the "
 "header is visible."
 msgstr ""
 "Bestemmer om «Søk verv»-knappen skal være synlig i navigasjonsmenyen i "
 "toppteksten."
 
-#: src/web/settings.py:311
+#: src/web/settings.py:310
 msgid "Link to the guide on what should be done when a new member enrolls."
 msgstr "Lenke til guiden med ting som skal gjøres når et nytt medlem tas opp."
 
-#: src/web/settings.py:316
+#: src/web/settings.py:315
 msgid "Link to the guide on what should be done when a member retires."
 msgstr "Lenke til guiden med ting som skal gjøres når et medlem panger."
 
-#: src/web/settings.py:321
+#: src/web/settings.py:320
 msgid "Link to the guide on what should be done when a member quits."
 msgstr "Lenke til guiden med ting som skal gjøres når et medlem slutter."
 
-#: src/web/settings.py:327
+#: src/web/settings.py:326
 msgid "Main Site Settings"
 msgstr "Hovedsideinnstillinger"
 
-#: src/web/settings.py:330
+#: src/web/settings.py:329
 msgid "Internal Site Settings"
 msgstr "Internsideinnstillinger"
 
@@ -3266,6 +3266,10 @@ msgstr "Om"
 msgid "About us"
 msgstr "Om oss"
 
+#: src/web/templates/web/header.html:76
+msgid "Apply to MAKE"
+msgstr "Søk verv"
+
 #: src/web/templates/web/header.html:99
 msgid "Administration"
 msgstr "Administrasjon"
diff --git a/src/web/settings.py b/src/web/settings.py
index 5b8f8acd2..efd32ba75 100644
--- a/src/web/settings.py
+++ b/src/web/settings.py
@@ -303,7 +303,7 @@ def generate_all_hosts(subdomains):
 CONSTANCE_CONFIG = {
     'SHOW_APPLY_BUTTON_IN_HEADER_NAV': (
         True,
-        _("Determines whether the “Søk verv” button in the navigation menu in the header is visible."),
+        _("Determines whether the “Apply to MAKE” button in the navigation menu in the header is visible."),
     ),
     'ENROLL_MEMBERS_GUIDE_LINK': (
         "",
diff --git a/src/web/templates/web/header.html b/src/web/templates/web/header.html
index 130cf6e7b..d4e568799 100644
--- a/src/web/templates/web/header.html
+++ b/src/web/templates/web/header.html
@@ -73,7 +73,7 @@
 
             {% if config.SHOW_APPLY_BUTTON_IN_HEADER_NAV %}
                 <a class="item" href="{% url 'apply' %}">
-                    <div class="text">Søk verv</div>
+                    <div class="text">{% translate "Apply to MAKE" %}</div>
                     <div class="make-bg-blue bubble-background"></div>
                 </a>
             {% endif %}

From d0129a01c80e3a0fcc07cc0884aa2b48dfa4fb6b Mon Sep 17 00:00:00 2001
From: Gunvor4 <Gunvor4@users.noreply.github.com>
Date: Thu, 5 Oct 2023 19:05:23 +0200
Subject: [PATCH 19/49] Changed CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index afa6e1fe2..38eb6827f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ A summary of changes made to the codebase, grouped per deployment.
 
 ### New features
 
-- 
+- The apply button in the English header, which previously read "søk verv", has now been translated to English ("apply to MAKE")
 
 ### Improvements
 

From 2dfeb80de468bc9c8e66c7c074952a13e2db8647 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Oct 2023 16:06:09 +0000
Subject: [PATCH 20/49] =?UTF-8?q?=E2=AC=86(deps):=20Bump=20pillow=20from?=
 =?UTF-8?q?=2010.0.0=20to=2010.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [pillow](https://github.com/python-pillow/Pillow) from 10.0.0 to 10.1.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/10.0.0...10.1.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index c9117e963..62bc73868 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -27,6 +27,6 @@ channels-redis==4.1.0
 
 # Misc. packages
 bleach[css]==6.0.0
-Pillow==10.0.0
+Pillow==10.1.0
 uuid==1.30
 XlsxWriter==3.1.2

From 837ad451daf733dca7c1f96a874702fd73f2010a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Jan 2024 16:26:55 +0000
Subject: [PATCH 21/49] =?UTF-8?q?=E2=AC=86(deps):=20Bump=20django-phonenum?=
 =?UTF-8?q?ber-field[phonenumbers]=20from=207.2.0=20to=207.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [django-phonenumber-field[phonenumbers]](https://github.com/stefanfoulis/django-phonenumber-field) from 7.2.0 to 7.3.0.
- [Release notes](https://github.com/stefanfoulis/django-phonenumber-field/releases)
- [Changelog](https://github.com/stefanfoulis/django-phonenumber-field/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/stefanfoulis/django-phonenumber-field/compare/7.2.0...7.3.0)

---
updated-dependencies:
- dependency-name: django-phonenumber-field[phonenumbers]
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index ed7ed2480..d8aa8a24e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ django-decorator-include==3.0
 django-extensions==3.2.3
 django-ical==1.9.2
 django-multiselectfield==0.1.12
-django-phonenumber-field[phonenumbers]==7.2.0
+django-phonenumber-field[phonenumbers]==7.3.0
 django-simple-history==3.4.0
 sorl-thumbnail==12.9.0
 

From 9f0298c401b9160b8f7beb00bf87d66839e04f74 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Jan 2024 16:27:01 +0000
Subject: [PATCH 22/49] =?UTF-8?q?=E2=AC=86(deps):=20Bump=20pillow=20from?=
 =?UTF-8?q?=2010.1.0=20to=2010.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [pillow](https://github.com/python-pillow/Pillow) from 10.1.0 to 10.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/10.1.0...10.2.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index ed7ed2480..c85597303 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -27,6 +27,6 @@ channels-redis==4.1.0
 
 # Misc. packages
 bleach[css]==6.0.0
-Pillow==10.1.0
+Pillow==10.2.0
 uuid==1.30
 XlsxWriter==3.1.2

From 07daa069f491377aded14f847f264051ad361fbb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jan 2024 18:12:11 +0000
Subject: [PATCH 23/49] =?UTF-8?q?=E2=AC=86(deps):=20Bump=20sorl-thumbnail?=
 =?UTF-8?q?=20from=2012.9.0=20to=2012.10.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [sorl-thumbnail](https://github.com/jazzband/sorl-thumbnail) from 12.9.0 to 12.10.0.
- [Release notes](https://github.com/jazzband/sorl-thumbnail/releases)
- [Changelog](https://github.com/jazzband/sorl-thumbnail/blob/master/CHANGES.rst)
- [Commits](https://github.com/jazzband/sorl-thumbnail/compare/12.9.0...12.10.0)

---
updated-dependencies:
- dependency-name: sorl-thumbnail
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 57a9ca9ca..f0e0968f4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ django-ical==1.9.2
 django-multiselectfield==0.1.12
 django-phonenumber-field[phonenumbers]==7.3.0
 django-simple-history==3.4.0
-sorl-thumbnail==12.9.0
+sorl-thumbnail==12.10.0
 
 # Packages related to authentication and other "social" stuff
 social-auth-app-django==5.3.0

From aad38900870276e7624917cceea546b0e0d512b9 Mon Sep 17 00:00:00 2001
From: elisakiv <elis.k.iver@gmail.com>
Date: Thu, 18 Jan 2024 19:41:00 +0100
Subject: [PATCH 24/49] Bump django from 4.1.7 to 4.2.9

---
 requirements.txt    | 2 +-
 src/web/settings.py | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index ed7ed2480..4cb5be2e5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 # Django-related packages
-Django==4.1.7
+Django==4.2.9
 django-hosts==5.2
 django-ckeditor==6.7.0
 django-cleanup==8.0.0
diff --git a/src/web/settings.py b/src/web/settings.py
index efd32ba75..31460c938 100644
--- a/src/web/settings.py
+++ b/src/web/settings.py
@@ -403,7 +403,11 @@ def generate_all_hosts(subdomains):
 
 # This is based on Django's ManifestStaticFilesStorage, which appends every static file's MD5 hash to its filename,
 # which avoids waiting for browsers' cache to update if a file's contents change
-STATICFILES_STORAGE = 'web.static.ManifestStaticFilesStorage'
+STORAGES = {
+    "staticfiles": {
+        "BACKEND": "web.static.ManifestStaticFilesStorage",
+    },
+}
 # Ignores adding a hash to the files whose paths match these glob patterns:
 # NOTE: Ignored files should be named so that it's obvious that they should be renamed when their contents update,
 #       to avoid being "stuck" in browsers' cache - which is what `ManifestStaticFilesStorage` would have prevented

From 066cce6f3e5acd75bc178f88c4097f3be5ccfd69 Mon Sep 17 00:00:00 2001
From: elisakiv <elis.k.iver@gmail.com>
Date: Thu, 25 Jan 2024 19:05:55 +0100
Subject: [PATCH 25/49] Added necessary default storage to settings

---
 src/web/settings.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/web/settings.py b/src/web/settings.py
index 31460c938..3e65a1fe0 100644
--- a/src/web/settings.py
+++ b/src/web/settings.py
@@ -404,8 +404,11 @@ def generate_all_hosts(subdomains):
 # This is based on Django's ManifestStaticFilesStorage, which appends every static file's MD5 hash to its filename,
 # which avoids waiting for browsers' cache to update if a file's contents change
 STORAGES = {
-    "staticfiles": {
-        "BACKEND": "web.static.ManifestStaticFilesStorage",
+    "default": {
+        "BACKEND": "django.core.files.storage.FileSystemStorage",
+    },
+    'staticfiles': {
+        'BACKEND': 'web.static.ManifestStaticFilesStorage',
     },
 }
 # Ignores adding a hash to the files whose paths match these glob patterns:

From 80366e19aa6cc0f07d1b2433e6f2ec519359367a Mon Sep 17 00:00:00 2001
From: elisakiv <elis.k.iver@gmail.com>
Date: Thu, 25 Jan 2024 19:06:54 +0100
Subject: [PATCH 26/49] Fixed issue in static.py

---
 src/web/static.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/web/static.py b/src/web/static.py
index 8a7a7e001..1cc16b3a3 100644
--- a/src/web/static.py
+++ b/src/web/static.py
@@ -66,13 +66,14 @@ def get_full_static_url(url: str):
         return f"{settings.STATIC_URL}{url}"
 
     def file_hash(self, name, content=None):
-        normalized_file_path = Path(name).as_posix()
-        # Don't hash the filename if the path matches any of the patterns in the `MANIFEST_STATICFILES_IGNORE_PATTERNS` setting
-        if any(
-                fnmatchcase(normalized_file_path, pattern)
-                for pattern in settings.MANIFEST_STATICFILES_IGNORE_PATTERNS
-        ):
-            return None
+        if name:
+            normalized_file_path = Path(name).as_posix()
+            # Don't hash the filename if the path matches any of the patterns in the `MANIFEST_STATICFILES_IGNORE_PATTERNS` setting
+            if any(
+                    fnmatchcase(normalized_file_path, pattern)
+                    for pattern in settings.MANIFEST_STATICFILES_IGNORE_PATTERNS
+            ):
+                return None
 
         return super().file_hash(name, content)
 

From eff6c2849c14ba9c5f601017c9df4219a77dc6df Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Feb 2024 17:49:00 +0000
Subject: [PATCH 27/49] =?UTF-8?q?=E2=AC=86(deps):=20Bump=20django-hosts=20?=
 =?UTF-8?q?from=205.2=20to=206.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [django-hosts](https://github.com/jazzband/django-hosts) from 5.2 to 6.0.
- [Changelog](https://github.com/jazzband/django-hosts/blob/master/docs/changelog.rst)
- [Commits](https://github.com/jazzband/django-hosts/compare/5.2...6.0)

---
updated-dependencies:
- dependency-name: django-hosts
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 75e480c7a..3c9876deb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 # Django-related packages
 Django==4.2.9
-django-hosts==5.2
+django-hosts==6.0
 django-ckeditor==6.7.0
 django-cleanup==8.0.0
 django-constance==3.1.0

From c8af5d72eefab3296bf07d4978d3c3d4596bf111 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Feb 2024 17:49:04 +0000
Subject: [PATCH 28/49] =?UTF-8?q?=E2=AC=86(deps):=20Bump=20django=20from?=
 =?UTF-8?q?=204.1.7=20to=205.0.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [django](https://github.com/django/django) from 4.1.7 to 5.0.2.
- [Commits](https://github.com/django/django/compare/4.1.7...5.0.2)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 75e480c7a..5a8ec380a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 # Django-related packages
-Django==4.2.9
+Django==5.0.2
 django-hosts==5.2
 django-ckeditor==6.7.0
 django-cleanup==8.0.0

From cf59cb4d5b4b542cb6e97817c1151349994d1828 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Feb 2024 18:12:32 +0000
Subject: [PATCH 29/49] =?UTF-8?q?=E2=AC=86(deps):=20Bump=20xlsxwriter=20fr?=
 =?UTF-8?q?om=203.1.2=20to=203.1.9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [xlsxwriter](https://github.com/jmcnamara/XlsxWriter) from 3.1.2 to 3.1.9.
- [Changelog](https://github.com/jmcnamara/XlsxWriter/blob/main/Changes)
- [Commits](https://github.com/jmcnamara/XlsxWriter/compare/RELEASE_3.1.2...RELEASE_3.1.9)

---
updated-dependencies:
- dependency-name: xlsxwriter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 75e480c7a..e762fe623 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -29,4 +29,4 @@ channels-redis==4.1.0
 bleach[css]==6.0.0
 Pillow==10.2.0
 uuid==1.30
-XlsxWriter==3.1.2
+XlsxWriter==3.1.9

From 07a3933d2075a7468f7b1ce2cd4584977f6143dc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Feb 2024 17:49:04 +0000
Subject: [PATCH 30/49] Made changed in migration files

Made changes in migration files to avoid error in timezone data, since Django 5.0.2 has removed the django.utils.timezone.utc alias to datetime.timezone.utc
---
 .../migrations/0008_contentbox_last_modified.py       |  5 ++---
 src/faq/migrations/0003_question_last_modified.py     |  5 ++---
 ...08_committee_and_inheritancegroup_last_modified.py |  7 +++----
 .../0012_member_and_systemaccess_last_modified.py     |  7 +++----
 ...inter3dcourse_and_reservationrule_last_modified.py | 11 +++++------
 .../migrations/0030_machine_info_message.py           |  4 +---
 .../migrations/0006_equipment_last_modified.py        |  5 ++---
 ...3_article_and_event_and_timeplace_last_modified.py |  9 ++++-----
 ...ntticket_creation_date_and_active_last_modified.py |  7 +++----
 9 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/src/contentbox/migrations/0008_contentbox_last_modified.py b/src/contentbox/migrations/0008_contentbox_last_modified.py
index 2bb97d05e..bafd4ab1c 100644
--- a/src/contentbox/migrations/0008_contentbox_last_modified.py
+++ b/src/contentbox/migrations/0008_contentbox_last_modified.py
@@ -1,8 +1,7 @@
 # Generated by Django 3.2.8 on 2021-10-25 18:28
 
-from datetime import datetime
+from datetime import datetime, timezone
 from django.db import migrations, models
-from django.utils.timezone import utc
 
 
 class Migration(migrations.Migration):
@@ -15,7 +14,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='contentbox',
             name='last_modified',
-            field=models.DateTimeField(auto_now=True, default=datetime.utcfromtimestamp(0).replace(tzinfo=utc), verbose_name='last modified'),
+            field=models.DateTimeField(auto_now=True, default=datetime.utcfromtimestamp(0), verbose_name='last modified'),
             preserve_default=False,
         ),
     ]
diff --git a/src/faq/migrations/0003_question_last_modified.py b/src/faq/migrations/0003_question_last_modified.py
index b654b3642..b758f732c 100644
--- a/src/faq/migrations/0003_question_last_modified.py
+++ b/src/faq/migrations/0003_question_last_modified.py
@@ -1,8 +1,7 @@
 # Generated by Django 3.2.8 on 2021-10-25 18:28
 
-from datetime import datetime
+from datetime import datetime, timezone
 from django.db import migrations, models
-from django.utils.timezone import utc
 
 
 class Migration(migrations.Migration):
@@ -15,7 +14,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='question',
             name='last_modified',
-            field=models.DateTimeField(auto_now=True, default=datetime.utcfromtimestamp(0).replace(tzinfo=utc), verbose_name='last modified'),
+            field=models.DateTimeField(auto_now=True, default=datetime.utcfromtimestamp(0), verbose_name='last modified'),
             preserve_default=False,
         ),
     ]
diff --git a/src/groups/migrations/0008_committee_and_inheritancegroup_last_modified.py b/src/groups/migrations/0008_committee_and_inheritancegroup_last_modified.py
index 979802006..eb31d7072 100644
--- a/src/groups/migrations/0008_committee_and_inheritancegroup_last_modified.py
+++ b/src/groups/migrations/0008_committee_and_inheritancegroup_last_modified.py
@@ -1,8 +1,7 @@
 # Generated by Django 3.2.8 on 2021-10-25 18:28
 
-from datetime import datetime
+from datetime import datetime, timezone
 from django.db import migrations, models
-from django.utils.timezone import utc
 
 
 class Migration(migrations.Migration):
@@ -15,13 +14,13 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='committee',
             name='last_modified',
-            field=models.DateTimeField(auto_now=True, default=datetime.utcfromtimestamp(0).replace(tzinfo=utc), verbose_name='last modified'),
+            field=models.DateTimeField(auto_now=True, default=datetime.utcfromtimestamp(0), verbose_name='last modified'),
             preserve_default=False,
         ),
         migrations.AddField(
             model_name='inheritancegroup',
             name='last_modified',
-            field=models.DateTimeField(auto_now=True, default=datetime.utcfromtimestamp(0).replace(tzinfo=utc), verbose_name='last modified'),
+            field=models.DateTimeField(auto_now=True, default=datetime.utcfromtimestamp(0), verbose_name='last modified'),
             preserve_default=False,
         ),
     ]
diff --git a/src/internal/migrations/0012_member_and_systemaccess_last_modified.py b/src/internal/migrations/0012_member_and_systemaccess_last_modified.py
index c71992f62..014d0fb98 100644
--- a/src/internal/migrations/0012_member_and_systemaccess_last_modified.py
+++ b/src/internal/migrations/0012_member_and_systemaccess_last_modified.py
@@ -1,8 +1,7 @@
 # Generated by Django 3.2.8 on 2021-10-25 18:28
 
-from datetime import datetime
+from datetime import datetime, timezone
 from django.db import migrations, models
-from django.utils.timezone import utc
 
 
 class Migration(migrations.Migration):
@@ -15,13 +14,13 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='member',
             name='last_modified',
-            field=models.DateTimeField(auto_now=True, default=datetime.utcfromtimestamp(0).replace(tzinfo=utc), verbose_name='last modified'),
+            field=models.DateTimeField(auto_now=True, default=datetime.utcfromtimestamp(0), verbose_name='last modified'),
             preserve_default=False,
         ),
         migrations.AddField(
             model_name='systemaccess',
             name='last_modified',
-            field=models.DateTimeField(auto_now=True, default=datetime.utcfromtimestamp(0).replace(tzinfo=utc), verbose_name='last modified'),
+            field=models.DateTimeField(auto_now=True, default=datetime.utcfromtimestamp(0), verbose_name='last modified'),
             preserve_default=False,
         ),
     ]
diff --git a/src/make_queue/migrations/0024_machine_and_machineusagerule_and_printer3dcourse_and_reservationrule_last_modified.py b/src/make_queue/migrations/0024_machine_and_machineusagerule_and_printer3dcourse_and_reservationrule_last_modified.py
index a2d037afc..7ef95981e 100644
--- a/src/make_queue/migrations/0024_machine_and_machineusagerule_and_printer3dcourse_and_reservationrule_last_modified.py
+++ b/src/make_queue/migrations/0024_machine_and_machineusagerule_and_printer3dcourse_and_reservationrule_last_modified.py
@@ -1,8 +1,7 @@
 # Generated by Django 3.2.8 on 2021-10-26 01:43
 
-from datetime import datetime
+from datetime import datetime, timezone
 from django.db import migrations, models
-from django.utils.timezone import utc
 
 
 class Migration(migrations.Migration):
@@ -15,25 +14,25 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='machine',
             name='last_modified',
-            field=models.DateTimeField(auto_now=True, default=datetime.utcfromtimestamp(0).replace(tzinfo=utc), verbose_name='last modified'),
+            field=models.DateTimeField(auto_now=True, default=datetime.utcfromtimestamp(0), verbose_name='last modified'),
             preserve_default=False,
         ),
         migrations.AddField(
             model_name='machineusagerule',
             name='last_modified',
-            field=models.DateTimeField(auto_now=True, default=datetime.utcfromtimestamp(0).replace(tzinfo=utc), verbose_name='last modified'),
+            field=models.DateTimeField(auto_now=True, default=datetime.utcfromtimestamp(0), verbose_name='last modified'),
             preserve_default=False,
         ),
         migrations.AddField(
             model_name='printer3dcourse',
             name='last_modified',
-            field=models.DateTimeField(auto_now=True, default=datetime.utcfromtimestamp(0).replace(tzinfo=utc), verbose_name='last modified'),
+            field=models.DateTimeField(auto_now=True, default=datetime.utcfromtimestamp(0), verbose_name='last modified'),
             preserve_default=False,
         ),
         migrations.AddField(
             model_name='reservationrule',
             name='last_modified',
-            field=models.DateTimeField(auto_now=True, default=datetime.utcfromtimestamp(0).replace(tzinfo=utc), verbose_name='last modified'),
+            field=models.DateTimeField(auto_now=True, default=datetime.utcfromtimestamp(0), verbose_name='last modified'),
             preserve_default=False,
         ),
     ]
diff --git a/src/make_queue/migrations/0030_machine_info_message.py b/src/make_queue/migrations/0030_machine_info_message.py
index 2cf97c236..8099a7567 100644
--- a/src/make_queue/migrations/0030_machine_info_message.py
+++ b/src/make_queue/migrations/0030_machine_info_message.py
@@ -3,12 +3,10 @@
 from datetime import datetime
 from django.db import migrations, models
 import django.utils.timezone
-from django.utils.timezone import utc
-
 
 def set_info_message_date_for_existing_machines(apps, schema_editor):
     Machine = apps.get_model('make_queue', 'Machine')
-    Machine.objects.update(info_message_date=datetime.utcfromtimestamp(0).replace(tzinfo=utc))
+    Machine.objects.update(info_message_date=datetime.utcfromtimestamp(0))
 
 
 class Migration(migrations.Migration):
diff --git a/src/makerspace/migrations/0006_equipment_last_modified.py b/src/makerspace/migrations/0006_equipment_last_modified.py
index 44ede267e..70f519ad7 100644
--- a/src/makerspace/migrations/0006_equipment_last_modified.py
+++ b/src/makerspace/migrations/0006_equipment_last_modified.py
@@ -1,8 +1,7 @@
 # Generated by Django 3.2.8 on 2021-10-25 18:28
 
-from datetime import datetime
+from datetime import datetime, timezone
 from django.db import migrations, models
-from django.utils.timezone import utc
 
 
 class Migration(migrations.Migration):
@@ -15,7 +14,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='equipment',
             name='last_modified',
-            field=models.DateTimeField(auto_now=True, default=datetime.utcfromtimestamp(0).replace(tzinfo=utc), verbose_name='last modified'),
+            field=models.DateTimeField(auto_now=True, default=datetime.utcfromtimestamp(0), verbose_name='last modified'),
             preserve_default=False,
         ),
     ]
diff --git a/src/news/migrations/0023_article_and_event_and_timeplace_last_modified.py b/src/news/migrations/0023_article_and_event_and_timeplace_last_modified.py
index 2dbc2f29e..8219690d3 100644
--- a/src/news/migrations/0023_article_and_event_and_timeplace_last_modified.py
+++ b/src/news/migrations/0023_article_and_event_and_timeplace_last_modified.py
@@ -1,8 +1,7 @@
 # Generated by Django 3.2.8 on 2021-11-01 11:10
 
-from datetime import datetime
+from datetime import datetime, timezone
 from django.db import migrations, models
-from django.utils.timezone import utc
 
 
 class Migration(migrations.Migration):
@@ -15,19 +14,19 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='article',
             name='last_modified',
-            field=models.DateTimeField(auto_now=True, default=datetime.utcfromtimestamp(0).replace(tzinfo=utc), verbose_name='last modified'),
+            field=models.DateTimeField(auto_now=True, default=datetime.utcfromtimestamp(0), verbose_name='last modified'),
             preserve_default=False,
         ),
         migrations.AddField(
             model_name='event',
             name='last_modified',
-            field=models.DateTimeField(auto_now=True, default=datetime.utcfromtimestamp(0).replace(tzinfo=utc), verbose_name='last modified'),
+            field=models.DateTimeField(auto_now=True, default=datetime.utcfromtimestamp(0), verbose_name='last modified'),
             preserve_default=False,
         ),
         migrations.AddField(
             model_name='timeplace',
             name='last_modified',
-            field=models.DateTimeField(auto_now=True, default=datetime.utcfromtimestamp(0).replace(tzinfo=utc), verbose_name='last modified'),
+            field=models.DateTimeField(auto_now=True, default=datetime.utcfromtimestamp(0), verbose_name='last modified'),
             preserve_default=False,
         ),
     ]
diff --git a/src/news/migrations/0030_eventticket_creation_date_and_active_last_modified.py b/src/news/migrations/0030_eventticket_creation_date_and_active_last_modified.py
index 15931a9d4..8cc6ffc6a 100644
--- a/src/news/migrations/0030_eventticket_creation_date_and_active_last_modified.py
+++ b/src/news/migrations/0030_eventticket_creation_date_and_active_last_modified.py
@@ -1,8 +1,7 @@
 # Generated by Django 4.0.6 on 2022-09-12 19:51
 
-from datetime import datetime
+from datetime import datetime, timezone
 from django.db import migrations, models
-from django.utils.timezone import utc
 import django.utils.timezone
 
 
@@ -16,7 +15,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='eventticket',
             name='active_last_modified',
-            field=models.DateTimeField(blank=True, default=datetime.utcfromtimestamp(0).replace(tzinfo=utc), verbose_name='last changed to active/canceled'),
+            field=models.DateTimeField(blank=True, default=datetime.utcfromtimestamp(0), verbose_name='last changed to active/canceled'),
             preserve_default=False,
         ),
         migrations.AlterField(
@@ -27,7 +26,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='eventticket',
             name='creation_date',
-            field=models.DateTimeField(auto_now_add=True, default=datetime.utcfromtimestamp(0).replace(tzinfo=utc), verbose_name='original registration date'),
+            field=models.DateTimeField(auto_now_add=True, default=datetime.utcfromtimestamp(0), verbose_name='original registration date'),
             preserve_default=False,
         ),
     ]

From 50d9538553129197663bbfc3490f68b6be1876f0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Feb 2024 15:38:00 +0000
Subject: [PATCH 31/49] =?UTF-8?q?=E2=AC=86(deps):=20Bump=20python-ldap=20f?=
 =?UTF-8?q?rom=203.4.3=20to=203.4.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [python-ldap](https://github.com/python-ldap/python-ldap) from 3.4.3 to 3.4.4.
- [Release notes](https://github.com/python-ldap/python-ldap/releases)
- [Commits](https://github.com/python-ldap/python-ldap/compare/python-ldap-3.4.3...python-ldap-3.4.4)

---
updated-dependencies:
- dependency-name: python-ldap
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 3e0fc9cce..5d5b3bbab 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,7 +19,7 @@ social-auth-app-django==5.3.0
 # (see https://python-social-auth.readthedocs.io/en/stable/installing.html#using-the-extras-options)
 social-auth-core[openidconnect]==4.4.2
 # TODO: updated, pre-built Windows wheels might be available after this is resolved: https://github.com/python-ldap/python-ldap/issues/511
-python-ldap==3.4.3
+python-ldap==3.4.4
 
 # Async-related packages (mainly for sending of emails)
 channels[daphne]==4.0.0

From 6043019f835aa1a7b63126d9ccf41fe5e6e94e9c Mon Sep 17 00:00:00 2001
From: Gunvor4 <Gunvor4@users.noreply.github.com>
Date: Mon, 26 Feb 2024 17:35:10 +0100
Subject: [PATCH 32/49] Made changes to README file

Christoph Gohlke has released new versions of python-ldap wheels on GitHub (:-D), and his old site is no longer working. The README file has now been updated with the correct link for python-ldap wheels.
---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 5f76dc89e..8f4fd485f 100644
--- a/README.md
+++ b/README.md
@@ -66,8 +66,7 @@ and set the following settings (File → Settings...):
        ```
 1. Install requirements:
    * If using Windows, first download the correct wheel for the [`python-ldap`](https://pypi.org/project/python-ldap/) package
-     from [Christoph Gohlke's page](https://www.lfd.uci.edu/~gohlke/pythonlibs/#_python-ldap)
-     (linked to by [`python-ldap`'s documentation](https://www.python-ldap.org/en/python-ldap-3.4.0/installing.html#windows))
+     from [Christoph Gohlke](https://github.com/cgohlke)'s [python-ldap-build repository](https://github.com/cgohlke/python-ldap-build).
      and install it:
      ```shell
      pip install [path to .whl file]

From bb2ea2bccfd958dbb289d9349ec3269f71779c43 Mon Sep 17 00:00:00 2001
From: Gunvor4 <Gunvor4@users.noreply.github.com>
Date: Mon, 26 Feb 2024 17:44:56 +0100
Subject: [PATCH 33/49] Included link to updated python-ldap wheels in
 requirements.txt

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 5d5b3bbab..5579ac463 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,7 +18,7 @@ social-auth-app-django==5.3.0
 # This is already a requirement of `social-auth-app-django`, but it's listed here to provide the `openidconnect` extra
 # (see https://python-social-auth.readthedocs.io/en/stable/installing.html#using-the-extras-options)
 social-auth-core[openidconnect]==4.4.2
-# TODO: updated, pre-built Windows wheels might be available after this is resolved: https://github.com/python-ldap/python-ldap/issues/511
+# python-ldap wheels are now available via https://github.com/cgohlke/python-ldap-build/releases
 python-ldap==3.4.4
 
 # Async-related packages (mainly for sending of emails)

From 56053158b1fbc0f77aba1f954fca53f97f846635 Mon Sep 17 00:00:00 2001
From: elisakiv <elis.k.iver@gmail.com>
Date: Tue, 27 Feb 2024 14:14:24 +0100
Subject: [PATCH 34/49] Fixed issues in the 3D printer course form

Made changes in 3D printer course form, because Django 5.2 no longer allows passing unsaved model instances to related filters.
---
 src/make_queue/forms/course.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/make_queue/forms/course.py b/src/make_queue/forms/course.py
index 71d28a1d7..ac8b0a165 100644
--- a/src/make_queue/forms/course.py
+++ b/src/make_queue/forms/course.py
@@ -23,8 +23,12 @@ class Meta:
 
     def __init__(self, *args, **kwargs):
         super().__init__(**kwargs)
+        if self.instance.user:
+            queryset = User.objects.filter(Q(printer_3d_course=self.instance))
+        else:
+            queryset = User.objects.filter(Q(printer_3d_course=None))
         self.fields['user'] = forms.ModelChoiceField(
-            queryset=User.objects.filter(Q(printer_3d_course=None) | Q(printer_3d_course=self.instance)),
+            queryset=queryset,
             required=False,
             widget=SemanticSearchableChoiceInput(prompt_text=_("Select user")),
             label=Printer3DCourse._meta.get_field('user').verbose_name,

From d3bbee7cd66f6ebe53390d76cc2e9a331cc9c8e7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Mar 2024 16:13:11 +0000
Subject: [PATCH 35/49] =?UTF-8?q?=E2=AC=86(deps):=20Bump=20django-simple-h?=
 =?UTF-8?q?istory=20from=203.4.0=20to=203.5.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [django-simple-history](https://github.com/jazzband/django-simple-history) from 3.4.0 to 3.5.0.
- [Release notes](https://github.com/jazzband/django-simple-history/releases)
- [Changelog](https://github.com/jazzband/django-simple-history/blob/master/CHANGES.rst)
- [Commits](https://github.com/jazzband/django-simple-history/compare/3.4.0...3.5.0)

---
updated-dependencies:
- dependency-name: django-simple-history
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 5579ac463..a8a9e2cb9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ django-extensions==3.2.3
 django-ical==1.9.2
 django-multiselectfield==0.1.12
 django-phonenumber-field[phonenumbers]==7.3.0
-django-simple-history==3.4.0
+django-simple-history==3.5.0
 sorl-thumbnail==12.10.0
 
 # Packages related to authentication and other "social" stuff

From abb6d13f55115dca8361b8889274db4de7e27d70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gunvor=20Bjerkelund=20R=C3=B8kke?=
 <114504373+Gunvor4@users.noreply.github.com>
Date: Thu, 7 Mar 2024 21:20:48 +0100
Subject: [PATCH 36/49] Remove Discord username validation (#717)

After a somewhat recent update
(see https://discord.com/blog/usernames and
https://support.discord.com/hc/en-us/articles/12620128861463-New-Usernames-Display-Names),
Discord usernames no longer have any particularly distinguishable
structure, and so it's neither very useful nor practical to (properly)
validate them.

Also removed `help_text` and `validators` from the existing migrations
that contain the `discord_username` field - namely `0015` and `0027`.
This is safe to do, since neither field option (keyword argument) affect
the database schema in any way.

---------

Co-authored-by: Gunvor4 <Gunvor4@users.noreply.github.com>
Co-authored-by: Anders <6058745+ddabble@users.noreply.github.com>
---
 CHANGELOG.md                                  |   2 +-
 ...thub_and_discord_and_minecraft_username.py |   2 +-
 ...lmember_and_historicalmember_committees.py |  10 +--
 src/internal/models.py                        |   5 +-
 src/internal/validators.py                    |   7 --
 src/locale/nb/LC_MESSAGES/django.mo           | Bin 53765 -> 53332 bytes
 src/locale/nb/LC_MESSAGES/django.po           |  64 +++++++-----------
 7 files changed, 31 insertions(+), 59 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38eb6827f..781802ba6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@ A summary of changes made to the codebase, grouped per deployment.
 
 ### Fixes
 
-- 
+- The Discord username field in the internal site's member form no longer enforces Discord's old username format
 
 ### Other changes
 
diff --git a/src/internal/migrations/0015_member_gmail_and_MAKE_email_and_ntnu_starting_semester_and_github_and_discord_and_minecraft_username.py b/src/internal/migrations/0015_member_gmail_and_MAKE_email_and_ntnu_starting_semester_and_github_and_discord_and_minecraft_username.py
index bf29c9227..345c6b605 100644
--- a/src/internal/migrations/0015_member_gmail_and_MAKE_email_and_ntnu_starting_semester_and_github_and_discord_and_minecraft_username.py
+++ b/src/internal/migrations/0015_member_gmail_and_MAKE_email_and_ntnu_starting_semester_and_github_and_discord_and_minecraft_username.py
@@ -18,7 +18,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='member',
             name='discord_username',
-            field=web.modelfields.UnlimitedCharField(blank=True, help_text='The username must include the hashtag and the four digits at the end.', validators=[django.core.validators.RegexValidator(re.compile('^(.+)#([0-9]{4})$'), 'Enter a valid Discord username – including the hashtag and the four digits at the end.')], verbose_name='Discord username'),
+            field=web.modelfields.UnlimitedCharField(blank=True, verbose_name='Discord username'),
         ),
         migrations.AddField(
             model_name='member',
diff --git a/src/internal/migrations/0024_historicalmember_and_historicalmember_committees.py b/src/internal/migrations/0024_historicalmember_and_historicalmember_committees.py
index cbb51cff1..4c36c327a 100644
--- a/src/internal/migrations/0024_historicalmember_and_historicalmember_committees.py
+++ b/src/internal/migrations/0024_historicalmember_and_historicalmember_committees.py
@@ -123,15 +123,7 @@ class Migration(migrations.Migration):
                 (
                     "discord_username",
                     web.modelfields.UnlimitedCharField(
-                        blank=True,
-                        help_text="The username must include the hashtag and the four digits at the end.",
-                        validators=[
-                            django.core.validators.RegexValidator(
-                                re.compile("^(.+)#([0-9]{4})$"),
-                                "Enter a valid Discord username – including the hashtag and the four digits at the end.",
-                            )
-                        ],
-                        verbose_name="Discord username",
+                        blank=True, verbose_name="Discord username"
                     ),
                 ),
                 (
diff --git a/src/internal/models.py b/src/internal/models.py
index 02afa34cd..c01bbed0b 100644
--- a/src/internal/models.py
+++ b/src/internal/models.py
@@ -19,7 +19,7 @@
 from web.modelfields import UnlimitedCharField
 from .modelfields import SemesterField
 from .util import date_to_semester, year_to_semester
-from .validators import WhitelistedEmailValidator, discord_username_validator
+from .validators import WhitelistedEmailValidator
 
 
 class Member(models.Model):
@@ -57,8 +57,7 @@ class Member(models.Model):
     honorary = models.BooleanField(default=False, verbose_name=_("honorary"))
     # Our code shouldn't have to keep track of these services' username length constraints, so we should not limit the length
     github_username = UnlimitedCharField(blank=True, verbose_name=_("GitHub username"))
-    discord_username = UnlimitedCharField(blank=True, validators=[discord_username_validator], verbose_name=_("Discord username"),
-                                          help_text=_("The username must include the hashtag and the four digits at the end."))
+    discord_username = UnlimitedCharField(blank=True, verbose_name=_("Discord username"))
     minecraft_username = UnlimitedCharField(blank=True, verbose_name=_("Minecraft username"))
     last_modified = models.DateTimeField(auto_now=True, verbose_name=_("last modified"))
 
diff --git a/src/internal/validators.py b/src/internal/validators.py
index f8cc3ea1b..11ad07a15 100644
--- a/src/internal/validators.py
+++ b/src/internal/validators.py
@@ -32,10 +32,3 @@ def validate_semester_float(value):
             "%(value)s is not a valid semester float",
             params={'value': value},
         )
-
-
-discord_username_regex = re.compile(r'^(.+)#([0-9]{4})$')
-discord_username_validator = RegexValidator(
-    discord_username_regex,
-    _("Enter a valid Discord username – including the hashtag and the four digits at the end."),
-)
diff --git a/src/locale/nb/LC_MESSAGES/django.mo b/src/locale/nb/LC_MESSAGES/django.mo
index c098d9c25ecbd39e3cd4d857990b029674e911d5..60af57a72aa3da35dcaec1e2e8ed6e27efe4bc76 100644
GIT binary patch
delta 14357
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
bwKH48UXeSurq+$#*<{6l=$-!_$r1d2gc@b_

delta 14761
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

diff --git a/src/locale/nb/LC_MESSAGES/django.po b/src/locale/nb/LC_MESSAGES/django.po
index 0b706b015..38ee42675 100644
--- a/src/locale/nb/LC_MESSAGES/django.po
+++ b/src/locale/nb/LC_MESSAGES/django.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAKE NTNU website\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-05 18:43+0200\n"
+"POT-Creation-Date: 2024-02-27 17:42+0100\n"
 "PO-Revision-Date: 2018-10-09 14:05+0200\n"
 "Last-Translator: Sindre Stephansen <sindre@sindrestephansen.com>\n"
 "Language-Team: Norwegian Bokmål <dev@makentnu.no>\n"
@@ -406,7 +406,7 @@ msgid "URL name"
 msgstr "URL-navn"
 
 #: src/contentbox/models.py:20 src/docs/models.py:15
-#: src/internal/models.py:262 src/makerspace/models.py:23
+#: src/internal/models.py:261 src/makerspace/models.py:23
 #: src/news/models.py:39
 msgid "title"
 msgstr "tittel"
@@ -417,8 +417,8 @@ msgstr "Ekstra rettigheter som kreves for å kunne endre på innholdsboksen."
 
 #: src/contentbox/models.py:29 src/docs/models.py:60 src/faq/models.py:42
 #: src/groups/models.py:39 src/groups/models.py:111
-#: src/internal/models.py:63 src/internal/models.py:209
-#: src/internal/models.py:281
+#: src/internal/models.py:62 src/internal/models.py:208
+#: src/internal/models.py:280
 #: src/internal/templates/internal/secret_list.html:67
 #: src/make_queue/models/course.py:37 src/make_queue/models/machine.py:186
 #: src/make_queue/models/machine.py:240
@@ -711,12 +711,12 @@ msgstr "gruppe"
 msgid "clickbait"
 msgstr "lokketekst"
 
-#: src/groups/models.py:107 src/internal/models.py:264
+#: src/groups/models.py:107 src/internal/models.py:263
 #: src/makerspace/models.py:24
 msgid "description"
 msgstr "beskrivelse"
 
-#: src/groups/models.py:108 src/internal/models.py:197
+#: src/groups/models.py:108 src/internal/models.py:196
 #: src/news/admin.py:313
 #: src/news/templates/admin/news/event/change_form_ticket_table.html:17
 #: src/users/admin.py:36
@@ -757,7 +757,7 @@ msgstr "Endre {committee}"
 msgid "full name"
 msgstr "fullt navn"
 
-#: src/internal/admin.py:50 src/internal/models.py:275
+#: src/internal/admin.py:50 src/internal/models.py:274
 msgid "extra view permissions"
 msgstr "ekstra visningsrettigheter"
 
@@ -916,63 +916,59 @@ msgid "Discord username"
 msgstr "Discord-brukernavn"
 
 #: src/internal/models.py:61
-msgid "The username must include the hashtag and the four digits at the end."
-msgstr "Brukernavnet må inkludere hashtaggen og de fire sifrene på slutten."
-
-#: src/internal/models.py:62
 #: src/internal/templates/internal/member_list.html:402
 msgid "Minecraft username"
 msgstr "Minecraft-brukernavn"
 
-#: src/internal/models.py:192
+#: src/internal/models.py:191
 msgid "Drive"
 msgstr "Drive"
 
-#: src/internal/models.py:193
+#: src/internal/models.py:192
 msgid "Slack"
 msgstr "Slack"
 
-#: src/internal/models.py:194
+#: src/internal/models.py:193
 #: src/make_queue/templates/make_queue/reservation_list.html:117
 #: src/make_queue/templates/make_queue/reservation_list.html:197
 msgid "Calendar"
 msgstr "Kalender"
 
-#: src/internal/models.py:195
+#: src/internal/models.py:194
 msgid "Trello"
 msgstr "Trello"
 
-#: src/internal/models.py:198
+#: src/internal/models.py:197
 msgid "Website"
 msgstr "Nettside"
 
-#: src/internal/models.py:205
+#: src/internal/models.py:204
 msgid "member"
 msgstr "medlem"
 
-#: src/internal/models.py:207
+#: src/internal/models.py:206
 msgid "system"
 msgstr "system"
 
-#: src/internal/models.py:208
+#: src/internal/models.py:207
 msgid "access"
 msgstr "tilgang"
 
-#: src/internal/models.py:219
+#: src/internal/models.py:218
 #, python-brace-format
 msgid "Access for {member} to {name}: {has_access}"
 msgstr "Tilgang for {member} til {name}: {has_access}"
 
-#: src/internal/models.py:268 src/make_queue/models/machine.py:54
+#: src/internal/models.py:267 src/make_queue/models/machine.py:54
 #: src/make_queue/models/machine.py:182 src/makerspace/models.py:30
 msgid "priority"
 msgstr "prioritet"
 
-#: src/internal/models.py:269
+#: src/internal/models.py:268
 msgid "If specified, the secrets are sorted ascending by this value."
 msgstr "Hvis spesifisert, sorteres hemmelighetene stigende på denne verdien."
 
-#: src/internal/models.py:277
+#: src/internal/models.py:276
 msgid ""
 "Extra permissions that are required for viewing the secret. If a user does "
 "not have all the chosen permissions, it will be hidden to them."
@@ -980,23 +976,23 @@ msgstr ""
 "Ekstra rettigheter som kreves for å se hemmeligheten. Hvis en bruker ikke "
 "har alle de valgte rettighetene vil den være skjult for vedkommende."
 
-#: src/internal/models.py:301
+#: src/internal/models.py:300
 msgid "quote"
 msgstr "sitat"
 
-#: src/internal/models.py:302
+#: src/internal/models.py:301
 msgid "quoted"
 msgstr "sitert"
 
-#: src/internal/models.py:302
+#: src/internal/models.py:301
 msgid "The person who is quoted."
 msgstr "Personen som blir sitert."
 
-#: src/internal/models.py:303
+#: src/internal/models.py:302
 msgid "context"
 msgstr "kontekst"
 
-#: src/internal/models.py:304
+#: src/internal/models.py:303
 #: src/make_queue/templates/make_queue/course/printer_3d_course_list.html:100
 #: src/make_queue/views/course.py:125
 #: src/news/templates/news/event/event_list_contents.html:26
@@ -1005,11 +1001,11 @@ msgstr "kontekst"
 msgid "date"
 msgstr "dato"
 
-#: src/internal/models.py:309
+#: src/internal/models.py:308
 msgid "author"
 msgstr "forfatter"
 
-#: src/internal/models.py:316
+#: src/internal/models.py:315
 #, python-brace-format
 msgid "“{quote}” —{quoted}"
 msgstr "«{quote}» —{quoted}"
@@ -1260,14 +1256,6 @@ msgstr "Oppgi en gyldig e-postadresse som slutter med «@makentnu.no»."
 msgid "Enter a valid format for a semester."
 msgstr "Oppgi et gyldig format for et semester."
 
-#: src/internal/validators.py:40
-msgid ""
-"Enter a valid Discord username – including the hashtag and the four digits "
-"at the end."
-msgstr ""
-"Oppgi et gyldig Discord-brukernavn – inkludert hashtaggen og de fire sifrene "
-"på slutten."
-
 #: src/internal/views.py:85
 msgid "Add New Member"
 msgstr "Legg til nytt medlem"

From 03964e79f60deaac8cc089f2c6242774a857229a Mon Sep 17 00:00:00 2001
From: elisakiv <elis.k.iver@gmail.com>
Date: Mon, 18 Mar 2024 17:30:36 +0100
Subject: [PATCH 37/49] Created a custom implementation of MultiSelectField

This was done in order to achieve compatibility with Django 5.0.

MultiSelectField is not comptible with Django 5.0, because it uses _get_flatchoices, which is no longer usable. In order to still use the package, a custom implementation was created that overwrites the deprecated method.
---
 src/make_queue/models/reservation.py |  4 ++--
 src/web/modelfields.py               | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/make_queue/models/reservation.py b/src/make_queue/models/reservation.py
index 01ae66a37..da4eb8dfe 100644
--- a/src/make_queue/models/reservation.py
+++ b/src/make_queue/models/reservation.py
@@ -10,13 +10,13 @@
 from django.utils.formats import time_format
 from django.utils.text import capfirst
 from django.utils.translation import gettext_lazy as _
-from multiselectfield import MultiSelectField
+
 
 from news.models import TimePlace
 from users.models import User
 from util.locale_utils import exact_weekday_to_day_name, short_datetime_format, timedelta_to_hours
 from util.model_utils import ComparisonType, comparison_boilerplate
-from web.modelfields import UnlimitedCharField
+from web.modelfields import UnlimitedCharField, MultiSelectField
 from .machine import Machine, MachineType
 
 
diff --git a/src/web/modelfields.py b/src/web/modelfields.py
index 0e5dee30f..93d0cdc43 100644
--- a/src/web/modelfields.py
+++ b/src/web/modelfields.py
@@ -1,5 +1,6 @@
 from django import forms
 from django.db import models
+from multiselectfield import MultiSelectField as MSField
 
 
 class UnlimitedCharField(models.TextField):
@@ -21,3 +22,27 @@ def formfield(self, **kwargs):
             'widget': forms.URLField.widget,  # Overrides TextField's Textarea widget
             **kwargs,
         })
+
+
+class MultiSelectField(MSField):
+    """
+    Custom Implementation of MultiSelectField to achieve Django 5.0 compatibility
+    #TODO remove when MultiSelectField fully supports Django 5.0
+
+    See: https://github.com/goinnn/django-multiselectfield/issues/141#issuecomment-1911731471
+    """
+
+    def _get_flatchoices(self):
+        flat_choices = super(models.CharField, self).flatchoices
+
+        class MSFFlatchoices(list):
+            # Used to trick django.contrib.admin.utils.display_for_field into not treating the list of values as a
+            # dictionary key (which errors out)
+            def __bool__(self):
+                return False
+
+            __nonzero__ = __bool__
+
+        return MSFFlatchoices(flat_choices)
+
+    flatchoices = property(_get_flatchoices)

From 89b47f65dc6251ed8395cf1fae583d4913a43eba Mon Sep 17 00:00:00 2001
From: elisakiv <elis.k.iver@gmail.com>
Date: Thu, 4 Apr 2024 19:20:15 +0200
Subject: [PATCH 38/49] Run makemigrations after updates to reservation model

---
 .../0034_alter_reservationrule_start_days.py  | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 src/make_queue/migrations/0034_alter_reservationrule_start_days.py

diff --git a/src/make_queue/migrations/0034_alter_reservationrule_start_days.py b/src/make_queue/migrations/0034_alter_reservationrule_start_days.py
new file mode 100644
index 000000000..2cb17e2c3
--- /dev/null
+++ b/src/make_queue/migrations/0034_alter_reservationrule_start_days.py
@@ -0,0 +1,19 @@
+# Generated by Django 5.0.2 on 2024-04-04 17:18
+
+import web.modelfields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('make_queue', '0033_historicalmachine'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='reservationrule',
+            name='start_days',
+            field=web.modelfields.MultiSelectField(choices=[(1, 'Monday'), (2, 'Tuesday'), (3, 'Wednesday'), (4, 'Thursday'), (5, 'Friday'), (6, 'Saturday'), (7, 'Sunday')], max_length=13, verbose_name='start days for rule periods'),
+        ),
+    ]

From 1b23eeeda17b584bd1dc45cf0cf9fd682880b3ca Mon Sep 17 00:00:00 2001
From: elisakiv <elis.k.iver@gmail.com>
Date: Thu, 4 Apr 2024 19:32:10 +0200
Subject: [PATCH 39/49] Updated CHANGELOG

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 781802ba6..0042da162 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,7 @@ A summary of changes made to the codebase, grouped per deployment.
 
 ### Other changes
 
--
+- Updated Django to 5.0.2
 
 
 ## 2023-05-10 ([#654](https://github.com/MAKENTNU/web/pull/654))

From 780d462aef2f9a3647f0832a14f91a0ddb539113 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Apr 2024 19:02:09 +0000
Subject: [PATCH 40/49] =?UTF-8?q?=E2=AC=86(deps):=20Bump=20django-cleanup?=
 =?UTF-8?q?=20from=208.0.0=20to=208.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [django-cleanup](https://github.com/un1t/django-cleanup) from 8.0.0 to 8.1.0.
- [Changelog](https://github.com/un1t/django-cleanup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/un1t/django-cleanup/compare/8.0.0...8.1.0)

---
updated-dependencies:
- dependency-name: django-cleanup
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index e35e99000..4d4cf4869 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@
 Django==5.0.2
 django-hosts==6.0
 django-ckeditor==6.7.0
-django-cleanup==8.0.0
+django-cleanup==8.1.0
 django-constance==3.1.0
 django-decorator-include==3.0
 # (See this page for a list of all management commands: https://django-extensions.readthedocs.io/en/latest/command_extensions.html)

From ebb5f0cf41d4743664699cc4f6b593261cd32c55 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Apr 2024 16:26:08 +0000
Subject: [PATCH 41/49] =?UTF-8?q?=F0=9F=91=B7(deps):=20Bump=20actions/setu?=
 =?UTF-8?q?p-python=20from=204=20to=205?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/python.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index 995d6d65d..54aae9887 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: "pip"

From a0270e49152df2536d1d3f9429fd082bf3046e4d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Apr 2024 16:58:15 +0000
Subject: [PATCH 42/49] =?UTF-8?q?=E2=AC=86(deps):=20Bump=20social-auth-app?=
 =?UTF-8?q?-django=20from=205.3.0=20to=205.4.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [social-auth-app-django](https://github.com/python-social-auth/social-app-django) from 5.3.0 to 5.4.1.
- [Release notes](https://github.com/python-social-auth/social-app-django/releases)
- [Changelog](https://github.com/python-social-auth/social-app-django/blob/master/CHANGELOG.md)
- [Commits](https://github.com/python-social-auth/social-app-django/compare/5.3.0...5.4.1)

---
updated-dependencies:
- dependency-name: social-auth-app-django
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 4d4cf4869..2d79a7e0d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,7 +14,7 @@ django-simple-history==3.5.0
 sorl-thumbnail==12.10.0
 
 # Packages related to authentication and other "social" stuff
-social-auth-app-django==5.3.0
+social-auth-app-django==5.4.1
 # This is already a requirement of `social-auth-app-django`, but it's listed here to provide the `openidconnect` extra
 # (see https://python-social-auth.readthedocs.io/en/stable/installing.html#using-the-extras-options)
 social-auth-core[openidconnect]==4.4.2

From b5a8d66c3c6324eda9cc9e324ce3a4e8193e7df8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 May 2024 17:15:07 +0000
Subject: [PATCH 43/49] =?UTF-8?q?=E2=AC=86(deps):=20Bump=20bleach[css]=20f?=
 =?UTF-8?q?rom=206.0.0=20to=206.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [bleach[css]](https://github.com/mozilla/bleach) from 6.0.0 to 6.1.0.
- [Changelog](https://github.com/mozilla/bleach/blob/main/CHANGES)
- [Commits](https://github.com/mozilla/bleach/compare/v6.0.0...v6.1.0)

---
updated-dependencies:
- dependency-name: bleach[css]
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 4d4cf4869..cf1edb6c2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -26,7 +26,7 @@ channels[daphne]==4.0.0
 channels-redis==4.1.0
 
 # Misc. packages
-bleach[css]==6.0.0
+bleach[css]==6.1.0
 Pillow==10.2.0
 uuid==1.30
 XlsxWriter==3.1.9

From 3c2e5921aa799c97d874e797d8d94ce40b0affee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 May 2024 17:23:19 +0000
Subject: [PATCH 44/49] =?UTF-8?q?=E2=AC=86(deps):=20Bump=20channels[daphne?=
 =?UTF-8?q?]=20from=204.0.0=20to=204.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [channels[daphne]](https://github.com/django/channels) from 4.0.0 to 4.1.0.
- [Changelog](https://github.com/django/channels/blob/main/CHANGELOG.txt)
- [Commits](https://github.com/django/channels/compare/4.0.0...4.1.0)

---
updated-dependencies:
- dependency-name: channels[daphne]
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index cf1edb6c2..5c4b7cc9a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -22,7 +22,7 @@ social-auth-core[openidconnect]==4.4.2
 python-ldap==3.4.4
 
 # Async-related packages (mainly for sending of emails)
-channels[daphne]==4.0.0
+channels[daphne]==4.1.0
 channels-redis==4.1.0
 
 # Misc. packages

From 17cde353ca78ba58821c837a96f2b195fda10987 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 May 2024 18:18:00 +0000
Subject: [PATCH 45/49] =?UTF-8?q?=E2=AC=86(deps):=20Bump=20channels-redis?=
 =?UTF-8?q?=20from=204.1.0=20to=204.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [channels-redis](https://github.com/django/channels_redis) from 4.1.0 to 4.2.0.
- [Changelog](https://github.com/django/channels_redis/blob/main/CHANGELOG.txt)
- [Commits](https://github.com/django/channels_redis/commits)

---
updated-dependencies:
- dependency-name: channels-redis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 5c4b7cc9a..d5cdb2961 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -23,7 +23,7 @@ python-ldap==3.4.4
 
 # Async-related packages (mainly for sending of emails)
 channels[daphne]==4.1.0
-channels-redis==4.1.0
+channels-redis==4.2.0
 
 # Misc. packages
 bleach[css]==6.1.0

From 1647cdad83341eabf40d298004b279e1fb5f0713 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 May 2024 16:42:01 +0000
Subject: [PATCH 46/49] =?UTF-8?q?=E2=AC=86(deps):=20Bump=20xlsxwriter=20fr?=
 =?UTF-8?q?om=203.1.9=20to=203.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [xlsxwriter](https://github.com/jmcnamara/XlsxWriter) from 3.1.9 to 3.2.0.
- [Changelog](https://github.com/jmcnamara/XlsxWriter/blob/main/Changes)
- [Commits](https://github.com/jmcnamara/XlsxWriter/compare/RELEASE_3.1.9...RELEASE_3.2.0)

---
updated-dependencies:
- dependency-name: xlsxwriter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index ff9a6b8eb..119fdf7b0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -29,4 +29,4 @@ channels-redis==4.1.0
 bleach[css]==6.1.0
 Pillow==10.2.0
 uuid==1.30
-XlsxWriter==3.1.9
+XlsxWriter==3.2.0

From 59509b145cfab0a678db27939edff8ff0528c9f6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 May 2024 14:58:37 +0000
Subject: [PATCH 47/49] =?UTF-8?q?=E2=AC=86(deps):=20Bump=20pillow=20from?=
 =?UTF-8?q?=2010.2.0=20to=2010.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [pillow](https://github.com/python-pillow/Pillow) from 10.2.0 to 10.3.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/10.2.0...10.3.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 119fdf7b0..7acccbdc3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -27,6 +27,6 @@ channels-redis==4.1.0
 
 # Misc. packages
 bleach[css]==6.1.0
-Pillow==10.2.0
+Pillow==10.3.0
 uuid==1.30
 XlsxWriter==3.2.0

From 77debc843581f167b424cf28db57cf1d3559a6d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 May 2024 15:57:34 +0000
Subject: [PATCH 48/49] =?UTF-8?q?=F0=9F=91=B7(deps):=20Bump=20github/codeq?=
 =?UTF-8?q?l-action=20from=202=20to=203?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 91eb44597..e434c6266 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -44,7 +44,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -58,7 +58,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
       # If this step fails, then you should remove it and run the build manually (see below).
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -71,6 +71,6 @@ jobs:
       #     ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
         with:
           category: "/language:${{matrix.language}}"

From 4d85a53297511f3b334cdae37e24f315fd9ccbce Mon Sep 17 00:00:00 2001
From: Gunvor4 <Gunvor4@users.noreply.github.com>
Date: Fri, 10 May 2024 20:48:45 +0200
Subject: [PATCH 49/49] Added CHANGELOG release date for #730

---
 CHANGELOG.md | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0042da162..f90fd1ccb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ A summary of changes made to the codebase, grouped per deployment.
 
 ### New features
 
-- The apply button in the English header, which previously read "søk verv", has now been translated to English ("apply to MAKE")
+- 
 
 ### Improvements
 
@@ -14,11 +14,27 @@ A summary of changes made to the codebase, grouped per deployment.
 
 ### Fixes
 
+- 
+
+### Other changes
+
+- 
+
+
+## 2024-05-10 ([#730](https://github.com/MAKENTNU/web/pull/730))
+
+### New features
+
+- The apply button in the English header, which previously read "søk verv", has now been translated to English ("apply to MAKE")
+
+### Fixes
+
 - The Discord username field in the internal site's member form no longer enforces Discord's old username format
 
 ### Other changes
 
 - Updated Django to 5.0.2
+- Updated a ridiculous amount of packages
 
 
 ## 2023-05-10 ([#654](https://github.com/MAKENTNU/web/pull/654))