Merge 65dea3e into 2776fb0

django-oscar · Nov 10, 2014 · 44a1657 · 44a1657
2 parents 2776fb0 + 65dea3e
commit 44a1657
Show file tree

Hide file tree

Showing 241 changed files with 77,695 additions and 53,682 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,17 +13,8 @@ env:
         - DJANGO=Django==1.6.8
         - DJANGO=Django==1.7.1
 
-matrix:
-    # South does not support Python 3.x
-    allow_failures:
-        - env: "DJANGO=Django==1.6.8"
-          python: '3.3'
-        - env: "DJANGO=Django==1.6.8"
-          python: '3.4'
-
 install:
-    - make install
-    - easy_install $DJANGO
+    - pip install -e . -r requirements.txt $DJANGO
 
 before_script:
     # Create testing databases for running migrations against
@@ -38,5 +29,4 @@ script:
 
 after_success:
     - coveralls
-    # TODO: Re-enable once 0.8 final is released
-    # - ./transifex.sh
+    - ./transifex.sh
diff --git a/AUTHORS b/AUTHORS
@@ -12,9 +12,9 @@ Eleni Lixourioti
 Tomasz Rybarczyk
 Andy Sellick
 Kura
+Michael van Tellingen
 Pavel Vavruska
 Patryk Zawadzki
-Michael van Tellingen
 Jonathan Moss
 andysellick
 Paweł Kowalski

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -19,21 +19,21 @@ Extend range of bankcard expiry month field.
 
 Make ``AbstractStockRecord`` abstract (`#645`)
 
-.. _`#645`: https://github.com/tangentlabs/django-oscar/pull/645
+.. _`#645`: https://github.com/django-oscar/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
+.. _`#622`: https://github.com/django-oscar/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
+.. _`#587`: https://github.com/django-oscar/django-oscar/pull/587
 
 0.4.6 - 2013-03-05
 ------------------
@@ -135,7 +135,7 @@ A couple of minor adjustments for Tangent projects
 * 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
+Diff: https://github.com/django-oscar/django-oscar/compare/0.3.3...0.3.4
 
 0.3.3 - 2012-08-24
 -------------------

diff --git a/Makefile b/Makefile
@@ -2,8 +2,7 @@
 .PHONY: install sandbox geoip demo docs coverage lint travis messages compiledmessages css clean preflight make_sandbox make_demo
 
 install:
-	pip install -r requirements.txt
-	python setup.py develop
+	pip install -e . -r requirements.txt
 
 build_sandbox:
 	# Remove media

diff --git a/README.rst b/README.rst
@@ -38,9 +38,9 @@ Continuous integration status:
 .. image:: https://travis-ci.org/django-oscar/django-oscar.svg?branch=master
     :target: https://travis-ci.org/django-oscar/django-oscar
 
-.. image:: https://coveralls.io/repos/tangentlabs/django-oscar/badge.png?branch=master
+.. image:: https://coveralls.io/repos/django-oscar/django-oscar/badge.png?branch=master
     :alt: Coverage
-    :target: https://coveralls.io/r/tangentlabs/django-oscar
+    :target: https://coveralls.io/r/django-oscar/django-oscar
 
 PyPI status:
 
@@ -74,13 +74,13 @@ Core team:
 
 - `David Winterbottom`_ (Twitter `@codeinthehole`_)
 - `Maik Hoepfel`_ (Twitter `@maikhoepfel`_)
-- `Marcus Bertheau_`
+- `Markus Bertheau`_
 
 .. _`David Winterbottom`: https://github.com/codeinthehole
 .. _`@codeinthehole`: https://twitter.com/codeinthehole
 .. _`Maik Hoepfel`: https://github.com/maikhoepfel
 .. _`@maikhoepfel`: https://twitter.com/maikhoepfel
-.. _`Marcus Bertheau`: https://github.com/mbertheau
+.. _`Markus Bertheau`: https://github.com/mbertheau
 
 Screenshots
 -----------

diff --git a/create_migration.sh b/create_migration.sh
@@ -22,7 +22,7 @@ sites/sandbox/manage.py migrate
 sites/sandbox/manage.py makemigrations ${APPS[@]}
 
 echo "Generating Django 1.6 migrations"
-pip install "Django==1.6.8" "South==1.0"
+pip install "Django==1.6.8" "South==1.0.1"
 rm -f sites/sandbox/db.sqlite
 sites/sandbox/manage.py syncdb --noinput
 sites/sandbox/manage.py migrate

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -58,7 +58,6 @@
 
 # General information about the project.
 project = u'django-oscar'
-copyright = u'2010-2014, Tangent Labs'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

diff --git a/docs/source/howto/how_to_integrate_payment.rst b/docs/source/howto/how_to_integrate_payment.rst
@@ -37,8 +37,8 @@ django-oscar-paypal_ extension.  Please use that as a reference.
 See also the sandbox for django-oscar-datacash_ which follows a similar pattern.
 
 
-.. _django-oscar-paypal: https://github.com/tangentlabs/django-oscar-paypal/tree/master/sandbox
-.. _django-oscar-datacash: https://github.com/tangentlabs/django-oscar-datacash/tree/master/sandbox
+.. _django-oscar-paypal: https://github.com/django-oscar/django-oscar-paypal/tree/master/sandbox
+.. _django-oscar-datacash: https://github.com/django-oscar/django-oscar-datacash/tree/master/sandbox
 
 Integration into checkout
 -------------------------

diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -14,11 +14,7 @@ has flexibility baked into its core so that complicated requirements can be
 elegantly captured. You can tame a spaghetti domain without writing spaghetti
 code.
 
-Oscar is maintained by `Tangent Snowball`_, who are experts in building complex
-transactional sites for both B2C and B2B markets. Years of e-commerce
-hard-earned experience informs Oscar's design. 
-
-.. _`Tangent Snowball`: http://www.tangentsnowball.com/
+Years of e-commerce hard-earned experience informs Oscar's design.
 
 Oscar is "domain-driven" in the sense that the core business objects can be
 customised to suit the domain at hand. In this way, your application can
@@ -52,9 +48,9 @@ Features:
 * Extension libraries available for many payment gateways, including PayPal_,
   GoCardless_, DataCash_ and more.
 
-.. _PayPal: https://github.com/tangentlabs/django-oscar-paypal
-.. _GoCardless: https://github.com/tangentlabs/django-oscar-gocardless
-.. _DataCash: https://github.com/tangentlabs/django-oscar-datacash
+.. _PayPal: https://github.com/django-oscar/django-oscar-paypal
+.. _GoCardless: https://github.com/django-oscar/django-oscar-gocardless
+.. _DataCash: https://github.com/django-oscar/django-oscar-datacash
 
 Oscar is a good choice if your domain has non-trivial business logic.  Oscar's
 flexibility means it's straightforward to implement business rules that would be
@@ -80,8 +76,7 @@ Example requirements that Oscar projects already handle:
 Oscar is used in production in several applications to sell everything from beer
 mats to iPads.  The `source is on GitHub`_ - contributions are always welcome.
 
-.. _`Tangent Labs`: http://www.tangentlabs.co.uk
-.. _`source is on GitHub`: https://github.com/tangentlabs/django-oscar
+.. _`source is on GitHub`: https://github.com/django-oscar/django-oscar
 
 First steps
 ===========

diff --git a/docs/source/internals/contributing/bugs-and-features.rst b/docs/source/internals/contributing/bugs-and-features.rst
@@ -20,7 +20,7 @@ general points:
 
 All bugs are reported on our `GitHub issue tracker`_.
 
-.. _`GitHub issue tracker`: https://github.com/tangentlabs/django-oscar/issues
+.. _`GitHub issue tracker`: https://github.com/django-oscar/django-oscar/issues
 
 Reporting security issues
 -------------------------

diff --git a/docs/source/internals/contributing/development-environment.rst b/docs/source/internals/contributing/development-environment.rst
@@ -43,7 +43,7 @@ against::
 Writing LESS/CSS
 ----------------
 
-Oscar's CSS files are built using LESS_.  However, the sandbox defaults to
+Oscar's CSS files are built using LESS_ V1.  However, the sandbox defaults to
 serving CSS files directly, bypassing LESS compilation.
 
 .. _LESS: http://lesscss.org/
@@ -58,7 +58,7 @@ in ``sites/sandbox/settings_local.py``.  This will cause Oscar to use
 work, you will need to ensure that the LESS compiler ``lessc`` is installed.
 Using npm, install LESS using::
 
-    npm install less
+    npm install less@'<2.0.0'
 
 .. _`django-compressor`: http://django_compressor.readthedocs.org/en/latest/
 

diff --git a/docs/source/internals/contributing/index.rst b/docs/source/internals/contributing/index.rst
@@ -20,7 +20,7 @@ can contribute in many ways:
   and go ahead!
 
 .. _django-oscar: http://groups.google.com/group/django-oscar
-.. _ticket tracker: https://github.com/tangentlabs/django-oscar/issues
+.. _ticket tracker: https://github.com/django-oscar/django-oscar/issues
 .. _Transifex: https://www.transifex.com/projects/p/django-oscar/
 
 Overview

diff --git a/docs/source/internals/getting_help.rst b/docs/source/internals/getting_help.rst
@@ -14,5 +14,5 @@ If you think you found a bug, please read
 :doc:`Reporting bugs <contributing/bugs-and-features>` and report it
 in the `GitHub issue tracker`_.
 
-.. _`GitHub issue tracker`: https://github.com/tangentlabs/django-oscar/issues
+.. _`GitHub issue tracker`: https://github.com/django-oscar/django-oscar/issues
 
diff --git a/docs/source/internals/getting_started.rst b/docs/source/internals/getting_started.rst
@@ -135,7 +135,7 @@ files from a remote storage (e.g. Amazon S3), you must manually copy a
 :ref:`"Image not found" image <missing-image-label>` into ``MEDIA_ROOT``.
 
 .. _`configured correctly`: https://docs.djangoproject.com/en/1.7/howto/static-files/
-.. _sandbox settings: https://github.com/tangentlabs/django-oscar/blob/3a5160a86c9b14c940c76a224a28cd37dd29f7f1/sites/sandbox/settings.py#L99
+.. _sandbox settings: https://github.com/django-oscar/django-oscar/blob/3a5160a86c9b14c940c76a224a28cd37dd29f7f1/sites/sandbox/settings.py#L99
 
 Modify your ``TEMPLATE_DIRS`` to include the main Oscar template directory:
 

diff --git a/docs/source/internals/sandbox.rst b/docs/source/internals/sandbox.rst
@@ -59,7 +59,7 @@ Install Oscar and its dependencies within a virtualenv:
 
 .. code-block:: bash
 
-    $ git clone https://github.com/tangentlabs/django-oscar.git
+    $ git clone https://github.com/django-oscar/django-oscar.git
     $ cd django-oscar
     $ mkvirtualenv oscar  # needs virtualenvwrapper
     (oscar) $ make sandbox
@@ -125,8 +125,8 @@ The customisations on top of core Oscar include:
 * Payment with PayPal Express using django-oscar-paypal_.
 * Payment with bankcards using Datacash using django-oscar-datacash_.
 
-.. _django-oscar-paypal: https://github.com/tangentlabs/django-oscar-paypal
-.. _django-oscar-datacash: https://github.com/tangentlabs/django-oscar-datacash
+.. _django-oscar-paypal: https://github.com/django-oscar/django-oscar-paypal
+.. _django-oscar-datacash: https://github.com/django-oscar/django-oscar-datacash
 
 .. note::
 
@@ -175,4 +175,4 @@ Now build the demo site:
 The demo (initialised with a sample set of products) will be available
 at: http://localhost:8000.
 
-.. _django-oscar-stores: https://github.com/tangentlabs/django-oscar-stores
+.. _django-oscar-stores: https://github.com/django-oscar/django-oscar-stores
diff --git a/docs/source/releases/index.rst b/docs/source/releases/index.rst
@@ -36,9 +36,17 @@ Release notes for each version of Oscar published to PyPI.
     v0.7.2
     v0.7.3
 
-0.8 release branch
+1.0 release branch
 
 .. toctree::
     :maxdepth: 1
 
-    v0.8
+    v1.0
+    v1.0.1
+
+1.1 release branch
+
+.. toctree::
+    :maxdepth: 1
+
+    v1.1
diff --git a/docs/source/releases/v0.5.1.rst b/docs/source/releases/v0.5.1.rst
@@ -27,10 +27,10 @@ This release contains fixes for the following issues:
   been added that cleans up the unnecessary database table.  Fixed in …
   610de82eb2_
 
-.. _7fd62f2af0: https://github.com/tangentlabs/django-oscar/commit/7fd62f2af078f950eeb278b97d01153b90b08e73
-.. _80384a4007: https://github.com/tangentlabs/django-oscar/commit/80384a40079590e1fb09d57f26095fa4e030fb27
-.. _5594bcccd6: https://github.com/tangentlabs/django-oscar/commit/5594bcccd67bfca6ec052ee635f0f0cbddc5dce5
-.. _cc5f63d827: https://github.com/tangentlabs/django-oscar/commit/cc5f63d827ce943e0ba1e7daa509cbd37b284c64 
-.. _fd256b63b1: https://github.com/tangentlabs/django-oscar/commit/fd256b63b184e08e33aa2802136a68d47bf4636e
-.. _02b3644e3c: https://github.com/tangentlabs/django-oscar/commit/02b3644e3c1f02959c3316d4291ec1c819c2baf7
-.. _610de82eb2: https://github.com/tangentlabs/django-oscar/commit/610de82eb25d00871ab1b30d01817c94d08bb96a
+.. _7fd62f2af0: https://github.com/django-oscar/django-oscar/commit/7fd62f2af078f950eeb278b97d01153b90b08e73
+.. _80384a4007: https://github.com/django-oscar/django-oscar/commit/80384a40079590e1fb09d57f26095fa4e030fb27
+.. _5594bcccd6: https://github.com/django-oscar/django-oscar/commit/5594bcccd67bfca6ec052ee635f0f0cbddc5dce5
+.. _cc5f63d827: https://github.com/django-oscar/django-oscar/commit/cc5f63d827ce943e0ba1e7daa509cbd37b284c64
+.. _fd256b63b1: https://github.com/django-oscar/django-oscar/commit/fd256b63b184e08e33aa2802136a68d47bf4636e
+.. _02b3644e3c: https://github.com/django-oscar/django-oscar/commit/02b3644e3c1f02959c3316d4291ec1c819c2baf7
+.. _610de82eb2: https://github.com/django-oscar/django-oscar/commit/610de82eb25d00871ab1b30d01817c94d08bb96a
diff --git a/docs/source/releases/v0.5.2.rst b/docs/source/releases/v0.5.2.rst
@@ -15,4 +15,4 @@ possible that this method weakens the security of the ``SECRET_KEY``.
 `The fix`_ uses Django's cryptographic signing functionality to sign the cookie
 in a more secure manner.
 
-.. _`The fix`: https://github.com/tangentlabs/django-oscar/commit/876f723
+.. _`The fix`: https://github.com/django-oscar/django-oscar/commit/876f723
diff --git a/docs/source/releases/v0.5.3.rst b/docs/source/releases/v0.5.3.rst
@@ -8,4 +8,4 @@ The only change from 0.5.2 is to `pin the dependency on Haystack to version 2.0.
 Previously, ``setup.py`` specified ``2.0.0-beta`` but this beta release has now
 been removed from PyPi, stopping Oscar from installing correctly.  
 
-.. _`pin the dependency on Haystack to version 2.0.0`: https://github.com/tangentlabs/django-oscar/commit/40ab98b
+.. _`pin the dependency on Haystack to version 2.0.0`: https://github.com/django-oscar/django-oscar/commit/40ab98b
diff --git a/docs/source/releases/v0.5.rst b/docs/source/releases/v0.5.rst
@@ -166,8 +166,8 @@ projects):
 
 * Coverage data is now submitted to coveralls.io_
 
-.. _coveralls.io: https://coveralls.io/r/tangentlabs/django-oscar
-.. _django-oscar-testsupport: https://github.com/tangentlabs/django-oscar-testsupport
+.. _coveralls.io: https://coveralls.io/r/django-oscar/django-oscar
+.. _django-oscar-testsupport: https://github.com/django-oscar/django-oscar-testsupport
 .. _tox: http://testrun.org/tox/latest/
 .. _Vagrant: http://www.vagrantup.com/
 

diff --git a/docs/source/releases/v0.6.1.rst b/docs/source/releases/v0.6.1.rst
@@ -73,16 +73,16 @@ The following bugs were fixed:
 * `#1146`_ - Various templates were adjusted to gracefully handle deleted
   products.
 
-.. _`#1109`: https://github.com/tangentlabs/django-oscar/issues/1109
-.. _`#1121`: https://github.com/tangentlabs/django-oscar/issues/1121
-.. _`#1127`: https://github.com/tangentlabs/django-oscar/issues/1127
-.. _`#1128`: https://github.com/tangentlabs/django-oscar/issues/1128
-.. _`#1130`: https://github.com/tangentlabs/django-oscar/issues/1130
-.. _`#1132`: https://github.com/tangentlabs/django-oscar/issues/1132
-.. _`#1133`: https://github.com/tangentlabs/django-oscar/issues/1133
-.. _`#1134`: https://github.com/tangentlabs/django-oscar/issues/1134
-.. _`#1138`: https://github.com/tangentlabs/django-oscar/issues/1138
-.. _`#1146`: https://github.com/tangentlabs/django-oscar/issues/1146
-.. _`#1149`: https://github.com/tangentlabs/django-oscar/issues/1149
+.. _`#1109`: https://github.com/django-oscar/django-oscar/issues/1109
+.. _`#1121`: https://github.com/django-oscar/django-oscar/issues/1121
+.. _`#1127`: https://github.com/django-oscar/django-oscar/issues/1127
+.. _`#1128`: https://github.com/django-oscar/django-oscar/issues/1128
+.. _`#1130`: https://github.com/django-oscar/django-oscar/issues/1130
+.. _`#1132`: https://github.com/django-oscar/django-oscar/issues/1132
+.. _`#1133`: https://github.com/django-oscar/django-oscar/issues/1133
+.. _`#1134`: https://github.com/django-oscar/django-oscar/issues/1134
+.. _`#1138`: https://github.com/django-oscar/django-oscar/issues/1138
+.. _`#1146`: https://github.com/django-oscar/django-oscar/issues/1146
+.. _`#1149`: https://github.com/django-oscar/django-oscar/issues/1149
 .. _`Django's docs`: https://docs.djangoproject.com/en/dev/ref/models/fields/#django.db.models.ForeignKey.on_delete
 
diff --git a/docs/source/releases/v0.6.2.rst b/docs/source/releases/v0.6.2.rst
@@ -30,9 +30,9 @@ The following bugs were fixed:
 * `#1127`_ - Remove a circular dependency bug around importing the `StockAlert`
   model when indexing.
 
-.. _`#1159`: https://github.com/tangentlabs/django-oscar/issues/1159
-.. _`#1157`: https://github.com/tangentlabs/django-oscar/issues/1157
-.. _`#1127`: https://github.com/tangentlabs/django-oscar/issues/1127
-.. _`fa1f8403`: https://github.com/tangentlabs/django-oscar/commit/fa1f8403fb43af693766acafc520d10932a7f5b0
-.. _`reverting the original commit`: https://github.com/tangentlabs/django-oscar/commit/ec950cf9de16c68858bc095d980e478be8146f79
+.. _`#1159`: https://github.com/django-oscar/django-oscar/issues/1159
+.. _`#1157`: https://github.com/django-oscar/django-oscar/issues/1157
+.. _`#1127`: https://github.com/django-oscar/django-oscar/issues/1127
+.. _`fa1f8403`: https://github.com/django-oscar/django-oscar/commit/fa1f8403fb43af693766acafc520d10932a7f5b0
+.. _`reverting the original commit`: https://github.com/django-oscar/django-oscar/commit/ec950cf9de16c68858bc095d980e478be8146f79
 .. _`explicit installation instructions`: http://django-debug-toolbar.readthedocs.org/en/latest/installation.html#explicit-setup
diff --git a/docs/source/releases/v0.6.3.rst b/docs/source/releases/v0.6.3.rst
@@ -25,8 +25,8 @@ The following issues were fixed:
 
 * `#1186`_ - Fix bug with dashboard order search
 
-.. _`#1127`: https://github.com/tangentlabs/django-oscar/issues/1127
-.. _`#1166`: https://github.com/tangentlabs/django-oscar/issues/1166
-.. _`#1167`: https://github.com/tangentlabs/django-oscar/issues/1167
-.. _`#1176`: https://github.com/tangentlabs/django-oscar/issues/1176
-.. _`#1186`: https://github.com/tangentlabs/django-oscar/issues/1186
+.. _`#1127`: https://github.com/django-oscar/django-oscar/issues/1127
+.. _`#1166`: https://github.com/django-oscar/django-oscar/issues/1166
+.. _`#1167`: https://github.com/django-oscar/django-oscar/issues/1167
+.. _`#1176`: https://github.com/django-oscar/django-oscar/issues/1176
+.. _`#1186`: https://github.com/django-oscar/django-oscar/issues/1186
diff --git a/docs/source/releases/v0.6.4.rst b/docs/source/releases/v0.6.4.rst
@@ -21,8 +21,8 @@ The following issues were fixed:
 * `#1275`_ - Dashboard partner user form now checks that the right fields are
   picked up from the user model (see also `#1282`_, `#1283`_)
 
-.. _`#1177`: https://github.com/tangentlabs/django-oscar/issues/1177
-.. _`#1273`: https://github.com/tangentlabs/django-oscar/issues/1273
-.. _`#1275`: https://github.com/tangentlabs/django-oscar/issues/1275
-.. _`#1282`: https://github.com/tangentlabs/django-oscar/issues/1282
-.. _`#1283`: https://github.com/tangentlabs/django-oscar/issues/1283
+.. _`#1177`: https://github.com/django-oscar/django-oscar/issues/1177
+.. _`#1273`: https://github.com/django-oscar/django-oscar/issues/1273
+.. _`#1275`: https://github.com/django-oscar/django-oscar/issues/1275
+.. _`#1282`: https://github.com/django-oscar/django-oscar/issues/1282
+.. _`#1283`: https://github.com/django-oscar/django-oscar/issues/1283