Maik Hoepfel
5fe4e836da
Add 1.1.1 release notes
This also reverses the order for the release notes overview. Makes more
sense to me that way.
10 years ago
Maik Hoepfel
2f928146fe
Add glyphicons fonts
This commit adds the glyphicons fonts used for Bootstrap. They're
referenced in our styles.css and hence need to be included.
This commit also removes the executable permission from the other fonts.
Closes #1802 .
10 years ago
David Winterbottom
d8eb8a3686
Bump version to 1.1 (final)
10 years ago
David Winterbottom
cb133ed59b
Tweak 1.1 release notes
10 years ago
David Winterbottom
c96e3fcd41
Import updated Transifex files
I had to manually correct the ru_RU django.po file as there were some
mismatching plurals. Not entirely sure what I did was the correct
resolution but it seemed sensible to my non-Russian eyes.
10 years ago
David Winterbottom
75d1808847
Enable 'make docs' to work with Django>=1.8
10 years ago
David Winterbottom
a74009e7da
Merge pull request #1775 from sasha0/master
fixed backward slug data migration, #1689
10 years ago
Alexander Gaevsky
60b136fc32
fixed backward slug data migration, #1689
10 years ago
Michael
6e91f44c46
Merge pull request #1773 from digicase/issues/1772/productselect_widget_select2_css_class
Fix CSS classes for ProductSelect widgets
10 years ago
Michael
6f11f2bc6a
Merge pull request #1774 from digicase/issues/1754/dashboard_prmotions_views_fields
Add required fields attributes
10 years ago
Arthur Case
ecf15acff2
Add required fields attributes
Some dashboard.promotions views were missing a fields attribute. For Django 1.8 compatibilty.
10 years ago
Arthur Case
c1ae543291
Fix CSS classes for ProductSelect widgets
ProductSelect widgets in the Dashboard require at least the CSS class `select2`. Django widget tweaks was overriding CSS classes set in the RemoteSelect and MultipleRemoteSelect widgets.
10 years ago
Michael
ab8fcbb9db
Merge pull request #1771 from sasha0/issue/1747/stock_alert_date_closed
setting date_closed on closing StockAlert, added additional check in …
10 years ago
David Winterbottom
636b5957f9
Merge pull request #1761 from mostafa-anm/update-customising-docs
Fix #1760 -- Update customising oscar docs
10 years ago
Alexander Gaevsky
aaee1d3579
setting date_closed on closing StockAlert, added additional check in stock alert tests, #1747
10 years ago
monikasulik
bfbf23b4a9
Merge pull request #1752 from john-parton/issue/1751_product_attribute_value_set_unicode_value
Easy: ProductAttributeValue._set_value use six.string_types instead of str.
10 years ago
Maik Hoepfel
325ebb785a
Merge branch 'sasha0-issue/1719/weight_based_shipping_discount'
10 years ago
Alexander Gaevsky
450d47bd10
fixes for applying discount to weight based shipping method
This should fix #1719 .
10 years ago
Maik Hoepfel
bcc3ef4566
Merge pull request #1770 from adamend/fix-basketview
Fix call to calculate_excl_discount
10 years ago
Maik Hoepfel
eeca4dbf32
Fix PEP8 issues
10 years ago
Adam Endicott
96417f368b
Fix call to calculate_excl_discount.
It was being passed a shipping charge, when it wants a basket.
10 years ago
Maik Hoepfel
ddf404bff0
Change allowed line length to 99 chars
The impromptu DjangoCon gathering decided it's a good idea.
10 years ago
Maik Hoepfel
0fec4e5b35
Finalise release notes
10 years ago
Maik Hoepfel
4b72a16cc8
Make Partner.name form field required
This is part of addressing #1723 . Partner.name is optional. But when we
create a partner through the dashboard, it doesn't make sense to not set
a name. Hence this commit enforces it at the form level.
Closes #1723 .
10 years ago
David Winterbottom
31ca8b052a
Merge pull request #1768 from django-oscar/issue/1653
Forbid hyphens in CommunicationEventType code field
10 years ago
David Winterbottom
276eba9249
Forbid hyphens in CommunicationEventType code field
10 years ago
Alexander Gaevsky
503f9822a1
added sample weight band generation
10 years ago
Alexander Gaevsky
970b48e027
added integration test when shipping discount applied to weight based shipping
10 years ago
Maik Hoepfel
eda02cf45b
Merge pull request #1766 from monikasulik/bugfix/1765_basket_message_bug
Fix validation message in basket
10 years ago
Maik Hoepfel
c3b2a892da
Merge pull request #1763 from monikasulik/bugfix/1654_basket_issue
Improve basket validation message
10 years ago
David Winterbottom
675989d078
Merge branch 'master' of github.com:django-oscar/django-oscar
10 years ago
Monika Sulik
86269f9092
Fix validation message in basket
Fixes stockrecord availability validation message in the case when stock is lower than allocation. Previously the message that appeared contained negative numbers. For example: "a maximum of -1 can be bought". Now it will display: "no stock available"
10 years ago
David Winterbottom
700242330a
Ensure product attribute codes can't be python keywords
10 years ago
David Winterbottom
5033f95757
Add tests to verify hyphens are not allowed in attribute codes
10 years ago
David Winterbottom
a908aad8a5
Merge remote-tracking branch 'origin/master' into pr/1729
10 years ago
David Winterbottom
30fa7f125b
Merge pull request #1764 from django-oscar/issue/1728
Add migrations required for Django 1.8
10 years ago
Monika Sulik
7fe9537e12
Fix pep8 issue
10 years ago
David Winterbottom
e9d4cdc17f
Add TODO comments to remove max_length when Django 1.7 support is dropped
10 years ago
David Winterbottom
bc3777042a
Excise Nose from runtests.py comments
10 years ago
David Winterbottom
3d5d96cec1
Set EmailFields to have max_length=75 to side-step migration problem
When the lowest version of Django we support is 1.8, we can remove these
max_lengths and fall back to the length set in Django (now 254). It's
messy to try and support both Django 1.7 and 1.8 with this change as
'makemigrations' will pick up different things depending on which
version of Django is being used.
10 years ago
David Winterbottom
a97a1a15f8
Add migration that allows product_class FK to be blank
10 years ago
David Winterbottom
3b45110de8
Add migrations for M2M fields which are no longer nullable
10 years ago
Monika Sulik
1dffba0fda
Merge branch 'master' into bugfix/1654_basket_issue
10 years ago
Monika Sulik
d58c9d44c5
Improve basket validation message
10 years ago
David Winterbottom
1208a0a034
Use a lower-bound for treebeard versions
10 years ago
David Winterbottom
4aa737a017
Merge pull request #1759 from django-oscar/issue/1596
Allow the reviews app to be forked with oscar_fork_app
10 years ago
David Winterbottom
3a6894edc3
Merge pull request #1762 from sasha0/master
Category model import, minor doc fix.
10 years ago
Alexander Gaevsky
4fbadf8060
fixed category model import, #1689
10 years ago
David Winterbottom
519cd212f3
Bump lint threshold warning
As the new warning from this PR is acceptable.
10 years ago
mostafa-anm
4ced5948de
Fix #1760 -- Update customising oscar docs
10 years ago