From c002b7a20ab0b8cb444ea4c0cdbde3815620b37f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20G=C3=B6tz?= Date: Thu, 1 Feb 2018 11:22:33 +0100 Subject: [PATCH 1/4] Update gitignore rm migrations --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0bd3a85..9c50a90 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ docker.env static_files/ +migrations/ # Created by https://www.gitignore.io/api/pycharm,python,django .idea/ From 267cbd5bfd0cb51e2bb1a7a602369c30a6f6b93a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20G=C3=B6tz?= Date: Thu, 1 Feb 2018 13:17:36 +0100 Subject: [PATCH 2/4] Remove happy hours --- ofu_app/templates/food/daily_food.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ofu_app/templates/food/daily_food.jinja b/ofu_app/templates/food/daily_food.jinja index ec3495f..d9f9581 100644 --- a/ofu_app/templates/food/daily_food.jinja +++ b/ofu_app/templates/food/daily_food.jinja @@ -15,7 +15,7 @@ {{ macros.tab_menu(title='Markusplatz', location_menu=markus_cafete, location_menus=weekly_markus_cafete ,fail_text='Aktuell gibt es keine warmen Speisen',css_id="markuspl") }}
- {{ macros.happy_hours(happy_hours=happy_hours) }} + {# {{ macros.happy_hours(happy_hours=happy_hours) }}#}
From a39dac8363d1f12e6d33584cc3eea00bc19ebcba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20G=C3=B6tz?= Date: Mon, 5 Feb 2018 00:16:25 +0100 Subject: [PATCH 3/4] Update gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0bd3a85..2921fbe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ docker.env static_files/ +coverage_html/ # Created by https://www.gitignore.io/api/pycharm,python,django .idea/ From fe16949725e8002c7de1a3a9cbef53599063acf6 Mon Sep 17 00:00:00 2001 From: michigg Date: Wed, 4 Apr 2018 18:51:19 +0200 Subject: [PATCH 4/4] Change conflicting static url --- ofu_app/core/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ofu_app/core/settings.py b/ofu_app/core/settings.py index c05af6c..62acafb 100755 --- a/ofu_app/core/settings.py +++ b/ofu_app/core/settings.py @@ -74,7 +74,7 @@ TIME_FORMAT = "H:i" ROOT_URLCONF = 'core.urls' WSGI_APPLICATION = 'core.wsgi.application' -STATIC_URL = '/static/' +STATIC_URL = '/static-dev/' STATIC_ROOT = os.path.join(BASE_DIR, "static_files") STATICFILES_DIRS = [ os.path.join(BASE_DIR, "static"),