David Winterbottom
dfdbbb3dfb
Added client test for anonymous checkout
14 years ago
David Winterbottom
e80dbc62e6
Merge branch 'master' of github.com:tangentlabs/django-oscar
14 years ago
David Winterbottom
3187cc2d42
Merge pull request #54 from owad/master
Added import exception class which was missing.
14 years ago
David Winterbottom
2574a83369
Fixed a few minor bugs with checking out
14 years ago
Łukasz Lechowicz
3e82a8677f
added empty CatalogueImportException class
14 years ago
David Winterbottom
596de7d561
Renamed stock sample data files
14 years ago
David Winterbottom
d2076e1ea7
Removed images (as they are now in a .tar.gz)
14 years ago
David Winterbottom
2997ef5f44
Merge branch 'master' into stock-and-thumbnails
14 years ago
David Winterbottom
de8a532cbc
Added new status for frozen baskets
14 years ago
David Winterbottom
7dae8b8a26
Removed BasketFactory
14 years ago
David Winterbottom
17b39ab7b4
Middleware baskets now work with signed in users and saved baskets
14 years ago
David Winterbottom
3ac94db7f7
Middleware baskets now working for anon users
14 years ago
David Winterbottom
0303aa98a0
Renamed item.html, fixed typo
14 years ago
David Winterbottom
a80364de46
Added a list of templates to try for a product detail page.
You can now use oscar/product/detail-for-upc-<UPC>.html
and /oscar/product/detail/detail-for-class-<ITEMCLASS>.html
to override the template for certain products.
14 years ago
David Winterbottom
9674ac9ca9
Fixed locals() usage missed in last commit
14 years ago
David Winterbottom
9a9d21d9be
Replaced render with TemplateResponse, and stopped using locals() in templates
14 years ago
David Winterbottom
4823d1a12e
Added basket as FK for DC transaction - this can be important for audit
14 years ago
David Winterbottom
cf572d0cec
Added bulk loading of baskets from text input
14 years ago
David Winterbottom
ef04db1a81
Added handling of bad credentials within Datacash adapter
14 years ago
David Winterbottom
0fa310b70c
Added mock dependency to requirements-dev.txt
14 years ago
David Winterbottom
84b4709952
Added a "see more" link to promotions
14 years ago
David Winterbottom
8fb8e54b78
Updated payment for datacash demo models
14 years ago
David Winterbottom
b7317e240c
Merge branch 'datacash'
Conflicts:
oscar/apps/checkout/core_views.py
oscar/apps/checkout/views.py
oscar/apps/customer/views.py
14 years ago
David Winterbottom
64f686faef
Slight re-ordering
14 years ago
David Winterbottom
8284d2fa8a
Added helper text for when partner name isn't recognised
14 years ago
David Winterbottom
7a2a4e2eef
Moved import_catalogue into the partner app
14 years ago
David Winterbottom
c841c62632
Minor tidy-up of stock import command
14 years ago
David Winterbottom
ecccc1c355
Merge remote branch 'andrew/master' into stock-and-thumbnails
14 years ago
David Winterbottom
7710074264
Merge branch 'master' of github.com:tangentlabs/django-oscar
14 years ago
David Winterbottom
2a141edfeb
Added a design decisions doc
14 years ago
David Winterbottom
bf4a6b4142
Fixed tests that were trying to set raw_html
14 years ago
David Winterbottom
06b34d4430
Edited docs/source/ecommerce_domain.rst via GitHub
14 years ago
David Winterbottom
53d9f91daa
Merge branch 'tabbed-promotions'
14 years ago
David Winterbottom
5e7cc38b3f
Added tabbed promotions - they still need a better dashboard though
14 years ago
David Winterbottom
0062c91b25
Merge pull request #51 from sk1p/patch-2
remove duplicate mark_step_as_complete from oscar.apps.checkout.core_views
14 years ago
David Winterbottom
827a2abda3
Merge pull request #50 from sk1p/patch-1
fix merge error and adjust some default values to reality
14 years ago
Alexander Clausen
e7b094fe88
remove duplicate mark_step_as_complete from oscar.apps.checkout.core_views
14 years ago
Alexander Clausen
b470a484af
Adjust import paths for INSTALLED_APPS in docs.
This syncs the documentation with the 'vanilla' example
14 years ago
Alexander Clausen
b591c1299f
fix merge error and adjust some default values to reality
14 years ago
Andrew Ingram
7719ee7f1a
Merge branch 'master' of github.com:tangentlabs/django-oscar
14 years ago
Andrew Ingram
88cd5bff0f
Tweaked BaseImageHandler slightly to load overridden mods rather than ImageModifier itself
14 years ago
Andrew Ingram
3135537d73
Removed apache sendfile backend because I haven't checked it works yet.
Tweaked DiskCache backend to work correctly with Nginx's X-Accel_Redirect
14 years ago
Andrew Ingram
8c86992762
Merge branch 'master' of github.com:AndrewIngram/django-oscar
Conflicts:
oscar/apps/image/dynamic/__init__.py
14 years ago
Andrew Ingram
163e856480
Added concept of response backends to image resizer, so it's now trivial to use something like X-Sendfile and X-Accel-Redirect rather than serving the image data directly through the app.
Moved exceptions into their own module to avoid circular imports
14 years ago
AndrewIngram
0303a1ceb4
Fixed a comment that was no longer accurate
14 years ago
David Winterbottom
56592c6948
Added error handling for when an item exists in the DB but not on the filesystem
14 years ago
David Winterbottom
02c7668ffb
Removed uploaded images from repo
14 years ago
David Winterbottom
15e4141356
Fixed run_tests.sh
14 years ago
David Winterbottom
76718cb676
Merge branch 'master' of https://github.com/kinygos/django-oscar into kinygos
14 years ago
David Winterbottom
d235c536a4
Updated installation docs
14 years ago