carom/carom-server
6
1
Fork 0
Code Issues Pull Requests Releases 2 Activity
163 Commits 2 Branches 6 Tags
57cf9553a2b5c152a56ef3d44f2803b5cce49662
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
reinsle 528e4647f3 make migration 2017-02-06 20:32:37 +01:00
reinsle e66d729b62 add tzinfo for calculating 2017-02-06 20:15:15 +01:00
reinsle dae777892b add locationdata process logic 2017-02-06 20:15:15 +01:00
reinsle 3a48ac9c6b update celery call 2017-02-06 20:14:34 +01:00
reinsle 288abf1ad0 add celery stuff 2017-02-06 20:13:08 +01:00
reinsle 5763890d5c update requirements file 2017-02-06 18:22:41 +01:00
reinsle 10bec23d98 add django-crispy-forms to requirements 2017-02-06 18:17:03 +01:00
reinsle aebcc9af76 cleanup 2017-02-05 19:20:48 +01:00
reinsle ab9569a2b6 fix docstring 2017-02-05 17:18:37 +01:00
reinsle e63f8b7562 Calculate prize of rental 2017-02-05 17:07:42 +01:00
reinsle 858cb5ce8d add http refresh to 3 sec 2017-02-05 13:28:58 +01:00
reinsle 802810fe0d add client info to accounting admin 2017-02-05 13:28:41 +01:00
reinsle bf20e232d9 fix view logic while no location 2017-02-05 12:58:06 +01:00
reinsle bede78cf84 fix toString 2017-02-04 12:39:28 +01:00
reinsle 7d4886abe2 update view 2017-02-04 12:30:01 +01:00
reinsle 1a2eb98d20 fix accounting model 2017-02-04 11:31:48 +01:00
reinsle 02bb974a92 update accounting model 2017-02-04 11:18:35 +01:00
reinsle 7776bc844c fix view logic 2017-02-04 11:13:39 +01:00
reinsle db051986a2 update location model 2017-02-04 06:51:09 +01:00
reinsle 7a7fbfb142 fix template matrix for login/logout 2017-02-04 06:37:02 +01:00
reinsle 19719a68b9 add login function 2017-02-04 06:20:46 +01:00
reinsle 47ba4b0b67 add login_required decorator 2017-02-03 09:42:23 +01:00
reinsle a003fbcf19 update jquery 2017-02-02 21:17:04 +01:00
reinsle 047a022f7e fix layout of presentation 2017-02-02 20:44:10 +01:00
reinsle e0c090dad9 fix access to accounting data 2017-02-02 20:43:32 +01:00
reinsle 16243def6d show accounting data from table 2017-02-01 20:25:33 +01:00
reinsle 90974ea783 update view, show location info 2017-02-01 18:57:29 +01:00
reinsle 48a912f04b update data model 2017-02-01 17:52:16 +01:00
reinsle 616fd63bfc update data model 2017-02-01 13:52:30 +01:00
reinsle 96dc601542 update django-extensions to 1.7.6 2017-02-01 11:42:51 +01:00
reinsle 16d181c8ce Merge branch 'develop' of git.wolke.einsle.de:carom/carom-server into develop 2017-01-27 09:37:31 +01:00
reinsle e34d4a5a7b local changes 2017-01-27 09:37:23 +01:00
reinsle be8e072675 create templates 2017-01-09 20:42:59 +01:00
reinsle eaa7a210ce update base view using local jquery 2017-01-09 19:30:56 +01:00
reinsle a78d3e3193 add jquery library 2017-01-09 19:23:44 +01:00
reinsle c29e8fbef8 add authentication classes 2017-01-09 19:00:03 +01:00
reinsle 99ecd5efc3 fix adminview 2017-01-09 18:40:48 +01:00