carom/carom-server
6
1
Fork 0
Code Issues Pull Requests Releases 2 Activity
206 Commits 2 Branches 6 Tags
9fb04c661d5f2a4c68dd004f57b64dc894c92842
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
reinsle 9fb04c661d set add info for reinsle 2017-04-29 11:34:18 +02:00
reinsle eb5168a1bd set version info 2017-04-29 11:24:57 +02:00
reinsle d759bbae9d Merge branch 'release/0.2.0' into develop 2017-04-29 11:24:28 +02:00
reinsle b0b848c1a6 set release 2017-04-29 11:24:09 +02:00
reinsle 673092407b add accounting tst 2017-04-29 11:15:26 +02:00
reinsle 6492c29e32 extend list filter for location 2017-04-29 11:06:14 +02:00
reinsle 865e8bb09a redesign location index page 2017-04-28 12:22:43 +02:00
reinsle 5647e23e12 realign search filter 2017-04-28 07:17:56 +02:00
reinsle 54e1beb177 add search filter to accounting 2017-04-28 07:11:58 +02:00
reinsle e1e5fdd6f5 fix login and logout urls 2017-04-27 14:35:04 +02:00
reinsle f1404e0c0f apply new version info 2017-04-27 14:29:30 +02:00
reinsle 279d643758 rewrite url scemata 2017-04-27 14:22:23 +02:00
reinsle b345c9dfaf Merge branch 'feature/use_generic_views' into develop 2017-04-27 14:05:21 +02:00
reinsle a165a0560f cleanup code 2017-04-27 14:04:56 +02:00
reinsle 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
reinsle 857af8d54d cleanup code 2017-04-27 14:03:57 +02:00
reinsle 3611839664 cleanup code 2017-04-27 13:59:36 +02:00
reinsle f0ed2a5195 fix code for accounting modal view 2017-04-27 13:56:18 +02:00
reinsle 7ad3a3e22d fix code for accounting confirm 2017-04-27 13:44:20 +02:00
reinsle cae1ee197e update accounting dialog 2017-04-27 12:24:38 +02:00
reinsle 5477a26cbb rebuild location index and detail view 2017-04-27 10:35:49 +02:00
reinsle 9186ed2083 update initial migration add dependencie to session 2017-04-27 09:01:54 +02:00
reinsle dc09be5a43 move code to use generic views 2017-04-27 08:04:44 +02:00
reinsle b04e642daa update views 2017-04-26 10:36:31 +02:00
reinsle 867788cd59 update accounting model 2017-04-26 10:17:19 +02:00
reinsle 55cf6101a8 update accounting model 2017-04-26 10:14:49 +02:00
reinsle 6135c7c61a add accounting user to admin view 2017-04-26 10:10:07 +02:00
reinsle 52d515b05e update requirements 2017-04-26 10:06:25 +02:00
reinsle c7efbffc8f update version info 2017-04-12 13:35:18 +02:00
reinsle 98f105296b store reporter uuid while saving accounting 2017-04-10 20:59:16 +02:00
reinsle 45db242c8e update requirements 2017-04-08 19:06:39 +02:00
reinsle 9a84532042 Merge branch 'feature/#11_accounting_dialog' into develop 2017-03-12 19:23:59 +01:00
reinsle 522411ea34 update accounting 2017-03-11 20:49:14 +01:00
reinsle ab6d1fa07e add dialog to show accounting data 2017-03-11 20:39:11 +01:00
reinsle 4669416a78 cleanup 2017-03-10 20:00:07 +01:00
reinsle dd1be9fe50 merge migrations 2017-03-10 19:54:35 +01:00
reinsle e3a34fe84a fix error in calculation price 2017-03-10 19:54:15 +01:00
reinsle 57cf9553a2 fix error 2017-03-10 19:48:58 +01:00
reinsle 594fbe76c2 update django rest framework 2017-03-10 19:34:21 +01:00
reinsle 29ef5ac541 Merge branch 'feature/#3_accounting_dialog' into develop 
# Conflicts:
#	billard/models.py
#	billard/views.py
 2017-03-09 20:52:34 +01:00
reinsle 201c347fcc Merge branch 'feature/#3_accounting_dialog' into develop 
# Conflicts:
#	billard/models.py
#	billard/views.py
 2017-03-09 20:52:12 +01:00
reinsle 81f0da2b63 Merge branch 'feature/#4_celery' into develop 2017-03-09 20:33:02 +01:00
reinsle 6c5c77b597 fix circular dependencie 2017-03-09 20:32:49 +01:00
reinsle 24b9743ce8 fix details on accounting dialog 2017-03-09 20:12:25 +01:00
reinsle e81c5ca9ab update django-extensions 2017-03-08 19:15:48 +01:00
reinsle 8367f002c3 move to explicit imports 2017-03-06 18:54:03 +01:00
reinsle f89306dfde updating admin 2017-03-02 21:01:07 +01:00
reinsle 943ff5ad21 update model 2017-03-02 20:59:10 +01:00
reinsle ea2ed0d6a1 Merge branch 'feature/#3_accounting_dialog' of ssh://git.einsle.de:5000/carom/carom-server into feature/#3_accounting_dialog 2017-03-02 20:54:57 +01:00
reinsle 4df4a095cb update calculating prize for accounting 2017-03-02 20:51:43 +01:00
reinsle 778078e86d update accounting model for bigger decimal 2017-03-02 16:11:11 +01:00
reinsle d4a68683fa update accounting using location data uuid 2017-02-27 08:01:58 +01:00
reinsle 0a36d3904e extend accounting model 2017-02-27 07:58:06 +01:00
reinsle 1323976521 fix error in model 2017-02-26 12:37:47 +01:00
reinsle 2eb8802e83 show version info in menu not in footer 2017-02-26 12:28:38 +01:00
reinsle f9c483c8d3 fix error in view.py 2017-02-26 12:20:50 +01:00
reinsle e22a153201 fix processingo of ld objects 2017-02-26 12:03:18 +01:00
reinsle eab72df9ac fix error calculating prize 2017-02-26 11:24:46 +01:00
reinsle ce9e54f21d carom/carom-doc#6 
Anzeige des Preises pro Tisch
 2017-02-26 10:37:28 +01:00
reinsle 9ed10884e2 carom/carom-doc#6 
Anzeige des PReises pro Tisch
 2017-02-26 10:32:38 +01:00
reinsle 2e6cc938aa add version info in footer 2017-02-25 20:30:08 +01:00
reinsle fa00563195 carom/carom-doc#8 
Calculate prize using normal and happy hour prize
 2017-02-25 20:02:48 +01:00
reinsle 6d16a473bf carom/carom-doc#8 
Update location model for happy hour
 2017-02-25 18:34:28 +01:00
reinsle 9df1ed5b79 reformat js block 2017-02-25 18:06:27 +01:00
reinsle ab842b00ed rebuild menue 2017-02-24 07:34:00 +01:00
reinsle e63120549c carom/carom-doc#4 
fixes page reload on ie11
 2017-02-22 17:11:39 +01:00
reinsle 11ff3b02fd add migration 2017-02-22 10:23:57 +01:00
reinsle 58252c830b reformat ajax logic only refresh desk area 2017-02-21 08:10:00 +01:00
reinsle 61ff97a8b2 fix typo 2017-02-20 18:49:55 +01:00
reinsle b6185e6282 update requests 2017-02-20 09:04:14 +01:00
reinsle ad46d883a0 show username 2017-02-17 19:08:43 +01:00
reinsle b46bd28ad6 modify ld processing 2017-02-17 18:56:40 +01:00
reinsle 1ecb96f520 fix ld management 2017-02-17 18:49:19 +01:00
reinsle cff748ccbe link to admin page 2017-02-17 18:38:47 +01:00
reinsle e16169c4ed Only show Location-Selector if locations > 1 2017-02-17 18:30:28 +01:00
reinsle 97489af723 fix error in ceck data 2017-02-11 20:10:24 +01:00
reinsle 9a18080db9 define celery settings 2017-02-11 19:23:59 +01:00
reinsle e84b2f54a9 reenable request processor 2017-02-11 18:59:42 +01:00
reinsle 0b1c7675f0 check for duplicated desk_no 2017-02-11 18:36:32 +01:00
reinsle e74fc9d626 send emails while errors 2017-02-11 11:31:27 +01:00
reinsle a72e1f67d2 definition of email settings 2017-02-11 11:29:07 +01:00
reinsle 4276ee76be fix select 2017-02-11 11:00:14 +01:00
reinsle 2f14ecce7e clean up code 2017-02-11 10:53:46 +01:00
reinsle 0f6805ea4e clean up code 2017-02-11 10:36:38 +01:00
reinsle 3a49658f21 modify accounting model 2017-02-11 10:34:30 +01:00
reinsle a8b9e7e61e modify accounting model 2017-02-11 10:23:03 +01:00
reinsle 9f6477e5f1 rename field 2017-02-10 21:23:14 +01:00
reinsle 4da0e85108 Merge branch 'feature/rebuild_model' into develop 2017-02-10 21:20:38 +01:00
reinsle 31772f2f4a update mode 2017-02-10 21:19:53 +01:00
reinsle c8c25714f0 update tasks 2017-02-10 21:18:12 +01:00
reinsle 263bff6540 rename table_no to desk_no 2017-02-10 20:49:38 +01:00
reinsle d516d830b6 usage of timezone 2017-02-10 20:35:19 +01:00
reinsle 93028156b7 rename table_no to desk_no 2017-02-10 19:55:50 +01:00
reinsle 55cdfc0509 update template using new desk model 2017-02-10 19:53:11 +01:00
reinsle 7b76fdc62c rebuild database structure, do single desk models 2017-02-10 18:37:36 +01:00
reinsle 25808f4c5a fix select accountings 2017-02-09 20:51:09 +01:00
reinsle fd3d597712 add test client 2017-02-09 20:39:30 +01:00
reinsle 8dac06a050 align text 2017-02-09 20:10:21 +01:00
reinsle 3c500baf99 fix accounting 2017-02-06 21:34:42 +01:00
reinsle 24a8099b83 fix queue management 2017-02-06 21:25:45 +01:00