benji
|
3f43dd8cd5
|
Merge branch 'master' of https://github.com/ZeusWPI/Tap
|
2015-09-02 14:35:36 +02:00 |
|
benji
|
c0fe8833fa
|
Remove unpermitted parameters and javascript error in orders
|
2015-09-02 14:35:29 +02:00 |
|
Tom Naessens
|
060d4b6a0c
|
Fix asset pipeline stuff
|
2015-09-02 14:05:25 +02:00 |
|
benji
|
4e88be6562
|
Clean up the validation code of stock
|
2015-09-02 12:57:41 +02:00 |
|
benji
|
ea360dc028
|
Merge pull request #63 from ZeusWPI/active_model_for_stock_form
Active model for stock form
|
2015-09-01 23:39:48 +02:00 |
|
benji
|
9850a63781
|
Remove fixtures for activemodel
|
2015-09-01 23:22:28 +02:00 |
|
benji
|
0862b275fc
|
Create actionmodel stock/stockentry and change form
|
2015-09-01 23:13:20 +02:00 |
|
benji
|
b7c292275b
|
Remove schulden for admins as this has been moved to a seperate application
|
2015-09-01 18:15:27 +02:00 |
|
benji
|
28ec934e0a
|
Merge pull request #61 from ZeusWPI/user_edit_styling
Do some styling
|
2015-09-01 17:40:42 +02:00 |
|
benji
|
7b345f28a8
|
Do some styling
|
2015-09-01 17:40:18 +02:00 |
|
benji
|
43190104ec
|
Add user avatar to user#show
|
2015-09-01 16:51:21 +02:00 |
|
benji
|
db6f29b0e5
|
Merge pull request #60 from ZeusWPI/user_show_styling
User show styling
|
2015-09-01 16:27:26 +02:00 |
|
benji
|
10d52c806d
|
Use actual value for products count instead of fix number
|
2015-09-01 16:21:43 +02:00 |
|
Tom Naessens
|
de459fe699
|
Merge branch 'master' of github.com:ZeusWPI/Tap
|
2015-09-01 15:40:24 +02:00 |
|
Tom Naessens
|
ea2731f63f
|
Fix tap repos
|
2015-09-01 15:40:16 +02:00 |
|
benji
|
a220397a33
|
Fix wrong migration
|
2015-09-01 15:12:13 +02:00 |
|
Tom Naessens
|
71db4d600b
|
Merge branch 'master' of github.com:ZeusWPI/Tab
|
2015-09-01 15:06:25 +02:00 |
|
Tom Naessens
|
8fdaf44115
|
Fix deployment
|
2015-09-01 15:05:56 +02:00 |
|
benji
|
1f2c3bd551
|
comment right line
|
2015-09-01 15:04:23 +02:00 |
|
Tom Naessens
|
d8c6ec8f0b
|
Merge branch 'master' of github.com:ZeusWPI/Tab
|
2015-09-01 15:02:21 +02:00 |
|
Tom Naessens
|
4763433b48
|
Prepare tab for new server
|
2015-09-01 15:02:14 +02:00 |
|
benji
|
5eb3a65205
|
Oops
|
2015-09-01 14:54:59 +02:00 |
|
benji
|
7014201510
|
Change some styling
|
2015-09-01 14:52:20 +02:00 |
|
benji
|
c505f1b665
|
Comment failing tests
|
2015-08-31 17:39:30 +02:00 |
|
benji
|
d4dd494c54
|
Merge pull request #59 from ZeusWPI/remove_debt
Remove debt
|
2015-08-31 16:47:45 +02:00 |
|
benji
|
c668cc1ab9
|
cancancan fix
|
2015-08-31 15:35:59 +02:00 |
|
benji
|
da278491b1
|
Fix authorization for orders using cancancan
|
2015-08-31 15:10:13 +02:00 |
|
benji
|
b5017bff9a
|
Remove debt from tab and refactor some code
|
2015-08-31 14:33:15 +02:00 |
|
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 |
|