Merge branch 'master' into delete_with_save_kwargs

Conflicts:
	oscar/apps/checkout/mixins.py
	oscar/apps/customer/views.py
	oscar/templates/oscar/dashboard/orders/order_detail.html

.coveragerc

@@ -1,2 +1,3 @@
 [run]
 source = oscar
+omit = *migrations*

.gitignore

@@ -1,8 +1,8 @@
 # Packaging
 *.pyc
 *.egg-info
-dist/
-build/
+/dist/
+/build/
 
 # Vagrant
 .vagrant
@@ -21,26 +21,28 @@ build/
 .idea
 
 # Docs
-docs/build/*
+/docs/build/*
 *.pdf
 TODO
 
 # Test files
 .coverage
+.noseids
 coverage.xml
 violations.txt
 nosetests.xml
-htmlcov/*
-.tox/*
+/htmlcov/*
+/.tox/*
 
 # Example sites
 settings_local.py
-sites/sandbox/*.sqlite
-sites/sandbox/assets/
-sites/sandbox/public/
-sites/sandbox/whoosh_index/
-sites/sandbox/logs/
-sites/demo/*.sqlite
-sites/demo/assets/
-sites/demo/public/
-sites/demo/whoosh_index/
+/sites/sandbox/*.sqlite
+/sites/sandbox/assets/
+/sites/sandbox/public/
+/sites/sandbox/whoosh_index/
+/sites/sandbox/logs/
+/sites/demo/*.sqlite
+/sites/demo/assets/
+/sites/demo/public/
+/sites/demo/whoosh_index/
+/sites/demo/logs/

.mailmap

@@ -0,0 +1,11 @@
+Andrew Ingram <andrew.ingram@tangentlabs.co.uk> AndrewIngram <andy@andrewingram.net>
+Sebastian Vetter <sebastian.vetter@tangentone.com.au> Sebastian Vetter <sebastian@roadside-developer.com> Sebastian Vetter <sebastian.vetter@tangentsnowball.com.au>
+Andy Sellick <andy.sellick@tangentone.co.uk> Andy Sellick <andy.sellick@tangentsnowball.com>
+Patryk Zawadzki <patrys@pld-linux.org> Patryk Zawadzki <patrys@room-303.com>
+John Papanastasiou <johnpapps@hotmail.com> John Papanastasiou <johnpapps@ubuntu.(none)>
+Jonathan Moss <jonathan.moss@tangentone.com.au> Jonathan Moss <xirisr@gmail.com>
+Kura <kura@deviling.net> Kura <kura@tangentlabs.co.uk>
+Mohammad Abbas <mohammad.abbas86@gmail.com> Mohammad Abbas <mohammad@mohammad-abbas.(none)> Mohammad Abbas <mohammad@mohammad-laptop.(none)>
+Oliver Randell <oliverrandell@gmail.com> OliverRandell <oliverrandell@gmail.com>
+Paweł Kowalski <bitrut@gmail.com> Paweł Kowalski <contact@pawelkowalski.info>
+Łukasz Lechowicz <llechowicz@gmail.com> Łukasz Lechowicz <owad@owad.(none)>

.travis.yml

@@ -1,14 +1,21 @@
 language: python
 python:
-  - 2.6
-  - 2.7
+- '2.6'
+- '2.7'
 env:
-# NOTE: easy_install *will* downgrade if setup.py specifies a max version
-# This leads to seemingly passing tests
-  - DJANGO_VERSION=1.4.5
-install: 
-  - easy_install Django==$DJANGO_VERSION
+  global:
+    # $TRANSIFEX_PASSWORD for oscar_bot (used in transifex.sh)
+    secure: FuIlzEsGJiAwhaIRBmRNsq9eXmuzs25fX6BChknW4lDyVAySWMp0+Zps9Bd0JgfFYUG3Ip+OTmksYIoTUsG25ZJS9cq1IFt3QKUAN70YCI/4ZBLeIdICPEyxq+Km179+NeEXmBUug17RLMLxh3MWfO+RKUHK9yHIPNNpq0dNyoo=
+  matrix:
+  - DJANGO_VERSION=1.4.10
+  - DJANGO_VERSION=1.5.5
+install:
+- easy_install Django==$DJANGO_VERSION
+before_script:
+  - mysql -e 'create database oscar_vagrant;'
+  - psql -c 'create database oscar_vagrant;' -U postgres
 script:
-  - make travis
+- make travis
 after_success:
-  - coveralls
+- coveralls
+- ./transifex.sh

AUTHORS

@@ -1,11 +1,18 @@
-The PRIMARY AUTHORS are:
-
-* David Winterbottom <david.winterbottom@gmail.com>
-* Andrew Ingram
-* Sebastian Vetter 
-
-Significant contributions from:
-
-* Patryk Zawadzki
-* Tomasz Rybarczyk
-* Janusz Harkot
+David Winterbottom
+Sebastian Vetter
+Andrew Ingram
+Jon Price
+Maik Hoepfel
+Asia Biega
+Andy Sellick
+Tomasz Rybarczyk
+Eleni Lixourioti
+OliverRandell
+Kura
+Paweł Kowalski
+Dawid Lorenz
+Pavel Vavruska
+Jonathan Moss
+Janusz Harkot
+Patryk Zawadzki
+AndrewIngram

CHANGELOG.rst

@@ -4,6 +4,67 @@ Changelog
 
 For releases after 0.4, see the release notes in the docs.
 
+0.4.11 - 2013-08-08
+-------------------
+
+Add extra blocks to order dashboard template.
+
+0.4.10 - 2013-07-03
+-------------------
+
+Extend range of bankcard expiry month field.
+
+0.4.9 - 2013-04-17
+------------------
+
+Make ``AbstractStockRecord`` abstract (`#645`)
+
+.. _`#645`: https://github.com/tangentlabs/django-oscar/pull/645
+
+0.4.8 - 2013-04-08
+------------------
+
+Fix bug with order dashboard line editing (`#622`_)
+
+.. _`#622`: https://github.com/tangentlabs/django-oscar/pull/622
+
+0.4.7 - 2013-03-20
+------------------
+
+Fix bug with order dashboard searching (`#587`_)
+
+.. _`#587`: https://github.com/tangentlabs/django-oscar/pull/587
+
+0.4.6 - 2013-03-05
+------------------
+
+Fix dependencies in ``setup.py``
+
+0.4.4 - 2013-01-25
+------------------
+
+Extend ``get_class`` to support loading from non-Oscar packages
+
+0.4.4 - 2013-01-16
+------------------
+
+Correct django-haystack in setup.py
+
+0.4.3 - 2013-01-16
+------------------
+
+Pin django-haystack version as backwards-incompatiable changes are happening
+
+0.4.2 - 2012-12-14
+------------------
+
+Nano-release to fix logout redirect bug
+
+0.4.1 - 2012-12-06
+------------------
+
+Nano-release to bump dependency versions.
+
 0.4 - 2012-10-19
 ----------------
 
@@ -53,6 +114,29 @@ changes.
 
 Please ask on the mailing list if any other problems are encountered.
 
+0.3.7 - 2013-07-03
+------------------
+* Extend number of years in bankcard expiry field
+
+0.3.6 - 2013-04-08
+-------------------
+* Fix line-handling bug in order dashboard.
+
+0.3.5 - 2012-09-28
+------------------
+A couple of minor adjustments for Tangent projects
+
+* Add handling of custom redirect after adding to basket
+* Add recursive URL decoration
+
+0.3.4 - 2012-09-24
+------------------
+
+* Rework price lookups in offer calculations (backport of functionality from 0.4)
+* Add additional block to profile template
+
+Diff: https://github.com/tangentlabs/django-oscar/compare/0.3.3...0.3.4
+
 0.3.3 - 2012-08-24
 -------------------
 
@@ -111,6 +195,11 @@ instead of::
     # base.html
     {% extends 'templates/base.html' %}
 
+0.2.2 - 13 July 2012
+~~~~~~~~~~~~~~~~~~~~
+
+Fixes a bug with applying absolute-discount benefits
+
 
 0.2.1 - 09 July 2012
 --------------------

MANIFEST.in

@@ -1,6 +1,8 @@
 include *.rst
+include AUTHORS
+include LICENSE
 recursive-include oscar/templates *.txt *.html
 recursive-include oscar/apps *.json
 recursive-include oscar/fixtures *.json
 recursive-include oscar/static *
-recursive-include oscar/locale *.po
+recursive-include oscar/locale *.po *.mo

Makefile

@@ -2,7 +2,7 @@
 .PHONY: install upgrade sandbox demo coverage ci i18n lint travis docs
 
 install:
-	pip install -r requirements.txt --use-mirrors
+	pip install -r requirements.txt
 	python setup.py develop
 
 upgrade:
@@ -15,27 +15,42 @@ sandbox: install
 	sites/sandbox/manage.py syncdb --noinput
 	sites/sandbox/manage.py migrate
 	# Import some fixtures
-	sites/sandbox/manage.py oscar_import_catalogue sites/_fixtures/books-catalogue.csv
-	sites/sandbox/manage.py oscar_import_catalogue_images sites/_fixtures/books-images.tar.gz
+	sites/sandbox/manage.py oscar_import_catalogue sites/sandbox/fixtures/*.csv
+	sites/sandbox/manage.py oscar_import_catalogue_images sites/sandbox/fixtures/images.tar.gz
 	sites/sandbox/manage.py loaddata countries.json sites/_fixtures/pages.json sites/_fixtures/auth.json sites/_fixtures/ranges.json sites/_fixtures/offers.json
-	sites/sandbox/manage.py rebuild_index --noinput
+	sites/sandbox/manage.py clear_index --noinput
+	sites/sandbox/manage.py update_index catalogue
+
+geoip:
+	wget http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
+	gunzip GeoLiteCity.dat.gz
+	mv GeoLiteCity.dat sites/demo/geoip
 
 demo: install
-	-rm -f sites/demo/db.sqlite
+	# Install additional requirements
+	pip install -r requirements_demo.txt
 	# Create database
+	sites/demo/manage.py reset_db --router=default --noinput
 	sites/demo/manage.py syncdb --noinput
 	sites/demo/manage.py migrate
-	# Import some fixtures
-	sites/demo/manage.py oscar_import_catalogue sites/_fixtures/books-catalogue.csv
-	sites/demo/manage.py oscar_import_catalogue_images sites/_fixtures/books-images.tar.gz
-	sites/demo/manage.py loaddata countries.json sites/_fixtures/pages.json sites/_fixtures/auth.json sites/_fixtures/ranges.json
-	sites/demo/manage.py rebuild_index --noinput
+	# Import some core fixtures
+	sites/demo/manage.py loaddata countries.json sites/_fixtures/pages.json
+	# Create catalogue (create product classes from fixture than import CSV files)
+	sites/demo/manage.py loaddata sites/demo/fixtures/auth.json sites/demo/fixtures/offers.json
+	sites/demo/manage.py loaddata sites/demo/fixtures/product-classes.json sites/demo/fixtures/product-attributes.json sites/demo/fixtures/shipping-event-types.json
+	sites/demo/manage.py create_products --class=Books sites/demo/fixtures/books.csv
+	sites/demo/manage.py create_products --class=Downloads sites/demo/fixtures/downloads.csv
+	sites/demo/manage.py create_products --class=Clothing sites/demo/fixtures/clothing.csv
+	sites/demo/manage.py import_product_images sites/demo/fixtures/images/
+	# Update search index
+	sites/demo/manage.py clear_index --noinput
+	sites/demo/manage.py update_index catalogue
 
 docs:
 	cd docs && make html
 
 coverage:
-	coverage run ./runtests.py
+	coverage run ./runtests.py --with-xunit
 	coverage xml -i
 
 # We probably should use upgrade instead of install here but we have a conflict
@@ -51,6 +66,8 @@ lint:
 # and upgrade would overwrite it.  We also build the sandbox as part of this target
 # to catch any errors that might come from that build process.
 travis: install lint coverage sandbox
+	pip install -r requirements_vagrant.txt
+	cd sites/sandbox && ./test_migrations.sh
 
 messages:
 	# Create the .po files used for i18n
@@ -62,16 +79,27 @@ compiledmessages:
 
 puppet:
 	# Install puppet modules required to set-up a Vagrant box
+	mkdir -p sites/puppet/modules
 	rm -rf sites/puppet/modules/*
 	puppet module install --target-dir sites/puppet/modules/ saz-memcached -v 2.0.2
 	puppet module install --target-dir sites/puppet/modules/ puppetlabs/mysql
 	puppet module install --target-dir sites/puppet/modules/ puppetlabs/apache
 	git clone git://github.com/akumria/puppet-postgresql.git sites/puppet/modules/postgresql
-	git clone git://github.com/uggedal/puppet-module-python.git sites/puppet/modules/python
+	git clone git://github.com/puppetmodules/puppet-module-python.git sites/puppet/modules/python
 	git clone git://github.com/codeinthehole/puppet-userconfig.git sites/puppet/modules/userconfig
 
 css:
 	# Compile CSS files from LESS
 	lessc oscar/static/oscar/less/styles.less > oscar/static/oscar/css/styles.css
 	lessc oscar/static/oscar/less/responsive.less > oscar/static/oscar/css/responsive.css
 	lessc oscar/static/oscar/less/dashboard.less > oscar/static/oscar/css/dashboard.css
+
+demo_css:
+	# Compile CSS for demo site
+	lessc sites/demo/static/demo/less/styles.less > sites/demo/static/demo/css/styles.css
+	lessc sites/demo/static/demo/less/responsive.less > sites/demo/static/demo/css/responsive.css
+
+clean:
+	# Remove files not in source control
+	find . -type f -name "*.pyc" -delete
+	rm -rf nosetests.xml coverage.xml htmlcov *.egg-info *.pdf dist violations.txt