equal
deleted
inserted
replaced
147 'django.contrib.sites', |
147 'django.contrib.sites', |
148 'django.contrib.messages', |
148 'django.contrib.messages', |
149 'django.contrib.staticfiles', |
149 'django.contrib.staticfiles', |
150 'django.contrib.admin', |
150 'django.contrib.admin', |
151 'django_extensions', |
151 'django_extensions', |
|
152 "djcelery_email", |
152 'registration', |
153 'registration', |
153 'haystack', |
154 'haystack', |
154 'easy_thumbnails', |
155 'easy_thumbnails', |
155 'renkanmanager', |
156 'renkanmanager', |
156 ) |
157 ) |
181 RENKAN_PREVIEW_WAIT = 5000 |
182 RENKAN_PREVIEW_WAIT = 5000 |
182 |
183 |
183 CELERY_TASK_SERIALIZER = 'json' |
184 CELERY_TASK_SERIALIZER = 'json' |
184 CELERY_ACCEPT_CONTENT = ['json', 'msgpack', 'yaml'] |
185 CELERY_ACCEPT_CONTENT = ['json', 'msgpack', 'yaml'] |
185 |
186 |
|
187 EMAIL_BACKEND = 'djcelery_email.backends.CeleryEmailBackend' |
|
188 |
186 from hdalab.config import * #@UnusedWildImport |
189 from hdalab.config import * #@UnusedWildImport |
187 |
190 |
188 if 'LOGIN_REDIRECT_URL' not in locals(): |
191 if 'LOGIN_REDIRECT_URL' not in locals(): |
189 LOGIN_REDIRECT_URL = BASE_URL |
192 LOGIN_REDIRECT_URL = BASE_URL |
190 if 'LOGIN_URL' not in locals(): |
193 if 'LOGIN_URL' not in locals(): |