Wykres commitów

180 Commity (dde0648b1e6614eefea7b6a954400644fea73d46)

Autor SHA1 Wiadomość Data
JamesRamm 29adff45be Add concrete variant model for tests 2017-02-19 14:53:20 +00:00
JamesRamm e917fb6825 Try to add generic product variant 2017-02-19 14:25:40 +00:00
JamesRamm 5382190eca Tidy up templates 2017-02-19 14:20:36 +00:00
JamesRamm de6f522000 Migrations for product template and dependency on user defined product model 2017-02-19 14:12:22 +00:00
JamesRamm 230b6e5fc6 Project template now works, but problems setting custom model 2017-02-19 11:23:43 +00:00
JamesRamm 78dfe80f2a Add productvariant model to template 2017-02-17 09:15:48 +00:00
JamesRamm 1c93a620eb Provides a project template 2017-02-17 09:03:21 +00:00
JamesRamm 5e6eb2101d Allow travis to install the project, working on #20 2017-02-15 15:57:21 +00:00
JamesRamm 481c3876f2 Merge branch 'master' of https://github.com/JamesRamm/longclaw 2017-02-15 15:35:08 +00:00
JamesRamm cb68c1f04f update requirements.txt 2017-02-15 15:35:03 +00:00
James Ramm 10de362508 Merge pull request #14 from alexfromvl/master
Add base template modeladmin orders
2017-02-13 08:20:09 +00:00
Alex af76d8be0c Update pip install -r requirements.txt 2017-02-13 17:05:51 +10:00
Alex 2e4aba2d9a Merge pull request #4 from JamesRamm/master
Update fork
2017-02-13 14:47:28 +10:00
JamesRamm 1baae40750 Remove some of the default cookiecutter stuff from contribution guide 2017-02-12 21:48:41 +00:00
JamesRamm 72844df672 Start on #5 2017-02-12 21:36:31 +00:00
James Ramm c9d9e1e5eb Merge pull request #18 from JamesRamm/shipping
Shipping
2017-02-12 16:25:50 +00:00
JamesRamm 6fb5fa0aff Final shipping rate changes, fixes #3 2017-02-12 16:22:19 +00:00
JamesRamm 0985ac1e08 Final shipping rate changes, fixes #3 2017-02-12 16:22:12 +00:00
JamesRamm b926d2756b Make some settings configurable 2017-02-12 16:05:03 +00:00
JamesRamm 8858545082 Adds shipping countries to model admin & use django-countries 2017-02-11 21:52:13 +00:00
JamesRamm 8b9867b740 Separate shipping models and address and register with modeladmin 2017-02-11 17:06:19 +00:00
James Ramm e2c6a7b8bf Update README.rst
Update installation instructions
2017-02-10 19:27:44 +00:00
James Ramm 6d845a2909 Merge pull request #15 from JamesRamm/order_template
Provides a react-based order view in the admin, with functionality to fulfill orders. Fixes #1
2017-02-10 19:14:39 +00:00
JamesRamm 2949fbde49 Update node version 2017-02-10 19:01:12 +00:00
JamesRamm cea198d6a5 Install npm dependencies 2017-02-10 18:48:07 +00:00
JamesRamm 6ef470b01d Call npm from client dir 2017-02-10 18:43:22 +00:00
JamesRamm 48194bb63b docstreing 2017-02-10 09:19:42 +00:00
JamesRamm 857c47cc9f Add asset building to setup 2017-02-10 09:18:37 +00:00
JamesRamm 5d432b31d3 Order view front end 2017-02-10 09:06:35 +00:00
JamesRamm cfc4e3ca1a Ignore JS bundles 2017-02-10 09:01:44 +00:00
JamesRamm 3580c2d0d9 Allow orders to be marked as fulfilled 2017-02-10 08:59:08 +00:00
JamesRamm fe4ac12cd5 Provides react based front end for order detail, with dummy actions for fulfill/refund 2017-02-10 08:26:21 +00:00
Alex 01eca7a155 Update index.html 2017-02-10 13:57:23 +10:00
Alex db956a133d Add base template for modeladmin/orders 2017-02-10 13:42:06 +10:00
Alex 86099c5113 Merge pull request #3 from JamesRamm/master
Update fork
2017-02-10 13:12:29 +10:00
JamesRamm 319016b7b3 React front end for orders 2017-02-09 22:13:28 +00:00
JamesRamm 6d5987c8d4 Working on #1. Adds a read-only order view with all relationship fields 2017-02-08 11:24:49 +00:00
JamesRamm ae92abffcb Fix migration dependencies 2017-02-07 21:01:33 +00:00
JamesRamm 23a50a9c5c Resolve conflict 2017-02-07 21:00:36 +00:00
JamesRamm 081d644d16 Bring settings up to date with master 2017-02-07 20:57:37 +00:00
JamesRamm b79f173c3c Merge branch 'master' into order_template 2017-02-07 20:57:05 +00:00
JamesRamm f375f582d9 Set up webpack for react 2017-02-07 20:55:53 +00:00
James Ramm bcdc6bfbb3 Merge pull request #13 from alexfromvl/master
Add project_template
2017-02-07 17:29:44 +00:00
Alex 63f69c7b08 Update requirements_dev.txt 2017-02-07 20:15:58 +10:00
JamesRamm 7cae5a859d py2 compatibility 2017-02-07 09:23:23 +00:00
JamesRamm aa4fa84a3e just make travis ok 2017-02-07 09:14:25 +00:00
Alex 0ae583f453 Create product.html 2017-02-07 18:26:44 +10:00
Alex caeaf2f6af Update README.rst 2017-02-07 18:10:46 +10:00
Alex 081c566aef Create README.rst 2017-02-07 18:10:12 +10:00
Alex 3c57f35cb1 Add project_template
Demo project_template for product index page.
2017-02-07 18:00:39 +10:00