CopyleftConf/copyleftconf-website Changeset - fc2b604da623

Changeset - fc2b604da623

Parent rev.

Child rev.

[Not reviewed]

Merge

0 14 2

Christopher Neugebauer - 7 years ago 2017-08-17 17:45:02
chrisjrn@gmail.com

Merge remote-tracking branch 'origin/master' into wednesday-cleanup

4 files changed with 19 insertions and 2 deletions:

pinaxcon/settings.py

pinaxcon/templates/_footer.html

pinaxcon/urls.py

pinaxcon/views.py

0 comments (0 inline, 0 general)

pinaxcon/settings.py

➞

Show inline comments

@@ ... @@
 # If DEFAULT_FROM_EMAIL is not set, email will most likely break in prod.
 from_email = os.environ.get("DJANGO_DEFAULT_FROM_EMAIL", None)
 if from_email is not None:
     DEFAULT_FROM_EMAIL = from_email
 # Local time zone for this installation. Choices can be found here:

pinaxcon/templates/_footer.html

➞

Show inline comments

@@ ... / @@ -10,3 +10,3 @@ @@
   <div class="footer-copy">
-    <p>&copy; 2017 North Bay Python, a member project of <a href="https://sfconservancy.org" >Software Freedom Conservancy</a>, a 501(c)(3) charity.</p>
     <p>&copy; 2017 North Bay Python, member project of <a href="https://sfconservancy.org" >Software Freedom Conservancy</a>, a 501(c)(3) charity.</p>

pinaxcon/urls.py

➞

Show inline comments

@@ ... / @@ -7,5 +7,6 @@ from django.views.generic import RedirectView @@
 from django.contrib import admin
 from pinaxcon import views
 import symposion.views
@@ ... / @@ -80 +81,3 @@ urlpatterns = [ @@
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 handler500 = views.server_error

pinaxcon/views.py

➞

Show inline comments

 new file 100644
 from django.http import HttpResponseServerError
 from django.template import RequestContext
 from django.template import Template
 from django.template.loader import get_template
 from django.views import defaults
 def server_error(request, template_name=defaults.ERROR_500_TEMPLATE_NAME):
     t = Template("{%% include '%s' %%}" % template_name)
     return HttpResponseServerError(t.render(RequestContext(request)))

0 comments (0 inline, 0 general)