fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: b899788)
Merge branch 'master' of github.com:fnp/wolnelektury
authorMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Mon, 26 Mar 2012 11:27:28 +0000 (13:27 +0200)
committerMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Mon, 26 Mar 2012 11:27:28 +0000 (13:27 +0200)
wolnelektury/settings/__init__.py patch | blob | history
wolnelektury/settings/auth.py patch | blob | history

diff --git a/wolnelektury/settings/__init__.py b/wolnelektury/settings/__init__.py
index 4d8b81b..e00d269 100644 (file)
--- a/wolnelektury/settings/__init__.py
+++ b/wolnelektury/settings/__init__.py
@@ -41,6 +41,7 @@ MIDDLEWARE_CLASSES = [
 ROOT_URLCONF = 'wolnelektury.urls'
 
 INSTALLED_APPS = [
+    'wolnelektury_core',
     # external
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -73,7 +74,6 @@ INSTALLED_APPS = [
     'modeltranslation',
 
     # our
-    'wolnelektury_core',
     'ajaxable',
     'api',
     'catalogue',
diff --git a/wolnelektury/settings/auth.py b/wolnelektury/settings/auth.py
index 136db06..21210c0 100644 (file)
--- a/wolnelektury/settings/auth.py
+++ b/wolnelektury/settings/auth.py
@@ -6,3 +6,5 @@ EMAIL_CONFIRMATION_DAYS = 2
 LOGIN_URL = '/uzytkownik/login/'
 
 LOGIN_REDIRECT_URL = '/'
+
+SOCIALACCOUNT_AUTO_SIGNUP = False
\ No newline at end of file