Merge branch 'master' into...

Merge branch 'master' into 139-lesson-topic-not-carried-to-previous-lesson-if-entered-in-second-lesson-of-a-block

README.rst

@@ -16,15 +16,15 @@ Licence
 
 ::
 
-  Copyright © 2019–2020 Tom Teichler <tom.teichler@teckids.org>
-  Copyright © 2019 Dominik George <dominik.george@teckids.org>
+  Copyright © 2019,2021 Dominik George <dominik.george@teckids.org>
+  Copyright © 2019,2020 Tom Teichler <tom.teichler@teckids.org>
   Copyright © 2019 mirabilos <thorsten.glaser@teckids.org>
+  Copyright © 2020,2021 Jonathan Weth <dev@jonathanweth.de>
   Copyright © 2020 Julian Leucker <leuckeju@katharineum.de>
-  Copyright © 2020 Jonathan Weth <wethjo@katharineum.de>
   Copyright © 2020 Hangzhi Yu <yuha@katharineum.de>
 
 
-  Licenced under the EUPL, version 1.2 or later
+  Licenced under the EUPL, version 1.2 or later, by Teckids e.V. (Bonn, Germany).
 
 Please see the LICENCE.rst file accompanying this distribution for the
 full licence text or on the `European Union Public Licence`_ website

aleksis/apps/alsijil/__init__.py

@@ -4,5 +4,3 @@ try:
     __version__ = pkg_resources.get_distribution("AlekSIS-App-Alsijil").version
 except Exception:
     __version__ = "unknown"
-
-default_app_config = "aleksis.apps.alsijil.apps.AlsijilConfig"

aleksis/apps/alsijil/apps.py

@@ -10,10 +10,10 @@ class AlsijilConfig(AppConfig):
     }
     licence = "EUPL-1.2+"
     copyright_info = (
+        ([2019, 2021], "Dominik George", "dominik.george@teckids.org"),
         ([2019, 2020], "Tom Teichler", "tom.teichler@teckids.org"),
-        ([2019], "Dominik George", "dominik.george@teckids.org"),
         ([2019], "mirabilos", "thorsten.glaser@teckids.org"),
+        ([2020, 2021], "Jonathan Weth", "dev@jonathanweth.de"),
         ([2020], "Julian Leucker", "leuckeju@katharineum.de"),
-        ([2020], "Jonathan Weth", "wethjo@katharineum.de"),
         ([2020], "Hangzhi Yu", "yuha@katharineum.de"),
     )

aleksis/apps/alsijil/migrations/0001_initial.py

@@ -24,7 +24,7 @@ class Migration(migrations.Migration):
             fields=[
                 (
                     "id",
-                    models.AutoField(
+                    models.BigAutoField(
                         auto_created=True,
                         primary_key=True,
                         serialize=False,
@@ -83,7 +83,7 @@ class Migration(migrations.Migration):
             fields=[
                 (
                     "id",
-                    models.AutoField(
+                    models.BigAutoField(
                         auto_created=True,
                         primary_key=True,
                         serialize=False,
@@ -147,7 +147,7 @@ class Migration(migrations.Migration):
             fields=[
                 (
                     "id",
-                    models.AutoField(
+                    models.BigAutoField(
                         auto_created=True,
                         primary_key=True,
                         serialize=False,

aleksis/apps/alsijil/migrations/0002_excuse_type.py

@@ -19,7 +19,7 @@ class Migration(migrations.Migration):
             fields=[
                 (
                     "id",
-                    models.AutoField(
+                    models.BigAutoField(
                         auto_created=True,
                         primary_key=True,
                         serialize=False,

aleksis/apps/alsijil/migrations/0003_extra_mark.py

@@ -19,7 +19,7 @@ class Migration(migrations.Migration):
             fields=[
                 (
                     "id",
-                    models.AutoField(
+                    models.BigAutoField(
                         auto_created=True,
                         primary_key=True,
                         serialize=False,

aleksis/apps/alsijil/migrations/0008_global_permissions.py

@@ -14,11 +14,11 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='AlsijilGlobalPermissions',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('extended_data', models.JSONField(default=dict, editable=False)),
             ],
-            "default_permissions": (),
             options={
+                "default_permissions": (),
                 'permissions': (('view_week', 'Can view week overview'), ('register_absence', 'Can register absence'), ('list_personal_note_filters', 'Can list all personal note filters')),
                 'managed': False,
             },

aleksis/apps/alsijil/migrations/0009_group_roles.py

@@ -19,7 +19,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='GroupRole',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('extended_data', models.JSONField(default=dict, editable=False)),
                 ('name', models.CharField(max_length=255, verbose_name='Name')),
                 ('icon', models.CharField(blank=True, choices=(lambda: ICONS)(), max_length=50, verbose_name='Icon')),
@@ -34,7 +34,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='GroupRoleAssignment',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('extended_data', models.JSONField(default=dict, editable=False)),
                 ('date_start', models.DateField(verbose_name='Start date')),
                 ('date_end', models.DateField(blank=True, help_text='Can be left empty if end date is not clear yet', null=True, verbose_name='End date')),