Costas Basdekis
7b7e436472
Fix several issues for Django 1.6
12 years ago
andrefsp
a662141224
Replace wysihtml5 with TinyMCE editor 4.0.10
bootstrap-wysihtml5 was too buggy. I was trying to avoid TinyMCE but it ended up
being the easier to use. I tried with CKEditor but it proved too
difficult to configure.
Fixes #757
Fixes #946
Fixes #945
Fixes #944
12 years ago
David Winterbottom
4c8cdce9a0
Rename basket Line properties for clarity
Previous names were ambiguous as to whether discounts were being
included or excluded.
12 years ago
David Winterbottom
3931d3b1cf
Extend offers to work when taxes aren't known
This involves some quite involved changes to the internals of how offers
and organised. A new boolean field has been added to the offer model to
indicate whether to apply to prices exclusive of tax. This is used
within the offer methods to determine whether a basket meets a
condition, and how to apply the benefit if it does.
Fixes #925
Fixes #924
12 years ago
David Winterbottom
2f3516165a
Merge branch 'master' of github.com:tangentlabs/django-oscar
12 years ago
David Winterbottom
8a91f3ae2b
Merge pull request #638
Conflicts:
oscar/apps/dashboard/catalogue/views.py
oscar/apps/dashboard/partners/views.py
oscar/apps/dashboard/reviews/views.py
oscar/templates/oscar/dashboard/catalogue/product_list.html
oscar/templates/oscar/dashboard/orders/order_list.html
oscar/templates/oscar/dashboard/pages/index.html
oscar/templates/oscar/dashboard/ranges/range_list.html
oscar/templates/oscar/dashboard/reports/partials/open_basket_report.html
oscar/templates/oscar/dashboard/reports/partials/order_report.html
oscar/templates/oscar/dashboard/reports/partials/submitted_basket_report.html
oscar/templates/oscar/dashboard/reports/partials/user_report.html
12 years ago
David Winterbottom
2135d3cbf7
Merge pull request #939 from schoonc/fixduplicatefield
Remove duplicate "Date joined" field
12 years ago
David Winterbottom
c8007155d3
Update demo checkout for 0.6
Fix issue with submit() method and a few other small issues.
Fixes #913
12 years ago
David Winterbottom
a4b5396486
Adjust demo shipping methods for 0.6
12 years ago
David Winterbottom
42f1a64229
Remove suggestions view from search app
This will return in a stronger form for v0.7.
12 years ago
David Winterbottom
ddd870fb35
Remove import_module
12 years ago
David Winterbottom
3d57529671
Minor search tweaks
The start of a final push to get search ready for 0.6.
12 years ago
David Winterbottom
4f0a1ce3d3
Use a PyPI version of Haystack
This requires a more recent version of Whoosh for the sandbox too.
12 years ago
David Winterbottom
d33f3f1c55
Use correct radio value for checkout gateway form
This fixes a bug where selecting "anonymous" checkout would think you
wanted to register first.
12 years ago
David Winterbottom
a2f720b75b
Don't --use-mirrors in Makefile
12 years ago
David Winterbottom
2684ea65f7
Merge pull request #785
12 years ago
David Winterbottom
ba57af3c5b
Don't hide shipping address form
Fixes #872
12 years ago
David Winterbottom
bcdb0046ee
Fix breadcrumb on order history detail template
12 years ago
David Winterbottom
7e696bc47f
Correct import syntax in middleware
12 years ago
David Winterbottom
0ab0c4b9d5
Correct call to Basket.add
Middleware incorrectly had the old API
Fixes #911
12 years ago
David Winterbottom
c1ebd55b3c
Merge pull request #948 from benburry/master
STATIC_URL incorrectly quoted in documentation
12 years ago
Alex Crawley
c30ca41fce
Add more blocks to dashboard product page
12 years ago
David Winterbottom
028be1523c
Add related_name to payment.Source
12 years ago
David Winterbottom
c8d28c689c
Split dashboard JS to make replacing WYSIWYG editor easier
12 years ago
Maik Hoepfel
2845638ceb
Fix typo in Exception and remove unused import
I noticed the error message as it was thrown in my failing tests for the
permission-based dashboard.
12 years ago
Ben Burry
41b56bd326
Remove quotes around STATIC_URL
12 years ago
David Winterbottom
89d12c8701
Add Google analytics to demo and sandbox
12 years ago
David Winterbottom
6aa631af46
Adjust checkout templates to allow tax to be shown separately
This is to support the US market where taxes are shown separately from
other prices. This change requires a custom template variable to be
used, show_tax_separately.
12 years ago
David Winterbottom
b2216419cc
Merge pull request #940 from therefromhere/patch-1
Template typo
12 years ago
David Winterbottom
441cf79c10
Correct RST image syntax
12 years ago
David Winterbottom
e954d405ca
Add Bitdeli badge to README
12 years ago
David Winterbottom
ed28ecad71
Adjust how shipping methods are handled in the repository class
The old Repository class wasn't thread safe as the method instances were
created at compile time. Since the instance is configured by setting
the basket for each request, this poses thread safety issues as two
requests could share the same method instance (one of which would have
the wrong basket assigned).
This change fiddles with how the methods are handled, ensuring that they
are instanciated within the instance methods so that thread-safety
issues go away.
Shipping methods need a gentle rewrite for v0.7 to ensure they aren't
vulnerable to such issues.
12 years ago
David Winterbottom
33db96dce9
Adjust order detail template to break out tax-exclusive costs
This is useful in the US where taxes are treated separately from other
charges.
12 years ago
John Carter
a036e02fba
Template typo
12 years ago
Alexander
efc81a6373
Remove duplicate "Date joined" field
12 years ago
David Winterbottom
c68e4760a5
Adjust screenshot thumbs
12 years ago
David Winterbottom
13c3cf61e5
Add garmsby.co.uk to README case studies
12 years ago
David Winterbottom
09ec1dc924
Comment out template timings from demo settings
12 years ago
David Winterbottom
c4d818242f
Update demo templates
Use strategy to look-up prices and availability
12 years ago
David Winterbottom
468277918d
Add 'retail' price property to base price object
12 years ago
David Winterbottom
d2e1e4089f
Disable template timings panel by default
12 years ago
David Winterbottom
7bcca0d6d3
Merge pull request #923 from tangentlabs/issue/923-dont-fallback
Don't fallback to default apps when ImportError is raised
12 years ago
David Winterbottom
b1bf90e4f2
Add FP Sport as new case study to README
12 years ago
David Winterbottom
0c6994d050
Tweak to range template
12 years ago
David Winterbottom
ea2cecfb0f
Cover range improvements in v0.6 release notes
12 years ago
David Winterbottom
e69ecd58d9
Add description field to range
12 years ago
David Winterbottom
6c1ef81731
Add customer-facing range detail view
12 years ago
David Winterbottom
fb33321ce5
Change field name to is_public
12 years ago
Alex Crawley
f4848cdaa6
Allow ranges to be be public
12 years ago
itbabu
7979e9422c
Ensure migrations reference appropriate user model
Fixes were required inthe basket, order, partner and wishlist apps.
12 years ago