carom/carom-server
6
1
Fork 0
Code Issues Pull Requests Releases 2 Activity
297 Commits 2 Branches 6 Tags
a177eb04da98875b3c5c014a5fdb88fcf1394ad5
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
reinsle a177eb04da Fix settings.py 2018-07-01 10:59:06 +02:00
reinsle 4b89e7afea update requirements and add django-tables2 2018-07-01 10:44:16 +02:00
reinsle f4ae4bd404 add django-tables2 to installed apps 2018-07-01 10:43:56 +02:00
reinsle 64c3756647 fix accounting 2018-04-01 19:11:17 +02:00
reinsle 77cc2ed0f5 fix accounting fields 2018-03-31 18:22:23 +02:00
reinsle 44ff50d0f6 Fix calc of daily sale 2018-03-31 18:09:34 +02:00
reinsle eca2d2d2a9 Add Tast to remove accountings with 0 prize 2018-03-31 17:49:45 +02:00
reinsle a62297f47f Cleanup Code 2018-03-31 16:40:32 +02:00
reinsle 01aa4bcc6e Fix receiver 2018-03-31 16:30:03 +02:00
reinsle eaad874013 Cleanup Code 2018-03-31 16:13:38 +02:00
reinsle 553590c582 Add function to process location data manually 2018-03-31 15:59:03 +02:00
reinsle 0c7f45c9c0 Add logging to processing location data objecte 2018-03-31 15:43:11 +02:00
reinsle 7a051fbf95 Update Requirements 2018-03-29 07:45:13 +02:00
reinsle 91b5de2274 Update Requirements 2018-03-19 20:04:09 +01:00
reinsle 7cd0854239 fix col size 2018-03-19 17:06:38 +01:00
reinsle a5c5c37a63 show daily sale on location detail page 2018-03-19 14:46:58 +01:00
reinsle f25ee6d198 add order for selecting objects 2018-02-19 10:56:56 +01:00
reinsle e3deead94b Update logic for update_seen of clients 2018-02-19 10:33:09 +01:00
reinsle 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
reinsle 4d0cb78cb6 add checkboxes for accounting 2018-02-15 15:58:55 +01:00
reinsle 7a2fed8ad0 fix calculating prize 2018-02-15 08:11:13 +01:00
reinsle 3483c823a0 cleanup code, remove unused templates 2018-02-15 08:10:58 +01:00
reinsle 47e265a02c refactor code 2018-02-13 17:02:04 +01:00
reinsle c90c608a31 add tooltip to ld processing url 2018-02-13 16:36:31 +01:00
reinsle 37f8b5a77d update button color 2018-02-13 11:08:53 +01:00
reinsle 90ab4539f4 Merge remote-tracking branch 'origin/develop' into develop 2018-02-13 08:38:33 +01:00
reinsle f952204606 Add myAccount view 2018-02-13 08:38:17 +01:00
reinsle d7181a77d4 Update Requirements 2018-02-12 19:27:16 +01:00
reinsle 679a831b7d set fix versions for python libraries 2018-02-11 11:53:30 +01:00
reinsle 128ea3eabb Merge branch 'release/0.5.1' into develop 2018-02-11 11:30:29 +01:00
reinsle 5ec25f0b01 Merge branch 'release/0.5.1' 2018-02-11 11:30:28 +01:00
reinsle 3bb906c732 Update Version information 2018-02-11 11:30:09 +01:00
reinsle 334e3be46b Merge branch 'feature/last_seen' into develop 2018-02-11 11:28:06 +01:00
reinsle ae02010203 add last_seen serializer 2018-02-11 11:27:27 +01:00
reinsle bab9196c38 show alert-danger if client last_seen older then 5 minutes 2018-02-11 11:20:09 +01:00
reinsle 1a0c0ff63a add abrechnen button to location detail 2018-02-11 11:05:50 +01:00
reinsle 64d38dfcd8 fix model dependencies 2018-02-11 10:59:45 +01:00
reinsle d9d78a969f reformat code 2018-02-11 10:56:44 +01:00
reinsle 076808f183 Merge branch 'feature/django_2' into develop 2018-02-11 10:52:30 +01:00
reinsle c7a28e8f7c Update urls logic to django 2 2018-02-11 10:50:48 +01:00
reinsle 7087ca6ae8 update requirements for django 2 2018-02-11 10:37:52 +01:00
reinsle 9923106096 remove django widget tweaks 
add debug_toolbar
 2018-02-11 10:35:30 +01:00
reinsle e7dd1aa01a move login formular to crispy 2018-02-11 08:12:47 +01:00
reinsle 335e8ca4ff fix table width 2018-02-10 20:06:30 +01:00
reinsle 8aa4f5cc48 move product version to settings file 2018-02-10 16:35:14 +01:00
reinsle 8657fab3c1 resizing buttons 2018-02-10 16:30:22 +01:00
reinsle 6f7fb6de85 Update Button Layout 2018-02-10 16:28:44 +01:00
reinsle 2bb0b62758 other color on accounting button 2018-02-10 16:28:00 +01:00
reinsle 50b95397bb other color on accounting button 2018-02-10 16:26:23 +01:00
reinsle 042443ce71 add example local settings file 2018-02-10 16:20:50 +01:00
reinsle 010ad6ef4f Add product info to settings file 2018-02-10 16:16:14 +01:00
reinsle 8f557a5c6a Merge branch 'release/0.5.0' 2018-02-10 15:38:15 +01:00
reinsle a0ecf70986 Add version information to menu 2018-02-10 15:37:02 +01:00
reinsle 78e16d61fd fix migration dependencies 2018-02-10 15:14:57 +01:00
reinsle ae1136bd6d Merge branch 'feature/bootstrap-4' into develop 2018-02-10 14:22:09 +01:00
reinsle f5222055d2 fix page refresh 2018-02-10 14:21:54 +01:00
reinsle 908464627e fix page refresh 2018-02-10 14:15:57 +01:00
reinsle e1d96b9b76 update to bootstrap 4 2018-02-10 14:00:59 +01:00
reinsle 9036e4b59a fix requirements 2018-02-10 13:10:47 +01:00
reinsle ae845c5fd2 Update gitignore 2018-02-10 11:52:50 +01:00
reinsle 5b4d840ebe Update requirements 2018-02-10 11:52:37 +01:00
reinsle d31793afbd Update to bootstrap 4 2018-02-10 11:04:29 +01:00
reinsle f18522636d Update requirements 2018-02-10 11:04:05 +01:00
reinsle 59a427d22f Update bootstrap to 4.0 2018-02-10 11:01:49 +01:00
reinsle bc097764e9 redirect / to /billard 2017-09-20 11:24:25 +02:00
reinsle 0f933aa681 Merge branch 'release/0.2.3' into develop 2017-08-18 10:45:07 +02:00
reinsle 2362c5d53e Merge branch 'release/0.2.3' 
# Conflicts:
#	billard/templates/billard/base.html
 2017-08-18 10:44:35 +02:00
reinsle acaa9441a5 set version information 2017-08-18 10:43:02 +02:00
reinsle e674b95d40 set version information 2017-08-18 10:41:55 +02:00
reinsle 2acd2fb952 Merge branch 'release/0.2.2' 2017-08-18 10:41:31 +02:00
reinsle a4e999ac52 set version information 2017-08-18 10:41:15 +02:00
reinsle e5d9d61211 messages fixed 2017-08-04 19:41:44 +02:00
reinsle e16872effe add error logging while processing location data 2017-08-04 19:31:46 +02:00
reinsle 091723d2ac changes to make ie8 ready 2017-08-04 19:22:46 +02:00
reinsle 79233c408e remove celery from project 2017-08-04 17:49:33 +02:00
reinsle 81d9b7f29c add command to process location data 2017-08-03 19:52:43 +02:00
reinsle 222367a6a2 update requirements 2017-08-03 19:10:15 +02:00
reinsle bb30dd73eb Merge tag '0.2.1' into develop 
Tagging version 0.2.1 0.2.1
 2017-08-01 07:57:19 +02:00
reinsle 73fe29b4a4 Merge branch 'release/0.2.1' 2017-08-01 07:57:19 +02:00
reinsle dd28964bf9 set version info 2017-08-01 07:57:00 +02:00
reinsle 294b189a92 add order by 2017-08-01 07:48:55 +02:00
reinsle 9dd2d30dcf disable cmd sceduler 2017-08-01 07:48:55 +02:00
reinsle dd85fcb6ea update requirements 2017-06-21 20:59:04 +02:00
reinsle bc89db6179 carom/carom-doc#13 
fix access accounting objects
 2017-05-17 09:57:56 +02:00
reinsle 50823e5688 do multiple update at once 2017-04-29 11:38:52 +02:00
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 68003388b7 Merge branch 'release/0.2.0' 2017-04-29 11:24:28 +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