diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-10-23 21:52:35 -0300 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-10-23 21:52:35 -0300 |
| commit | 9cf8cef59ac090cd9d7460edd66333fcffba3a51 (patch) | |
| tree | e43ba5470672164f6abdfe64f2134e35c9bdde1c /askbot/setup_templates | |
| parent | 77e8d9ec9ca426c4ee8e5bb666572472635edbbe (diff) | |
| download | askbot-9cf8cef59ac090cd9d7460edd66333fcffba3a51.tar.gz askbot-9cf8cef59ac090cd9d7460edd66333fcffba3a51.tar.bz2 askbot-9cf8cef59ac090cd9d7460edd66333fcffba3a51.zip | |
added missing settings to the setup templates
Diffstat (limited to 'askbot/setup_templates')
| -rw-r--r-- | askbot/setup_templates/settings.py | 2 | ||||
| -rw-r--r-- | askbot/setup_templates/settings.py.mustache | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/askbot/setup_templates/settings.py b/askbot/setup_templates/settings.py index 94df6f29..65075361 100644 --- a/askbot/setup_templates/settings.py +++ b/askbot/setup_templates/settings.py @@ -174,6 +174,7 @@ INSTALLED_APPS = ( 'djcelery', 'djkombu', 'followit', + 'tinymce', #'avatar',#experimental use git clone git://github.com/ericflo/django-avatar.git$ ) @@ -249,6 +250,7 @@ TINYMCE_JS_ROOT = os.path.join(STATIC_ROOT, 'common/media/js/tinymce/') TINYMCE_URL = STATIC_URL + 'common/media/js/tinymce/' TINYMCE_DEFAULT_CONFIG = { 'plugins': 'askbot_imageuploader,askbot_attachment', + 'convert_urls': False, 'theme': 'advanced', 'content_css': STATIC_URL + 'default/media/style/tinymce/content.css', 'force_br_newlines': True, diff --git a/askbot/setup_templates/settings.py.mustache b/askbot/setup_templates/settings.py.mustache index 74295513..287b0bb1 100644 --- a/askbot/setup_templates/settings.py.mustache +++ b/askbot/setup_templates/settings.py.mustache @@ -174,6 +174,7 @@ INSTALLED_APPS = ( 'djcelery', 'djkombu', 'followit', + 'tinymce', #'avatar',#experimental use git clone git://github.com/ericflo/django-avatar.git$ ) @@ -251,6 +252,7 @@ TINYMCE_JS_ROOT = os.path.join(STATIC_ROOT, 'common/media/js/tinymce/') TINYMCE_URL = STATIC_URL + 'common/media/js/tinymce/' TINYMCE_DEFAULT_CONFIG = { 'plugins': 'askbot_imageuploader,askbot_attachment', + 'convert_urls': False, 'theme': 'advanced', 'content_css': STATIC_URL + 'default/media/style/tinymce/content.css', 'force_br_newlines': True, |