Merge branch 'main' into logo-default

This commit is contained in:
Mouse Reeve
2020-12-12 16:03:19 -08:00
230 changed files with 8169 additions and 4734 deletions

View File

@ -29,6 +29,9 @@ class SiteSettings(models.Model):
upload_to='static/images/',
default='/static/images/favicon.ico'
)
support_link = models.CharField(max_length=255, null=True, blank=True)
support_title = models.CharField(max_length=100, null=True, blank=True)
admin_email = models.EmailField(max_length=255, null=True, blank=True)
@classmethod
def get(cls):
@ -66,7 +69,7 @@ class SiteInvite(models.Model):
def get_passowrd_reset_expiry():
''' give people a limited time to use the link '''
now = datetime.datetime.now()
now = timezone.now()
return now + datetime.timedelta(days=1)