Commit graph

476 commits

Author SHA1 Message Date
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
benji
634e507836 Merge branch 'master' of github.com:ZeusWPI/Tap 2016-02-04 13:28:56 +01:00
benji
913abe24fd Merge pull request #85 from ZeusWPI/production
Production
2016-02-02 18:55:06 +01:00
benji
ca5e7825dd Merge branch 'production' of github.com:ZeusWPI/Tap into production 2016-02-02 18:49:28 +01:00
benji
1c52891210 remove the right test 2016-02-02 18:49:22 +01:00
benji
e07cf38986 Revert "Fix failing test"
This reverts commit d210ff9da21e0185c2f0dc9d116ce90b2d2beffb.
2016-02-02 18:46:05 +01:00
benji
20a0378ac2 Merge branch 'master' into production 2016-02-02 18:39:05 +01:00
benji
969ae541a1 Fix failing test 2016-02-02 18:37:53 +01:00
benji
7969b71564 Merge branch 'master' of github.com:ZeusWPI/Tap 2016-02-02 18:37:09 +01:00
benji
a6ea7450c5 Fix failing test 2016-02-02 18:36:57 +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
9ab2072654 Merge pull request #82 from ZeusWPI/production
Production
2016-02-01 15:12:40 +01:00
benji
e91e3213d7 Prepare some things for production phase 2015-12-31 17:30:57 +01:00
benji
0a1747246e Fix versions of airbrake and omniauth 2015-12-31 16:36:08 +01:00
benji
83d74e7eda Merge pull request #81 from ZeusWPI/update_version
Update to ruby 2.2.3 and rails 4.2.4
2015-12-01 22:02:43 +01:00
benji
841d53ea16 Merge branch 'master' into update_version 2015-12-01 21:57:05 +01:00
benji
0b0e766c86 Merge pull request #79 from ZeusWPI/tests
Rewrite ability
2015-12-01 21:56:54 +01:00
benji
124937bc7f Update to ruby 2.2.3 and rails 4.2.4 2015-12-01 21:54:35 +01:00
benji
edfb5e3988 Merge branch 'master' into tests 2015-12-01 21:33:20 +01:00
benji
871e36a293 Merge pull request #80 from ZeusWPI/helper_method_for_guest
Add better helper
2015-12-01 21:32:30 +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
7f07d1a0ab Merge branch 'guest_account' 2015-12-01 20:57:46 +01:00
benji
45af959d45 Merge branch 'master' into guest_account 2015-12-01 20:57:33 +01:00