diff options
| author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-10-25 09:34:08 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-10-25 09:34:08 -0600 |
| commit | a4f16c01eb4800ceb92f51479e8b04a1e69bfc8c (patch) | |
| tree | 3fa217c74048c5465436b3489b42044455ace5f9 | |
| parent | f6877916d84c43a86e239e2343c6779257c8f9c7 (diff) | |
| parent | 5c233c42df00c9f1949653f41dd1d91286c8097b (diff) | |
| download | askbot-a4f16c01eb4800ceb92f51479e8b04a1e69bfc8c.tar.gz askbot-a4f16c01eb4800ceb92f51479e8b04a1e69bfc8c.tar.bz2 askbot-a4f16c01eb4800ceb92f51479e8b04a1e69bfc8c.zip | |
Merge branch 'master' of github.com:ASKBOT/askbot-devel
Conflicts:
askbot/setup_templates/settings.py
| -rw-r--r-- | askbot/setup_templates/settings.py | 4 | ||||
| -rw-r--r-- | askbot/setup_templates/settings.py.mustache | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/askbot/setup_templates/settings.py b/askbot/setup_templates/settings.py index ec98175c..b43b2b50 100644 --- a/askbot/setup_templates/settings.py +++ b/askbot/setup_templates/settings.py @@ -163,7 +163,6 @@ INSTALLED_APPS = ( 'django.contrib.sitemaps', #'debug_toolbar', #'haystack', - 'tinymce', 'askbot', 'askbot.deps.django_authopenid', #'askbot.importers.stackexchange', #se loader @@ -175,6 +174,7 @@ INSTALLED_APPS = ( 'djcelery', 'djkombu', 'followit', + 'tinymce', #'avatar',#experimental use git clone git://github.com/ericflo/django-avatar.git$ ) @@ -247,12 +247,12 @@ HAYSTACK_SEARCH_ENGINE = 'simple' TINYMCE_COMPRESSOR = True TINYMCE_SPELLCHECKER = False TINYMCE_JS_ROOT = os.path.join(STATIC_ROOT, 'default/media/js/tinymce/') + TINYMCE_URL = STATIC_URL + 'default/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, 'force_p_newlines': False, 'forced_root_block': '', diff --git a/askbot/setup_templates/settings.py.mustache b/askbot/setup_templates/settings.py.mustache index ae0ff4cc..aa153435 100644 --- a/askbot/setup_templates/settings.py.mustache +++ b/askbot/setup_templates/settings.py.mustache @@ -164,7 +164,6 @@ INSTALLED_APPS = ( #Optional, to enable haystack search #'haystack', 'askbot', - 'tinymce', 'askbot.deps.django_authopenid', #'askbot.importers.stackexchange', #se loader 'south', @@ -175,6 +174,7 @@ INSTALLED_APPS = ( 'djcelery', 'djkombu', 'followit', + 'tinymce', #'avatar',#experimental use git clone git://github.com/ericflo/django-avatar.git$ ) |