Skip to content
Snippets Groups Projects
Commit c94f960d authored by Tom Teichler's avatar Tom Teichler :beers:
Browse files

Merge branch 'master' into 58-migrate-to-materialize-css

parents 368915db b2b39def
No related branches found
No related tags found
1 merge request!37Resolve "Migrate to materialize.css"
from datetime import date from datetime import date
from calendarweek import CalendarWeek
from django.db.models import Exists, F, OuterRef from django.db.models import Exists, F, OuterRef
from aleksis.apps.chronos.models import LessonPeriod from aleksis.apps.chronos.models import LessonPeriod
from aleksis.apps.chronos.util import CalendarWeek
from aleksis.core.models import Group, Person from aleksis.core.models import Group, Person
from .models import PersonalNote from .models import PersonalNote
......
from calendarweek import CalendarWeek
from datetime import date, datetime, timedelta from datetime import date, datetime, timedelta
from typing import Optional from typing import Optional
...@@ -12,7 +13,6 @@ from django.utils.translation import ugettext as _ ...@@ -12,7 +13,6 @@ from django.utils.translation import ugettext as _
from django_tables2 import RequestConfig from django_tables2 import RequestConfig
from aleksis.apps.chronos.models import LessonPeriod from aleksis.apps.chronos.models import LessonPeriod
from aleksis.apps.chronos.util import CalendarWeek
from aleksis.core.decorators import admin_required from aleksis.core.decorators import admin_required
from aleksis.core.models import Group, Person, School from aleksis.core.models import Group, Person, School
from aleksis.core.util import messages from aleksis.core.util import messages
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment