Merge branch 'develop' into 'master'

Develop

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!78

sikweb/settings.py

@@ -82,7 +82,8 @@ DATABASES = {
 
 # Google api settings
 GROUP_KEY = os.getenv("GROUP_KEY", "")
-GOOGLE_SERVICE_ACCOUNT = json.loads(os.getenv("GOOGLE_CREDS_JSON", "{}"))
+# GOOGLE_SERVICE_ACCOUNT = json.loads(os.getenv("GOOGLE_CREDS_JSON", "{}"))
+GOOGLE_SERVICE_ACCOUNT = json.loads("{}")
 
 # JWT authentication
 SIMPLE_JWT = {

templates/kaehmy/export.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "kaehmy/base.html" %}
 
 {% load static %}
 {% load i18n %}

templates/members/settings.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "members/base.html" %}
 
 {% load static %}
 {% load i18n %}