Przeglądaj źródła

Updated changelog/readme/version ahead of 0.3 release

master
David Winterbottom 13 lat temu
rodzic
commit
a6292605bc
3 zmienionych plików z 59 dodań i 18 usunięć
  1. 24
    8
      CHANGELOG.rst
  2. 31
    6
      README.rst
  3. 4
    4
      oscar/__init__.py

+ 24
- 8
CHANGELOG.rst Wyświetl plik

3
 =========
3
 =========
4
 
4
 
5
 0.3 
5
 0.3 
6
-~~~
6
+---
7
 
7
 
8
-**Important** - A new setting ``OSCAR_MAIN_TEMPLATE_DIR`` has been introduced
8
+* i18n support added - Oscar now ships with .po files for seven languages.
9
+  Translation files are welcome.
10
+* Category management added to dashboard
11
+* Some improvements to how group/variant products are handled
12
+* Improved installation process using makefile
13
+
14
+Migrations
15
+~~~~~~~~~~
16
+
17
+There are 3 new migrations in the catalogue app.  If you have a local version,
18
+you will need to run::
19
+
20
+    ./manage.py schemamigration catalogue --auto
21
+
22
+to pick up the changes in Oscar's catalogue app.
23
+
24
+Breaking changes
25
+~~~~~~~~~~~~~~~~
26
+
27
+A new setting ``OSCAR_MAIN_TEMPLATE_DIR`` has been introduced
9
 as the template structure has been altered.  This requires your
28
 as the template structure has been altered.  This requires your
10
 ``TEMPLATE_DIRS`` setting to be altered to include this folder, eg::
29
 ``TEMPLATE_DIRS`` setting to be altered to include this folder, eg::
11
 
30
 
25
     # base.html
44
     # base.html
26
     {% extends 'templates/base.html' %}
45
     {% extends 'templates/base.html' %}
27
 
46
 
28
-* Category management added to dashboard
29
-
30
-* Some improvements to how group/variant products are handled
31
 
47
 
32
 0.2.1 - 09 July 2012
48
 0.2.1 - 09 July 2012
33
-~~~~~~~~~~~~~~~~~~~~
49
+--------------------
34
 
50
 
35
 Mainly small bug-fixes to templates and javascript.  
51
 Mainly small bug-fixes to templates and javascript.  
36
 
52
 
37
 0.2 - 01 June 2012
53
 0.2 - 01 June 2012
38
-~~~~~~~~~~~~~~~~~~
54
+------------------
39
 
55
 
40
 Many components have been rewritten since 0.1 - Oscar is much more of a complete
56
 Many components have been rewritten since 0.1 - Oscar is much more of a complete
41
 package now.  New features include:
57
 package now.  New features include:
56
 two.
72
 two.
57
 
73
 
58
 0.1
74
 0.1
59
-~~~
75
+---
60
 
76
 
61
 * Initial release - used in production by two major applications at Tangent but
77
 * Initial release - used in production by two major applications at Tangent but
62
   still quite rough around the edges.  Many features were implemented directly
78
   still quite rough around the edges.  Many features were implemented directly

+ 31
- 6
README.rst Wyświetl plik

15
 * `Official homepage`_ 
15
 * `Official homepage`_ 
16
 * `Sandbox site`_ (an hourly build of the unstable master branch - it's
16
 * `Sandbox site`_ (an hourly build of the unstable master branch - it's
17
   experimental but feel free to explore and get a feel for the base Oscar
17
   experimental but feel free to explore and get a feel for the base Oscar
18
-  install) 
18
+  install.  Dashboard access coming soon!) 
19
 * `Documentation`_ on the excellent `readthedocs.org`_
19
 * `Documentation`_ on the excellent `readthedocs.org`_
20
 * `Google Group`_ - the mailing list is django-oscar@googlegroups.com
20
 * `Google Group`_ - the mailing list is django-oscar@googlegroups.com
21
 * `Continuous integration homepage`_ on `travis-ci.org`_
21
 * `Continuous integration homepage`_ on `travis-ci.org`_
38
 and maintained by `Tangent Labs`_, a London-based digital agency, with help from
38
 and maintained by `Tangent Labs`_, a London-based digital agency, with help from
39
 `Mirumee`.
39
 `Mirumee`.
40
 
40
 
41
+.. _`David Winterbottom`: http://codeinthehole.com
42
+.. _`@codeinthehole`: https://twitter.com/codeinthehole
43
+.. _`Tangent Labs`: http://www.tangentlabs.co.uk
44
+.. _`Mirumee`: http://mirumee.com/
45
+
46
+Extensions
47
+----------
48
+
49
+* django-oscar-datacash_ - Integration with the DataCash_ payment gateway
50
+* django-oscar-paypal_ - Integration with PayPal.  This currently supports both
51
+  `Express Checkout`_ and `PayFlow Pro`_.
52
+* django-oscar-gocardless_ - Integration with the GoCardless_ payment gateway
53
+* django-oscar-jirafe_ - Integration with the Jirafe_ analytics package
54
+
55
+.. _django-oscar-datacash: https://github.com/tangentlabs/django-oscar-datacash
56
+.. _DataCash: http://www.datacash.com/
57
+.. _django-oscar-paypal: https://github.com/tangentlabs/django-oscar-paypal
58
+.. _`Express Checkout`: https://www.paypal.com/uk/cgi-bin/webscr?cmd=_additional-payment-ref-impl1
59
+.. _`PayFlow Pro`: https://merchant.paypal.com/us/cgi-bin/?cmd=_render-content&content_ID=merchant/payment_gateway
60
+.. _django-oscar-gocardless: https://github.com/tangentlabs/django-oscar-gocardless
61
+.. _GoCardless: https://gocardless.com/
62
+.. _django-oscar-jirafe: https://github.com/tangentlabs/django-oscar-jirafe
63
+.. _Jirafe: https://jirafe.com/
64
+
41
 License
65
 License
42
 -------
66
 -------
43
 
67
 
44
 Oscar is released under the permissive `New BSD license`_.
68
 Oscar is released under the permissive `New BSD license`_.
45
 
69
 
46
-.. _`David Winterbottom`: http://codeinthehole.com
47
-.. _`@codeinthehole`: https://twitter.com/codeinthehole
48
-.. _`Tangent Labs`: http://www.tangentlabs.co.uk
49
 .. _`New BSD license`: https://github.com/tangentlabs/django-oscar/blob/master/LICENSE
70
 .. _`New BSD license`: https://github.com/tangentlabs/django-oscar/blob/master/LICENSE
50
-.. _`Mirumee`: http://mirumee.com/
51
 
71
 
52
 Case studies
72
 Case studies
53
 ------------
73
 ------------
55
 Oscar is still in active development, but is used in production by a range of
75
 Oscar is still in active development, but is used in production by a range of
56
 companies, from large multinationals to small, boutique stores:
76
 companies, from large multinationals to small, boutique stores:
57
 
77
 
78
+Tangent projects:
79
+
58
 * Tata Group - http://www.landmarkonthenet.com
80
 * Tata Group - http://www.landmarkonthenet.com
59
 * Carlsberg - Their global "We Deliver More" platform is powered by Oscar (but
81
 * Carlsberg - Their global "We Deliver More" platform is powered by Oscar (but
60
   is a B2B site so it not browsable by the public).
82
   is a B2B site so it not browsable by the public).
61
-* Dolbeau - http://www.dolbeau.ca/
62
 * The UK Labour party - http://shop.labour.org.uk
83
 * The UK Labour party - http://shop.labour.org.uk
63
 
84
 
85
+Non-Tangent:
86
+
87
+* Dolbeau - http://www.dolbeau.ca/
88
+
64
 Many more on the way.  If you use Oscar in production, please let us know.
89
 Many more on the way.  If you use Oscar in production, please let us know.

+ 4
- 4
oscar/__init__.py Wyświetl plik

3
 # Use 'final' as the 4th element to indicate
3
 # Use 'final' as the 4th element to indicate
4
 # a full release
4
 # a full release
5
 
5
 
6
-VERSION = (0, 3, 0, 'alpha', 0)
7
-    
6
+VERSION = (0, 3, 0, 'final')
7
+
8
 def get_short_version():
8
 def get_short_version():
9
     return '%s.%s' % (VERSION[0], VERSION[1])
9
     return '%s.%s' % (VERSION[0], VERSION[1])
10
 
10
 
20
     return version
20
     return version
21
 
21
 
22
 
22
 
23
-# Cheeky setting that allows each template to be accessible by two paths. 
23
+# Cheeky setting that allows each template to be accessible by two paths.
24
 # Eg: the template 'oscar/templates/oscar/base.html' can be accessed via both
24
 # Eg: the template 'oscar/templates/oscar/base.html' can be accessed via both
25
-# 'base.html' and 'oscar/base.html'.  This allows Oscar's templates to be 
25
+# 'base.html' and 'oscar/base.html'.  This allows Oscar's templates to be
26
 # extended by templates with the same filename
26
 # extended by templates with the same filename
27
 OSCAR_MAIN_TEMPLATE_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)),
27
 OSCAR_MAIN_TEMPLATE_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)),
28
                                        'templates/oscar')
28
                                        'templates/oscar')

Ładowanie…
Anuluj
Zapisz