Commit graph

282 commits

Author SHA1 Message Date
benji
df91936ff8 Merge branch 'delete_products' 2015-08-25 16:05:22 +02:00
benji
cc9e4ed6b3 Merge master 2015-08-25 16:05:13 +02:00
benji
b7f40f8832 Add possibility to remove products from the offer without breaking stuff 2015-08-25 15:53:27 +02:00
benji
5d39abafd5 Merge pull request #53 from VandorpeDavid/calories
Calories
2015-08-24 16:16:27 +02:00
benji
652c598722 Merge pull request #55 from VandorpeDavid/out_of_order
Red border when product is sold out
2015-08-24 16:02:29 +02:00
David Vandorpe
595d8ed282 Forgot to commit helper 2015-07-08 17:43:20 +02:00
David Vandorpe
ee86411d58 Using helper to generate kcal tag
As suggested by Benji
2015-07-08 17:38:51 +02:00
David Vandorpe
d397ae7d34 Use of .zero? instead of == 0 2015-07-08 17:06:02 +02:00
benji
4dcf2c2b1b Merge pull request #54 from VandorpeDavid/negative_purchases
Enforce stock max en 0 min for amount of products in orders
2015-07-08 14:37:26 +02:00
David Vandorpe
24f9531192 Senpai Silox Styling Suggestions 2015-07-08 13:37:19 +02:00
David Vandorpe
91945b6983 Senpai Silox Styling Suggestions 2015-07-08 13:31:32 +02:00
David Vandorpe
7831520c6f Red border when product is sold out 2015-07-07 22:36:04 +02:00
David Vandorpe
33b797b5d9 Enforce stock max en 0 min for amount of products in orders
Fixes #48
2015-07-07 21:47:20 +02:00
David Vandorpe
a8055d6f09 Adding calories to several views 2015-07-07 20:20:34 +02:00
David Vandorpe
849d9ce04b Product calories: DB migration + Model update + attribute permit 2015-07-07 20:11:37 +02:00
benji
5a5fbdf1c9 Fix #38 2015-07-01 23:51:26 +02:00
benji
dc73128508 Fix #49 2015-07-01 16:56:09 +02:00
benji
90e270a03e Avoid long product names of fucking up entire layout 2015-07-01 16:19:36 +02:00
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