Commits · master · Emil Svensson / emil-2-shop · GitLab

06 Dec, 2015 25 commits
- Merge branch 'master' of buck.ludd.ltu.se:solpanda/emil-2-shop · 1c0b6b4b
  Emil Svensson authored Dec 06, 2015
```
Conflicts:
	app/views.py
```
  1c0b6b4b
- fixed so checkout updates orders · 45294e51
  Emil Svensson authored Dec 06, 2015
  
  45294e51
- Checkout now only shows in-stock items · ff738aea
  Emil Tylén authored Dec 06, 2015
  
  ff738aea
- changed query tuples to lists · 09026cd4
  Emil Tylén authored Dec 06, 2015
  
  09026cd4
- compacted imports a tiny bit · 6e4bf8f6
  Emil Tylén authored Dec 06, 2015
  
  6e4bf8f6
- amount should not have a default · 4db9deab
  Emil Tylén authored Dec 06, 2015
  
  4db9deab
- Timestamp is default for query now · 01d33b6c
  Emil Tylén authored Dec 06, 2015
  
  01d33b6c
- Merge branch 'master' of buck.ludd.ltu.se:solpanda/emil-2-shop · c5f7780e
  Emil Tylén authored Dec 06, 2015
  
  c5f7780e
- Tables now self-populate and have reasonable defaults · d352eda0
  Emil Tylén authored Dec 06, 2015
  
  d352eda0
- woring check out · 41c656eb
  Emil Svensson authored Dec 06, 2015
  
  41c656eb
- Merge branch 'master' of buck.ludd.ltu.se:solpanda/emil-2-shop · 56e73f43
  Emil Svensson authored Dec 06, 2015
  
  56e73f43
- almost working check out · db2d1962
  Emil Svensson authored Dec 06, 2015
  
  db2d1962
- products on checkout now link to their respective page · 443a2299
  Emil Tylén authored Dec 06, 2015
  
  443a2299
- separated the cart variable and made sure no queries are run for items that show 0 · d9049c0d
  Emil Tylén authored Dec 06, 2015
  
  d9049c0d
- removed unnecessary type conversion · 9bab78a4
  Emil Tylén authored Dec 06, 2015
  
  9bab78a4
- uses float instead of decimal for 2.7 compliance · 51376b31
  Emil Tylén authored Dec 06, 2015
  
  51376b31
- Merge branch 'master' of buck.ludd.ltu.se:solpanda/emil-2-shop · cad24de6
  Emil Svensson authored Dec 06, 2015
  
  cad24de6
- python 2 fixes · 016d23ca
  Emil Svensson authored Dec 06, 2015
  
  016d23ca
- added typecast to cost so that we can save money by not using money · 73881446
  Emil Tylén authored Dec 06, 2015
  
  73881446
- removed swap file · 7388b61f
  Emil Tylén authored Dec 06, 2015
  
  7388b61f
- Merge branch 'master' of buck.ludd.ltu.se:solpanda/emil-2-shop · a55ced44
  Emil Tylén authored Dec 06, 2015
  
  a55ced44
- added cart to checkout · e4c47bc5
  Emil Tylén authored Dec 06, 2015
  
  e4c47bc5
- added vote system · c99fd942
  Emil Svensson authored Dec 06, 2015
  
  c99fd942
- Merge branch 'master' of buck.ludd.ltu.se:solpanda/emil-2-shop · 310ade01
  Emil Svensson authored Dec 06, 2015
```
Conflicts:
	app/templates/product.html
```
  310ade01
- added time to comments · 0f68144a
  Emil Svensson authored Dec 06, 2015
  
  0f68144a
05 Dec, 2015 15 commits
- Merge branch 'master' of buck.ludd.ltu.se:solpanda/emil-2-shop · 61a371fb
  Emil Tylén authored Dec 05, 2015
  
  61a371fb
- Added shopping cart to product · 9d30c0ee
  Emil Tylén authored Dec 05, 2015
  
  9d30c0ee
- added database comments for products · 6a64151c
  Emil Svensson authored Dec 05, 2015
  
  6a64151c
- added automatic timestamps to commenting command · 9b81f6f2
  Emil Tylén authored Dec 05, 2015
  
  9b81f6f2
- Fancied up product.html, rearranged views.py and added a SQL string to insert new comments · dd879157
  Emil Tylén authored Dec 05, 2015
  
  dd879157
- Merge branch 'master' of buck.ludd.ltu.se:solpanda/emil-2-shop · 340b2696
  Emil Tylén authored Dec 05, 2015
  
  340b2696
- Merge branch 'master' of buck.ludd.ltu.se:solpanda/emil-2-shop · 1af24a87
  Emil Tylén authored Dec 05, 2015
  
  1af24a87
- added score form · ada14d31
  Emil Svensson authored Dec 05, 2015
  
  ada14d31
- Added db support for /products and /products/id · 2665b353
  Emil Tylén authored Dec 05, 2015
  
  2665b353
- forms for commenting on products · 09e51e74
  Emil Svensson authored Dec 05, 2015
  
  09e51e74
- added form for checkout · 6317595a
  Emil Svensson authored Dec 05, 2015
  
  6317595a
- removed pyc files · 294a4d7a
  Emil Svensson authored Dec 05, 2015
  
  294a4d7a
- Merge branch 'master' of buck.ludd.ltu.se:solpanda/emil-2-shop · 74621b48
  Emil Svensson authored Dec 05, 2015
  
  74621b48
- gitigonre · d6eb1567
  Emil Svensson authored Dec 05, 2015
  
  d6eb1567
- Merge branch 'master' of buck.ludd.ltu.se:solpanda/emil-2-shop · ae8de5a2
  Emil Tylén authored Dec 05, 2015
  
  ae8de5a2