From 41a6ab12767dbd601f1b1fe0e053f8f665f28215 2017-08-16 04:10:42 From: Joshua Simmons Date: 2017-08-16 04:10:42 Subject: [PATCH] Merge branch 'master' of github.com:northbaypython/website --- diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index f403c4b4f986be0f02ef95764ce4b7d049bdb40d..715d4469c6743a91874e0507ff20af2a0f945880 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -29,7 +29,12 @@ ALLOWED_HOSTS = ["localhost", ".herokuapp.com", ".northbaypython.org"] # timezone as the operating system. # If running in a Windows environment this must be set to the same as your # system time zone. -TIME_ZONE = "UTC" +TIME_ZONE = os.environ.get("TZ", "America/Los_Angeles") + + +# Use SSLRedirectMiddleware +SSL_ON = os.environ.get("DJANGO_SSL_ON", True) +SSL_ALWAYS = os.environ.get("DJANGO_SSL_ALWAYS", False) # Language code for this installation. All choices can be found here: # http://www.i18nguy.com/unicode/language-identifiers.html @@ -80,6 +85,14 @@ STATICFILES_FINDERS = [ "compressor.finders.CompressorFinder", ] + +# Amazon S3 setup +DEFAULT_FILE_STORAGE = os.environ.get("DJANGO_DEFAULT_FILE_STORAGE", 'django.core.files.storage.FileSystemStorage') # noqa +AWS_ACCESS_KEY_ID = os.environ.get("DJANGO_AWS_ACCESS_KEY_ID", None) +AWS_SECRET_ACCESS_KEY = os.environ.get("DJANGO_AWS_SECRET_ACCESS_KEY", None) +AWS_STORAGE_BUCKET_NAME = os.environ.get("DJANGO_AWS_STORAGE_BUCKET_NAME", None) + + # Make this unique, and don't share it with anybody. SECRET_KEY = "6r&z0i#!k-thu4nv^zzx!f$fbp(i5mq_^%%@ihu_qxxotl_" @@ -118,6 +131,8 @@ MIDDLEWARE_CLASSES = [ "django.contrib.messages.middleware.MessageMiddleware", "reversion.middleware.RevisionMiddleware", "django.middleware.clickjacking.XFrameOptionsMiddleware", + "ssl_redirect.middleware.SSLRedirectMiddleware", + ] ROOT_URLCONF = "pinaxcon.urls" diff --git a/pinaxcon/templates/_footer.html b/pinaxcon/templates/_footer.html index 07550d63373f53ead7b922189ef73a940c7af93b..a05b171e6ecc66fa0e2b79c59f4f93fe14ce4f40 100644 --- a/pinaxcon/templates/_footer.html +++ b/pinaxcon/templates/_footer.html @@ -1,13 +1,13 @@ {% load staticfiles %}
-
+ -
+

© 2017 North Bay Python, a member project of Software Freedom Conservancy, a 501(c)(3) charity.

@@ -15,10 +15,7 @@ | Twitter | Code of Conduct | Colophon

-
-
- This site is free and open source software, powered by Symposion - and Registrasion. +

This site is free and open source software, powered by Symposion and Registrasion.

diff --git a/pinaxcon/templates/static_pages/about/team.html b/pinaxcon/templates/static_pages/about/team.html index fc6352354e152771a09cba14ff6d90777eb96201..ae5717500115545f9e50dfdc37383aa6aecfb6e1 100644 --- a/pinaxcon/templates/static_pages/about/team.html +++ b/pinaxcon/templates/static_pages/about/team.html @@ -27,6 +27,7 @@ Our team of North Bay and Bay Area locals has years of experience building commu @@ -53,8 +54,8 @@ Our team of North Bay and Bay Area locals has years of experience building commu

We acknowledge that our small team has limited perspective, and that to build a truly inclusive event, we need to seek the perspectives of a diverse range of people. We thank the following people and organizations for providing us with advice along the way.

diff --git a/pinaxcon/templates/static_pages/homepage.html b/pinaxcon/templates/static_pages/homepage.html index c6a2046fd838ca5aef21d10e3c8816eabc2dd876..45f916433c8a315413b345b78a5cd57951a2d8cc 100644 --- a/pinaxcon/templates/static_pages/homepage.html +++ b/pinaxcon/templates/static_pages/homepage.html @@ -27,14 +27,14 @@

- 2017 conference: December 2 & 3
+ December 2 & 3, 2017
Talk submissions open August 21

-
+