* commit '5f2f1098a479a77c0c7c7818fb8df5f30f2414f2':
remove delete option from inline images
correct the empty message on the index page
rephrase a second message
rephrase the message on empty categories
remove the delete option from the picture model
allow dupilcated names of pictures
add a check to limit picture uploads
add a description field to the Option model
prevent options from deletion und don't allow new options
remove the Setting model
allow pictures to be added on the article
readd pictures to the article details page
fix the url of the django book
remove a todo tag
add the currencies refresh cronjob to the ansible role
* master:
remove delete option from inline images
correct the empty message on the index page
rephrase a second message
rephrase the message on empty categories
remove the delete option from the picture model
allow dupilcated names of pictures
add a check to limit picture uploads
add a description field to the Option model
prevent options from deletion und don't allow new options
remove the Setting model
allow pictures to be added on the article
readd pictures to the article details page
fix the url of the django book
remove a todo tag
add the currencies refresh cronjob to the ansible role
If one selectes a inline picture and deletes it. The whole article
gets deleted. It's therefor better if the user has to go to the
picture admin form and delete the picture from there
* 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
* currency:
corrected currencies app and added different view.
correct the datetimefield on the orders model
add the currencies app to the setup script
vagrant provision does not work so i need to commit unsolved files
commit for history. going to implement new databasestructure now.
changed view and deleted the database unique filed
add tableview in /currencies
disable debugging for production
Add date to currencies list
Duno if thats your and my config and has to be ignored but for now il commit it.
get currency from SNB rss to work
testpush
corrections and first try to migrate
UN-finished Push of currency branch. Preview only, do not change. Ivan on charge.
Ivan Hörler
Andreas Zweili