diff -r 81acd8021764 -r 96ddbedf93cb src/hdalab/settings.py --- a/src/hdalab/settings.py Mon Mar 09 11:03:57 2015 +0100 +++ b/src/hdalab/settings.py Mon Mar 09 11:05:44 2015 +0100 @@ -149,7 +149,10 @@ 'django.contrib.staticfiles', 'django.contrib.admin', 'django_extensions', + 'djcelery_email', 'registration', + 'honeypot', + 'envelope', 'haystack', 'easy_thumbnails', 'renkanmanager', @@ -177,6 +180,16 @@ LOCALE_PATHS = () +RENKAN_PREVIEW_DIM = (500,500) +RENKAN_PREVIEW_WAIT = 5000 + +CELERY_TASK_SERIALIZER = 'json' +CELERY_ACCEPT_CONTENT = ['json', 'msgpack', 'yaml'] + +EMAIL_BACKEND = 'djcelery_email.backends.CeleryEmailBackend' + +HONEYPOT_FIELD_NAME='phone' +ENVELOPE_SUBJECT_INTRO='[hdalab contact]' from hdalab.config import * #@UnusedWildImport