Merge branch 'master' of edugit.org:AlekSIS/official/AlekSIS

aleksis/core/admin.py

+#noqa
+
 from django.contrib import admin
 
 from reversion.admin import VersionAdmin

aleksis/core/mixins.py

@@ -65,8 +65,9 @@ class ExtensibleModel(models.Model):
     # Defines a material design icon associated with this type of model
     icon_ = "radio_button_unchecked"
 
-    site = models.ForeignKey(Site, on_delete=models.CASCADE,
-                             default=Site.objects.get_current, editable=False)
+    site = models.ForeignKey(
+        Site, on_delete=models.CASCADE, default=Site.objects.get_current, editable=False
+    )
     objects = CurrentSiteManager()
     objects_all_sites = models.Manager()
 

aleksis/core/preferences.py

@@ -3,16 +3,9 @@ from django.forms import EmailField, ImageField, URLField
 from django.utils.translation import gettext_lazy as _
 
 from dynamic_preferences.preferences import Section
-from dynamic_preferences.types import (
-    ChoicePreference,
-    FilePreference,
-    StringPreference,
-)
-
-from .registries import (
-    person_preferences_registry,
-    site_preferences_registry,
-)
+from dynamic_preferences.types import ChoicePreference, FilePreference, StringPreference
+
+from .registries import person_preferences_registry, site_preferences_registry
 from .util.notifications import get_notification_choices_lazy
 
 general = Section("general")
@@ -127,14 +120,12 @@ class ImprintURL(StringPreference):
 class AdressingNameFormat(ChoicePreference):
     section = notification
     name = "addressing_name_format"
-    default = "german"
+    default = "first_last"
     required = False
     verbose_name = _("Name format for addressing")
     choices = (
-        (None, "-----"),
-        ("german", "John Doe"),
-        ("english", "Doe, John"),
-        ("dutch", "Doe John"),
+        ("first_last", "John Doe"),
+        ("last_fist", "Doe, John"),
     )
 
 

aleksis/core/settings.py

@@ -480,8 +480,7 @@ PWA_APP_SPLASH_SCREEN = [
             title="pwa_icon", size=192, rel="apple", default=STATIC_URL + "icons/apple_180.png"
         ),
         "media": (
-            "(device-width: 320px) and (device-height: 568px) and"
-            "(-webkit-device-pixel-ratio: 2)"
+            "(device-width: 320px) and (device-height: 568px) and" "(-webkit-device-pixel-ratio: 2)"
         ),
     }
 ]

aleksis/core/util/apps.py

@@ -15,6 +15,7 @@ from .core_helpers import copyright_years
 
 class AppConfig(django.apps.AppConfig):
     """An extended version of DJango's AppConfig container."""
+
     def ready(self):
         super().ready()
 

aleksis/core/views.py

@@ -380,6 +380,7 @@ def searchbar_snippets(request: HttpRequest) -> HttpResponse:
 
 class PermissionSearchView(PermissionRequiredMixin, SearchView):
     """Wrapper to apply permission to haystack's search view."""
+
     permission_required = "core.search"
 
     def create_response(self):

AlekSIS-App-Chronos @ 23a4be92

-Subproject commit 66cf0ada54140132554fbf8515e8098702ecfc0b
+Subproject commit 23a4be92b84da38cea0f3d9ac382ba03e63ff139

AlekSIS-App-DashboardFeeds @ e93849fb

-Subproject commit a7bd17eea561f28f6693e1c0b5b58383f5a829ce
+Subproject commit e93849fb326fddf183d42a5b167425b061ffa124

AlekSIS-App-Hjelp @ 3006443b

-Subproject commit 1e0df6f5d4703738f0058f022521e4094f181d60
+Subproject commit 3006443bda5b013a71972dc4b56b778e6ade3247