web_AI-5/django/didgeridoo/webshop
Ivan Hörler c5419bfc60 Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart
* 'cart' of git.2li.ch:ibz/web_AI-5:
  push form hack

# Conflicts:
#	django/didgeridoo/webshop/forms.py
#	django/didgeridoo/webshop/templates/webshop/cart.html
#	django/didgeridoo/webshop/views.py
2018-02-19 20:05:04 +01:00
..
fixtures add a fixture for a test user 2018-02-18 13:23:39 +01:00
templates unfinished try to set initial value in views.py line 243 2018-02-19 19:11:40 +01:00
__init__.py rename the django project 2017-11-12 21:35:59 +01:00
admin.py some corrections to comply with PEP8 2018-02-18 18:40:55 +01:00
apps.py rename the django project 2017-11-12 21:35:59 +01:00
forms.py unfinished try to set initial value in views.py line 243 2018-02-19 19:11:40 +01:00
models.py add amountform not working yet 2018-02-18 21:58:46 +01:00
tests.py rename the django project 2017-11-12 21:35:59 +01:00
urls.py commit for andreas 2018-02-04 18:32:54 +01:00
utils.py clean up the process_article_prices function 2018-02-12 22:48:54 +01:00
views.py Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart 2018-02-19 20:05:04 +01:00