Browse Source

Merge branch 'releases/0.2'

master
David Winterbottom 13 years ago
parent
commit
c117c4330c
4 changed files with 9 additions and 3 deletions
  1. 5
    0
      CHANGELOG.rst
  2. 1
    1
      oscar/apps/dashboard/pages/views.py
  3. 1
    1
      oscar/static/oscar/js/oscar/dashboard.js
  4. 2
    1
      release.sh

+ 5
- 0
CHANGELOG.rst View File

2
 Changelog
2
 Changelog
3
 =========
3
 =========
4
 
4
 
5
+0.2.1 - 09 July 2012
6
+~~~~~~~~~~~~~~~~~~~~
7
+
8
+Mainly small bug-fixes to templates and javascript.  
9
+
5
 0.2 - 01 June 2012
10
 0.2 - 01 June 2012
6
 ~~~~~~~~~~~~~~~~~~
11
 ~~~~~~~~~~~~~~~~~~
7
 
12
 

+ 1
- 1
oscar/apps/dashboard/pages/views.py View File

42
         data = self.form.cleaned_data
42
         data = self.form.cleaned_data
43
 
43
 
44
         if data['title']:
44
         if data['title']:
45
-            queryset = queryset.filter(title__contains=data['title'])
45
+            queryset = queryset.filter(title__icontains=data['title'])
46
             self.description += " with title containing '%s'" % data['title']
46
             self.description += " with title containing '%s'" % data['title']
47
 
47
 
48
         return queryset
48
         return queryset

+ 1
- 1
oscar/static/oscar/js/oscar/dashboard.js View File

4
     var csrf_token = null;
4
     var csrf_token = null;
5
     $.each(cookies, function(index, cookie) {
5
     $.each(cookies, function(index, cookie) {
6
         cookieParts = $.trim(cookie).split('=');
6
         cookieParts = $.trim(cookie).split('=');
7
-        if (cookie_parts[0] == 'csrftoken') {
7
+        if (cookieParts[0] == 'csrftoken') {
8
             csrfToken = cookieParts[1];
8
             csrfToken = cookieParts[1];
9
         }
9
         }
10
     });
10
     });

+ 2
- 1
release.sh View File

9
 
9
 
10
 # Tag in Git
10
 # Tag in Git
11
 git tag $RELEASE_NUM -m "Tagging release $RELEASE_NUM"
11
 git tag $RELEASE_NUM -m "Tagging release $RELEASE_NUM"
12
-git push --tags
12
+git push --tags
13
+git push 

Loading…
Cancel
Save