Commit graph

333 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
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
670b17622d show error flash on failed file stuffs 2016-02-04 23:47:34 +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
71fc48cd71 Find correct user on users#show 2016-02-04 21:03:03 +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
6aec736c52 Little bug with user order 2016-02-02 15:20:04 +01:00
benji
e396401a4a Fix some stuff 2016-02-02 14:42:02 +01:00
benji
e91e3213d7 Prepare some things for production phase 2015-12-31 17:30:57 +01:00
benji
edfb5e3988 Merge branch 'master' into tests 2015-12-01 21:33:20 +01:00
benji
d092e08718 Add better helper 2015-12-01 21:19:35 +01:00
benji
4f67230258 Merge branch 'master' into tests 2015-12-01 21:07:51 +01:00
benji
49898d484f Add guest account 2015-11-30 18:29:18 +01:00
benji
da8ac14623 Merge branch 'master' of https://github.com/ZeusWPI/Tap 2015-11-05 19:52:41 +01:00
benji
47713d12ab little something 2015-11-05 19:52:34 +01:00
benji
512a3aeede Rewrite ability 2015-10-29 15:42:23 +01:00
benji
41d67556f4 Fix ability test 2015-10-29 14:27:06 +01:00
benji
b7ac8c32f7 Simplify ability 2015-10-29 14:09:52 +01:00
benji
f109f5eb18 Remove format html from quickpay 2015-10-29 11:54:02 +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
539b65b75f barcode model test 2015-10-28 21:54:55 +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
80899f21aa double barcodes 2015-10-27 20:57:43 +01:00
benji
aec212e754 Really fix it 2015-10-27 17:11:12 +01:00
benji
9c9511b95e Add error when barcode not found 2015-10-27 16:52:06 +01:00
benji
62075f9cb1 Remove redirect loop for koelkast 2015-10-27 16:31:10 +01:00
benji
8099de435b Fix 69 2015-10-26 18:57:59 +01:00
benji
344f259efd Use try so it doesn't crash 2015-10-07 16:49:29 +02:00
benji
3d9afce424 load barcode 2015-10-07 16:42:05 +02:00
benji
cf4cb74087 authorization 2015-10-07 16:39:06 +02:00
benji
d575de04eb Relative url 2015-10-07 16:04:09 +02:00
benji
5b22c54c0f shallow 2015-10-07 15:55:47 +02:00
benji
f0032448d5 Ability 2015-10-07 15:52:05 +02:00
benji
c8b21ed1d1 Load barcode through product 2015-10-07 15:34:22 +02:00
benji
0baa857458 urgh 2015-10-07 15:10:14 +02:00