Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: django-oscar/django-oscar
...
head fork: django-oscar/django-oscar
Commits on Jun 13, 2012
@codeinthehole codeinthehole Added documentation for signals. 4a539a4
Commits on Jun 14, 2012
@codeinthehole codeinthehole Updated README 16e5cbd
@codeinthehole codeinthehole Bump version 964116b
@codeinthehole codeinthehole Added recipe for disabling an app a990c40
@codeinthehole codeinthehole Template fix for reviews dashboard
Deleted products were causing a template error.  Conditional template
tags to the rescue!
7ac85a5
@codeinthehole codeinthehole Fixed issue with delegating max_purchase_quantity to wrapper 5ee4165
Commits on Jun 15, 2012
@codeinthehole codeinthehole Added recipe on customising stock messaging c1fa49f
Commits on Jun 25, 2012
@paluh paluh Fix forms validation in product dashboard ac60ff8
Commits on Jun 26, 2012
@fjern fjern Display order status on anonymous order-status page 9425f13
@codeinthehole codeinthehole Merge pull request #221 from tangentlabs/product-view-validation
Fix forms validation in product dashboard
47d165a
Commits on Jun 27, 2012
@codeinthehole codeinthehole Reworked the way baskets are merged.
When merging a cookie basket with a user basket, we now set the new line
quantity to the max of that from the two baskets.  This is to prevent
stock rules being violated by merging these baskets.
a9e8334
Commits on Jun 28, 2012
@bitrut bitrut Make the cheapest shipping method the default one 1d5442a
@codeinthehole codeinthehole Merge pull request #222 from tangentlabs/cheapest_method_default
Make the cheapest shipping method the default one
ce13286
Commits on Jul 04, 2012
@codeinthehole codeinthehole Merge remote-tracking branch 'origin/releases/0.2' into releases/0.2 5bc51c5
@bitrut bitrut Some new template blocks to give more flexibility ebcb650
@codeinthehole codeinthehole Added fix for issue with users being able to bypass shipping.
Taking inspiration from Asia's pull request.
ec03e45
@codeinthehole codeinthehole Merge pull request #225 from tangentlabs/dashboard_order_detail
Dashboard order detail
3edc2bf
@codeinthehole codeinthehole Added checkout tests to prevent empty baskets being allowed in checkout 7f52fba
Commits on Jul 05, 2012
@codeinthehole codeinthehole Fixed but with missing method left if checkout views 559e010
@codeinthehole codeinthehole Added tests for anonymous checkout using a voucher 94c1a3c
@codeinthehole codeinthehole Merge branch 'releases/0.2' of github.com:tangentlabs/django-oscar in…
…to releases/0.2
98dc5ad
@codeinthehole codeinthehole Fixed template cancel link 5f67e38
@codeinthehole codeinthehole Updated message dispatcher to now always need an event_type 64feea8
@codeinthehole codeinthehole Merge branch 'releases/0.2'
Conflicts:
	oscar/__init__.py
	oscar/apps/basket/abstract_models.py
	oscar/apps/checkout/views.py
	tests/functional/basket_tests.py
4d5b02c
@codeinthehole codeinthehole Merge branch 'master' of github.com:tangentlabs/django-oscar 5927c0c
Something went wrong with that request. Please try again.