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 May 21, 2012
@Geekfish Geekfish changed product manager to be loaded using get_class 333bd3d
@Geekfish Geekfish Merge branch 'releases/0.2' of github.com:tangentlabs/django-oscar in…
…to releases/0.2

Conflicts:
	oscar/apps/catalogue/abstract_models.py
9691041
Commits on May 29, 2012
@codeinthehole codeinthehole Fixed bug caused by lack of form prefixing 67b160f
@codeinthehole codeinthehole Hopefully fixed the final processing stats issue now 02cde41
Commits on May 30, 2012
Jon Price jobs 0057777, 0056911, 0060095, 0060100 + added a little more to FED …
…documentation
9bfbf0c
@Geekfish Geekfish Merge branch 'releases/0.2' of github.com:tangentlabs/django-oscar in…
…to releases/0.2
77f1401
@codeinthehole codeinthehole Added helper tax properties on Line model 9c71776
@codeinthehole codeinthehole Removed silly restriction on number of chars in a page URL d686f2a
@Geekfish Geekfish Merge branch 'releases/0.2' of github.com:tangentlabs/django-oscar in…
…to releases/0.2
aab5576
@Geekfish Geekfish added status url on the html email for anon users, fixed wording in p…
…laintext
cf61307
@codeinthehole codeinthehole Made the search query wildcardy - probably a bad thing but needed in …
…the shortterm
bb8f516
@codeinthehole codeinthehole Suppressed pesky stdout from hourly update script 8d17550
@codeinthehole codeinthehole Added support for downloadable products through checkout.
The session object now has methods for recording that shipping isn't
required for a given order.
22ef646
@codeinthehole codeinthehole Merge branch 'releases/0.2' of github.com:tangentlabs/django-oscar in…
…to releases/0.2
ea2f603
Commits on May 31, 2012
@codeinthehole codeinthehole Merge pull request #203 from informa/master
Resubmitted pull request
1bc3d60
@codeinthehole codeinthehole Removed hard-coded 'book's from templates 23914a2
@codeinthehole codeinthehole Adjusted variant product display bc9775f
@codeinthehole codeinthehole Added handling of zero available shipping methods 4b39ef0
@paluh paluh Add "select all" checkbox also in order items table 2179eac
@codeinthehole codeinthehole Merge pull request #204 from tangentlabs/select-all-in-order-items-table
Select all in order items table
7b57639
@codeinthehole codeinthehole Minor correction for weight being None in scales 0537ba6
@codeinthehole codeinthehole Altered shipping scales to use attribute code, not name adfc96c
@codeinthehole codeinthehole Merge branch 'releases/0.2' of github.com:tangentlabs/django-oscar in…
…to releases/0.2
a3bd202
@codeinthehole codeinthehole Fixed tests for scales 52fd1a1
@codeinthehole codeinthehole Fixed attribute value display in template 00ad5fe
@codeinthehole codeinthehole Slight tidy-up of reviews on catalogue detail page e3e7fcc
@codeinthehole codeinthehole Tweaked JS for disabling submit button 6336eaf
@codeinthehole codeinthehole Merge branch 'releases/0.2' 504922a
@codeinthehole codeinthehole Reverted version to 0.3 97437fc
Something went wrong with that request. Please try again.