Commit graph

76 commits

Author SHA1 Message Date
tl3ilaxu fab824fad3 Merge branch 'master' of https://github.com/ZeusWPI/Tap into interface 2016-02-11 16:27:20 +01:00
benji 2791df4f62 Fix guest url 2016-02-04 18:26:20 +01:00
tl3ilaxu da166cf7eb Make code not horrible 2016-02-04 14:24:02 +01:00
tl3ilaxu 412cd4b103 Minor interface fixes 2016-02-04 00:23:12 +01:00
benji e91e3213d7 Prepare some things for production phase 2015-12-31 17:30:57 +01:00
benji 49898d484f Add guest account 2015-11-30 18:29:18 +01:00
benji 839151405b Remove hack for nested models 2015-10-28 22:07:48 +01:00
benji 5b922ceab5 Add way to see changes in quickpay 2015-10-28 16:57:11 +01:00
benji aec212e754 Really fix it 2015-10-27 17:11:12 +01:00
benji 8099de435b Fix 69 2015-10-26 18:57:59 +01:00
benji 4c1a630415 Some view changes to make stuff more obvious 2015-10-07 14:52:44 +02:00
benji e6264fd6c8 Move some stuff to barcodecontroller where it belongs + refactoring 2015-09-28 21:51:40 +02:00
benji 19dec68c59 add workflow for adding products/stock through barcodes 2015-09-25 14:24:32 +02:00
benji 046b2c382c Merge branch 'master' into barcode 2015-09-21 19:07:03 +02:00
benji 5a538a924b oops 2015-09-21 13:00:22 +02:00
benji 571fce83fd Add warning for testfase 2015-09-21 12:25:27 +02:00
benji 6403835872 Use barcode to create new order 2015-09-20 21:21:18 +02:00
benji ec2b516727 Refactor views 2015-09-19 11:05:43 +02:00
benji ef75909298 Change erb to haml 2015-09-17 14:05:33 +02:00
benji b55ba47209 Refactor 2015-09-14 20:26:16 +02:00
benji de1436f5c7 Allow destroying of orders 2015-09-14 17:52:25 +02:00
benji 251d3b69b7 Move tab api to seperate job 2015-09-14 17:29:00 +02:00
Tom Naessens d9cc0ee30e Merge branch 'master' of github.com:ZeusWPI/Tap 2015-09-02 14:58:30 +02:00
Tom Naessens 90f4baa546 Fix order/new button group wrapping (closes #65) 2015-09-02 14:58:23 +02:00
benji c0fe8833fa Remove unpermitted parameters and javascript error in orders 2015-09-02 14:35:29 +02:00
benji f4cc8a9a27 Fix #43 2015-04-03 21:27:03 +02:00
benji bbf6adef38 remove text field for search 2015-03-19 18:46:41 +01:00
benji 6ec27acaf8 Refactor dagschotel and make test succeed again 2015-03-19 16:22:55 +01:00
benji 0c06c4bedb Change some css and refactor some controller actions 2015-03-12 13:25:11 +01:00
benji 01c777baa1 Do some extra shit 2015-03-10 11:37:48 +01:00
benji cec6a43ca1 Extra css on start page 2015-02-20 13:34:48 +01:00
benji 82be0ceca4 Add more users on overview screen 2015-02-20 09:21:18 +01:00
benji d8cf9e443e Clarify schuld in orders/new 2015-02-19 18:12:57 +01:00
Caroline De Brouwer 52b397e250 Stijltjes op producten en al een beetje op profiles 2015-02-12 16:14:11 +01:00
benji cf8ec8da6e Some clean up 2015-02-09 17:06:24 +01:00
benji 3676068fd9 Add papertrail and paginate orders on user page 2015-02-09 13:23:38 +01:00
benji b260d90328 Add formatted form builder 2015-02-09 11:58:43 +01:00
benji 9e72274629 add stock to products and some clean up 2015-01-15 00:39:34 +01:00
benji aa97b51ca6 Small changes to user show page, remove lots of sql queries 2015-01-09 19:15:48 +01:00
benji f595b0dba9 Add controller action to define root based on user role 2015-01-06 20:33:11 +01:00
Benjamin Cousaert b7cd3a7060 Add info about order 2014-12-15 18:56:13 +01:00
Benjamin Cousaert cfd7f6fc0f Add quickpay link and controller action 2014-12-10 13:21:06 +01:00
ohsab addf41999a layout users monopoly stijl 2014-12-10 05:13:17 +01:00
Tom Naessens 0b80a17940 Merge index and overview 2014-12-10 01:03:22 +01:00
Tom Naessens 9b026c7f25 Yuy, even nicer forms 2014-12-10 00:45:49 +01:00
Tom Naessens 3eeaaf3835 Clean javascript is clean <3 2014-12-10 00:38:48 +01:00
Tom Naessens dc50fdec88 Fix some styles 2014-12-09 23:19:03 +01:00
ohsab 6c51972248 footer layout 2014-12-09 22:36:24 +01:00
ohsab 5d2859ae61 Merge branch 'master' of https://github.com/ZeusWPI/Tab
Conflicts:
	app/assets/stylesheets/application.css.scss
2014-12-09 21:26:19 +01:00
ohsab 3ddead7943 layout 2014-12-09 21:25:34 +01:00