* 'cart' of git.2li.ch:ibz/web_AI-5:
extend the test case introduction
remove unused code
refactor according to PEP8
refactor according to PEP8
remove unnecessary h1 tags from template
extend the test cases
extend the "Testing" section
remove unneeded escapes
# Conflicts:
# django/didgeridoo/webshop/views.py
* 'cart' of git.2li.ch:ibz/web_AI-5:
some corrections to comply with PEP8
remove the inline pictures from the Article admin page
add surround the submit button with a P Tag
add another use case
fix a typo
add a entry about testing
correct the bib entries
correct spelling mistakes
wrap the jinja template in a sexylisting environment
remove todo tag
add empty lines for better visibiliy
remove whitespace
add a source for fixtures
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
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.
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