Merge branch 'master' into quizzes

[oweals/karmaworld.git] / karmaworld / settings / common.py

diff --git a/karmaworld/settings/common.py b/karmaworld/settings/common.py
index ba16684d45fc5a2c27c99621dd24dfe2e1f6a776..80f30128d0d9d1b3ad2733d14f3d5c1bf04ce013 100644 (file)
--- a/karmaworld/settings/common.py
+++ b/karmaworld/settings/common.py
@@ -152,6 +152,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.tz',
     'django.contrib.messages.context_processors.messages',
     'django.core.context_processors.request',
+    'karmaworld.apps.notes.context_processors.s3_url',
 
     # allauth specific context processors
     "allauth.account.context_processors.account",
@@ -177,6 +178,9 @@ MIDDLEWARE_CLASSES = (
     # Use GZip compression to reduce bandwidth.
     'django.middleware.gzip.GZipMiddleware',
 
+    # Version control middleware.
+    'reversion.middleware.RevisionMiddleware',
+
     # Default Django middleware.
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
@@ -227,6 +231,9 @@ THIRD_PARTY_APPS = (
     # Tagging https://github.com/yedpodtrzitko/django-taggit
     'taggit',
 
+    # Version control
+    'reversion',
+
     'allauth',
     'allauth.account',
     'allauth.socialaccount',
@@ -234,6 +241,9 @@ THIRD_PARTY_APPS = (
     'allauth.socialaccount.providers.facebook',
     'allauth.socialaccount.providers.google',
     'allauth.socialaccount.providers.twitter',
+
+    # Added to make quizzes moderation nicer
+    'nested_inlines',
 )
 
 LOCAL_APPS = (
@@ -244,6 +254,7 @@ LOCAL_APPS = (
     'karmaworld.apps.users',
     'karmaworld.apps.moderation',
     'karmaworld.apps.licenses',
+    'karmaworld.apps.quizzes',
 )
 
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps
@@ -273,6 +284,7 @@ SOCIALACCOUNT_QUERY_EMAIL = True
 SOCIALACCOUNT_AUTO_SIGNUP = False
 ACCOUNT_USER_DISPLAY = 'karmaworld.apps.users.models.user_display_name'
 ACCOUNT_SIGNUP_FORM_CLASS = 'karmaworld.apps.users.forms.SignupForm'
+ACCOUNT_DEFAULT_HTTP_PROTOCOL = 'https'
 
 AUTH_PROFILE_MODULE = 'users.UserProfile'