benji
|
01a1f254d9
|
Merge branch 'master' of https://github.com/ZeusWPI/Tab
|
2015-03-26 12:45:54 +01:00 |
|
benji
|
4e651882e9
|
Add seeds for don
|
2015-03-26 12:45:45 +01:00 |
|
benji
|
17cb194897
|
Delete .DS_Store
|
2015-03-25 18:35:46 +01:00 |
|
benji
|
e4e717084b
|
put back database_authenticatable to users, fix empty avatar form bug
|
2015-03-25 17:49:37 +01:00 |
|
benji
|
63e9b81754
|
remove ssl skip - we're secure now
|
2015-03-25 09:11:40 +01:00 |
|
benji
|
c58c8781b6
|
Merge pull request #34 from ZeusWPI/clean_user_registration
Replace multistep registration by default avatar from identicon
|
2015-03-23 12:01:34 +01:00 |
|
benji
|
efd4dcbb2c
|
Replace multistep registration by default avatar from identicon
|
2015-03-23 11:54:15 +01:00 |
|
benji
|
33ffcfdb9b
|
remove database_authenticatable from user and fix paths
|
2015-03-21 17:58:49 +01:00 |
|
benji
|
d687213834
|
Merge branch 'oauth'
|
2015-03-21 14:52:06 +01:00 |
|
benji
|
a97a64b6db
|
Fix user_avatar url
|
2015-03-21 13:00:24 +01:00 |
|
benji
|
c4cee1aac0
|
Merge pull request #31 from ZeusWPI/oauth
Oauth
|
2015-03-20 04:56:47 +01:00 |
|
benji
|
6cbf3df70e
|
No root path when session present
|
2015-03-20 04:54:44 +01:00 |
|
benji
|
67285d8107
|
Add logout button for sessions
|
2015-03-20 04:20:39 +01:00 |
|
benji
|
3ecb2b53d8
|
Add user avatar after user creation
|
2015-03-20 03:57:00 +01:00 |
|
benji
|
7a5b1f20dd
|
tests and travis succeeding
|
2015-03-20 02:33:37 +01:00 |
|
benji
|
6ca2ecebc2
|
Change devise to handle oauth
|
2015-03-20 02:21:56 +01:00 |
|
Tom Naessens
|
342ee1bc0b
|
Set log level to info
|
2015-03-20 00:18:54 +01:00 |
|
Tom Naessens
|
a94c266428
|
Add responders gem
|
2015-03-20 00:00:03 +01:00 |
|
benji
|
aeb3fcab37
|
add capistrano-passenger
|
2015-03-19 23:55:06 +01:00 |
|
benji
|
d6a41c8823
|
devise secret key
|
2015-03-19 23:33:59 +01:00 |
|
benji
|
f81426d30d
|
update environsments production
|
2015-03-19 23:18:18 +01:00 |
|
Tom Naessens
|
d4c883e056
|
Add errbit to tab
|
2015-03-19 22:55:40 +01:00 |
|
Tom Naessens
|
edef683f86
|
Merge branch 'master' of github.com:ZeusWPI/Tab
|
2015-03-19 22:53:53 +01:00 |
|
Tom Naessens
|
c20aec9099
|
Add ruby version and king
|
2015-03-19 22:53:49 +01:00 |
|
benji
|
ee1c7891aa
|
Merge pull request #29 from ZeusWPI/omniauth
Omniauth
|
2015-03-19 22:37:38 +01:00 |
|
benji
|
eaa076b508
|
Add oauth
|
2015-03-19 22:37:16 +01:00 |
|
benji
|
c9a24e81e2
|
Add tab omniauth
|
2015-03-19 19:03:17 +01:00 |
|
benji
|
bbf6adef38
|
remove text field for search
|
2015-03-19 18:46:41 +01:00 |
|
benji
|
46fd14a0a5
|
tests working
|
2015-03-19 18:04:58 +01:00 |
|
benji
|
a4245c1331
|
Change users to table, fix seeds and remove name and lastname from users
|
2015-03-19 17:38:59 +01:00 |
|
benji
|
6ec27acaf8
|
Refactor dagschotel and make test succeed again
|
2015-03-19 16:22:55 +01:00 |
|
benji
|
191517bda7
|
Lot of styles, and some other stuff
|
2015-03-19 14:59:37 +01:00 |
|
benji
|
0c06c4bedb
|
Change some css and refactor some controller actions
|
2015-03-12 13:25:11 +01:00 |
|
benji
|
3a11861bb0
|
Fix html validator on numberfield
|
2015-03-10 12:14:54 +01:00 |
|
benji
|
a0a5785115
|
Merge pull request #28 from ZeusWPI/keep_cancelled_orders
Do some extra shit
|
2015-03-10 11:45:43 +01:00 |
|
benji
|
01c777baa1
|
Do some extra shit
|
2015-03-10 11:37:48 +01:00 |
|
benji
|
a5dbe99d27
|
Add tests for ordering and quickpay
|
2015-03-10 08:52:16 +01:00 |
|
benji
|
35fc8ecc77
|
Add test for placing order
|
2015-03-09 13:17:41 +01:00 |
|
benji
|
ec597ff1aa
|
Merge branch 'master' of https://github.com/ZeusWPI/Tab
|
2015-03-05 10:17:04 +01:00 |
|
benji
|
c99fc4e492
|
Remove complexity from formbuilder
|
2015-03-05 10:16:58 +01:00 |
|
benji
|
bb36147721
|
Merge pull request #27 from ZeusWPI/test_coverage
Test coverage
|
2015-03-04 20:17:08 +01:00 |
|
benji
|
88c780b14e
|
Final test
|
2015-03-04 19:59:07 +01:00 |
|
benji
|
41e8c113ed
|
Stock validator test
|
2015-03-04 18:18:47 +01:00 |
|
benji
|
41140e0784
|
Add test for g_order_items in order
|
2015-03-04 17:14:44 +01:00 |
|
benji
|
51ba90d70a
|
Add test for stock changes
|
2015-03-04 10:25:03 +01:00 |
|
benji
|
5857d37527
|
Merge pull request #26 from ZeusWPI/21/buttons
Fixed pixel
|
2015-03-04 09:59:32 +01:00 |
|
benji
|
ee0239447e
|
Add simplecov config to exclude config files from coveralls
|
2015-03-04 09:50:55 +01:00 |
|
benji
|
ea93a4c456
|
Remove ugly constraint
|
2015-03-03 20:11:50 +01:00 |
|
Tleilaxu
|
72cfaadfe3
|
Fixed pixel
|
2015-03-03 19:45:13 +01:00 |
|
benji
|
d72f691442
|
Finish user tests
|
2015-03-03 18:16:05 +01:00 |
|