|
|
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 |
|
|
|
010ad6ef4f
|
Add product info to settings file
|
2018-02-10 16:16:14 +01:00 |
|
|
|
8f557a5c6a
|
Merge branch 'release/0.5.0'
|
2018-02-10 15:38:15 +01:00 |
|
|
|
a0ecf70986
|
Add version information to menu
|
2018-02-10 15:37:02 +01:00 |
|
|
|
78e16d61fd
|
fix migration dependencies
|
2018-02-10 15:14:57 +01:00 |
|
|
|
ae1136bd6d
|
Merge branch 'feature/bootstrap-4' into develop
|
2018-02-10 14:22:09 +01:00 |
|
|
|
f5222055d2
|
fix page refresh
|
2018-02-10 14:21:54 +01:00 |
|
|
|
908464627e
|
fix page refresh
|
2018-02-10 14:15:57 +01:00 |
|
|
|
e1d96b9b76
|
update to bootstrap 4
|
2018-02-10 14:00:59 +01:00 |
|
|
|
9036e4b59a
|
fix requirements
|
2018-02-10 13:10:47 +01:00 |
|
|
|
ae845c5fd2
|
Update gitignore
|
2018-02-10 11:52:50 +01:00 |
|
|
|
5b4d840ebe
|
Update requirements
|
2018-02-10 11:52:37 +01:00 |
|
|
|
d31793afbd
|
Update to bootstrap 4
|
2018-02-10 11:04:29 +01:00 |
|
|
|
f18522636d
|
Update requirements
|
2018-02-10 11:04:05 +01:00 |
|
|
|
59a427d22f
|
Update bootstrap to 4.0
|
2018-02-10 11:01:49 +01:00 |
|
|
|
bc097764e9
|
redirect / to /billard
|
2017-09-20 11:24:25 +02:00 |
|
|
|
0f933aa681
|
Merge branch 'release/0.2.3' into develop
|
2017-08-18 10:45:07 +02:00 |
|
|
|
2362c5d53e
|
Merge branch 'release/0.2.3'
# Conflicts:
# billard/templates/billard/base.html
|
2017-08-18 10:44:35 +02:00 |
|
|
|
acaa9441a5
|
set version information
|
2017-08-18 10:43:02 +02:00 |
|
