TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'master'

Browse Source 
Develop

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!78
This commit is contained in:
Ilari Ojakorpi
2022-08-16 18:49:48 +00:00
parent afbdca1501 a310d51f5e
commit 9d116528b9
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sikweb/settings.py
+2 -1
View File
@@ -82,7 +82,8 @@ DATABASES = {
# Google api settings # Google api settings
GROUP_KEY = os.getenv("GROUP_KEY", "") 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 # JWT authentication
SIMPLE_JWT = { SIMPLE_JWT = {
templates/kaehmy/export.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "base.html" %} {% extends "kaehmy/base.html" %}
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
templates/members/settings.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "base.html" %} {% extends "members/base.html" %}
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}