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

aleksis/core/templates/dynamic_preferences/sections.html

@@ -9,7 +9,7 @@
     {% for section in registry.section_objects.values %}
       <li class="tab">
         <a class="{% if active_section == section.name %}active{% endif %}"
-           href="{% url registry_url section %}"
+           href="{% url registry_url section.name %}"
            target="_self">
           {{ section.verbose_name }}
         </a>

aleksis/core/util/core_helpers.py

@@ -10,6 +10,7 @@ from uuid import uuid4
 from django.conf import settings
 from django.db.models import Model
 from django.http import HttpRequest
+from django.shortcuts import get_object_or_404
 from django.utils import timezone
 from django.utils.functional import lazy
 from django.shortcuts import get_object_or_404

AlekSIS-App-Chronos @ 66cf0ada

-Subproject commit 6833571a02b8df133ea0f3b99f75e93da0c50fc9
+Subproject commit 66cf0ada54140132554fbf8515e8098702ecfc0b

AlekSIS-App-DashboardFeeds @ a7bd17ee

-Subproject commit bbf946c3c91d94d425889a1bcc6436acb7f1819d
+Subproject commit a7bd17eea561f28f6693e1c0b5b58383f5a829ce

AlekSIS-App-Hjelp @ 1e0df6f5

-Subproject commit 920fe05ed236a2f8e96b0f54348c5125edb80002
+Subproject commit 1e0df6f5d4703738f0058f022521e4094f181d60

AlekSIS-App-LDAP @ 00e8ab7b

-Subproject commit f99aa641eb5cdeaf5421e5297813cbcb3c55eb6c
+Subproject commit 00e8ab7beae6b3e3ad8394912dc2409030049926

AlekSIS-App-Untis @ 77b64a28

-Subproject commit a567021ee5e66657b3374a76865bab1ee9bdbc33
+Subproject commit 77b64a28724b5ffb32fb2a48ec5bbf758d85fc75