Просмотр исходного кода

Update release notes, two minor style fixes

master
Maik Hoepfel 12 лет назад
Родитель
Сommit
b18decab4e

+ 4
- 0
docs/source/releases/v0.7.rst Просмотреть файл

58
 * It is now possible to disable the redirect that happens when a product or
58
 * It is now possible to disable the redirect that happens when a product or
59
   category's slug changed and an old URL is used (`b920f8ba`_).
59
   category's slug changed and an old URL is used (`b920f8ba`_).
60
 
60
 
61
+* :class:`~oscar.apps.payment.forms.BankCardNumberField` now allows specifying
62
+  accepted card types (`32b7249`_).
63
+
61
 .. _`b920f8ba`: https://github.com/tangentlabs/django-oscar/commit/b920f8ba288cd2f19bb167db2a012479ba956397
64
 .. _`b920f8ba`: https://github.com/tangentlabs/django-oscar/commit/b920f8ba288cd2f19bb167db2a012479ba956397
62
 .. _`ef3ccf08a7`: https://github.com/tangentlabs/django-oscar/commit/ef3ccf08a707ae1250cdb8d5f2dc6f721d020dc4
65
 .. _`ef3ccf08a7`: https://github.com/tangentlabs/django-oscar/commit/ef3ccf08a707ae1250cdb8d5f2dc6f721d020dc4
66
+.. _`32b7249`: https://github.com/tangentlabs/django-oscar/commit/32b7249e44b40cb1b20d01226f77ae6777a20b91
63
 
67
 
64
 Bugfixes
68
 Bugfixes
65
 ~~~~~~~~
69
 ~~~~~~~~

+ 2
- 4
oscar/apps/dashboard/offers/views.py Просмотреть файл

1
 import datetime
1
 import datetime
2
 import json
2
 import json
3
 
3
 
4
-from django.views.generic import (ListView, FormView, DeleteView,
5
-                                  CreateView, UpdateView)
6
-from oscar.core.loading import get_model
4
+from django.views.generic import ListView, FormView, DeleteView
7
 from django.core.urlresolvers import reverse
5
 from django.core.urlresolvers import reverse
8
 from django.contrib import messages
6
 from django.contrib import messages
9
 from django.http import HttpResponseRedirect
7
 from django.http import HttpResponseRedirect
12
 from django.core import serializers
10
 from django.core import serializers
13
 from django.core.serializers.json import DjangoJSONEncoder
11
 from django.core.serializers.json import DjangoJSONEncoder
14
 
12
 
15
-from oscar.core.loading import get_classes, get_class
13
+from oscar.core.loading import get_classes, get_class, get_model
16
 from oscar.views import sort_queryset
14
 from oscar.views import sort_queryset
17
 
15
 
18
 ConditionalOffer = get_model('offer', 'ConditionalOffer')
16
 ConditionalOffer = get_model('offer', 'ConditionalOffer')

+ 1
- 1
oscar/static/oscar/less/page/layout.less Просмотреть файл

23
 }
23
 }
24
 
24
 
25
 // Some padding for the inner container
25
 // Some padding for the inner container
26
-// Also usefull for the mobile
26
+// Also useful for mobile
27
 .page_inner {
27
 .page_inner {
28
     padding:@gridGutterWidth;
28
     padding:@gridGutterWidth;
29
     .clearfix();
29
     .clearfix();

Загрузка…
Отмена
Сохранить