Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'releases/0.2'

  • Loading branch information...
commit c117c4330c05b7ab942577eb280a957f8f443743 2 parents a22a3a4 + 41b5783
David Winterbottom codeinthehole authored
5 CHANGELOG.rst
View
@@ -2,6 +2,11 @@
Changelog
=========
+0.2.1 - 09 July 2012
+~~~~~~~~~~~~~~~~~~~~
+
+Mainly small bug-fixes to templates and javascript.
+
0.2 - 01 June 2012
~~~~~~~~~~~~~~~~~~
2  oscar/apps/dashboard/pages/views.py
View
@@ -42,7 +42,7 @@ def get_queryset(self):
data = self.form.cleaned_data
if data['title']:
- queryset = queryset.filter(title__contains=data['title'])
+ queryset = queryset.filter(title__icontains=data['title'])
self.description += " with title containing '%s'" % data['title']
return queryset
2  oscar/static/oscar/js/oscar/dashboard.js
View
@@ -4,7 +4,7 @@ oscar.getCsrfToken = function() {
var csrf_token = null;
$.each(cookies, function(index, cookie) {
cookieParts = $.trim(cookie).split('=');
- if (cookie_parts[0] == 'csrftoken') {
+ if (cookieParts[0] == 'csrftoken') {
csrfToken = cookieParts[1];
}
});
3  release.sh
View
@@ -9,4 +9,5 @@ git tag | grep $RELEASE_NUM > /dev/null && \
# Tag in Git
git tag $RELEASE_NUM -m "Tagging release $RELEASE_NUM"
-git push --tags
+git push --tags
+git push
Please sign in to comment.
Something went wrong with that request. Please try again.