Commit graph

212 commits

Author SHA1 Message Date
Felix Van der Jeugt
6dc80bbaeb Merge branch 'master' into fix/side-bar-layout 2016-02-05 19:52:37 +01:00
Felix Van der Jeugt
e72e76e9a3 fix form errors and notice when nothing changed 2016-02-05 09:16:02 +01:00
Felix Van der Jeugt
9c31d9d6b4 remove the edit page - it's not used anyway 2016-02-04 23:38:10 +01:00
Felix Van der Jeugt
63539e01f7 put settings in side bar 2016-02-04 23:28:13 +01:00
benji
d723c46c2a Little design fix 2016-02-04 19:03:02 +01:00
benji
a2f5b172e3 Who wants feedback anyway? 2016-02-04 18:46:33 +01:00
benji
2791df4f62 Fix guest url 2016-02-04 18:26:20 +01:00
benji
0ee070d27e Make link of balance 2016-02-02 17:50:22 +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
b5782b13d8 user test 2015-10-28 23:34:03 +01:00
benji
839151405b Remove hack for nested models 2015-10-28 22:07:48 +01:00
benji
8906ca7e39 Add flash messages on quickpay 2015-10-28 20:48:49 +01:00
benji
5b922ceab5 Add way to see changes in quickpay 2015-10-28 16:57:11 +01:00
benji
e8e4fc6855 Old tab in footer 2015-10-27 23:00:01 +01:00
benji
3299f46ed7 Rewrite flash messages 2015-10-27 22:54:06 +01:00
benji
6b3e57ab45 Add barcodes index and destroy 2015-10-27 22:09:01 +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
bd27ac3cca Add styling to stockentry 2015-09-26 12:13:43 +02:00
benji
19dec68c59 add workflow for adding products/stock through barcodes 2015-09-25 14:24:32 +02:00
benji
0885359d71 users controller test 2015-09-22 20:06:50 +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
ec2174171d format balance 2015-09-21 12:48:30 +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
17a54723ec Remove index and destroy on userscontroller 2015-09-18 21:05:32 +02:00
benji
442c694122 Fix some small bugs 2015-09-17 15:32:39 +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
benji
891e596fda replace tab api key to secrets 2015-09-12 11:47:00 +02:00
benji
5ba36e431f Merge branch 'rspec' 2015-09-12 11:30:59 +02:00
benji
48aaaa354d Merge branch 'master' into rspec 2015-09-12 11:30:09 +02:00
benji
825dee8e02 Add delayed job to post requests to tab 2015-09-12 11:17:58 +02:00
Tom Naessens
0f5bfa0432 Annnd another substitute 2015-09-08 13:35:56 +02:00
Tom Naessens
8ac363911e s/tab/tap/g 2015-09-08 13:30:18 +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
4e88be6562 Clean up the validation code of stock 2015-09-02 12:57:41 +02:00
benji
0862b275fc Create actionmodel stock/stockentry and change form 2015-09-01 23:13:20 +02:00
benji
b7c292275b Remove schulden for admins as this has been moved to a seperate application 2015-09-01 18:15:27 +02:00
benji
7b345f28a8 Do some styling 2015-09-01 17:40:18 +02:00
benji
43190104ec Add user avatar to user#show 2015-09-01 16:51:21 +02:00