diff options
| author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2013-02-14 13:03:29 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2013-02-14 13:03:29 -0600 |
| commit | 8dcde62c89e336c31bd794a795c30dfa31e3a3bd (patch) | |
| tree | 32eac8450d4b623ffab59ed150940c0117613e1d | |
| parent | 028b94f1b95de8b64f296b15ba6ed6441e788466 (diff) | |
| download | askbot-8dcde62c89e336c31bd794a795c30dfa31e3a3bd.tar.gz askbot-8dcde62c89e336c31bd794a795c30dfa31e3a3bd.tar.bz2 askbot-8dcde62c89e336c31bd794a795c30dfa31e3a3bd.zip | |
fixed django-tinymce version
| -rw-r--r-- | askbot/__init__.py | 4 | ||||
| -rw-r--r-- | askbot/setup_templates/settings.py | 2 | ||||
| -rw-r--r-- | askbot/setup_templates/settings.py.mustache | 2 | ||||
| -rw-r--r-- | askbot_requirements.txt | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/askbot/__init__.py b/askbot/__init__.py index d90b7daa..e00a1e2f 100644 --- a/askbot/__init__.py +++ b/askbot/__init__.py @@ -33,14 +33,14 @@ REQUIREMENTS = { 'openid': 'python-openid', 'pystache': 'pystache==0.3.1', 'pytz': 'pytz', - 'tinymce': 'django-tinymce', + 'tinymce': 'django-tinymce==1.5.1b2', 'longerusername': 'longerusername', 'bs4': 'beautifulsoup4' } if platform.system() != 'Windows': REQUIREMENTS['lamson'] = 'Lamson' - + #necessary for interoperability of django and coffin try: from askbot import patches diff --git a/askbot/setup_templates/settings.py b/askbot/setup_templates/settings.py index ebf76e14..51bb05fb 100644 --- a/askbot/setup_templates/settings.py +++ b/askbot/setup_templates/settings.py @@ -244,7 +244,7 @@ HAYSTACK_SITECONF = 'askbot.search.haystack' #http://django-haystack.readthedocs.org/en/v1.2.7/settings.html HAYSTACK_SEARCH_ENGINE = 'simple' -TINYMCE_COMPRESSOR = False +TINYMCE_COMPRESSOR = True TINYMCE_SPELLCHECKER = False TINYMCE_JS_ROOT = os.path.join(STATIC_ROOT, 'default/media/js/tinymce/') diff --git a/askbot/setup_templates/settings.py.mustache b/askbot/setup_templates/settings.py.mustache index 48d3dc6e..1c4ca6de 100644 --- a/askbot/setup_templates/settings.py.mustache +++ b/askbot/setup_templates/settings.py.mustache @@ -250,7 +250,7 @@ HAYSTACK_SITECONF = 'askbot.search.haystack' #http://django-haystack.readthedocs.org/en/v1.2.7/settings.html HAYSTACK_SEARCH_ENGINE = 'simple' -TINYMCE_COMPRESSOR = False +TINYMCE_COMPRESSOR = True TINYMCE_SPELLCHECKER = False TINYMCE_JS_ROOT = os.path.join(STATIC_ROOT, 'default/media/js/tinymce/') TINYMCE_JS_URL = STATIC_URL + 'default/media/js/tinymce/tiny_mce.js' diff --git a/askbot_requirements.txt b/askbot_requirements.txt index a9a939b4..ea9dd005 100644 --- a/askbot_requirements.txt +++ b/askbot_requirements.txt @@ -20,6 +20,6 @@ python-openid pystache==0.3.1 pytz sanction -django-tinymce +django-tinymce==1.5.1b2 longerusername beautifulsoup4 |