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', |
|
154 'honeypot', |
|
155 'envelope', |
153 'haystack', |
156 'haystack', |
154 'easy_thumbnails', |
157 'easy_thumbnails', |
155 'renkanmanager', |
158 'renkanmanager', |
156 ) |
159 ) |
157 |
160 |
175 |
178 |
176 ACCOUNT_ACTIVATION_DAYS = 7 |
179 ACCOUNT_ACTIVATION_DAYS = 7 |
177 |
180 |
178 LOCALE_PATHS = () |
181 LOCALE_PATHS = () |
179 |
182 |
|
183 RENKAN_PREVIEW_DIM = (500,500) |
|
184 RENKAN_PREVIEW_WAIT = 5000 |
|
185 |
|
186 CELERY_TASK_SERIALIZER = 'json' |
|
187 CELERY_ACCEPT_CONTENT = ['json', 'msgpack', 'yaml'] |
|
188 |
|
189 EMAIL_BACKEND = 'djcelery_email.backends.CeleryEmailBackend' |
|
190 |
|
191 HONEYPOT_FIELD_NAME='phone' |
|
192 ENVELOPE_SUBJECT_INTRO='[hdalab contact]' |
180 |
193 |
181 from hdalab.config import * #@UnusedWildImport |
194 from hdalab.config import * #@UnusedWildImport |
182 |
195 |
183 if 'LOGIN_REDIRECT_URL' not in locals(): |
196 if 'LOGIN_REDIRECT_URL' not in locals(): |
184 LOGIN_REDIRECT_URL = BASE_URL |
197 LOGIN_REDIRECT_URL = BASE_URL |