Merge branch 'add-missing-mumble-migration' into 'master'

[ADD] Missing Mumble migration See merge request allianceauth/allianceauth!1655
Merge branch 'optimer-fix' into 'master'
2025-07-29 14:12:28 +02:00 · 2024-10-18 02:37:50 +00:00 · 2024-10-18 02:37:19 +00:00 · 2024-10-18 02:29:33 +00:00 · 2024-10-18 02:29:33 +00:00 · 2024-10-14 19:22:46 +08:00
5 changed files with 47 additions and 10 deletions
--- a/README.md
+++ b/README.md
@ -5,7 +5,7 @@
 [![django](https://img.shields.io/pypi/djversions/allianceauth?label=django)](https://pypi.org/project/allianceauth/)
 [![version](https://img.shields.io/pypi/v/allianceauth?label=release)](https://pypi.org/project/allianceauth/)
 [![pipeline status](https://gitlab.com/allianceauth/allianceauth/badges/master/pipeline.svg)](https://gitlab.com/allianceauth/allianceauth/commits/master)
-[![Documentation Status](https://readthedocs.org/projects/allianceauth/badge/?version=latest)](http://allianceauth.readthedocs.io/?badge=latest)
+[![Documentation Status](https://readthedocs.org/projects/allianceauth/badge/?version=latest)](https://allianceauth.readthedocs.io/?badge=latest)
 [![coverage report](https://gitlab.com/allianceauth/allianceauth/badges/master/coverage.svg)](https://gitlab.com/allianceauth/allianceauth/commits/master)
 [![Chat on Discord](https://img.shields.io/discord/399006117012832262.svg)](https://discord.gg/fjnHAmk)

@ -14,7 +14,7 @@ An auth system for EVE Online to help in-game organizations manage online servic
 ## Content

 - [Overview](#overview)
- [Documentation](http://allianceauth.rtfd.io)
+- [Documentation](https://allianceauth.rtfd.io)
 - [Support](#support)
 - [Release Notes](https://gitlab.com/allianceauth/allianceauth/-/releases)
 - [Developer Team](#development-team)
@ -38,7 +38,7 @@ Main features:

 - English :flag_gb:, Chinese :flag_cn:, German :flag_de:, Spanish :flag_es:, Korean :flag_kr:, Russian :flag_ru:, Italian :flag_it:, French :flag_fr:, Japanese :flag_jp: and Ukrainian :flag_ua: Localization

-For further details about AA - including an installation guide and a full list of included services and plugin apps - please see the [official documentation](http://allianceauth.rtfd.io).
+For further details about AA - including an installation guide and a full list of included services and plugin apps - please see the [official documentation](https://allianceauth.rtfd.io).

 ## Screenshot

--- a/allianceauth/eveonline/evelinks/dotlan.py
+++ b/allianceauth/eveonline/evelinks/dotlan.py
@ -10,7 +10,7 @@ from . import (
 )


-_BASE_URL = 'http://evemaps.dotlan.net'
+_BASE_URL = 'https://evemaps.dotlan.net'


 def _build_url(category: str, name: str) -> str:
--- a/allianceauth/eveonline/evelinks/tests/test_evelinks.py
+++ b/allianceauth/eveonline/evelinks/tests/test_evelinks.py
@ -31,29 +31,29 @@ class TestDotlan(TestCase):
    def test_alliance_url(self):
        self.assertEqual(
            dotlan.alliance_url('Wayne Enterprices'),
-            'http://evemaps.dotlan.net/alliance/Wayne_Enterprices'
+            'https://evemaps.dotlan.net/alliance/Wayne_Enterprices'
        )

    def test_corporation_url(self):
        self.assertEqual(
            dotlan.corporation_url('Wayne Technology'),
-            'http://evemaps.dotlan.net/corp/Wayne_Technology'
+            'https://evemaps.dotlan.net/corp/Wayne_Technology'
        )
        self.assertEqual(
            dotlan.corporation_url('Crédit Agricole'),
-            'http://evemaps.dotlan.net/corp/Cr%C3%A9dit_Agricole'
+            'https://evemaps.dotlan.net/corp/Cr%C3%A9dit_Agricole'
        )

    def test_region_url(self):
        self.assertEqual(
            dotlan.region_url('Black Rise'),
-            'http://evemaps.dotlan.net/map/Black_Rise'
+            'https://evemaps.dotlan.net/map/Black_Rise'
        )

    def test_solar_system_url(self):
        self.assertEqual(
            dotlan.solar_system_url('Jita'),
-            'http://evemaps.dotlan.net/system/Jita'
+            'https://evemaps.dotlan.net/system/Jita'
        )


--- a/allianceauth/optimer/form.py
+++ b/allianceauth/optimer/form.py
@ -15,7 +15,7 @@ class OpForm(forms.Form):
    operation_name = forms.CharField(max_length=254, required=True, label=_("Operation Name"))
    type = forms.CharField(required=False, label=_("Operation Type"))
    fc = forms.CharField(max_length=254, required=True, label=_("Fleet Commander"))
-    duration = forms.CharField(max_length=254, required=True, label=_("Duration"))
+    duration = forms.CharField(max_length=25, required=True, label=_("Duration"))
    description = forms.CharField(
        widget=forms.Textarea(attrs={"rows": 10, "cols": 20, "input_type": "textarea"}),
        required=False,
--- a/allianceauth/services/modules/mumble/migrations/0013_connection_history.py
+++ b/allianceauth/services/modules/mumble/migrations/0013_connection_history.py
@ -0,0 +1,37 @@
+# Generated by Django 4.2.16 on 2024-10-07 13:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("mumble", "0012_mumble_client_info"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="mumbleuser",
+            options={
+                "permissions": (
+                    ("access_mumble", "Can access the Mumble service"),
+                    (
+                        "view_connection_history",
+                        "Can access the connection history of the Mumble service",
+                    ),
+                )
+            },
+        ),
+        migrations.AlterField(
+            model_name="mumbleuser",
+            name="release",
+            field=models.TextField(
+                blank=True,
+                editable=False,
+                help_text="Client release. For official releases, this equals the version. For snapshots and git compiles, this will be something else.",
+                max_length=254,
+                null=True,
+                verbose_name="Mumble Release",
+            ),
+        ),
+    ]
Author	SHA1	Message	Date
Ariel Rin	225e68647e	Merge branch 'add-missing-mumble-migration' into 'master' [ADD] Missing Mumble migration See merge request allianceauth/allianceauth!1655	2024-10-18 02:37:50 +00:00
Ariel Rin	7e2f864ebf	Merge branch 'optimer-fix' into 'master' Fix maximum character limit for duration in the optimer form See merge request allianceauth/allianceauth!1656	2024-10-18 02:37:19 +00:00
Ariel Rin	f2384ba45b	Merge branch 'master' into 'master' Use https where applicable See merge request allianceauth/allianceauth!1657	2024-10-18 02:29:33 +00:00
salartarium	c5918b9b3c	Use https where applicable	2024-10-18 02:29:33 +00:00
Aaron Kable	ffedc4103d	fix max chars on duration	2024-10-14 19:22:46 +08:00
Peter Pfeufer	0467b23a1a	[ADD] Missing Mumble migration Running migrations: No migrations to apply. Your models in app(s): 'mumble' have changes that are not yet reflected in a migration, and so won't be applied. Run 'manage.py makemigrations' to make new migrations, and then re-run 'manage.py migrate' to apply them.	2024-10-07 15:42:51 +02:00