Merge branch 'main' into images-django-imagekit

This commit is contained in:
Mouse Reeve
2021-08-02 13:43:59 -06:00
committed by GitHub
58 changed files with 4202 additions and 1234 deletions

View File

@ -12,10 +12,7 @@ def site_settings(request): # pylint: disable=unused-argument
"site": models.SiteSettings.objects.get(),
"active_announcements": models.Announcement.active_announcements(),
"enable_thumbnail_generation": settings.ENABLE_THUMBNAIL_GENERATION,
"static_url": settings.STATIC_URL,
"media_url": settings.MEDIA_URL,
"static_path": settings.STATIC_PATH,
"media_path": settings.MEDIA_PATH,
"media_full_url": settings.MEDIA_FULL_URL,
"preview_images_enabled": settings.ENABLE_PREVIEW_IMAGES,
"request_protocol": request_protocol,
}