9061e66151
Duno if thats your and my config and has to be ignored but for now il commit it.
2017-12-26 13:02:19 +01:00
4da981e5d6
Merge commit 'bc3b14b5dd697f1784acbcbfa0ef0948de4ef560' into currency
...
* commit 'bc3b14b5dd697f1784acbcbfa0ef0948de4ef560':
add a base.html file and refactor the other html files
refactor the views
2017-12-19 22:38:21 +01:00
fc5184fa77
get currency from SNB rss to work
2017-12-19 22:33:00 +01:00
776f81b3c9
testpush
2017-12-19 21:28:05 +01:00
bc3b14b5dd
add a base.html file and refactor the other html files
2017-12-19 20:21:46 +01:00
b8fa6eef5c
refactor the views
2017-12-19 20:12:21 +01:00
409b18807b
corrections and first try to migrate
2017-12-18 19:19:08 +01:00
28841df4e3
Merge branch 'master' into currency
...
* 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
2017-12-18 19:11:24 +01:00
344447b909
UN-finished Push of currency branch. Preview only, do not change. Ivan on charge.
2017-12-18 09:03:52 +01:00
e63627ca4f
fix the category list
2017-12-17 19:37:49 +01:00
6894a1bfba
add a view to show the details of an article
2017-12-17 10:37:04 +01:00
7c5af973f2
add a view to list all articles in a category
2017-12-17 10:36:44 +01:00
a73f48a40a
point the project root to the webshop app
2017-12-17 10:35:46 +01:00
cc313a50f3
add an index view and a coresponding template
2017-12-17 10:35:21 +01:00
83bb342383
cities return both the zip code and their name
...
Since some cities have multiple zip codes it's necessary that they
return both the zip code and the name.
2017-12-12 20:32:57 +01:00
5e8e4af2e7
sort the cities by their zip code.
2017-12-12 20:21:28 +01:00
6b5bd3fe45
only allow positiv prices
...
In order to only allow positiv prices I had import two new classes.
2017-12-06 21:14:14 +01:00
2ec5a9ca7e
display the option name in the settings list
2017-12-06 20:35:06 +01:00
71438ed14c
add images to the Picture model
...
In addition to the image attribute I added the directory where the
images get stored.
2017-12-06 20:32:49 +01:00
bba1bde937
add the Pillow module to allow image uploads
2017-12-06 20:32:24 +01:00
4626d02435
set the media root
2017-12-06 20:31:47 +01:00
9e0a80a419
change the article description to TextField type
...
A text field makes it easier to edit the description than with a
CharField because the text box is bigger.
2017-12-06 18:28:35 +01:00
843ff35eaf
add category foreign keys to the article
2017-12-06 18:27:58 +01:00
134c5ea066
remove the article foreign key from the categories
...
Articles belong to a category not the other way round.
2017-12-06 18:26:57 +01:00
81aef7c629
add inkscape svg file of the stakeholder diagramm
2017-12-03 22:34:05 +01:00
cfcd3d5aab
add a stakeholder diagramm
2017-12-03 22:33:06 +01:00
a3ffae1ad3
add django-extensions for generating the diagrammes
2017-12-03 17:00:57 +01:00
a6372c7b14
add class pictures to the documentation
2017-12-03 16:52:15 +01:00
db7e4f4e79
give some models a verbose name
2017-11-26 21:24:17 +01:00
de2d105eba
rename the settings model to setting
2017-11-26 21:23:18 +01:00
772924ef8d
display the salutations names
2017-11-19 22:22:40 +01:00
0427c43a25
slight refactor to conform with pep8
2017-11-19 22:22:26 +01:00
8fbbb1740a
remap the ports of the vagrant vm
2017-11-18 09:44:14 +01:00
74041233c1
update the gitignore file
2017-11-18 09:26:40 +01:00
9aa74c5893
remove the workspace file from the repository
2017-11-18 09:25:20 +01:00
ba460d9348
update the gitignore file
2017-11-18 09:24:56 +01:00
c4cc64eb23
refactor the admin file
2017-11-18 09:22:17 +01:00
fb94b92edc
refactor the models
2017-11-18 09:18:06 +01:00
47dfcd63e7
add a pycharm project
2017-11-18 09:17:56 +01:00
ccf9432503
add all the migration files to the ignore list
...
Due to heavy developement it makes currently more sense to not commit
this files and just regenerate them.
2017-11-14 21:27:36 +01:00
1085ef3295
make the manage.py script executable
2017-11-14 21:26:52 +01:00
c754670931
update the models
2017-11-14 21:26:44 +01:00
f09ba05737
update the erd
2017-11-14 21:26:28 +01:00
fef4946823
add some default data into the database
2017-11-14 21:26:14 +01:00
4e6471716d
update the apache config in the ansible role
2017-11-14 19:13:58 +01:00
c539123a47
partial creation of the models
2017-11-13 22:55:20 +01:00
97b53da9a1
partial apache conf update
2017-11-13 22:55:09 +01:00
64a4edd3f6
add the webshop app to django
2017-11-13 22:48:51 +01:00
f6df899f6f
add utf8 support to the database
2017-11-13 22:48:31 +01:00
13d4ecbc55
update the erd
2017-11-13 22:48:22 +01:00
Ivan Hörler
Andreas Zweili