diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index cddf9f0f493da1d7fa865e2092ced98d09427a62..b464592bba2b4b363d808e093fe94f7eb0979d7b 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -108,6 +108,7 @@ TEMPLATES = [ "account.context_processors.account", "pinax_theme_bootstrap.context_processors.theme", "symposion.reviews.context_processors.reviews", + "sekizai.context_processors.sekizai", ], }, }, @@ -140,7 +141,8 @@ INSTALLED_APPS = [ "django.contrib.sessions", "django.contrib.sites", "django.contrib.staticfiles", - + "django.contrib.humanize", + # theme "bootstrapform", "pinax_theme_bootstrap", @@ -200,6 +202,18 @@ INSTALLED_APPS = [ "jquery", "djangoformsetjs", + # wiki + "django_nyt", + "mptt", + "sekizai", + "sorl.thumbnail", + "wiki", + "wiki.plugins.attachments", + "wiki.plugins.notifications", + "wiki.plugins.images", + "wiki.plugins.macros", + + #testing "django_nose", ] @@ -298,6 +312,9 @@ TEST_RUNNER = 'django_nose.NoseTestSuiteRunner' ADMIN_USERNAMES = [] +# Wiki settings +WIKI_CHECK_SLUG_URL_AVAILABLE = False + # Tell nose to measure coverage on the 'foo' and 'bar' apps NOSE_ARGS = [ '--with-coverage',