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
|
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 |
|
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 |
|
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
|
2f71e95a81
|
Add private option to users
|
2015-06-30 22:30:34 +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
|
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
|
f4cc8a9a27
|
Fix #43
|
2015-04-03 21:27:03 +02:00 |
|
benji
|
0bcbc20702
|
change index of products in table view
|
2015-03-28 14:36:07 +01:00 |
|
benji
|
e4e717084b
|
put back database_authenticatable to users, fix empty avatar form bug
|
2015-03-25 17:49:37 +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
|
a97a64b6db
|
Fix user_avatar url
|
2015-03-21 13:00:24 +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
|
6ca2ecebc2
|
Change devise to handle oauth
|
2015-03-20 02:21:56 +01:00 |
|
benji
|
eaa076b508
|
Add oauth
|
2015-03-19 22:37:16 +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
|
01c777baa1
|
Do some extra shit
|
2015-03-10 11:37:48 +01:00 |
|
benji
|
35fc8ecc77
|
Add test for placing order
|
2015-03-09 13:17:41 +01:00 |
|
benji
|
7d367a154d
|
Only show button on own user page
|
2015-03-02 16:11:44 +01:00 |
|
benji
|
b8b89aa779
|
Add order button on user profile page
|
2015-03-02 16:10:54 +01:00 |
|
benji
|
35876715f6
|
Add contextmenu for keyboard
|
2015-02-20 15:05:11 +01:00 |
|
benji
|
cec6a43ca1
|
Extra css on start page
|
2015-02-20 13:34:48 +01:00 |
|
benji
|
1c6be64e5c
|
Merge branch 'master' of https://github.com/ZeusWPI/Tab
|
2015-02-20 09:21:24 +01:00 |
|
benji
|
82be0ceca4
|
Add more users on overview screen
|
2015-02-20 09:21:18 +01:00 |
|
benji
|
c2d5db70df
|
Merge pull request #25 from ZeusWPI/21/buttons
21/buttons
|
2015-02-19 18:14:35 +01:00 |
|
Tleilaxu
|
b9e5c63a9a
|
Merge branch 'master' of github.com:ZeusWPI/Tab into 21/buttons
Conflicts:
app/assets/stylesheets/orders.css.scss
|
2015-02-19 18:13:35 +01:00 |
|
benji
|
d8cf9e443e
|
Clarify schuld in orders/new
|
2015-02-19 18:12:57 +01:00 |
|
Tleilaxu
|
0b35bb1f06
|
Fixed css
|
2015-02-19 18:08:50 +01:00 |
|
benji
|
7c1dee80ee
|
fix some css
|
2015-02-19 18:07:34 +01:00 |
|