Skip to content
Snippets Groups Projects
Commit f5c1befe authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Merge branch 'master' into 51-pdf-export-for-timetables

parents 3c824401 69fda47f
No related branches found
No related tags found
1 merge request!77Resolve "PDF export for timetables"
Pipeline #7321 passed
Stage: test
Stage: build
Stage: publish
Stage: docker
Stage: deploy
Hide whitespace changes
Inline Side-by-side
README.rst
+ 1
− 1
View file @ f5c1befe
......@@ -31,7 +31,7 @@ Licence
Copyright © 2019 Tom Teichler <tom.teichler@teckids.org>
Copyright © 2019 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/chronos/__init__.py
+ 0
− 2
View file @ f5c1befe
......@@ -4,5 +4,3 @@ try:
__version__ = pkg_resources.get_distribution("AlekSIS-App-Chronos").version
except Exception:
__version__ = "unknown"
default_app_config = "aleksis.apps.chronos.apps.ChronosConfig"
aleksis/apps/chronos/migrations/0001_initial.py
+ 34
− 34
View file @ f5c1befe
......@@ -26,7 +26,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -35,7 +35,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -56,7 +56,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -65,7 +65,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -87,7 +87,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -96,7 +96,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -126,7 +126,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -135,7 +135,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -165,7 +165,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -174,7 +174,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -202,7 +202,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -211,7 +211,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -258,7 +258,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -267,7 +267,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -312,7 +312,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -321,7 +321,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -400,7 +400,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -409,7 +409,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -465,7 +465,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -474,7 +474,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -507,7 +507,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -516,7 +516,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -676,7 +676,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -685,7 +685,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -717,7 +717,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -726,7 +726,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -808,7 +808,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -817,7 +817,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -878,7 +878,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -887,7 +887,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -995,7 +995,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -1004,7 +1004,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -1039,7 +1039,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -1048,7 +1048,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......
aleksis/apps/chronos/migrations/0002_school_term_validity.py
+ 2
− 2
View file @ f5c1befe
......@@ -53,7 +53,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -62,7 +62,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment