diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d280ccb9..aa118aa8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -26,7 +26,7 @@ repos: # Code Upgrades ## Django - repo: https://github.com/adamchainz/django-upgrade - rev: 1.30.0 + rev: 1.31.1 hooks: - id: django-upgrade args: [--target-version=5.2] @@ -130,7 +130,7 @@ repos: - id: editorconfig-checker - repo: https://github.com/igorshubovych/markdownlint-cli - rev: v0.48.0 + rev: v0.49.0 hooks: - id: markdownlint language: node @@ -155,7 +155,7 @@ repos: # Infrastructure ## pyproject.toml - repo: https://github.com/tox-dev/pyproject-fmt - rev: v2.23.0 + rev: v2.25.1 hooks: - id: pyproject-fmt args: diff --git a/allianceauth/__init__.py b/allianceauth/__init__.py index 76ec4929..8e4ce06f 100644 --- a/allianceauth/__init__.py +++ b/allianceauth/__init__.py @@ -5,7 +5,7 @@ manage online service access. # This will make sure the app is always imported when # Django starts so that shared_task will use this app. -__version__ = '5.1.4' +__version__ = '5.2.0' __title__ = 'Alliance Auth' __title_useragent__ = 'AllianceAuth' __url__ = 'https://gitlab.com/allianceauth/allianceauth' diff --git a/allianceauth/locale/de/LC_MESSAGES/django.mo b/allianceauth/locale/de/LC_MESSAGES/django.mo index 245d33d2..868af887 100644 Binary files a/allianceauth/locale/de/LC_MESSAGES/django.mo and b/allianceauth/locale/de/LC_MESSAGES/django.mo differ diff --git a/allianceauth/locale/en/LC_MESSAGES/django.po b/allianceauth/locale/en/LC_MESSAGES/django.po index 0b3f46bc..772b3a8b 100644 --- a/allianceauth/locale/en/LC_MESSAGES/django.po +++ b/allianceauth/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-15 14:01+1000\n" +"POT-Creation-Date: 2026-07-06 14:40+1000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -208,110 +208,110 @@ msgstr "" msgid "A main character is required to perform that action. Add one below." msgstr "" -#: allianceauth/authentication/forms.py:16 +#: allianceauth/authentication/forms.py:18 msgid "Email" msgstr "" -#: allianceauth/authentication/forms.py:25 +#: allianceauth/authentication/forms.py:27 msgid "This activation link has expired." msgstr "" -#: allianceauth/authentication/forms.py:26 +#: allianceauth/authentication/forms.py:28 msgid "This activation link is invalid." msgstr "" -#: allianceauth/authentication/forms.py:86 +#: allianceauth/authentication/forms.py:88 #, python-brace-format msgid "You are not allowed to add or remove these restricted groups: {}" msgstr "" -#: allianceauth/authentication/models.py:78 +#: allianceauth/authentication/models.py:100 #: allianceauth/project_template/project_name/settings/base.py:104 msgid "English" msgstr "" -#: allianceauth/authentication/models.py:79 +#: allianceauth/authentication/models.py:101 msgid "Czech" msgstr "" -#: allianceauth/authentication/models.py:80 +#: allianceauth/authentication/models.py:102 #: allianceauth/project_template/project_name/settings/base.py:106 msgid "German" msgstr "" -#: allianceauth/authentication/models.py:81 +#: allianceauth/authentication/models.py:103 #: allianceauth/project_template/project_name/settings/base.py:107 msgid "Spanish" msgstr "" -#: allianceauth/authentication/models.py:82 +#: allianceauth/authentication/models.py:104 #: allianceauth/project_template/project_name/settings/base.py:108 msgid "Italian" msgstr "" -#: allianceauth/authentication/models.py:83 +#: allianceauth/authentication/models.py:105 #: allianceauth/project_template/project_name/settings/base.py:109 msgid "Japanese" msgstr "" -#: allianceauth/authentication/models.py:84 +#: allianceauth/authentication/models.py:106 #: allianceauth/project_template/project_name/settings/base.py:110 msgid "Korean" msgstr "" -#: allianceauth/authentication/models.py:85 +#: allianceauth/authentication/models.py:107 #: allianceauth/project_template/project_name/settings/base.py:111 msgid "French" msgstr "" -#: allianceauth/authentication/models.py:86 +#: allianceauth/authentication/models.py:108 #: allianceauth/project_template/project_name/settings/base.py:114 msgid "Russian" msgstr "" -#: allianceauth/authentication/models.py:87 +#: allianceauth/authentication/models.py:109 #: allianceauth/project_template/project_name/settings/base.py:112 msgid "Dutch" msgstr "" -#: allianceauth/authentication/models.py:88 +#: allianceauth/authentication/models.py:110 #: allianceauth/project_template/project_name/settings/base.py:113 msgid "Polish" msgstr "" -#: allianceauth/authentication/models.py:89 +#: allianceauth/authentication/models.py:111 #: allianceauth/project_template/project_name/settings/base.py:115 msgid "Ukrainian" msgstr "" -#: allianceauth/authentication/models.py:90 +#: allianceauth/authentication/models.py:112 #: allianceauth/project_template/project_name/settings/base.py:116 msgid "Simplified Chinese" msgstr "" -#: allianceauth/authentication/models.py:106 +#: allianceauth/authentication/models.py:128 #: allianceauth/menu/templates/menu/menu-user.html:67 msgid "Language" msgstr "" -#: allianceauth/authentication/models.py:112 +#: allianceauth/authentication/models.py:134 msgid "Night Mode" msgstr "" -#: allianceauth/authentication/models.py:116 +#: allianceauth/authentication/models.py:138 #: allianceauth/theme/templates/theme/theme_select.html:4 msgid "Theme" msgstr "" -#: allianceauth/authentication/models.py:123 +#: allianceauth/authentication/models.py:145 msgid "Minimize Sidebar Menu" msgstr "" -#: allianceauth/authentication/models.py:125 +#: allianceauth/authentication/models.py:147 msgid "Keep the sidebar menu minimized" msgstr "" -#: allianceauth/authentication/models.py:146 +#: allianceauth/authentication/models.py:168 #, python-format msgid "Your user's state is now: %(state)s" msgstr "" @@ -973,23 +973,23 @@ msgstr "" msgid "No created fatlinks on record." msgstr "" -#: allianceauth/fleetactivitytracking/views.py:220 +#: allianceauth/fleetactivitytracking/views.py:219 msgid "Character does not exist" msgstr "" -#: allianceauth/fleetactivitytracking/views.py:223 +#: allianceauth/fleetactivitytracking/views.py:222 msgid "User does not exist" msgstr "" -#: allianceauth/fleetactivitytracking/views.py:291 +#: allianceauth/fleetactivitytracking/views.py:290 msgid "Fleet participation registered." msgstr "" -#: allianceauth/fleetactivitytracking/views.py:310 +#: allianceauth/fleetactivitytracking/views.py:309 msgid "FAT link has expired." msgstr "" -#: allianceauth/fleetactivitytracking/views.py:315 +#: allianceauth/fleetactivitytracking/views.py:314 #, python-brace-format msgid "" "Cannot register the fleet participation for {character_name}. The character " @@ -1015,21 +1015,21 @@ msgstr "" msgid "Groups" msgstr "" -#: allianceauth/groupmanagement/forms.py:18 +#: allianceauth/groupmanagement/forms.py:19 #: allianceauth/permissions_tool/templates/permissions_tool/overview.html:34 #: allianceauth/services/modules/mumble/models.py:118 msgid "Users" msgstr "" -#: allianceauth/groupmanagement/forms.py:52 +#: allianceauth/groupmanagement/forms.py:53 msgid "This name has been reserved and can not be used for groups." msgstr "" -#: allianceauth/groupmanagement/forms.py:62 +#: allianceauth/groupmanagement/forms.py:63 msgid "(auto)" msgstr "" -#: allianceauth/groupmanagement/forms.py:71 +#: allianceauth/groupmanagement/forms.py:72 msgid "There already exists a group with that name." msgstr "" @@ -1785,19 +1785,19 @@ msgstr "" msgid "Sign In" msgstr "" -#: allianceauth/notifications/models.py:22 +#: allianceauth/notifications/models.py:23 msgid "danger" msgstr "" -#: allianceauth/notifications/models.py:23 +#: allianceauth/notifications/models.py:24 msgid "warning" msgstr "" -#: allianceauth/notifications/models.py:24 +#: allianceauth/notifications/models.py:25 msgid "info" msgstr "" -#: allianceauth/notifications/models.py:25 +#: allianceauth/notifications/models.py:26 msgid "success" msgstr "" @@ -2131,11 +2131,11 @@ msgstr "" msgid "Discord Service" msgstr "" -#: allianceauth/services/modules/discord/models.py:149 +#: allianceauth/services/modules/discord/models.py:152 msgid "Discord Account Disabled" msgstr "" -#: allianceauth/services/modules/discord/models.py:151 +#: allianceauth/services/modules/discord/models.py:154 msgid "" "Your Discord account was disabled automatically by Auth. If you think this " "was a mistake, please contact an admin." diff --git a/allianceauth/locale/es/LC_MESSAGES/django.mo b/allianceauth/locale/es/LC_MESSAGES/django.mo index 350320d1..8c888620 100644 Binary files a/allianceauth/locale/es/LC_MESSAGES/django.mo and b/allianceauth/locale/es/LC_MESSAGES/django.mo differ diff --git a/allianceauth/locale/fr_FR/LC_MESSAGES/django.mo b/allianceauth/locale/fr_FR/LC_MESSAGES/django.mo index 857b607b..f639ad69 100644 Binary files a/allianceauth/locale/fr_FR/LC_MESSAGES/django.mo and b/allianceauth/locale/fr_FR/LC_MESSAGES/django.mo differ diff --git a/allianceauth/locale/it_IT/LC_MESSAGES/django.mo b/allianceauth/locale/it_IT/LC_MESSAGES/django.mo index 1987d878..45b4956e 100644 Binary files a/allianceauth/locale/it_IT/LC_MESSAGES/django.mo and b/allianceauth/locale/it_IT/LC_MESSAGES/django.mo differ diff --git a/allianceauth/locale/ja/LC_MESSAGES/django.mo b/allianceauth/locale/ja/LC_MESSAGES/django.mo index 34663390..62a454aa 100644 Binary files a/allianceauth/locale/ja/LC_MESSAGES/django.mo and b/allianceauth/locale/ja/LC_MESSAGES/django.mo differ diff --git a/allianceauth/locale/ko_KR/LC_MESSAGES/django.mo b/allianceauth/locale/ko_KR/LC_MESSAGES/django.mo index 98bbbfa6..97d54400 100644 Binary files a/allianceauth/locale/ko_KR/LC_MESSAGES/django.mo and b/allianceauth/locale/ko_KR/LC_MESSAGES/django.mo differ diff --git a/allianceauth/locale/pl_PL/LC_MESSAGES/django.mo b/allianceauth/locale/pl_PL/LC_MESSAGES/django.mo index 558ac4c2..42c032fd 100644 Binary files a/allianceauth/locale/pl_PL/LC_MESSAGES/django.mo and b/allianceauth/locale/pl_PL/LC_MESSAGES/django.mo differ diff --git a/allianceauth/locale/ru/LC_MESSAGES/django.mo b/allianceauth/locale/ru/LC_MESSAGES/django.mo index 9c2bb425..bff42528 100644 Binary files a/allianceauth/locale/ru/LC_MESSAGES/django.mo and b/allianceauth/locale/ru/LC_MESSAGES/django.mo differ diff --git a/allianceauth/locale/uk/LC_MESSAGES/django.mo b/allianceauth/locale/uk/LC_MESSAGES/django.mo index a1e8a898..1cae1f7f 100644 Binary files a/allianceauth/locale/uk/LC_MESSAGES/django.mo and b/allianceauth/locale/uk/LC_MESSAGES/django.mo differ diff --git a/allianceauth/locale/zh_Hans/LC_MESSAGES/django.mo b/allianceauth/locale/zh_Hans/LC_MESSAGES/django.mo index ead1b4fa..3360d0d3 100644 Binary files a/allianceauth/locale/zh_Hans/LC_MESSAGES/django.mo and b/allianceauth/locale/zh_Hans/LC_MESSAGES/django.mo differ diff --git a/allianceauth/services/modules/teamspeak3/migrations/0007_alter_authts_auth_group_alter_teamspeak3user_user_and_more.py b/allianceauth/services/modules/teamspeak3/migrations/0007_alter_authts_auth_group_alter_teamspeak3user_user_and_more.py new file mode 100644 index 00000000..b3234ba3 --- /dev/null +++ b/allianceauth/services/modules/teamspeak3/migrations/0007_alter_authts_auth_group_alter_teamspeak3user_user_and_more.py @@ -0,0 +1,31 @@ +# Generated by Django 5.2.12 on 2026-07-06 05:23 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('authentication', '0026_alter_characterownership_user_and_more'), + ('groupmanagement', '0021_alter_authgroup_group_and_more'), + ('teamspeak3', '0006_v5squash'), + ] + + operations = [ + migrations.AlterField( + model_name='authts', + name='auth_group', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='groupmanagement.group'), + ), + migrations.AlterField( + model_name='teamspeak3user', + name='user', + field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, related_name='teamspeak3', serialize=False, to='authentication.user'), + ), + migrations.AlterField( + model_name='usertsgroup', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='authentication.user'), + ), + ] diff --git a/docker/.env.example b/docker/.env.example index 6e06c0c2..02577ec7 100644 --- a/docker/.env.example +++ b/docker/.env.example @@ -1,7 +1,7 @@ PROTOCOL=https:// AUTH_SUBDOMAIN=%AUTH_SUBDOMAIN% DOMAIN=%DOMAIN% -AA_DOCKER_TAG=registry.gitlab.com/allianceauth/allianceauth/auth:v5.1.4 +AA_DOCKER_TAG=registry.gitlab.com/allianceauth/allianceauth/auth:v5.2.0 # Nginx Proxy Manager PROXY_HTTP_PORT=80 diff --git a/docker/Dockerfile b/docker/Dockerfile index c914eae5..1cf45198 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,5 @@ FROM python:3.12-slim -ARG AUTH_VERSION=v5.1.4 +ARG AUTH_VERSION=v5.2.0 ARG AUTH_PACKAGE=allianceauth==${AUTH_VERSION} ENV AUTH_USER=allianceauth ENV AUTH_GROUP=allianceauth