From: Marcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Date: Mon, 26 Mar 2012 11:27:28 +0000 (+0200)
Subject: Merge branch 'master' of github.com:fnp/wolnelektury
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/6b780de1a5ee6c4e5acfb0cf4c8832a41e0b1a36?hp=b89978824e0c351444c0033262308351ac480e53

Merge branch 'master' of github.com:fnp/wolnelektury
---

diff --git a/wolnelektury/settings/__init__.py b/wolnelektury/settings/__init__.py
index 4d8b81b9c..e00d26988 100644
--- 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 136db060d..21210c074 100644
--- 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