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 |
|
benji
|
5bff129f58
|
Merge pull request #78 from ZeusWPI/barcode_test
Add tests for barcode controller
|
2015-12-01 20:50:15 +01:00 |
|
benji
|
d361abc91e
|
Add tests for barcode controller
|
2015-12-01 20:02:08 +01:00 |
|
benji
|
49898d484f
|
Add guest account
|
2015-11-30 18:29:18 +01:00 |
|
Tom Naessens
|
e3fe271c4f
|
Fix errbit host
|
2015-11-29 15:20:26 +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
|
f089653f0f
|
Merge pull request #76 from ZeusWPI/tests
Tests
|
2015-10-29 14:48:29 +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
|
7cc2ec6a20
|
product controller
|
2015-10-29 13:53:11 +01:00 |
|
benji
|
f109f5eb18
|
Remove format html from quickpay
|
2015-10-29 11:54:02 +01:00 |
|
benji
|
6248e1211a
|
user controller test
|
2015-10-29 11:50:16 +01:00 |
|
benji
|
b5782b13d8
|
user test
|
2015-10-28 23:34:03 +01:00 |
|
benji
|
f5e6a6e7bf
|
product test
|
2015-10-28 22:58:56 +01:00 |
|
benji
|
a453a6ada2
|
order test
|
2015-10-28 22:48:49 +01:00 |
|
benji
|
839151405b
|
Remove hack for nested models
|
2015-10-28 22:07:48 +01:00 |
|
benji
|
895c523bb9
|
annotate
|
2015-10-28 21:55:59 +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 |
|