Merge branch 'master' into 239-frontend-for-additional-fields-for-group

.gitlab-ci.yml

@@ -70,7 +70,7 @@ pages:
 build_docker:
   stage: build
   image:
-    name: gcr.io/kaniko-project/executor:v0.19.0
+    name: gcr.io/kaniko-project/executor:v0.22.0
     entrypoint: [""]
   script:
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" >/kaniko/.docker/config.json

aleksis/core/migrations/0001_initial.py

 # Generated by Django 3.0.5 on 2020-05-04 14:16
 
+import aleksis.core.mixins
+import aleksis.core.util.core_helpers
 import datetime
-
+from django.conf import settings
 import django.contrib.postgres.fields.jsonb
 import django.contrib.sites.managers
-import django.db.models.deletion
-from django.conf import settings
 from django.db import migrations, models
-
+import django.db.models.deletion
 import image_cropping.fields
 import phonenumber_field.modelfields
 
-import aleksis.core.mixins
-import aleksis.core.util.core_helpers
-
 
 class Migration(migrations.Migration):
 

aleksis/core/mixins.py

@@ -218,9 +218,6 @@ class ExtensibleModel(models.Model, metaclass=_ExtensibleModelBase):
         """Collect all fields that can be synced on a model."""
         return lazy(cls.syncable_fields_choices, tuple)
 
-    def __str__(self) -> str:
-        return f"{self.__class__.meta.name} {self.pk}"
-
     class Meta:
         abstract = True
 

aleksis/core/tables.py

@@ -28,7 +28,7 @@ class AdditionalFieldsTable(tables.Table):
     """Table to list group types."""
 
     class Meta:
-        attrs = {"class": "table table-striped table-bordered table-hover table-responsive-xl"}
+        attrs = {"class": "responsive-table hightlight"}
 
     title = tables.LinkColumn("edit_additional_field_by_id", args=[A("id")])
     delete = tables.LinkColumn(

AlekSIS-App-Chronos @ 9c747d37

-Subproject commit d3c035f8b48274481c626e0348f2088be96c1578
+Subproject commit 9c747d3737c3ac31fce2eafcf8a977bb926feeb9

AlekSIS-App-DashboardFeeds @ a921629b

-Subproject commit 2e5700b344de0e0dbf9f24df069a305aaec0e136
+Subproject commit a921629be8c775720d4c81fc078114bddcd9e7d1

AlekSIS-App-Hjelp @ 6a2e35f4

-Subproject commit b331cd2bc9c1b7ca7af3428d6c2ad5bec3850859
+Subproject commit 6a2e35f4756260a2a044f500295b29a357069ea0

AlekSIS-App-LDAP @ e782474f

-Subproject commit 6367352a370f09d723f3d6ba0e6c4dd2667d952b
+Subproject commit e782474f724b2eb281001897b4ad85f093e1539e

AlekSIS-App-Untis @ 95cdb833

-Subproject commit ce7169cb168db94802bb2c4be53c8aa5664b5503
+Subproject commit 95cdb833b1eb8f235d73028a2c96390fd024e8b3

tox.ini

@@ -9,8 +9,6 @@ whitelist_externals = poetry
 skip_install = true
 envdir = {toxworkdir}/globalenv
 commands_pre =
-     - sudo apt update
-     - sudo apt install python3-ldap libldap2-dev libssl-dev libsasl2-dev python3.7-dev -y
      - poetry install
 commands =
     - poetry run pytest --cov=. {posargs} aleksis/
@@ -24,9 +22,9 @@ setenv =
 
 [testenv:lint]
 commands =
-    - poetry run black --check --diff aleksis/ --exclude "migrations"
-    - poetry run isort -c --diff --stdout -rc -s migrations aleksis/
-    poetry run flake8 {posargs} --exclude-from-doctest migrations aleksis/
+    - poetry run black --check --diff aleksis/
+    - poetry run isort -c --diff --stdout -rc aleksis/
+    poetry run flake8 {posargs} aleksis/
 
 [testenv:security]
 commands =
@@ -58,6 +56,7 @@ use_parantheses = 1
 default_section = THIRDPARTY
 known_first_party = aleksis
 known_django = django
+skip = migrations
 sections = FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
 
 [mypy]