Commit graph

359 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
benji
5d7210b228 Merge pull request #102 from ZeusWPI/mobile
Mobile
2016-03-01 18:17:11 +01:00
tl3ilaxu
5f73efc7d4 Don't let users generate money 2016-03-01 17:15:29 +01:00
tl3ilaxu
fefe6f1a0c Indentation anti-nazi commit 2016-03-01 16:50:19 +01:00
tl3ilaxu
9700f12655 Fix annoying ass stock numbers 2016-03-01 16:38:03 +01:00
tl3ilaxu
648b0362c5 greater_than_or_equal_to: 0 }
Merge branch 'master' of https://github.com/ZeusWPI/Tap into mobile
2016-03-01 16:10:15 +01:00
tl3ilaxu
13d0f27c7e Merge branch 'master' of https://github.com/ZeusWPI/Tap into letterlijk-1-lijn 2016-03-01 16:07:22 +01:00
benji
d9c7e5249e Fix tests for now 2016-03-01 16:05:46 +01:00
tl3ilaxu
18ea5ad627 LETTERLIJK 1 LIJN 2016-03-01 15:25:44 +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
Ilion Beyst
c6dc220d3d fix formula and test it 2016-02-16 15:38:44 +01:00
Ilion Beyst
b5970738b9 I cannot into rails 2016-02-16 15:04:49 +01:00
Ilion Beyst
3b47847276 also save the model after changing it ... 2016-02-16 15:03:15 +01:00
Ilion Beyst
727372c7ef implement frecency 2016-02-16 15:00:43 +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
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