equal
deleted
inserted
replaced
78 'django.middleware.csrf.CsrfViewMiddleware', |
78 'django.middleware.csrf.CsrfViewMiddleware', |
79 'django.contrib.auth.middleware.AuthenticationMiddleware', |
79 'django.contrib.auth.middleware.AuthenticationMiddleware', |
80 'django.middleware.locale.LocaleMiddleware', |
80 'django.middleware.locale.LocaleMiddleware', |
81 'django.contrib.messages.middleware.MessageMiddleware', |
81 'django.contrib.messages.middleware.MessageMiddleware', |
82 'jogging.middleware.LoggingMiddleware', |
82 'jogging.middleware.LoggingMiddleware', |
|
83 'openid_consumer.middleware.OpenIDMiddleware', |
83 ) |
84 ) |
84 |
85 |
85 TEMPLATE_CONTEXT_PROCESSORS = ( |
86 TEMPLATE_CONTEXT_PROCESSORS = ( |
86 "django.core.context_processors.request", |
87 "django.core.context_processors.request", |
87 "django.core.context_processors.auth", |
88 "django.core.context_processors.auth", |
125 'ldt.ldt_utils', |
126 'ldt.ldt_utils', |
126 'ldt.text', |
127 'ldt.text', |
127 'ldt.user', |
128 'ldt.user', |
128 'ldt.management', |
129 'ldt.management', |
129 'oauth_provider', |
130 'oauth_provider', |
|
131 'openid_consumer', |
|
132 'piston', |
|
133 'socialauth', |
130 ) |
134 ) |
131 |
135 |
132 DECOUPAGE_BLACKLIST = ( |
136 DECOUPAGE_BLACKLIST = ( |
133 "de_PPP", |
137 "de_PPP", |
134 ) |
138 ) |
149 OAUTH_AUTHORIZE_VIEW = 'oauth_provider.views.fake_authorize_view' |
153 OAUTH_AUTHORIZE_VIEW = 'oauth_provider.views.fake_authorize_view' |
150 OAUTH_CALLBACK_VIEW = 'oauth_provider.views.fake_callback_view' |
154 OAUTH_CALLBACK_VIEW = 'oauth_provider.views.fake_callback_view' |
151 TEST_WEBSERVER_ADDRPORT = "127.0.0.1:8000" |
155 TEST_WEBSERVER_ADDRPORT = "127.0.0.1:8000" |
152 |
156 |
153 from config import * |
157 from config import * |
|
158 from socialauthsettings import * |
154 |
159 |
155 LOGIN_URL = BASE_URL + 'platform/accounts/login/' |
160 LOGIN_URL = BASE_URL + 'accounts/login/' |
156 LOGOUT_URL = BASE_URL + 'platform/accounts/logout/' |
161 LOGOUT_URL = BASE_URL + 'accounts/logout/' |
157 LOGIN_REDIRECT_URL = BASE_URL + 'ldtplatform' |
162 #LOGIN_REDIRECT_URL = BASE_URL + 'ldtplatform' |
|
163 LOGIN_REDIRECT_URL = BASE_URL + 'ldt/' |
|
164 LOGOUT_REDIRECT_URL = BASE_URL + 'accounts/login' |
|
165 PROFILE_REDIRECT_URL = BASE_URL + 'accounts/create/profile' |
158 |
166 |
159 GLOBAL_LOG_LEVEL = LOG_LEVEL |
167 GLOBAL_LOG_LEVEL = LOG_LEVEL |
160 GLOBAL_LOG_HANDLERS = [{'handler':logging.FileHandler(LOG_FILE), 'format':"%(asctime)s - %(levelname)s : %(message)s"}] |
168 GLOBAL_LOG_HANDLERS = [{'handler':logging.FileHandler(LOG_FILE), 'format':"%(asctime)s - %(levelname)s : %(message)s"}] |
161 |
169 |