From 2c0f8c45302eaba5ae9ba9ba22edb8135ad46653 Mon Sep 17 00:00:00 2001 From: tmslav Date: Sun, 8 May 2016 01:04:03 +0000 Subject: [PATCH] update email sending --- .gitignore | 1 + dynamicweb/settings/base.py | 19 ++++++++++--------- dynamicweb/settings/prod.py | 4 +++- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index e2e5a9d5..6e6250b1 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ __pycache__/ #django local_settings.py +media/ !media/keep /CACHE/ /static/ diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index 12120227..11efef38 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -84,18 +84,18 @@ INSTALLED_APPS = ( 'djangocms_file', 'djangocms_picture', 'djangocms_video', - # 'djangocms_flash', - # 'djangocms_googlemap', - # 'djangocms_inherit', - # 'djangocms_link', - # 'djangocms_teaser', + 'djangocms_flash', + 'djangocms_googlemap', + 'djangocms_inherit', + 'djangocms_link', + 'djangocms_teaser', 'djangocms_page_meta', 'djangocms_text_ckeditor', 'djangocms_admin_style', 'cmsplugin_filer_file', 'cmsplugin_filer_folder', 'cmsplugin_filer_link', - # 'cmsplugin_filer_teaser', + 'cmsplugin_filer_teaser', 'cmsplugin_filer_video', # # blog @@ -103,7 +103,7 @@ INSTALLED_APPS = ( 'reversion', # ungleich 'ungleich', - 'ungleich_page', +# 'ungleich_page', 'hosting', 'digitalglarus', 'django_extensions', @@ -177,7 +177,7 @@ CMS_TEMPLATES = ( DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': 'app', + 'NAME': 'app_new', } } @@ -303,7 +303,7 @@ META_SITE_PROTOCOL = 'http' META_USE_SITES = True MIGRATION_MODULES = { 'cms': 'cms.migrations', - # 'filer': 'filer.migrations_django', + #'filer': 'filer.migrations_django', # 'menus': 'menus.migrations_django', 'djangocms_flash': 'djangocms_flash.migrations_django', 'djangocms_googlemap': 'djangocms_googlemap.migrations_django', @@ -338,6 +338,7 @@ STATICFILES_FINDERS = ( THUMBNAIL_PROCESSORS = ( 'easy_thumbnails.processors.colorspace', 'easy_thumbnails.processors.autocrop', + #'easy_thumbnails.processors.scale_and_crop', 'filer.thumbnail_processors.scale_and_crop_with_subject_location', 'easy_thumbnails.processors.filters', ) diff --git a/dynamicweb/settings/prod.py b/dynamicweb/settings/prod.py index 1f21ca46..1588b5c3 100644 --- a/dynamicweb/settings/prod.py +++ b/dynamicweb/settings/prod.py @@ -3,10 +3,12 @@ from .base import * ADMINS = ( ('Nico Schottelius', 'nico.schottelius@ungleich.ch'), ('Raul Ascencio', 'raul.ascencio@yandex.com'), + ('Tomislav Rupcic','tmslav@gmail.com'), + ) # ('Sanghee Kim', 'sanghee.kim@ungleich.ch'), -MANAGERS = ADMINS +#MANAGERS = ADMINS REGISTRATION_MESSAGE['message'] = REGISTRATION_MESSAGE['message'].format(host='digitalglarus.ungleich.ch',slug='{slug}')