I've removed the inline pictures because when you upload more than the
maximum allowed pictures at once it still works. Only if you upload
them one after the other the check works. Therefor it's safer to only
allow the upload through the Picture admin page. This way the check
works every time.
* 'cart' of git.2li.ch:ibz/web_AI-5:
fix "Varianten" heading
correct wording
correct false escaping in the documentation
exend the section "Varianten"
move a section
remove a comment and some todo tags
add the currency name to all the prices
* commit 'b228d5954ef71926b80ecc8c0f58435f0f3ae9c1':
clean up the process_article_prices function
move some code out of the views.py file
update paths
rearrange figures
extend the documentation
extend the order and shoppingcart sections
update the documentation
add a class diagramme for the shoppingcartposition
update the documentation
add a bib entry for Dia
update the erd
add new class diagrammes
wrap the registration in a transaction
extend the documentation for models
extend the bibliography
add the erd diagramms and their description
add an .eps version of the dia erd file
add the final_erd files
Sometimes when the creation of the person object fails the user get's
created anyway resulting in a user without a user profile.
By wrapping both the user and profile creation in a transaction the
user gets only created if the person profile worked as well.
* commit '0048475a2d63a08805050d767834606e6547eab9':
remove a migration file
add a cronjob to trigger the currency updates
add migrations to the ignore list
remove a duplicate entry
changed some of the views and implemented a more selfish perspective of a shop. For shure not ideal and in NO way DRY but a solution for now.
selfmade css file
unfinshed atempt to make a nav abandoned for later use maybe
add bootstrap to ansible and vagrant for django-bootstrap3 support
In Django it's better to use timezone.now instead of datetime.now()
this is because it has additional settings for timezones which this
way wouldn't get reflected in the attributes and lead to wrong
datetime values.
* origin/master:
remove the old media directory
create the path /srv/media/images in the Vagrant vm
create the media directory on the production server
add pictures to the article details page
move the media root and add support for MEDIA_URL
readd two commands
* currency: (25 commits)
changed view and deleted the database unique filed
add tableview in /currencies
checkout the production branch on the production server
add a registration
disable debugging for production
add a user profile
extend the base template with login, profile and logout links
add templates to support user authentication
add url patterns to support user authentication
remove an unnecessary shebang
remove unnecessary attributes from the Person model
redirect logins back to the index
make imports more explicit
remove an unnecessary configuration
remove an old file
change the article status to active
change the content include because the org-mode file is called doku
add a python package to the ansible role
add fixtures with test data
Add date to currencies list
...
# Conflicts:
# Vagrantfile
# ansible/roles/web_AI-5/tasks/main.yml
# django/didgeridoo/didgeridoo/settings.py
# django/didgeridoo/webshop/templates/webshop/base.html
* commit 'ee7232cd502afbf15f36769da0835b4a1e1358df':
checkout the production branch on the production server
add a registration
disable debugging for production
add a user profile
extend the base template with login, profile and logout links
add templates to support user authentication
add url patterns to support user authentication
remove an unnecessary shebang
remove unnecessary attributes from the Person model
redirect logins back to the index
make imports more explicit
remove an unnecessary configuration
remove an old file
change the article status to active
change the content include because the org-mode file is called doku
add a python package to the ansible role
add fixtures with test data
fix the admin view of order of goods
added sketch of Siteview to docs
* master:
fix a typo
move some parts from the vagrant file into a separate script
make the setup script executable
fix a typo
add a setup script to the ansible role
add a pip install routine to the ansible role
add the repository to the ansible role
fix a typo in the ansbible role
add missing packages to the ansible role
add a list of allowed hosts to the django settings
change ansible includes to import_tasks
extend the admin interface for the order class
add an intermediate class between order and article
add a date field to the orders class
sort city outputs by zip code
update readme with more up to date information
In order to be able to correctly edit the an order we need the
information of the induvidual order positions. In addition a better
layout is required to better find the information.
* master:
fix the category list
add a view to show the details of an article
add a view to list all articles in a category
point the project root to the webshop app
add an index view and a coresponding template
Ivan Hörler
Andreas Zweili