Commit Graph

177 Commits

Author SHA1 Message Date
Sebastian Pipping bb468f25bf Hopefully fix crash on sending "Schöfferhofer" to LCD display 2011-10-17 21:23:17 +02:00
Sebastian Pipping 028d03456f Merge branch 'master' into display-threading
Conflicts:
	client-barcode/freitagslib/network.py
2011-10-17 20:01:43 +02:00
Sebastian Pipping dd27a1e5ab client-barcode: Handle long labels better 2011-10-17 19:59:16 +02:00
Florian Streibelt afa510e090 better timeouts and the real url 2011-10-15 06:11:15 +02:00
Florian Streibelt 1818360fc5 some screens net to get fixed. 2011-10-15 05:58:48 +02:00
Florian Streibelt bc234a691c renamed to a more sane name 2011-10-15 05:41:05 +02:00
Florian Streibelt 18f1de1b26 screensaver now implemented in python (too) including idle message per state. 2011-10-15 05:38:14 +02:00
Florian Streibelt f5f55eff84 reordering of functions 2011-10-15 04:19:49 +02:00
Sebastian Pipping 7a70f06bbb client-barcode: No longer mention absense of deposit for items how never have deposit 2011-10-15 04:17:22 +02:00
Florian Streibelt 5684b46001 Moar functions for the display 2011-10-15 04:15:50 +02:00
Sebastian Pipping 35989b3e04 client-barcode: Update server URL 2011-10-15 04:12:55 +02:00
seba f1bbfbb20c Fixed some api bugs
- Disallowed buying more than 30 items at once
 - Disallowed transacting 0 euros to account
2011-10-15 04:06:01 +02:00
seba 23b2164e23 moved map, added docs link 2011-10-15 03:49:43 +02:00
Florian Streibelt 665ba7cc5e Display now has scrolling text implemented in a python thread and error-screens, etc 2011-10-15 03:49:13 +02:00
seba 17e9321eed added thumbnail support (kudoes to tannek) 2011-10-15 03:43:33 +02:00
Florian Streibelt 15493ee6aa now now exit if display daemin dies 2011-10-15 02:21:32 +02:00
Florian Streibelt 5124cf1d23 wrong escape sequence 2011-10-15 02:10:19 +02:00
theresa b62b6543e4 Show prices on start page, fix background color 2011-10-15 01:39:06 +02:00
Florian Streibelt d6e277fac4 cursor off/full display init after resume 2011-10-14 20:46:25 +02:00
theresa f7476ebf68 Fix right column on start page and table width on buyable list 2011-10-14 20:23:29 +02:00
Konrad Mohrfeldt ff74f9305e meh, dont mess with the buybutton ^^ 2011-10-14 17:58:05 +02:00
seba 5ddd2c71a1 Merge branch 'master' of git.someserver.de:k4ever
Conflicts:
	k4ever/buyable/templates/buyables/showItems.html
	k4ever/media/css/style.css
2011-10-14 14:58:52 +02:00
theresa b059611d4a Fix stylesheet (links, fonts, margins) 2011-10-14 13:42:06 +02:00
Konrad Mohrfeldt adb8233120 updated buyButton and table.showitem styles
updated templates for product listings
2011-10-14 09:21:13 +02:00
theresa 37cd8698bf devel/ cleanup + a bit README text 2011-10-14 05:18:19 +02:00
Florian Streibelt b83d15a461 finally{} 2011-10-14 01:48:28 +02:00
theresa 86b25703be Merge branch 'master' of git.someserver.de:k4ever 2011-10-14 00:07:29 +02:00
Florian Streibelt f0fa719d9f now displays deposit corectly 2011-10-13 23:58:47 +02:00
theresa e7253465d7 Beautify settings page and buying history, order items in store 2011-10-13 23:55:43 +02:00
theresa 60b16bd532 Added multi-authblob submission error msg 2011-10-13 23:53:44 +02:00
Florian Streibelt f880ec04ea now with goodbye message 2011-10-13 23:21:09 +02:00
Florian Streibelt 2a1ad9f122 fixed some escape codes and added some output screens 2011-10-13 22:23:36 +02:00
Florian Streibelt ad5eff49be Scrolling text now in function and with a 'slide in' from right 2011-10-13 22:22:04 +02:00
Sebastian Pipping 56673f9936 client-barcode: Turn "UNDO" into "STORNO" on howto sheet 2011-10-13 20:54:02 +02:00
Sebastian Pipping aa204aea02 client-barcode: Increase visibility of commit reminder 2011-10-13 20:51:47 +02:00
Florian Streibelt 8261c3ecef Merge branch 'master' into display 2011-10-13 19:21:15 +02:00
Florian Streibelt e36d00c393 Bugs removed that prevented the screen from turning on again.: 2011-10-13 19:19:17 +02:00
Sebastian Pipping 584cd364e5 client-barcode: Repair deposit, bug reported by Florian 2011-10-13 19:08:00 +02:00
Sebastian Pipping f48d01ff1a client-barcode: Integrate feedback from Theresa into howto sheet 2011-10-13 03:12:34 +02:00
Konrad Mohrfeldt b3e4988547 updated start page view 2011-10-13 01:37:28 +02:00
Konrad Mohrfeldt 2f98b6b17c added raw images for deposit and payment+deposit 2011-10-13 00:58:47 +02:00
Konrad Mohrfeldt 8eedb855cb only populate search field when logged in 2011-10-13 00:58:17 +02:00
Konrad Mohrfeldt def4cebcdf removed unused css bg 2011-10-13 00:57:41 +02:00
Konrad Mohrfeldt bb960dcba3 added deposit, payment and payment+deposit images 2011-10-13 00:55:36 +02:00
Konrad Mohrfeldt 1051d7cec1 dont track the media/img folder 2011-10-12 23:56:29 +02:00
Konrad Mohrfeldt 5849239f5e updated styles for top bar 2011-10-12 21:13:43 +02:00
Konrad Mohrfeldt 9729e675ff migrated to api2 2011-10-12 21:13:21 +02:00
Florian Streibelt f9550712d8 not all screens yet on the display. scroll text would be nice... 2011-10-12 20:45:28 +02:00
Florian Streibelt ed8659964c Merge branch 'master' into display
Conflicts:
	client-barcode/freitagskasse.py
2011-10-12 19:59:34 +02:00
Florian Streibelt ffe61d7e7c stuff... 2011-10-12 19:53:05 +02:00