Commit 802f1a30 authored by David Seaward's avatar David Seaward

merge changes from upstream/master

parents 6c70e2d5 1af2b871
...@@ -6,6 +6,7 @@ SITE_TITLE = Title ...@@ -6,6 +6,7 @@ SITE_TITLE = Title
SITE_BYLINE = Example byline SITE_BYLINE = Example byline
SITE_DOMAIN = example.com SITE_DOMAIN = example.com
DEBUG = True DEBUG = True
DEBUG_SKIP_ACTIVATION_COMMAND = True
ALLOWED_HOSTS = localhost ALLOWED_HOSTS = localhost
STATIC_ROOT = /var/opt/purist/account/static STATIC_ROOT = /var/opt/purist/account/static
REGISTRATION_OPEN = True REGISTRATION_OPEN = True
......
...@@ -72,7 +72,7 @@ class Limit(models.Model): ...@@ -72,7 +72,7 @@ class Limit(models.Model):
def timedelta_to_daystring(self, delta): def timedelta_to_daystring(self, delta):
single_day = 60 * 60 * 24 single_day = 60 * 60 * 24
days = int(delta.total_seconds() / single_day) days = int(round(delta.total_seconds() / single_day))
return str(days) + " days" return str(days) + " days"
def days_credit_label(self): def days_credit_label(self):
......
...@@ -23,6 +23,7 @@ SECRET_KEY = secret_config("DJANGO_SECRET_KEY") ...@@ -23,6 +23,7 @@ SECRET_KEY = secret_config("DJANGO_SECRET_KEY")
# SECURITY WARNING: don't run with debug turned on in production! # SECURITY WARNING: don't run with debug turned on in production!
DEBUG = config("DEBUG", cast=bool) DEBUG = config("DEBUG", cast=bool)
DEBUG_SKIP_ACTIVATION_COMMAND = config("DEBUG_SKIP_ACTIVATION_COMMAND", cast=bool)
# Required if DEBUG is False # Required if DEBUG is False
ALLOWED_HOSTS = config("ALLOWED_HOSTS", cast=Csv()) ALLOWED_HOSTS = config("ALLOWED_HOSTS", cast=Csv())
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment