diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-03-05 19:01:37 -0300 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-03-05 19:01:37 -0300 |
| commit | 37250b7cfe88cbcf22f8ca61fbe1f39d04a4e0cd (patch) | |
| tree | 922e066bfec9f6a95320ee5748ea687ebc72f169 | |
| parent | 3e0f667226d94ea31a3696a2704d7a9d106acd0e (diff) | |
| parent | fb0df1a738d3a9dc01c5b54619f286148532c6ce (diff) | |
| download | askbot-37250b7cfe88cbcf22f8ca61fbe1f39d04a4e0cd.tar.gz askbot-37250b7cfe88cbcf22f8ca61fbe1f39d04a4e0cd.tar.bz2 askbot-37250b7cfe88cbcf22f8ca61fbe1f39d04a4e0cd.zip | |
Merge branch 'master' into rich-text-comments
| -rwxr-xr-x | .gitignore | 1 | ||||
| -rw-r--r-- | askbot/__init__.py | 2 | ||||
| -rw-r--r-- | askbot/context.py | 1 | ||||
| -rw-r--r-- | askbot/media/style/style.css | 1 |
4 files changed, 4 insertions, 1 deletions
@@ -12,6 +12,7 @@ run nbproject settings_local.py settings.py +tinymce .idea .coverage *.iml diff --git a/askbot/__init__.py b/askbot/__init__.py index f2cd6c5b..024c821d 100644 --- a/askbot/__init__.py +++ b/askbot/__init__.py @@ -13,7 +13,7 @@ VERSION = (0, 7, 48) #values - the package qualifier to use for pip REQUIREMENTS = { 'akismet': 'akismet', - 'django': 'django>=1.3.1', + 'django': 'django>=1.3.1,<1.5', 'jinja2': 'Jinja2', 'coffin': 'Coffin>=0.3', 'south': 'South>=0.7.1', diff --git a/askbot/context.py b/askbot/context.py index 523e8e09..fba17b5f 100644 --- a/askbot/context.py +++ b/askbot/context.py @@ -46,6 +46,7 @@ def application_settings(request): 'ASKBOT_USE_LOCAL_FONTS', False ) + my_settings['CSRF_COOKIE_NAME'] = settings.CSRF_COOKIE_NAME my_settings['DEBUG'] = settings.DEBUG my_settings['USING_RUNSERVER'] = 'runserver' in sys.argv my_settings['ASKBOT_VERSION'] = askbot.get_version() diff --git a/askbot/media/style/style.css b/askbot/media/style/style.css index 0d325360..a53ebf37 100644 --- a/askbot/media/style/style.css +++ b/askbot/media/style/style.css @@ -275,6 +275,7 @@ body.user-messages { height: 20px; padding-bottom: 5px; + white-space: nowrap; } #userToolsNav a { height: 35px; |