equal
deleted
inserted
replaced
136 'oauth_provider', |
136 'oauth_provider', |
137 'django_openid_consumer', |
137 'django_openid_consumer', |
138 'piston', |
138 'piston', |
139 'social_auth', |
139 'social_auth', |
140 'south', |
140 'south', |
|
141 'guardian', |
141 ) |
142 ) |
142 |
143 |
143 AUTH_PROFILE_MODULE = 'user.UserProfile' |
144 AUTH_PROFILE_MODULE = 'user.UserProfile' |
144 |
145 |
145 DECOUPAGE_BLACKLIST = ( |
146 DECOUPAGE_BLACKLIST = ( |
160 # 'social_auth.backends.contrib.linkedin.LinkedinBackend', |
161 # 'social_auth.backends.contrib.linkedin.LinkedinBackend', |
161 # 'social_auth.backends.contrib.LiveJournalBackend', |
162 # 'social_auth.backends.contrib.LiveJournalBackend', |
162 # 'social_auth.backends.contrib.orkut.OrkutBackend', |
163 # 'social_auth.backends.contrib.orkut.OrkutBackend', |
163 'social_auth.backends.OpenIDBackend', |
164 'social_auth.backends.OpenIDBackend', |
164 'django.contrib.auth.backends.ModelBackend', |
165 'django.contrib.auth.backends.ModelBackend', |
|
166 'guardian.backends.ObjectPermissionBackend', |
165 ) |
167 ) |
166 SOCIAL_AUTH_IMPORT_BACKENDS = ( |
168 SOCIAL_AUTH_IMPORT_BACKENDS = ( |
167 'myproy.social_auth_extra_services', |
169 'myproy.social_auth_extra_services', |
168 ) |
170 ) |
169 |
171 |
199 # google testing |
201 # google testing |
200 TEST_GOOGLE_USER = 'jacquesverrier@gmail.com' |
202 TEST_GOOGLE_USER = 'jacquesverrier@gmail.com' |
201 TEST_GOOGLE_PASSWORD = '' |
203 TEST_GOOGLE_PASSWORD = '' |
202 |
204 |
203 AUTO_INDEX_AFTER_SAVE = True |
205 AUTO_INDEX_AFTER_SAVE = True |
|
206 |
|
207 ANONYMOUS_USER_ID = -1 |
204 |
208 |
205 WEB_VERSION = ldtplatform.get_version() |
209 WEB_VERSION = ldtplatform.get_version() |
206 |
210 |
207 from config import * |
211 from config import * |
208 |
212 |