Andreas Zweili
acafb61399
redirect logins back to the index
2017-12-28 19:14:00 +01:00
Andreas Zweili
f9f1c89a01
make imports more explicit
2017-12-28 16:40:04 +01:00
Andreas Zweili
f48c316f39
remove an unnecessary configuration
2017-12-28 16:26:54 +01:00
Andreas Zweili
e518669698
remove an old file
2017-12-28 16:23:22 +01:00
Andreas Zweili
48eee1c00b
change the article status to active
2017-12-28 16:23:02 +01:00
Andreas Zweili
9589f0f980
change the content include because the org-mode file is called doku
2017-12-28 16:20:22 +01:00
Andreas Zweili
fc34c3fa4c
add a python package to the ansible role
2017-12-27 19:35:36 +01:00
Andreas Zweili
6ddd869722
add fixtures with test data
2017-12-27 19:33:29 +01:00
Ivan Hörler
cea3252322
add bootstrap to ansible and vagrant for django-bootstrap3 support
2017-12-27 19:32:14 +01:00
Ivan Hörler
318d599a2f
Add date to currencies list
2017-12-27 18:17:14 +01:00
Andreas Zweili
f6597ec69e
fix the admin view of order of goods
2017-12-27 15:10:12 +01:00
Ivan Hörler
3aaf5ee62c
added sketch of Siteview to docs
2017-12-27 09:26:30 +01:00
Ivan Hörler
1b7252a669
Merge branch 'master' into currency
...
* master:
fix a typo
move some parts from the vagrant file into a separate script
make the setup script executable
fix a typo
add a setup script to the ansible role
add a pip install routine to the ansible role
add the repository to the ansible role
fix a typo in the ansbible role
add missing packages to the ansible role
add a list of allowed hosts to the django settings
change ansible includes to import_tasks
extend the admin interface for the order class
add an intermediate class between order and article
add a date field to the orders class
sort city outputs by zip code
update readme with more up to date information
2017-12-26 13:03:20 +01:00
Ivan Hörler
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
Andreas Zweili
2b8f41725c
fix a typo
2017-12-25 22:50:42 +01:00
Andreas Zweili
16a854012d
move some parts from the vagrant file into a separate script
...
This way both vagrant and ansible can use the script
2017-12-25 22:47:04 +01:00
Andreas Zweili
630d46fb4d
make the setup script executable
2017-12-25 22:39:34 +01:00
Andreas Zweili
05cb259a30
fix a typo
2017-12-25 22:39:26 +01:00
Andreas Zweili
78eeb91f03
add a setup script to the ansible role
2017-12-25 22:34:38 +01:00
Andreas Zweili
058dc79bef
add a pip install routine to the ansible role
2017-12-25 22:33:17 +01:00
Andreas Zweili
6fdad5704f
add the repository to the ansible role
2017-12-25 22:33:01 +01:00
Andreas Zweili
ba2776336e
fix a typo in the ansbible role
2017-12-25 22:32:37 +01:00
Andreas Zweili
ee449c4176
add missing packages to the ansible role
2017-12-25 22:32:24 +01:00
Andreas Zweili
054909b145
add a list of allowed hosts to the django settings
2017-12-25 22:32:07 +01:00
Andreas Zweili
49ac7f71a3
change ansible includes to import_tasks
2017-12-25 22:31:47 +01:00
Andreas Zweili
0ef5cdff80
extend the admin interface for the order class
...
In order to be able to correctly edit the an order we need the
information of the induvidual order positions. In addition a better
layout is required to better find the information.
2017-12-21 23:07:58 +01:00
Andreas Zweili
f4aa223135
add an intermediate class between order and article
...
Because we need additional fields in an order it's necessary to add an
additional class where the information gets stored.
2017-12-21 23:06:09 +01:00
Andreas Zweili
3dc9aa33bb
add a date field to the orders class
...
In order to be able to identify the correct customer order it's
necessary to have the date of the order available.
2017-12-21 23:05:10 +01:00
Andreas Zweili
991fbfc6f5
sort city outputs by zip code
2017-12-20 19:51:49 +01:00
Andreas Zweili
7b3ecdf5f5
update readme with more up to date information
2017-12-20 19:48:12 +01:00
Ivan Hörler
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
Ivan Hörler
fc5184fa77
get currency from SNB rss to work
2017-12-19 22:33:00 +01:00
Ivan Hörler
776f81b3c9
testpush
2017-12-19 21:28:05 +01:00
Andreas Zweili
bc3b14b5dd
add a base.html file and refactor the other html files
2017-12-19 20:21:46 +01:00
Andreas Zweili
b8fa6eef5c
refactor the views
2017-12-19 20:12:21 +01:00
Ivan Hörler
409b18807b
corrections and first try to migrate
2017-12-18 19:19:08 +01:00
Ivan Hörler
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
Ivan Hörler
344447b909
UN-finished Push of currency branch. Preview only, do not change. Ivan on charge.
2017-12-18 09:03:52 +01:00
Andreas Zweili
e63627ca4f
fix the category list
2017-12-17 19:37:49 +01:00
Andreas Zweili
6894a1bfba
add a view to show the details of an article
2017-12-17 10:37:04 +01:00
Andreas Zweili
7c5af973f2
add a view to list all articles in a category
2017-12-17 10:36:44 +01:00
Andreas Zweili
a73f48a40a
point the project root to the webshop app
2017-12-17 10:35:46 +01:00
Andreas Zweili
cc313a50f3
add an index view and a coresponding template
2017-12-17 10:35:21 +01:00
Andreas Zweili
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
Andreas Zweili
5e8e4af2e7
sort the cities by their zip code.
2017-12-12 20:21:28 +01:00
Andreas Zweili
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
Andreas Zweili
2ec5a9ca7e
display the option name in the settings list
2017-12-06 20:35:06 +01:00
Andreas Zweili
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
Andreas Zweili
bba1bde937
add the Pillow module to allow image uploads
2017-12-06 20:32:24 +01:00
Andreas Zweili
4626d02435
set the media root
2017-12-06 20:31:47 +01:00
