From 18611219905b2ce01c5898a8864155969fafdd89 Mon Sep 17 00:00:00 2001
From: Christopher Neugebauer <chrisjrn@gmail.com>
Date: Sat, 11 Nov 2017 15:31:04 -0800
Subject: [PATCH 1/3] Delete an oops

---
 pinaxcon/templates/static_pages/attend/hotels.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pinaxcon/templates/static_pages/attend/hotels.html b/pinaxcon/templates/static_pages/attend/hotels.html
index adca8b6..f5f56eb 100644
--- a/pinaxcon/templates/static_pages/attend/hotels.html
+++ b/pinaxcon/templates/static_pages/attend/hotels.html
@@ -36,7 +36,7 @@
 
 <p>The only hotel in Downtown Petaluma is a recently renovated boutique hotel in a 1920s-era building. It's a short walk from North Bay Python's venue, and is close to Petaluma's best places to eat and drink.</p>
 
-<p>Hotel Petaluma has offered all of their available rooms to North Bay Python attendees, so if you want to stay as close as possible to the venue, book through our exclusive link by November 1st.</p>
+<p>Hotel Petaluma has offered all of their available rooms to North Bay Python attendees, so if you want to stay as close as possible to the venue, book through our exclusive link.</p>
 
 <h3>Sheraton Petaluma</h3>
 

From 9ac3ff378d3b736c942b4457ba3d6f0ba85c6eb0 Mon Sep 17 00:00:00 2001
From: Joshua Simmons <i@joshuasimmons.name>
Date: Sat, 11 Nov 2017 15:38:42 -0800
Subject: [PATCH 2/3] add accessibility guide to footer

---
 pinaxcon/templates/_footer.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pinaxcon/templates/_footer.html b/pinaxcon/templates/_footer.html
index 2c8013c..4754147 100644
--- a/pinaxcon/templates/_footer.html
+++ b/pinaxcon/templates/_footer.html
@@ -24,6 +24,7 @@
     <p>
       <a href="https://facebook.com/northbaypython">Facebook</a>
       | <a href="https://twitter.com/northbaypython">Twitter</a>
+      | <a href="/accessibility">Accessibility</a>
       | <a href="/code-of-conduct">Code of Conduct</a>
       | <a href="/terms">Terms and Conditions</a>
       | <a href="/about/colophon">Colophon</a>

From a3af1be7574c80720ded619f8717b51d91d3e24f Mon Sep 17 00:00:00 2001
From: Christopher Neugebauer <chrisjrn@gmail.com>
Date: Sun, 12 Nov 2017 16:45:05 -0800
Subject: [PATCH 3/3] Adds wiki support

---
 pinaxcon/settings.py  | 22 ++++++++++++++++++++++
 pinaxcon/urls.py      |  6 ++++++
 requirements/base.txt |  1 +
 3 files changed, 29 insertions(+)

diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py
index d549207..898da78 100644
--- a/pinaxcon/settings.py
+++ b/pinaxcon/settings.py
@@ -132,11 +132,14 @@ TEMPLATES = [
                 "account.context_processors.account",
                 "pinax_theme_bootstrap.context_processors.theme",
                 "symposion.reviews.context_processors.reviews",
+                "sekizai.context_processors.sekizai",
             ],
         },
     },
 ]
 
+TEMPLATE_DEBUG = False
+
 MIDDLEWARE_CLASSES = [
     "django.contrib.sessions.middleware.SessionMiddleware",
     "django.middleware.common.CommonMiddleware",
@@ -212,6 +215,18 @@ INSTALLED_APPS = [
     #testing
     "django_nose",
 
+    # wiki
+    'django.contrib.humanize',
+    'django_nyt',
+    'mptt',
+    'sekizai',
+    'sorl.thumbnail',
+    'wiki',
+    'wiki.plugins.attachments',
+    'wiki.plugins.notifications',
+    'wiki.plugins.images',
+    'wiki.plugins.macros',
+
     # stylesheets and js
     'compressor',
 ]
@@ -309,6 +324,13 @@ TICKET_PRODUCT_CATEGORY = 1
 
 INVOICE_CURRENCY = "USD"
 
+WIKI_ACCOUNT_HANDLING = False
+WIKI_ACCOUNT_SIGNUP_ALLOWED = False
+
+WIKI_ANONYMOUS_WRITE = False
+WIKI_ANONYMOUS_UPLOAD = False
+
+
 # Use nose to run all tests
 TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
 
diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py
index a936b8b..2439614 100644
--- a/pinaxcon/urls.py
+++ b/pinaxcon/urls.py
@@ -4,6 +4,8 @@ from django.conf.urls.static import static
 from django.contrib.staticfiles.templatetags.staticfiles import static as _static
 from django.views.generic import TemplateView
 from django.views.generic import RedirectView
+from django_nyt.urls import get_pattern as get_nyt_pattern
+from wiki.urls import get_pattern as get_wiki_pattern
 
 from django.contrib import admin
 
@@ -85,10 +87,14 @@ urlpatterns = [
     url(r'^tickets/', include('registrasion.urls')),
     url(r'^nested_admin/', include('nested_admin.urls')),
 
+    url(r'^wiki/notifications/', get_nyt_pattern()),
+    url(r'^wiki/', get_wiki_pattern())
+
     # Catch-all MUST go last.
     #url(r"^", include("pinax.pages.urls")),
 ]
 
+
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 handler500 = views.server_error
diff --git a/requirements/base.txt b/requirements/base.txt
index cd7a650..94f429e 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -17,6 +17,7 @@ django-countries==4.6.1
 easy-thumbnails==2.4.1
 django-timezone-field==2.0
 django-model-utils==3.0.0
+wiki==0.3b3
 
 
 # For testing