Commit graph

514 commits

Author SHA1 Message Date
benji
bf52027229 Add image_tag of avatar on user edit page 2015-07-01 11:16:08 +02:00
benji
f5c970af53 Fix css on order_items 2015-06-30 23:33:11 +02:00
benji
7c7c93f607 Merge pull request #51 from ZeusWPI/private_user
Add private option to users
2015-06-30 23:32:48 +02:00
benji
2f71e95a81 Add private option to users 2015-06-30 22:30:34 +02:00
benji
97fdd2e24c Change orderitems from text inputs to number fields 2015-04-04 04:13:30 +02:00
benji
ec36ac619f use english locale 2015-04-04 03:38:29 +02:00
benji
eda0d86e74 Fix #47 2015-04-04 03:26:25 +02:00
benji
8e5ccfed7a urgh 2015-04-04 02:50:26 +02:00
benji
48236e1f69 add token for tests 2015-04-04 02:09:25 +02:00
benji
d8f77442ab comma and empty token in development 2015-04-04 01:51:11 +02:00
benji
0105c30a36 secrets 2015-04-04 01:47:02 +02:00
benji
be9c967db2 Add slack notification 2015-04-04 01:44:28 +02:00
benji
9ec9f043ed Merge pull request #46 from ZeusWPI/products_list
Products list
2015-04-03 23:56:48 +02:00
benji
99c49db848 change products to table view 2015-04-03 23:56:13 +02:00
benji
bd67675472 add #42 2015-04-03 22:19:47 +02:00
benji
9f898fa832 fix #45 2015-04-03 22:01:20 +02:00
benji
f4cc8a9a27 Fix #43 2015-04-03 21:27:03 +02:00
benji
983174b67d add faker to production 2015-04-03 16:52:07 +02:00
benji
0bcbc20702 change index of products in table view 2015-03-28 14:36:07 +01:00
benji
044ad2051d fixing tests 2015-03-26 12:53:12 +01:00
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