Merge branch 'refs/heads/master' into develop

This commit is contained in:
vabene1111
2019-11-19 19:18:15 +01:00
2 changed files with 21 additions and 0 deletions

View File

@@ -0,0 +1,18 @@
# Generated by Django 2.2.7 on 2019-11-15 14:04
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('cookbook', '0011_recipe_time'),
]
operations = [
migrations.AlterField(
model_name='recipe',
name='time',
field=models.IntegerField(default=0),
),
]

View File

@@ -26,6 +26,9 @@ ALLOWED_HOSTS = os.getenv('ALLOWED_HOSTS').split(',') if os.getenv('ALLOWED_HOST
LOGIN_REDIRECT_URL = "index"
LOGOUT_REDIRECT_URL = "index"
SESSION_EXPIRE_AT_BROWSER_CLOSE = False
SESSION_COOKIE_AGE = 365 * 60 * 24
CRISPY_TEMPLATE_PACK = 'bootstrap4'
DJANGO_TABLES2_TEMPLATE = 'cookbook/templates/generic/table_template.html'