Merge branch 'master' into prod

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'
 

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

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