From: Javyer Der Derian <javier@tribalo.net>
Date: Thu, 17 Apr 2014 21:58:38 +0000 (-0300)
Subject: Merge pull request #45 from udacity/sort_modes
X-Git-Tag: live~22
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/87761a02340d63155104e92a18983e3d01c6bdbb?hp=3223ab3b10da1eac0f6f608a2619ffe53d5a0889

Merge pull request #45 from udacity/sort_modes

Pagination updates
---

diff --git a/forum/views/meta.py b/forum/views/meta.py
index a47cf1d..e7d1515 100644
--- a/forum/views/meta.py
+++ b/forum/views/meta.py
@@ -37,7 +37,7 @@ def static(request, title, content):
 def media(request, skin, path):
     response = serve(request, "%s/media/%s" % (skin, path),
                  document_root=os.path.join(os.path.dirname(os.path.dirname(__file__)), 'skins').replace('\\', '/'))
-    content_type = response['Content-Type']
+    content_type = response.get('Content-Type', '')
     if ('charset=' not in content_type):
         if (content_type.startswith('text') or content_type=='application/x-javascript'):
             content_type += '; charset=utf-8'
diff --git a/forum/views/readers.py b/forum/views/readers.py
index e7336e0..fc819bf 100644
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -8,6 +8,7 @@ from django.core.paginator import Paginator, EmptyPage, InvalidPage
 from django.template import RequestContext
 from django import template
 from django.utils.html import *
+from django.utils.http import urlquote
 from django.db.models import Q, Count
 from django.utils.translation import ugettext as _
 from django.core.urlresolvers import reverse
diff --git a/forum_modules/akismet/startup.py b/forum_modules/akismet/startup.py
index 2387e05..c050754 100644
--- a/forum_modules/akismet/startup.py
+++ b/forum_modules/akismet/startup.py
@@ -1,5 +1,4 @@
 import json
-import loggin
 
 from django.utils.translation import ugettext as _
 from django.http import HttpResponse, HttpResponseRedirect
diff --git a/forum_modules/robotstxt/urls.py b/forum_modules/robotstxt/urls.py
index 5f74a0a..ddcac3b 100644
--- a/forum_modules/robotstxt/urls.py
+++ b/forum_modules/robotstxt/urls.py
@@ -3,5 +3,5 @@ from django.http import  HttpResponse
 import settings
 
 urlpatterns = patterns('',
-    (r'^robots.txt$',  lambda r: HttpResponse(settings.ROBOTS_FILE.value)),
+    (r'^robots.txt$',  lambda r: HttpResponse(settings.ROBOTS_FILE.value, content_type='text/plain')),
 )
diff --git a/requirements.txt b/requirements.txt
index fd43d5c..8266787 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ html5lib
 python-openid
 South
 python-memcached
-django==1.3.7
+django==1.6.0
 django-debug-toolbar
 django-endless-pagination
 pytz
diff --git a/settings_local.py.dist b/settings_local.py.dist
index 896a433..81c1eaa 100644
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -72,7 +72,6 @@ TIME_ZONE = 'America/New_York'
 USE_I18N = True
 LANGUAGE_CODE = 'en'
 
-DJANGO_VERSION = 1.1
 OSQA_DEFAULT_SKIN = 'default'
 
 DISABLED_MODULES = ['books', 'recaptcha', 'project_badges']