Commit graph

232 commits

Author SHA1 Message Date
tl3ilaxu 9292dd807f Remove obsolete json 2016-03-03 22:30:23 +01:00
tl3ilaxu f3669117a2 Make quick pay reload, the good way 2016-03-03 22:20:56 +01:00
tl3ilaxu 0ecde8201e Make quick pay reload, the bad way 2016-03-03 00:10:34 +01:00
tl3ilaxu 8265004df5 Seperate javascript 2016-03-02 23:11:37 +01:00
tl3ilaxu 3a4c45a4eb Use new ruby style 2016-03-02 22:03:07 +01:00
tl3ilaxu 67c07d50b8 Remove obsolete text when there's no dagschotel 2016-03-02 18:56:27 +01:00
tl3ilaxu d99304b065 Add ordering form sidebar 2016-03-02 18:51:04 +01:00
tl3ilaxu 536d4c44ae Release users from the burden of needing to have a dagschotel 2016-03-02 00:43:27 +01:00
tl3ilaxu a88dd7d4c0 Merge branch 'master' of https://github.com/ZeusWPI/Tap into mobile 2016-03-01 15:11:26 +01:00
tl3ilaxu 135e04536f Add random tweaks 2016-03-01 15:11:19 +01:00
benji 26973a330a Betaal uw fucking schulden 2016-02-29 11:27:05 +01:00
tl3ilaxu 95c209001d Merge 2016-02-16 18:16:48 +01:00
tl3ilaxu 4ae5adac64 Add line brake 2016-02-16 18:13:17 +01:00
tl3ilaxu da11d20f2c Fix mobile 2016-02-16 16:51:36 +01:00
tl3ilaxu fab824fad3 Merge branch 'master' of https://github.com/ZeusWPI/Tap into interface 2016-02-11 16:27:20 +01:00
benji 353df49dbf Merge pull request #90 from ZeusWPI/bootstrap_switch
Use bootstrap switch for the private/public button
2016-02-10 13:50:26 +01:00
benji bdb5bbc851 Remove label for avatar field 2016-02-09 00:29:51 +01:00
benji 3a602b55dc Use bootstrap switch for the private/public button 2016-02-09 00:12:54 +01:00
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
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 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