|
|
e71f125b5d
|
Merge branch 'feature/use_generic_views' of ssh://git.einsle.de:5000/carom/carom-server into feature/use_generic_views
|
2017-04-27 14:04:06 +02:00 |
|
|
|
857af8d54d
|
cleanup code
|
2017-04-27 14:03:57 +02:00 |
|
|
|
3611839664
|
cleanup code
|
2017-04-27 13:59:36 +02:00 |
|
|
|
f0ed2a5195
|
fix code for accounting modal view
|
2017-04-27 13:56:18 +02:00 |
|
|
|
7ad3a3e22d
|
fix code for accounting confirm
|
2017-04-27 13:44:20 +02:00 |
|
|
|
cae1ee197e
|
update accounting dialog
|
2017-04-27 12:24:38 +02:00 |
|
|
|
5477a26cbb
|
rebuild location index and detail view
|
2017-04-27 10:35:49 +02:00 |
|
|
|
9186ed2083
|
update initial migration add dependencie to session
|
2017-04-27 09:01:54 +02:00 |
|
|
|
dc09be5a43
|
move code to use generic views
|
2017-04-27 08:04:44 +02:00 |
|
|
|
b04e642daa
|
update views
|
2017-04-26 10:36:31 +02:00 |
|
|
|
867788cd59
|
update accounting model
|
2017-04-26 10:17:19 +02:00 |
|
|
|
55cf6101a8
|
update accounting model
|
2017-04-26 10:14:49 +02:00 |
|
|
|
6135c7c61a
|
add accounting user to admin view
|
2017-04-26 10:10:07 +02:00 |
|
|
|
52d515b05e
|
update requirements
|
2017-04-26 10:06:25 +02:00 |
|
|
|
c7efbffc8f
|
update version info
|
2017-04-12 13:35:18 +02:00 |
|
Robert Einsle
|
a1f8599b34
|
Merge tag '0.1.1' into develop
tag as version 0.1.1
|
2017-04-12 13:22:04 +02:00 |
|
Robert Einsle
|
69a58ad9a3
|
Merge branch 'release/0.1.1'
|
2017-04-12 13:21:55 +02:00 |
|
|
|
98f105296b
|
store reporter uuid while saving accounting
|
2017-04-10 20:59:16 +02:00 |
|
Alexander Werner
|
0a6704b191
|
updated accounting view permission
|
2017-04-10 20:30:27 +02:00 |
|
Alexander Werner
|
0f324b8a17
|
Update permissions and groups
|
2017-04-10 19:38:49 +02:00 |
|
|
|
45db242c8e
|
update requirements
|
2017-04-08 19:06:39 +02:00 |
|
Alexander Werner
|
95967c5f05
|
Fix in accountmodal
|
2017-03-27 21:14:17 +02:00 |
|
Alexander Werner
|
46f0c3a88b
|
Added get prize testcases and fixed prize calculation
|
2017-03-27 21:01:43 +02:00 |
|
|
|
9a84532042
|
Merge branch 'feature/#11_accounting_dialog' into develop
|
2017-03-12 19:23:59 +01:00 |
|
|
|
522411ea34
|
update accounting
|
2017-03-11 20:49:14 +01:00 |
|
|
|
ab6d1fa07e
|
add dialog to show accounting data
|
2017-03-11 20:39:11 +01:00 |
|
|
|
4669416a78
|
cleanup
|
2017-03-10 20:00:07 +01:00 |
|
|
|
dd1be9fe50
|
merge migrations
|
2017-03-10 19:54:35 +01:00 |
|
|
|
e3a34fe84a
|
fix error in calculation price
|
2017-03-10 19:54:15 +01:00 |
|
|
|
57cf9553a2
|
fix error
|
2017-03-10 19:48:58 +01:00 |
|
|
|
594fbe76c2
|
update django rest framework
|
2017-03-10 19:34:21 +01:00 |
|
|
|
29ef5ac541
|
Merge branch 'feature/#3_accounting_dialog' into develop
# Conflicts:
# billard/models.py
# billard/views.py
|
2017-03-09 20:52:34 +01:00 |
|
|
|
201c347fcc
|
Merge branch 'feature/#3_accounting_dialog' into develop
# Conflicts:
# billard/models.py
# billard/views.py
|
2017-03-09 20:52:12 +01:00 |
|
|
|
81f0da2b63
|
Merge branch 'feature/#4_celery' into develop
|
2017-03-09 20:33:02 +01:00 |
|
|
|
6c5c77b597
|
fix circular dependencie
|
2017-03-09 20:32:49 +01:00 |
|
Alexander Werner
|
3141944ff3
|
updated code for shared_tasks
|
2017-03-09 20:26:03 +01:00 |
|
|
|
24b9743ce8
|
fix details on accounting dialog
|
2017-03-09 20:12:25 +01:00 |
|
Alexander Werner
|
d2932d834a
|
updated code for shared_tasks
|
2017-03-09 20:08:35 +01:00 |
|
Alexander Werner
|
f6d7d858ed
|
Merge branch 'feature/#3_accounting_dialog' of git.einsle.de:carom/carom-server into feature/#3_accounting_dialog
|
2017-03-09 19:50:50 +01:00 |
|
Alexander Werner
|
a968e59cf1
|
fixed error if report_user not set
|
2017-03-09 19:50:39 +01:00 |
|
|
|
e81c5ca9ab
|
update django-extensions
|
2017-03-08 19:15:48 +01:00 |
|
Alexander Werner
|
bd48677953
|
updated modal code
|
2017-03-06 20:13:22 +01:00 |
|
Alexander Werner
|
61a5c3ee04
|
updated modal code
|
2017-03-06 20:11:07 +01:00 |
|
Alexander Werner
|
e7a25888a7
|
updated modal code
|
2017-03-06 20:05:53 +01:00 |
|
Alexander Werner
|
51a5d1659a
|
updated modal code
|
2017-03-06 19:48:59 +01:00 |
|
Alexander Werner
|
323ab5ae98
|
updated modal code
|
2017-03-06 19:44:36 +01:00 |
|
Alexander Werner
|
8e95ae4ff5
|
updated modal code
|
2017-03-06 19:31:35 +01:00 |
|
Alexander Werner
|
d2e56b99b8
|
updated modal code
|
2017-03-06 19:22:01 +01:00 |
|
Alexander Werner
|
716cb2d347
|
updated modal code
|
2017-03-06 19:04:47 +01:00 |
|
Alexander Werner
|
1a7cce0934
|
Merge branch 'feature/#3_accounting_dialog' of git.einsle.de:carom/carom-server into feature/#3_accounting_dialog
|
2017-03-06 19:03:39 +01:00 |
|
