Changeset - 42cf9e71f1b2
[Not reviewed]
Merge
0 3 0
Christopher Neugebauer - 6 years ago 2017-11-13 01:00:59
chrisjrn@gmail.com
Merge branch 'master' into prod
3 files changed with 29 insertions and 0 deletions:
0 comments (0 inline, 0 general)
pinaxcon/settings.py
Show inline comments
...
 
@@ -129,17 +129,20 @@ TEMPLATES = [
 
                "django.template.context_processors.tz",
 
                "django.template.context_processors.request",
 
                "django.contrib.messages.context_processors.messages",
 
                "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",
 
    "django.middleware.csrf.CsrfViewMiddleware",
 
    "django.contrib.auth.middleware.AuthenticationMiddleware",
 
    "django.contrib.auth.middleware.SessionAuthenticationMiddleware",
...
 
@@ -209,12 +212,24 @@ INSTALLED_APPS = [
 
    "pinaxcon.proposals",
 
    "pinaxcon.registrasion",
 

	
 
    #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',
 
]
 

	
 
# A sample logging configuration. The only tangible logging
 
# performed by this configuration is to send an email to
...
 
@@ -306,12 +321,19 @@ ATTENDEE_PROFILE_MODEL = "pinaxcon.registrasion.models.AttendeeProfile"
 
# in order to register.
 
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'
 

	
 

	
 
# Tell nose to measure coverage on the 'foo' and 'bar' apps
 
NOSE_ARGS = [
pinaxcon/urls.py
Show inline comments
 
from django.conf import settings
 
from django.conf.urls import include, url
 
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
 

	
 
from pinaxcon import views
 

	
 
import symposion.views
...
 
@@ -82,13 +84,17 @@ urlpatterns = [
 
    url(r"^tickets/payments/", include("registripe.urls")),
 

	
 
    # Required by registrasion
 
    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
Show inline comments
...
 
@@ -14,12 +14,13 @@ django-libsass==0.7
 
django-markdown-deux==1.0.5
 
django-sitetree==1.8.0
 
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
 
django-nose==1.4.4
 
coverage==4.0.3
 

	
0 comments (0 inline, 0 general)