From a1e991b44958eccb12792faa71f440a850f104e2 Mon Sep 17 00:00:00 2001
From: Adolfo Fitoria <adolfo.fitoria@gmail.com>
Date: Tue, 30 Apr 2013 15:13:21 -0600
Subject: taking mathjax out of compress

---
 askbot/templates/meta/bottom_scripts.html | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/askbot/templates/meta/bottom_scripts.html b/askbot/templates/meta/bottom_scripts.html
index 7af1d50d..eec4256d 100644
--- a/askbot/templates/meta/bottom_scripts.html
+++ b/askbot/templates/meta/bottom_scripts.html
@@ -56,16 +56,6 @@
 <script type='text/javascript' src="{{"/js/jquery.history.js"|media }}"></script>
 <script type='text/javascript' src="{{"/js/utils.js"|media }}"></script>
 <script type="text/javascript" src="{{'/js/live_search.js'|media}}"></script>
-{% if settings.ENABLE_MATHJAX %}
-    {# we don't want to load mathjax just in case, only if it is really enabled #}
-    <script type='text/javascript' src="{{settings.MATHJAX_BASE_URL}}/MathJax.js">
-        MathJax.Hub.Config({
-            extensions: ["tex2jax.js"],
-            jax: ["input/TeX","output/HTML-CSS"],
-            tex2jax: {inlineMath: [["$","$"],["\\(","\\)"]]}
-        });
-    </script>
-{% endif %}
 <script type="text/javascript">
     /*<![CDATA[*/
     $('.mceStatusbar').remove();//a hack to remove the tinyMCE status bar
@@ -121,6 +111,16 @@
 </script>
 {% endcompress %}
 {# stuff below should not be compressed #}
+{% if settings.ENABLE_MATHJAX %}
+    {# we don't want to load mathjax just in case, only if it is really enabled #}
+    <script type='text/javascript' src="{{settings.MATHJAX_BASE_URL}}/MathJax.js">
+        MathJax.Hub.Config({
+            extensions: ["tex2jax.js"],
+            jax: ["input/TeX","output/HTML-CSS"],
+            tex2jax: {inlineMath: [["$","$"],["\\(","\\)"]]}
+        });
+    </script>
+{% endif %}
 {% if settings.USE_CUSTOM_JS %}
 <script 
     src="{% url "custom_js" %}?v={{ settings.MEDIA_RESOURCE_REVISION }}"
-- 
cgit v1.2.3-1-g7c22


From 7dd06189a24bcfd4c189034b4fc317b6080a4ff8 Mon Sep 17 00:00:00 2001
From: Vovk Donets <donets.vladimir@gmail.com>
Date: Thu, 2 May 2013 02:17:46 +0700
Subject: added a route to askbot.urls. Without this route admin user was not
 able to login and received error message:'Exception Type:NoReverseMatch'

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

diff --git a/askbot/urls.py b/askbot/urls.py
index d3426980..32867615 100644
--- a/askbot/urls.py
+++ b/askbot/urls.py
@@ -563,6 +563,7 @@ urlpatterns = patterns('',
         name = 'askbot_jsi18n'
     ),
     url('^messages/', include('group_messaging.urls')),
+    url('^settings/', include('livesettings.urls')),
 )
 
 #todo - this url below won't work, because it is defined above
-- 
cgit v1.2.3-1-g7c22


From d2561b16f77d794ddb93e85bd3e35e21fcd6a5dc Mon Sep 17 00:00:00 2001
From: Vovk Donets <donets.vladimir@gmail.com>
Date: Thu, 2 May 2013 02:34:28 +0700
Subject: fix: UnicodeDecodeError at /askbot/settings/EMAIL/
 (askbot/deps/livesettings/values.py in _default_text, line 252)

---
 askbot/deps/livesettings/values.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/askbot/deps/livesettings/values.py b/askbot/deps/livesettings/values.py
index 0f30808a..4ed2fe0e 100644
--- a/askbot/deps/livesettings/values.py
+++ b/askbot/deps/livesettings/values.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """Taken and modified from the dbsettings project.
 
 http://code.google.com/p/django-values/
-- 
cgit v1.2.3-1-g7c22