tl3ilaxu
|
536d4c44ae
|
Release users from the burden of needing to have a dagschotel
|
2016-03-02 00:43:27 +01:00 |
|
Ilion Beyst
|
7d07d12493
|
increase frecency memory
|
2016-03-01 22:56:00 +01:00 |
|
benji
|
5d7210b228
|
Merge pull request #102 from ZeusWPI/mobile
Mobile
|
2016-03-01 18:17:11 +01:00 |
|
|
benji
|
fb2d24e0fe
|
Merge pull request #103 from ZeusWPI/letterlijk-1-lijn
Letterlijk 1 lijn
|
2016-03-01 17:55:41 +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 |
|
|
benji
|
935049c1bf
|
Merge pull request #96 from ZeusWPI/frecency
Frecency
|
2016-02-16 15:46:27 +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 |
|
|
benji
|
0b63edd40e
|
Merge pull request #92 from ZeusWPI/interface
Minor interface changes
|
2016-02-11 17:15:32 +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
|
9cfb4bfaed
|
Merge pull request #91 from ZeusWPI/fix/remove-avatar-label
Remove label for avatar field
|
2016-02-09 15:00:08 +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 |
|
|
benji
|
5915e2d6b8
|
Merge pull request #89 from ZeusWPI/ruby2.3.0
Upgrade ruby version
|
2016-02-08 21:31:00 +01:00 |
|
|
benji
|
7561685e79
|
Upgrade ruby version
|
2016-02-08 21:27:41 +01:00 |
|
|
benji
|
a4776da803
|
Merge pull request #87 from ZeusWPI/fix/side-bar-layout
Fix/side bar layout
|
2016-02-08 20:28:43 +01:00 |
|
|
benji
|
d30945a265
|
Merge pull request #88 from ZeusWPI/fix/coverage-models-user
cover the user model
|
2016-02-08 18:16:13 +01:00 |
|
Felix Van der Jeugt
|
91e551e35e
|
cover the user model
|
2016-02-05 22:47:51 +01:00 |
|
|
Felix Van der Jeugt
|
7e1d6735d3
|
add tests for avatar upload
|
2016-02-05 20:51:19 +01:00 |
|
|
Felix Van der Jeugt
|
60827e1492
|
plz no vendor yes?
|
2016-02-05 20:02:36 +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
|
6d06ebdac8
|
"fix" tests
|
2016-02-05 19:51:39 +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 |
|
|
benji
|
69d458cfa9
|
Put delay for tap to tab transactions back to 5 minutes
|
2016-02-04 18:15:58 +01:00 |
|
|
benji
|
bcfa1670dd
|
Fix version of mysql2 to deploy
|
2016-02-04 16:57:33 +01:00 |
|
|
benji
|
36bb7b5fda
|
Rebuild Gemfile.lock after downgrading
|
2016-02-04 16:50:38 +01:00 |
|
|
benji
|
0cac19597a
|
Put back to ruby 2.2.2 to deploy
|
2016-02-04 15:56:49 +01:00 |
|
|
tl3ilaxu
|
da166cf7eb
|
Make code not horrible
|
2016-02-04 14:24:02 +01:00 |
|