seba
/
k4ever
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
141 Commits 3 Branches 0 Tags 2.5 MiB
Commit Graph

141 Commits

Author SHA1 Message Date
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
theresa 86b25703be Merge branch 'master' of git.someserver.de:k4ever 2011-10-14 00:07:29 +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
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
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
theresa a3223e197c Merge branch 'master' of git.someserver.de:k4ever 2011-10-12 18:36:23 +02:00
Sebastian Pipping f5f1b25bc0 client-barcode: Update howto sheet to include to-go codes 2011-10-12 17:13:44 +02:00
Sebastian Pipping 255c08d6c3 Show hint on Plugin permissions if user unknown 2011-10-12 16:06:03 +02:00
Sebastian Pipping 9a0206da97 Remove unused COLOR_WARN 2011-10-12 16:02:08 +02:00
Sebastian Pipping 356c2584db client-barcode: Resolve class ToGoCommand, make UNDO delete commodity/deposity combined 2011-10-12 05:51:11 +02:00
Florian Streibelt 8d6ff280e3 fix for exception handlibg if not an HTTP but URLError 2011-10-12 02:19:52 +02:00
theresa 08e9d4590c List of previous transactions: Make items align 2011-10-12 02:10:58 +02:00
theresa 77a8dd73ed Buying history: Show pictures side-by-side instead of names 2011-10-12 01:43:30 +02:00
Florian Streibelt 83c4e1441d one typo and one bugfix for user unknown on login 2011-10-12 01:35:07 +02:00
theresa bed84eed06 Reordered the welcome page, added images and buying option 2011-10-12 01:21:06 +02:00
Florian Streibelt 9ccdb10e34 Userspace daemon that creates a FIFO and opens the serial port to talk to an EPSON display attached to a serial port. Implemented in C. 
Initial Commit of a rcs-free development.
 2011-10-12 00:49:35 +02:00
seba 7f484ffc52 Fix: Bulkbuying requires now items to be bought. 2011-10-11 01:34:07 +02:00
seba f6f0a0f114 Added bulk buying to api2 2011-10-10 23:59:45 +02:00
theresa 828a31ec67 Fixed some typos and rewrote some of the doku. 2011-10-10 22:15:14 +02:00
Sebastian Pipping e72e5838f1 client-barcode: Adjust display of deposit to match the webapp 2011-10-10 22:10:17 +02:00
Sebastian Pipping f697486296 client-barcode: Allow buying sole deposit of an item 2011-10-10 22:10:17 +02:00
Sebastian Pipping 92efe05fed client-barcode: Implement (in)equality test for class Item 2011-10-10 22:00:10 +02:00
seba 4f6ae55ba4 Some Api2-Handler fixes done with sping 2011-10-10 21:14:07 +02:00
Sebastian Pipping 22d0bf50b9 Propaget deposit flag to server 2011-10-10 07:54:27 +02:00
Sebastian Pipping 16f24cb4a3 Server: Add missing negation 2011-10-10 07:54:27 +02:00
Sebastian Pipping 5fffd09053 Ignore empty input lines rather than trying to find a barcode to match them 2011-10-10 07:38:14 +02:00
Sebastian Pipping 7242261f16 urllib2.URLError may not have attribute "reason" 2011-10-10 07:38:14 +02:00
Sebastian Pipping fafb03c843 Implement to-go logic for all, none, or previous 2011-10-10 07:38:14 +02:00
Sebastian Pipping cf5cae5303 Show total effect on balance, too 2011-10-10 04:49:35 +02:00
Sebastian Pipping c720456749 Fix sign of buy command (display only) 2011-10-10 04:49:35 +02:00
Sebastian Pipping a3521100b6 Add first bits of color 2011-10-10 04:49:35 +02:00
Sebastian Pipping 6b726137b8 Add colorama 0.2.4 2011-10-10 04:49:35 +02:00
Sebastian Pipping 15a154b05c Be less loud 2011-10-10 03:54:14 +02:00
seba 252010544d added check for admin plugin user group membership 2011-10-08 18:11:45 +02:00
seba 0bd4f3b4e0 added aspect ratio checking for admin (+note) 2011-10-08 05:05:27 +02:00
seba c42babf7c3 TODOs for release 2011-10-07 20:04:35 +02:00