From fcdee7bf534d151639f6ec13bfef89221bf7bd2b Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Thu, 28 Feb 2013 17:48:55 -0300
Subject: restricted version of Django from above

---
 askbot/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/askbot/__init__.py b/askbot/__init__.py
index 0d9156aa..cf850e33 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',
-- 
cgit v1.2.3-1-g7c22


From 57ab319bd511dd89a2a12de9c3b1cd93d24f929f Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Mon, 4 Mar 2013 22:35:37 -0300
Subject: a fix in the user tools navigation css

---
 .gitignore                    | 1 +
 askbot/media/style/style.css  | 1 +
 askbot/media/style/style.less | 1 +
 3 files changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 2f360b2a..b8629b7b 100755
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ run
 nbproject
 settings_local.py
 settings.py
+tinymce
 .idea
 .coverage
 *.iml
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;
diff --git a/askbot/media/style/style.less b/askbot/media/style/style.less
index 53573280..a0813f1a 100644
--- a/askbot/media/style/style.less
+++ b/askbot/media/style/style.less
@@ -273,6 +273,7 @@ body.user-messages {
 #userToolsNav {/* Navigation bar containing login link or user information, check widgets/user_navigation.html*/
     height: 20px;
     padding-bottom:5px;
+    white-space: nowrap;
 
     a {
         height: 35px;
-- 
cgit v1.2.3-1-g7c22


From fb0df1a738d3a9dc01c5b54619f286148532c6ce Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Tue, 5 Mar 2013 00:03:31 -0300
Subject: added csrf cookie name to the context

---
 askbot/context.py | 1 +
 1 file changed, 1 insertion(+)

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()
-- 
cgit v1.2.3-1-g7c22