Merge branch 'releases/0.3'

oscar/apps/payment/forms.py

@@ -161,7 +161,7 @@ class BankcardStartingMonthField(BankcardMonthField):
         return months
 
     def year_choices(self):
-        years = [(x, x) for x in xrange( date.today().year - self.num_years, date.today().year)]
+        years = [(x, x) for x in xrange(date.today().year - self.num_years, date.today().year + 1)]
         years.insert(0, ("", "--"))
         return years
 

oscar/templates/oscar/catalogue/browse.html

@@ -58,7 +58,7 @@
     </div>
     {% if category.description %}
         <div class="row-fluid">
-            <div class="span9"><p>{{ category.description }}</p></div>
+            <div class="span9"><p>{{ category.description|safe }}</p></div>
 			{% if category.image %}
 				<div class="span3"><img src="{{ category.image.url }}" alt="{{ summary }}" /></div>
 			{% endif %}

oscar/templates/oscar/dashboard/catalogue/category_list.html

@@ -47,7 +47,7 @@ Category management | {{ block.super }}
     {% for category in child_categories %}
         <tr>
             <td>{{ category.name }}</td>
-			<td>{{ category.description|default:""|truncatewords:6 }}</td>
+			<td>{{ category.description|default:""|striptags|cut:"&nbsp;"|truncatewords:6 }}</td>
 			<td>{{ category.get_num_children }}</td>
             <td>
                 <a class="btn btn-primary" href="{% url dashboard:catalogue-category-update category.id %}">Edit category</a>