Merge commit '5f2f1098a479a77c0c7c7818fb8df5f30f2414f2' into currency

Browse Source

* 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

...

This commit is contained in:

Ivan Hörler 2018-01-14 14:08:10 +01:00

parent 013d3d2d28 5f2f1098a4

commit 034f9563bc

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available