Commit Graph

347 Commits

Author SHA1 Message Date
a177eb04da Fix settings.py 2018-07-01 10:59:06 +02:00
4b89e7afea update requirements and add django-tables2 2018-07-01 10:44:16 +02:00
f4ae4bd404 add django-tables2 to installed apps 2018-07-01 10:43:56 +02:00
64c3756647 fix accounting 2018-04-01 19:11:17 +02:00
77cc2ed0f5 fix accounting fields 2018-03-31 18:22:23 +02:00
44ff50d0f6 Fix calc of daily sale 2018-03-31 18:09:34 +02:00
eca2d2d2a9 Add Tast to remove accountings with 0 prize 2018-03-31 17:49:45 +02:00
a62297f47f Cleanup Code 2018-03-31 16:40:32 +02:00
01aa4bcc6e Fix receiver 2018-03-31 16:30:03 +02:00
eaad874013 Cleanup Code 2018-03-31 16:13:38 +02:00
553590c582 Add function to process location data manually 2018-03-31 15:59:03 +02:00
0c7f45c9c0 Add logging to processing location data objecte 2018-03-31 15:43:11 +02:00
7a051fbf95 Update Requirements 2018-03-29 07:45:13 +02:00
91b5de2274 Update Requirements 2018-03-19 20:04:09 +01:00
7cd0854239 fix col size 2018-03-19 17:06:38 +01:00
a5c5c37a63 show daily sale on location detail page 2018-03-19 14:46:58 +01:00
f25ee6d198 add order for selecting objects 2018-02-19 10:56:56 +01:00
e3deead94b Update logic for update_seen of clients 2018-02-19 10:33:09 +01:00
45dea64599 Merge branches 'develop' and 'master' of ssh://git.einsle.de:5000/carom/carom-server into develop 2018-02-19 06:49:44 +01:00
4d0cb78cb6 add checkboxes for accounting 2018-02-15 15:58:55 +01:00
7a2fed8ad0 fix calculating prize 2018-02-15 08:11:13 +01:00
3483c823a0 cleanup code, remove unused templates 2018-02-15 08:10:58 +01:00
47e265a02c refactor code 2018-02-13 17:02:04 +01:00
c90c608a31 add tooltip to ld processing url 2018-02-13 16:36:31 +01:00
37f8b5a77d update button color 2018-02-13 11:08:53 +01:00
90ab4539f4 Merge remote-tracking branch 'origin/develop' into develop 2018-02-13 08:38:33 +01:00
f952204606 Add myAccount view 2018-02-13 08:38:17 +01:00
d7181a77d4 Update Requirements 2018-02-12 19:27:16 +01:00
679a831b7d set fix versions for python libraries 2018-02-11 11:53:30 +01:00
128ea3eabb Merge branch 'release/0.5.1' into develop 2018-02-11 11:30:29 +01:00
5ec25f0b01 Merge branch 'release/0.5.1' 2018-02-11 11:30:28 +01:00
3bb906c732 Update Version information 2018-02-11 11:30:09 +01:00
334e3be46b Merge branch 'feature/last_seen' into develop 2018-02-11 11:28:06 +01:00
ae02010203 add last_seen serializer 2018-02-11 11:27:27 +01:00
bab9196c38 show alert-danger if client last_seen older then 5 minutes 2018-02-11 11:20:09 +01:00
1a0c0ff63a add abrechnen button to location detail 2018-02-11 11:05:50 +01:00
64d38dfcd8 fix model dependencies 2018-02-11 10:59:45 +01:00
d9d78a969f reformat code 2018-02-11 10:56:44 +01:00
076808f183 Merge branch 'feature/django_2' into develop 2018-02-11 10:52:30 +01:00
c7a28e8f7c Update urls logic to django 2 2018-02-11 10:50:48 +01:00
7087ca6ae8 update requirements for django 2 2018-02-11 10:37:52 +01:00
9923106096 remove django widget tweaks
add debug_toolbar
2018-02-11 10:35:30 +01:00
e7dd1aa01a move login formular to crispy 2018-02-11 08:12:47 +01:00
335e8ca4ff fix table width 2018-02-10 20:06:30 +01:00
8aa4f5cc48 move product version to settings file 2018-02-10 16:35:14 +01:00
8657fab3c1 resizing buttons 2018-02-10 16:30:22 +01:00
6f7fb6de85 Update Button Layout 2018-02-10 16:28:44 +01:00
2bb0b62758 other color on accounting button 2018-02-10 16:28:00 +01:00
50b95397bb other color on accounting button 2018-02-10 16:26:23 +01:00
042443ce71 add example local settings file 2018-02-10 16:20:50 +01:00