6f25179795
Merge branch 'master' into production
2018-01-14 12:39:02 +01:00
7f94bd4f0d
correct the empty message on the index page
2018-01-14 12:38:38 +01:00
05717a63ea
Merge branch 'master' into production
2018-01-14 12:36:57 +01:00
b80c40c902
rephrase a second message
2018-01-14 12:36:22 +01:00
c7abe2ffd2
Merge branch 'master' into production
2018-01-14 12:34:47 +01:00
82e4d84724
rephrase the message on empty categories
2018-01-14 12:34:13 +01:00
75dac7d385
Merge branch 'master' into production
2018-01-14 12:28:48 +01:00
e54765a54f
remove the delete option from the picture model
...
This option got added by accident. If we would keep it then the
related article would get deleted when one deletes a picture.
2018-01-14 12:22:46 +01:00
2f58fcec94
allow dupilcated names of pictures
2018-01-14 12:22:27 +01:00
35de9bf7a5
add a check to limit picture uploads
...
with the option max_pictures it's now possible to limit the amount of
pictures a user is allowed to upload to an article.
2018-01-14 12:20:47 +01:00
fabdc48492
add a description field to the Option model
2018-01-14 12:19:44 +01:00
d4502c655f
prevent options from deletion und don't allow new options
2018-01-14 12:18:13 +01:00
d929a23ede
remove the Setting model
2018-01-14 12:16:00 +01:00
50d7d11fe4
Merge branch 'production' of git.2li.ch:ibz/web_AI-5 into production
2018-01-13 17:40:17 +01:00
f7d86ea9c0
Merge branch 'master' into production
2018-01-13 17:40:11 +01:00
9cdf14c618
allow pictures to be added on the article
2018-01-13 16:13:26 +01:00
d040e96460
readd pictures to the article details page
2018-01-13 16:13:06 +01:00
16e9168938
fix the url of the django book
2018-01-13 14:40:33 +01:00
2360e05291
remove a todo tag
2018-01-13 11:06:25 +01:00
eed61deedd
add the currencies refresh cronjob to the ansible role
2018-01-13 10:55:40 +01:00
0048475a2d
remove a migration file
2018-01-13 10:46:49 +01:00
0a8e74110f
add a cronjob to trigger the currency updates
2018-01-13 09:37:38 +01:00
012e4ff148
add migrations to the ignore list
2018-01-13 09:36:25 +01:00
95ec91fbf0
remove a duplicate entry
2018-01-13 09:34:01 +01:00
185f07044c
remove a duplicate application entry
2018-01-13 09:32:03 +01:00
b31133b5b2
correct the settings for the production server
2018-01-13 08:31:18 +01:00
5c9a8bec1a
Merge branch 'master' into production
2018-01-13 08:30:23 +01:00
852751bc27
Merge branch 'frontendstyling' into andreas
2018-01-13 08:29:31 +01:00
9ff08f099d
Merge branch 'master' of git.2li.ch:ibz/web_AI-5
...
* 'master' of git.2li.ch:ibz/web_AI-5:
extend the use case diagramm
2018-01-11 19:21:23 +01:00
b02e8c1343
corrected offline error to be catched.
2018-01-11 19:21:13 +01:00
b83001ce11
Merge branch 'andreas'
2018-01-11 18:07:03 +01:00
59a128b448
extend the use case diagramm
2018-01-11 17:59:38 +01:00
6cf9d77cae
Corrected a race condition of strings in views.py and the related parts of exchange_rates.py
2018-01-11 07:54:51 +01:00
aca21b4353
changed view and catched a bug in currencies.views.py
2018-01-10 22:43:22 +01:00
12ba3262ec
Merge branch 'currency'
...
* 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.
2018-01-10 01:01:44 +01:00
a4307da75f
Merge branch 'currency' of git.2li.ch:ibz/web_AI-5 into currency
...
* 'currency' of git.2li.ch:ibz/web_AI-5:
correct the datetimefield on the orders model
2018-01-10 00:59:01 +01:00
6290eb7a6a
corrected currencies app and added different view.
2018-01-10 00:58:34 +01:00
ff86d93660
add the django book to the references
2018-01-08 21:09:15 +01:00
fd031925e4
list all the references without actually citing them
2018-01-08 21:08:34 +01:00
56e10eab5f
add minor corrections to the use case diagramm
2018-01-07 23:46:54 +01:00
8fdd019d50
reformat the tables
2018-01-07 23:46:40 +01:00
c66512a039
finalize the use case diagramm section
2018-01-07 18:52:40 +01:00
7d1e0cf7a6
add the files for the use case diagramm
2018-01-07 18:52:26 +01:00
d7202623cd
add a use case diagramm
2018-01-07 11:01:25 +01:00
f809765bb2
rename "Nutzer" zu "Kunden"
2018-01-06 15:53:04 +01:00
08ad23edef
remove todo states
2018-01-06 15:03:18 +01:00
94251f2636
add user stories
2018-01-06 15:02:55 +01:00
a68530d356
add the license to the latex section
2018-01-06 15:02:39 +01:00
f7cbe84b23
reformat the editor section
2018-01-06 15:02:30 +01:00
6731922c49
add the version number to the django section
2018-01-06 15:01:35 +01:00
Andreas Zweili
Ivan Hörler