Permalink
Browse files

Merge branch 'releases/0.2'

  • Loading branch information...
2 parents 89ef9c5 + 61a16ba commit db91e3b2677b106df436eb4813b1e20bfe35cc3d @codeinthehole codeinthehole committed Jun 1, 2012
Showing with 14 additions and 15 deletions.
  1. +14 −14 README.rst
  2. +0 −1 oscar/static/oscar/js/oscar/ui.js
View
@@ -10,20 +10,6 @@ core functionality can be customised to suit the needs of your project. This
allows it to handle a wide range of e-commerce requirements, from large-scale B2C
sites to complex B2B sites rich in domain-specific business logic.
-Case studies
-------------
-
-Oscar is still in active development, but is used in production by a range of
-companies, from large multinationals to small, boutique stores:
-
-* Tata Group - http://www.landmarkonthenet.com
-* Carlsberg - Their global "We Deliver More" platform is powered by Oscar (but
- is a B2B site so it not browsable by the public).
-* Dolbeau - http://www.dolbeau.ca/
-* The UK Labour party - http://shop.labour.org.uk (will be live in early June)
-
-Many more on the way.
-
This README is just a stub - see the following links for more details
information:
@@ -56,3 +42,17 @@ Oscar is released under the permissive `New BSD license`_.
.. _`@codeinthehole`: https://twitter.com/codeinthehole
.. _`Tangent Labs`: http://www.tangentlabs.co.uk
.. _`New BSD license`: https://github.com/tangentlabs/django-oscar/blob/master/LICENSE
+
+Case studies
+------------
+
+Oscar is still in active development, but is used in production by a range of
+companies, from large multinationals to small, boutique stores:
+
+* Tata Group - http://www.landmarkonthenet.com
+* Carlsberg - Their global "We Deliver More" platform is powered by Oscar (but
+ is a B2B site so it not browsable by the public).
+* Dolbeau - http://www.dolbeau.ca/
+* The UK Labour party - http://shop.labour.org.uk (will be live in early June)
+
+Many more on the way.
@@ -90,7 +90,6 @@ $(document).ready(function()
// This activates elastislide
var es_carousel = $('.es-carousel-wrapper'),
product_page = $('.product_page').length;
- console.log(es_carousel.length);
// on prodct page
if (es_carousel.length && product_page > 0) {
es_carousel.elastislide({

0 comments on commit db91e3b

Please sign in to comment.