瀏覽代碼

Update links to Oscar repo

This reflects the change in the repo URL.
master
Maik Hoepfel 10 年之前
父節點
當前提交
afcef5d75f

+ 4
- 4
CHANGELOG.rst 查看文件

19
 
19
 
20
 Make ``AbstractStockRecord`` abstract (`#645`)
20
 Make ``AbstractStockRecord`` abstract (`#645`)
21
 
21
 
22
-.. _`#645`: https://github.com/tangentlabs/django-oscar/pull/645
22
+.. _`#645`: https://github.com/django-oscar/django-oscar/pull/645
23
 
23
 
24
 0.4.8 - 2013-04-08
24
 0.4.8 - 2013-04-08
25
 ------------------
25
 ------------------
26
 
26
 
27
 Fix bug with order dashboard line editing (`#622`_)
27
 Fix bug with order dashboard line editing (`#622`_)
28
 
28
 
29
-.. _`#622`: https://github.com/tangentlabs/django-oscar/pull/622
29
+.. _`#622`: https://github.com/django-oscar/django-oscar/pull/622
30
 
30
 
31
 0.4.7 - 2013-03-20
31
 0.4.7 - 2013-03-20
32
 ------------------
32
 ------------------
33
 
33
 
34
 Fix bug with order dashboard searching (`#587`_)
34
 Fix bug with order dashboard searching (`#587`_)
35
 
35
 
36
-.. _`#587`: https://github.com/tangentlabs/django-oscar/pull/587
36
+.. _`#587`: https://github.com/django-oscar/django-oscar/pull/587
37
 
37
 
38
 0.4.6 - 2013-03-05
38
 0.4.6 - 2013-03-05
39
 ------------------
39
 ------------------
135
 * Rework price lookups in offer calculations (backport of functionality from 0.4)
135
 * Rework price lookups in offer calculations (backport of functionality from 0.4)
136
 * Add additional block to profile template
136
 * Add additional block to profile template
137
 
137
 
138
-Diff: https://github.com/tangentlabs/django-oscar/compare/0.3.3...0.3.4
138
+Diff: https://github.com/django-oscar/django-oscar/compare/0.3.3...0.3.4
139
 
139
 
140
 0.3.3 - 2012-08-24
140
 0.3.3 - 2012-08-24
141
 -------------------
141
 -------------------

+ 2
- 2
README.rst 查看文件

38
 .. image:: https://travis-ci.org/django-oscar/django-oscar.svg?branch=master
38
 .. image:: https://travis-ci.org/django-oscar/django-oscar.svg?branch=master
39
     :target: https://travis-ci.org/django-oscar/django-oscar
39
     :target: https://travis-ci.org/django-oscar/django-oscar
40
 
40
 
41
-.. image:: https://coveralls.io/repos/tangentlabs/django-oscar/badge.png?branch=master
41
+.. image:: https://coveralls.io/repos/django-oscar/django-oscar/badge.png?branch=master
42
     :alt: Coverage
42
     :alt: Coverage
43
-    :target: https://coveralls.io/r/tangentlabs/django-oscar
43
+    :target: https://coveralls.io/r/django-oscar/django-oscar
44
 
44
 
45
 PyPI status:
45
 PyPI status:
46
 
46
 

+ 2
- 2
docs/source/howto/how_to_integrate_payment.rst 查看文件

37
 See also the sandbox for django-oscar-datacash_ which follows a similar pattern.
37
 See also the sandbox for django-oscar-datacash_ which follows a similar pattern.
38
 
38
 
39
 
39
 
40
-.. _django-oscar-paypal: https://github.com/tangentlabs/django-oscar-paypal/tree/master/sandbox
41
-.. _django-oscar-datacash: https://github.com/tangentlabs/django-oscar-datacash/tree/master/sandbox
40
+.. _django-oscar-paypal: https://github.com/django-oscar/django-oscar-paypal/tree/master/sandbox
41
+.. _django-oscar-datacash: https://github.com/django-oscar/django-oscar-datacash/tree/master/sandbox
42
 
42
 
43
 Integration into checkout
43
 Integration into checkout
44
 -------------------------
44
 -------------------------

+ 4
- 4
docs/source/index.rst 查看文件

52
 * Extension libraries available for many payment gateways, including PayPal_,
52
 * Extension libraries available for many payment gateways, including PayPal_,
53
   GoCardless_, DataCash_ and more.
53
   GoCardless_, DataCash_ and more.
54
 
54
 
55
-.. _PayPal: https://github.com/tangentlabs/django-oscar-paypal
56
-.. _GoCardless: https://github.com/tangentlabs/django-oscar-gocardless
57
-.. _DataCash: https://github.com/tangentlabs/django-oscar-datacash
55
+.. _PayPal: https://github.com/django-oscar/django-oscar-paypal
56
+.. _GoCardless: https://github.com/django-oscar/django-oscar-gocardless
57
+.. _DataCash: https://github.com/django-oscar/django-oscar-datacash
58
 
58
 
59
 Oscar is a good choice if your domain has non-trivial business logic.  Oscar's
59
 Oscar is a good choice if your domain has non-trivial business logic.  Oscar's
60
 flexibility means it's straightforward to implement business rules that would be
60
 flexibility means it's straightforward to implement business rules that would be
81
 mats to iPads.  The `source is on GitHub`_ - contributions are always welcome.
81
 mats to iPads.  The `source is on GitHub`_ - contributions are always welcome.
82
 
82
 
83
 .. _`Tangent Labs`: http://www.tangentlabs.co.uk
83
 .. _`Tangent Labs`: http://www.tangentlabs.co.uk
84
-.. _`source is on GitHub`: https://github.com/tangentlabs/django-oscar
84
+.. _`source is on GitHub`: https://github.com/django-oscar/django-oscar
85
 
85
 
86
 First steps
86
 First steps
87
 ===========
87
 ===========

+ 1
- 1
docs/source/internals/contributing/bugs-and-features.rst 查看文件

20
 
20
 
21
 All bugs are reported on our `GitHub issue tracker`_.
21
 All bugs are reported on our `GitHub issue tracker`_.
22
 
22
 
23
-.. _`GitHub issue tracker`: https://github.com/tangentlabs/django-oscar/issues
23
+.. _`GitHub issue tracker`: https://github.com/django-oscar/django-oscar/issues
24
 
24
 
25
 Reporting security issues
25
 Reporting security issues
26
 -------------------------
26
 -------------------------

+ 1
- 1
docs/source/internals/contributing/index.rst 查看文件

20
   and go ahead!
20
   and go ahead!
21
 
21
 
22
 .. _django-oscar: http://groups.google.com/group/django-oscar
22
 .. _django-oscar: http://groups.google.com/group/django-oscar
23
-.. _ticket tracker: https://github.com/tangentlabs/django-oscar/issues
23
+.. _ticket tracker: https://github.com/django-oscar/django-oscar/issues
24
 .. _Transifex: https://www.transifex.com/projects/p/django-oscar/
24
 .. _Transifex: https://www.transifex.com/projects/p/django-oscar/
25
 
25
 
26
 Overview
26
 Overview

+ 1
- 1
docs/source/internals/getting_help.rst 查看文件

14
 :doc:`Reporting bugs <contributing/bugs-and-features>` and report it
14
 :doc:`Reporting bugs <contributing/bugs-and-features>` and report it
15
 in the `GitHub issue tracker`_.
15
 in the `GitHub issue tracker`_.
16
 
16
 
17
-.. _`GitHub issue tracker`: https://github.com/tangentlabs/django-oscar/issues
17
+.. _`GitHub issue tracker`: https://github.com/django-oscar/django-oscar/issues
18
 
18
 

+ 1
- 1
docs/source/internals/getting_started.rst 查看文件

135
 :ref:`"Image not found" image <missing-image-label>` into ``MEDIA_ROOT``.
135
 :ref:`"Image not found" image <missing-image-label>` into ``MEDIA_ROOT``.
136
 
136
 
137
 .. _`configured correctly`: https://docs.djangoproject.com/en/1.7/howto/static-files/
137
 .. _`configured correctly`: https://docs.djangoproject.com/en/1.7/howto/static-files/
138
-.. _sandbox settings: https://github.com/tangentlabs/django-oscar/blob/3a5160a86c9b14c940c76a224a28cd37dd29f7f1/sites/sandbox/settings.py#L99
138
+.. _sandbox settings: https://github.com/django-oscar/django-oscar/blob/3a5160a86c9b14c940c76a224a28cd37dd29f7f1/sites/sandbox/settings.py#L99
139
 
139
 
140
 Modify your ``TEMPLATE_DIRS`` to include the main Oscar template directory:
140
 Modify your ``TEMPLATE_DIRS`` to include the main Oscar template directory:
141
 
141
 

+ 4
- 4
docs/source/internals/sandbox.rst 查看文件

59
 
59
 
60
 .. code-block:: bash
60
 .. code-block:: bash
61
 
61
 
62
-    $ git clone https://github.com/tangentlabs/django-oscar.git
62
+    $ git clone https://github.com/django-oscar/django-oscar.git
63
     $ cd django-oscar
63
     $ cd django-oscar
64
     $ mkvirtualenv oscar  # needs virtualenvwrapper
64
     $ mkvirtualenv oscar  # needs virtualenvwrapper
65
     (oscar) $ make sandbox
65
     (oscar) $ make sandbox
125
 * Payment with PayPal Express using django-oscar-paypal_.
125
 * Payment with PayPal Express using django-oscar-paypal_.
126
 * Payment with bankcards using Datacash using django-oscar-datacash_.
126
 * Payment with bankcards using Datacash using django-oscar-datacash_.
127
 
127
 
128
-.. _django-oscar-paypal: https://github.com/tangentlabs/django-oscar-paypal
129
-.. _django-oscar-datacash: https://github.com/tangentlabs/django-oscar-datacash
128
+.. _django-oscar-paypal: https://github.com/django-oscar/django-oscar-paypal
129
+.. _django-oscar-datacash: https://github.com/django-oscar/django-oscar-datacash
130
 
130
 
131
 .. note::
131
 .. note::
132
 
132
 
175
 The demo (initialised with a sample set of products) will be available
175
 The demo (initialised with a sample set of products) will be available
176
 at: http://localhost:8000.
176
 at: http://localhost:8000.
177
 
177
 
178
-.. _django-oscar-stores: https://github.com/tangentlabs/django-oscar-stores
178
+.. _django-oscar-stores: https://github.com/django-oscar/django-oscar-stores

+ 7
- 7
docs/source/releases/v0.5.1.rst 查看文件

27
   been added that cleans up the unnecessary database table.  Fixed in …
27
   been added that cleans up the unnecessary database table.  Fixed in …
28
   610de82eb2_
28
   610de82eb2_
29
 
29
 
30
-.. _7fd62f2af0: https://github.com/tangentlabs/django-oscar/commit/7fd62f2af078f950eeb278b97d01153b90b08e73
31
-.. _80384a4007: https://github.com/tangentlabs/django-oscar/commit/80384a40079590e1fb09d57f26095fa4e030fb27
32
-.. _5594bcccd6: https://github.com/tangentlabs/django-oscar/commit/5594bcccd67bfca6ec052ee635f0f0cbddc5dce5
33
-.. _cc5f63d827: https://github.com/tangentlabs/django-oscar/commit/cc5f63d827ce943e0ba1e7daa509cbd37b284c64 
34
-.. _fd256b63b1: https://github.com/tangentlabs/django-oscar/commit/fd256b63b184e08e33aa2802136a68d47bf4636e
35
-.. _02b3644e3c: https://github.com/tangentlabs/django-oscar/commit/02b3644e3c1f02959c3316d4291ec1c819c2baf7
36
-.. _610de82eb2: https://github.com/tangentlabs/django-oscar/commit/610de82eb25d00871ab1b30d01817c94d08bb96a
30
+.. _7fd62f2af0: https://github.com/django-oscar/django-oscar/commit/7fd62f2af078f950eeb278b97d01153b90b08e73
31
+.. _80384a4007: https://github.com/django-oscar/django-oscar/commit/80384a40079590e1fb09d57f26095fa4e030fb27
32
+.. _5594bcccd6: https://github.com/django-oscar/django-oscar/commit/5594bcccd67bfca6ec052ee635f0f0cbddc5dce5
33
+.. _cc5f63d827: https://github.com/django-oscar/django-oscar/commit/cc5f63d827ce943e0ba1e7daa509cbd37b284c64
34
+.. _fd256b63b1: https://github.com/django-oscar/django-oscar/commit/fd256b63b184e08e33aa2802136a68d47bf4636e
35
+.. _02b3644e3c: https://github.com/django-oscar/django-oscar/commit/02b3644e3c1f02959c3316d4291ec1c819c2baf7
36
+.. _610de82eb2: https://github.com/django-oscar/django-oscar/commit/610de82eb25d00871ab1b30d01817c94d08bb96a

+ 1
- 1
docs/source/releases/v0.5.2.rst 查看文件

15
 `The fix`_ uses Django's cryptographic signing functionality to sign the cookie
15
 `The fix`_ uses Django's cryptographic signing functionality to sign the cookie
16
 in a more secure manner.
16
 in a more secure manner.
17
 
17
 
18
-.. _`The fix`: https://github.com/tangentlabs/django-oscar/commit/876f723
18
+.. _`The fix`: https://github.com/django-oscar/django-oscar/commit/876f723

+ 1
- 1
docs/source/releases/v0.5.3.rst 查看文件

8
 Previously, ``setup.py`` specified ``2.0.0-beta`` but this beta release has now
8
 Previously, ``setup.py`` specified ``2.0.0-beta`` but this beta release has now
9
 been removed from PyPi, stopping Oscar from installing correctly.  
9
 been removed from PyPi, stopping Oscar from installing correctly.  
10
 
10
 
11
-.. _`pin the dependency on Haystack to version 2.0.0`: https://github.com/tangentlabs/django-oscar/commit/40ab98b
11
+.. _`pin the dependency on Haystack to version 2.0.0`: https://github.com/django-oscar/django-oscar/commit/40ab98b

+ 2
- 2
docs/source/releases/v0.5.rst 查看文件

166
 
166
 
167
 * Coverage data is now submitted to coveralls.io_
167
 * Coverage data is now submitted to coveralls.io_
168
 
168
 
169
-.. _coveralls.io: https://coveralls.io/r/tangentlabs/django-oscar
170
-.. _django-oscar-testsupport: https://github.com/tangentlabs/django-oscar-testsupport
169
+.. _coveralls.io: https://coveralls.io/r/django-oscar/django-oscar
170
+.. _django-oscar-testsupport: https://github.com/django-oscar/django-oscar-testsupport
171
 .. _tox: http://testrun.org/tox/latest/
171
 .. _tox: http://testrun.org/tox/latest/
172
 .. _Vagrant: http://www.vagrantup.com/
172
 .. _Vagrant: http://www.vagrantup.com/
173
 
173
 

+ 11
- 11
docs/source/releases/v0.6.1.rst 查看文件

73
 * `#1146`_ - Various templates were adjusted to gracefully handle deleted
73
 * `#1146`_ - Various templates were adjusted to gracefully handle deleted
74
   products.
74
   products.
75
 
75
 
76
-.. _`#1109`: https://github.com/tangentlabs/django-oscar/issues/1109
77
-.. _`#1121`: https://github.com/tangentlabs/django-oscar/issues/1121
78
-.. _`#1127`: https://github.com/tangentlabs/django-oscar/issues/1127
79
-.. _`#1128`: https://github.com/tangentlabs/django-oscar/issues/1128
80
-.. _`#1130`: https://github.com/tangentlabs/django-oscar/issues/1130
81
-.. _`#1132`: https://github.com/tangentlabs/django-oscar/issues/1132
82
-.. _`#1133`: https://github.com/tangentlabs/django-oscar/issues/1133
83
-.. _`#1134`: https://github.com/tangentlabs/django-oscar/issues/1134
84
-.. _`#1138`: https://github.com/tangentlabs/django-oscar/issues/1138
85
-.. _`#1146`: https://github.com/tangentlabs/django-oscar/issues/1146
86
-.. _`#1149`: https://github.com/tangentlabs/django-oscar/issues/1149
76
+.. _`#1109`: https://github.com/django-oscar/django-oscar/issues/1109
77
+.. _`#1121`: https://github.com/django-oscar/django-oscar/issues/1121
78
+.. _`#1127`: https://github.com/django-oscar/django-oscar/issues/1127
79
+.. _`#1128`: https://github.com/django-oscar/django-oscar/issues/1128
80
+.. _`#1130`: https://github.com/django-oscar/django-oscar/issues/1130
81
+.. _`#1132`: https://github.com/django-oscar/django-oscar/issues/1132
82
+.. _`#1133`: https://github.com/django-oscar/django-oscar/issues/1133
83
+.. _`#1134`: https://github.com/django-oscar/django-oscar/issues/1134
84
+.. _`#1138`: https://github.com/django-oscar/django-oscar/issues/1138
85
+.. _`#1146`: https://github.com/django-oscar/django-oscar/issues/1146
86
+.. _`#1149`: https://github.com/django-oscar/django-oscar/issues/1149
87
 .. _`Django's docs`: https://docs.djangoproject.com/en/dev/ref/models/fields/#django.db.models.ForeignKey.on_delete
87
 .. _`Django's docs`: https://docs.djangoproject.com/en/dev/ref/models/fields/#django.db.models.ForeignKey.on_delete
88
 
88
 

+ 5
- 5
docs/source/releases/v0.6.2.rst 查看文件

30
 * `#1127`_ - Remove a circular dependency bug around importing the `StockAlert`
30
 * `#1127`_ - Remove a circular dependency bug around importing the `StockAlert`
31
   model when indexing.
31
   model when indexing.
32
 
32
 
33
-.. _`#1159`: https://github.com/tangentlabs/django-oscar/issues/1159
34
-.. _`#1157`: https://github.com/tangentlabs/django-oscar/issues/1157
35
-.. _`#1127`: https://github.com/tangentlabs/django-oscar/issues/1127
36
-.. _`fa1f8403`: https://github.com/tangentlabs/django-oscar/commit/fa1f8403fb43af693766acafc520d10932a7f5b0
37
-.. _`reverting the original commit`: https://github.com/tangentlabs/django-oscar/commit/ec950cf9de16c68858bc095d980e478be8146f79
33
+.. _`#1159`: https://github.com/django-oscar/django-oscar/issues/1159
34
+.. _`#1157`: https://github.com/django-oscar/django-oscar/issues/1157
35
+.. _`#1127`: https://github.com/django-oscar/django-oscar/issues/1127
36
+.. _`fa1f8403`: https://github.com/django-oscar/django-oscar/commit/fa1f8403fb43af693766acafc520d10932a7f5b0
37
+.. _`reverting the original commit`: https://github.com/django-oscar/django-oscar/commit/ec950cf9de16c68858bc095d980e478be8146f79
38
 .. _`explicit installation instructions`: http://django-debug-toolbar.readthedocs.org/en/latest/installation.html#explicit-setup
38
 .. _`explicit installation instructions`: http://django-debug-toolbar.readthedocs.org/en/latest/installation.html#explicit-setup

+ 5
- 5
docs/source/releases/v0.6.3.rst 查看文件

25
 
25
 
26
 * `#1186`_ - Fix bug with dashboard order search
26
 * `#1186`_ - Fix bug with dashboard order search
27
 
27
 
28
-.. _`#1127`: https://github.com/tangentlabs/django-oscar/issues/1127
29
-.. _`#1166`: https://github.com/tangentlabs/django-oscar/issues/1166
30
-.. _`#1167`: https://github.com/tangentlabs/django-oscar/issues/1167
31
-.. _`#1176`: https://github.com/tangentlabs/django-oscar/issues/1176
32
-.. _`#1186`: https://github.com/tangentlabs/django-oscar/issues/1186
28
+.. _`#1127`: https://github.com/django-oscar/django-oscar/issues/1127
29
+.. _`#1166`: https://github.com/django-oscar/django-oscar/issues/1166
30
+.. _`#1167`: https://github.com/django-oscar/django-oscar/issues/1167
31
+.. _`#1176`: https://github.com/django-oscar/django-oscar/issues/1176
32
+.. _`#1186`: https://github.com/django-oscar/django-oscar/issues/1186

+ 5
- 5
docs/source/releases/v0.6.4.rst 查看文件

21
 * `#1275`_ - Dashboard partner user form now checks that the right fields are
21
 * `#1275`_ - Dashboard partner user form now checks that the right fields are
22
   picked up from the user model (see also `#1282`_, `#1283`_)
22
   picked up from the user model (see also `#1282`_, `#1283`_)
23
 
23
 
24
-.. _`#1177`: https://github.com/tangentlabs/django-oscar/issues/1177
25
-.. _`#1273`: https://github.com/tangentlabs/django-oscar/issues/1273
26
-.. _`#1275`: https://github.com/tangentlabs/django-oscar/issues/1275
27
-.. _`#1282`: https://github.com/tangentlabs/django-oscar/issues/1282
28
-.. _`#1283`: https://github.com/tangentlabs/django-oscar/issues/1283
24
+.. _`#1177`: https://github.com/django-oscar/django-oscar/issues/1177
25
+.. _`#1273`: https://github.com/django-oscar/django-oscar/issues/1273
26
+.. _`#1275`: https://github.com/django-oscar/django-oscar/issues/1275
27
+.. _`#1282`: https://github.com/django-oscar/django-oscar/issues/1282
28
+.. _`#1283`: https://github.com/django-oscar/django-oscar/issues/1283

+ 4
- 4
docs/source/releases/v0.6.rst 查看文件

218
 * PayPal Express integration using django-oscar-paypal_
218
 * PayPal Express integration using django-oscar-paypal_
219
 * Datacash integration using django-oscar-datacash_
219
 * Datacash integration using django-oscar-datacash_
220
 
220
 
221
-.. _django-oscar-paypal: https://github.com/tangentlabs/django-oscar-paypal
222
-.. _django-oscar-datacash: https://github.com/tangentlabs/django-oscar-datacash
223
-.. _django-oscar-stores: https://github.com/tangentlabs/django-oscar-stores
221
+.. _django-oscar-paypal: https://github.com/django-oscar/django-oscar-paypal
222
+.. _django-oscar-datacash: https://github.com/django-oscar/django-oscar-datacash
223
+.. _django-oscar-stores: https://github.com/django-oscar/django-oscar-stores
224
 
224
 
225
 See the :doc:`sandbox and demo site documentation </internals/sandbox>` for more details.  A publicly accessible version of the demo site
225
 See the :doc:`sandbox and demo site documentation </internals/sandbox>` for more details.  A publicly accessible version of the demo site
226
 is available at http://demo.oscarcommerce.com.
226
 is available at http://demo.oscarcommerce.com.
892
 using this extension, you should remove it as a dependency and use the
892
 using this extension, you should remove it as a dependency and use the
893
 analogous functionality from ``oscar/test/``.
893
 analogous functionality from ``oscar/test/``.
894
 
894
 
895
-.. _`Oscar test support library`: https://github.com/tangentlabs/django-oscar-testsupport
895
+.. _`Oscar test support library`: https://github.com/django-oscar/django-oscar-testsupport

+ 2
- 2
docs/source/releases/v0.7.1.rst 查看文件

14
 intended to be used in a preview (this is what `django-oscar-paypal`_ needs to
14
 intended to be used in a preview (this is what `django-oscar-paypal`_ needs to
15
 do).
15
 do).
16
 
16
 
17
-.. _`makes a change`: https://github.com/tangentlabs/django-oscar/commit/fbce17c
18
-.. _`django-oscar-paypal`: https://github.com/tangentlabs/django-oscar-paypal
17
+.. _`makes a change`: https://github.com/django-oscar/django-oscar/commit/fbce17c
18
+.. _`django-oscar-paypal`: https://github.com/django-oscar/django-oscar-paypal

+ 11
- 11
docs/source/releases/v0.7.rst 查看文件

66
 * Only products are returned by the core search view.  Other content types in
66
 * Only products are returned by the core search view.  Other content types in
67
   your search index are filtered out (`#370`_).
67
   your search index are filtered out (`#370`_).
68
 
68
 
69
-.. _`#370`: https://github.com/tangentlabs/django-oscar/issues/370
69
+.. _`#370`: https://github.com/django-oscar/django-oscar/issues/370
70
 
70
 
71
 Extended signals
71
 Extended signals
72
 ~~~~~~~~~~~~~~~~
72
 ~~~~~~~~~~~~~~~~
201
   extended to submit the Python and Django version in use.
201
   extended to submit the Python and Django version in use.
202
   Tracking is still easily disabled by setting ``OSCAR_TRACKING`` to ``False``.
202
   Tracking is still easily disabled by setting ``OSCAR_TRACKING`` to ``False``.
203
 
203
 
204
-.. _`#1202`: https://github.com/tangentlabs/django-oscar/pull/1202
205
-.. _`#1299`: https://github.com/tangentlabs/django-oscar/pull/1299
206
-.. _`b920f8ba`: https://github.com/tangentlabs/django-oscar/commit/b920f8ba288cd2f19bb167db2a012479ba956397
207
-.. _`ef3ccf08a7`: https://github.com/tangentlabs/django-oscar/commit/ef3ccf08a707ae1250cdb8d5f2dc6f721d020dc4
208
-.. _`32b7249`: https://github.com/tangentlabs/django-oscar/commit/32b7249e44b40cb1b20d01226f77ae6777a20b91
204
+.. _`#1202`: https://github.com/django-oscar/django-oscar/pull/1202
205
+.. _`#1299`: https://github.com/django-oscar/django-oscar/pull/1299
206
+.. _`b920f8ba`: https://github.com/django-oscar/django-oscar/commit/b920f8ba288cd2f19bb167db2a012479ba956397
207
+.. _`ef3ccf08a7`: https://github.com/django-oscar/django-oscar/commit/ef3ccf08a707ae1250cdb8d5f2dc6f721d020dc4
208
+.. _`32b7249`: https://github.com/django-oscar/django-oscar/commit/32b7249e44b40cb1b20d01226f77ae6777a20b91
209
 .. _`i18n_patterns`: https://docs.djangoproject.com/en/dev/topics/i18n/translation/#language-prefix-in-url-patterns
209
 .. _`i18n_patterns`: https://docs.djangoproject.com/en/dev/topics/i18n/translation/#language-prefix-in-url-patterns
210
 
210
 
211
 Bugfixes
211
 Bugfixes
219
 
219
 
220
 * Products can now be removed from categories (`#1289`_).
220
 * Products can now be removed from categories (`#1289`_).
221
 
221
 
222
-.. _`#1228`: https://github.com/tangentlabs/django-oscar/issues/1228
223
-.. _`#1289`: https://github.com/tangentlabs/django-oscar/issues/1289
224
-.. _`be04d46639`: https://github.com/tangentlabs/django-oscar/commit/
222
+.. _`#1228`: https://github.com/django-oscar/django-oscar/issues/1228
223
+.. _`#1289`: https://github.com/django-oscar/django-oscar/issues/1289
224
+.. _`be04d46639`: https://github.com/django-oscar/django-oscar/commit/
225
 
225
 
226
 .. _incompatible_changes_in_0.7:
226
 .. _incompatible_changes_in_0.7:
227
 
227
 
280
 * The methods ``get_error_response`` and ``can_basket_be_submitted`` have been
280
 * The methods ``get_error_response`` and ``can_basket_be_submitted`` have been
281
   removed from the ``PaymentDetailsView`` view class in checkout
281
   removed from the ``PaymentDetailsView`` view class in checkout
282
 
282
 
283
-.. _`#1123`: https://github.com/tangentlabs/django-oscar/pull/1123
284
-.. _`#1251`: https://github.com/tangentlabs/django-oscar/pull/1251
283
+.. _`#1123`: https://github.com/django-oscar/django-oscar/pull/1123
284
+.. _`#1251`: https://github.com/django-oscar/django-oscar/pull/1251
285
 
285
 
286
 Removal of features deprecated in 0.6
286
 Removal of features deprecated in 0.6
287
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
287
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+ 3
- 3
docs/source/releases/v1.0.rst 查看文件

494
   been adjusted to take the basket and the purchase info tuple as parameters
494
   been adjusted to take the basket and the purchase info tuple as parameters
495
   instead of the request instance (c74f57bf_ and 8ba283e8_).
495
   instead of the request instance (c74f57bf_ and 8ba283e8_).
496
 
496
 
497
-.. _c74f57bf: https://github.com/tangentlabs/django-oscar/commit/c74f57bf434661877f4d2d2259e7e7eb18b34951#diff-d200ac8746274e0307f512af886e1f3eR148
498
-.. _8ba283e8: https://github.com/tangentlabs/django-oscar/commit/8ba283e8c4239e4eff95da5e8097a17ecfadf5f5
497
+.. _c74f57bf: https://github.com/django-oscar/django-oscar/commit/c74f57bf434661877f4d2d2259e7e7eb18b34951#diff-d200ac8746274e0307f512af886e1f3eR148
498
+.. _8ba283e8: https://github.com/django-oscar/django-oscar/commit/8ba283e8c4239e4eff95da5e8097a17ecfadf5f5
499
 
499
 
500
 Misc
500
 Misc
501
 ~~~~
501
 ~~~~
601
   e.g. a ``datetime`` import that's pulled in via the star import. Any such
601
   e.g. a ``datetime`` import that's pulled in via the star import. Any such
602
   import errors will cause a loud failure and should be easy to spot and fix.
602
   import errors will cause a loud failure and should be easy to spot and fix.
603
 
603
 
604
-.. _rewritten: https://github.com/tangentlabs/django-oscar/commit/d8b4dbfed17be90846ea4bc47b5f7b39ad944c24
604
+.. _rewritten: https://github.com/django-oscar/django-oscar/commit/d8b4dbfed17be90846ea4bc47b5f7b39ad944c24
605
 
605
 
606
 Migrations
606
 Migrations
607
 ~~~~~~~~~~
607
 ~~~~~~~~~~

+ 5
- 5
oscar/templates/oscar/checkout/payment_details.html 查看文件

20
     {% block payment_details_content %}
20
     {% block payment_details_content %}
21
         <p>{% trans "This page needs implementing within your project.  You may want to use one of Oscar's payment gateway libraries:" %}</p>
21
         <p>{% trans "This page needs implementing within your project.  You may want to use one of Oscar's payment gateway libraries:" %}</p>
22
         <ul>
22
         <ul>
23
-            <li><a href="https://github.com/tangentlabs/django-oscar-paypal">django-oscar-paypal</a></li>
24
-            <li><a href="https://github.com/tangentlabs/django-oscar-datacash">django-oscar-datacash</a></li>
25
-            <li><a href="https://github.com/tangentlabs/django-oscar-gocardless">django-oscar-gocardless</a></li>
26
-            <li><a href="https://github.com/tangentlabs/django-oscar-paymentexpress">django-oscar-paymentexpress</a></li>
27
-            <li><a href="https://github.com/tangentlabs/django-oscar-accounts">django-oscar-accounts</a></li>
23
+            <li><a href="https://github.com/django-oscar/django-oscar-paypal">django-oscar-paypal</a></li>
24
+            <li><a href="https://github.com/django-oscar/django-oscar-datacash">django-oscar-datacash</a></li>
25
+            <li><a href="https://github.com/django-oscar/django-oscar-gocardless">django-oscar-gocardless</a></li>
26
+            <li><a href="https://github.com/django-oscar/django-oscar-paymentexpress">django-oscar-paymentexpress</a></li>
27
+            <li><a href="https://github.com/django-oscar/django-oscar-accounts">django-oscar-accounts</a></li>
28
         </ul>
28
         </ul>
29
         <a id="view_preview" href="{% url 'checkout:preview' %}" class="btn btn-primary btn-large">{% trans "Continue" %}</a>
29
         <a id="view_preview" href="{% url 'checkout:preview' %}" class="btn btn-primary btn-large">{% trans "Continue" %}</a>
30
     {% endblock payment_details_content %}
30
     {% endblock payment_details_content %}

+ 1
- 1
setup.py 查看文件

22
 
22
 
23
 setup(name='django-oscar',
23
 setup(name='django-oscar',
24
       version=get_version().replace(' ', '-'),
24
       version=get_version().replace(' ', '-'),
25
-      url='https://github.com/tangentlabs/django-oscar',
25
+      url='https://github.com/django-oscar/django-oscar',
26
       author="David Winterbottom",
26
       author="David Winterbottom",
27
       author_email="david.winterbottom@tangentlabs.co.uk",
27
       author_email="david.winterbottom@tangentlabs.co.uk",
28
       description="A domain-driven e-commerce framework for Django",
28
       description="A domain-driven e-commerce framework for Django",

+ 0
- 28
sites/sandbox/update_qa.sh 查看文件

1
-#!/usr/bin/env bash
2
-#
3
-# Updated the QA build to HEAD of the current git branch.
4
-
5
-cd /var/www/oscar/builds/qa/
6
-
7
-# Update any dependencies
8
-source ../../virtualenvs/qa/bin/activate
9
-python setup.py develop
10
-pip install -r requirements.txt
11
-
12
-# Run any new migrations
13
-cd sites/sandbox
14
-./manage.py syncdb --noinput
15
-./manage.py migrate
16
-./manage.py collectstatic --noinput
17
-
18
-# Re-compile python code
19
-touch deploy/wsgi/qa.wsgi
20
-
21
-# Copy down server config files
22
-cp deploy/nginx/qa.conf /etc/nginx/sites-enabled/qa.oscar.tangentlabs.co.uk
23
-/etc/init.d/nginx configtest && /etc/init.d/nginx force-reload
24
-cp deploy/apache2/qa.conf /etc/apache2/sites-enabled/qa.oscar.tangentlabs.co.uk
25
-/etc/init.d/apache2 reload
26
-
27
-# Copy down cronjob file
28
-cp deploy/cron.d/oscar /etc/cron.d/oscar-qa

Loading…
取消
儲存