ohsab
|
6c51972248
|
footer layout
|
2014-12-09 22:36:24 +01:00 |
|
Tom Naessens
|
0216ecfaf5
|
Don't add user avatars to the repo
|
2014-12-09 22:33:57 +01:00 |
|
|
Tom Naessens
|
4ecfac5070
|
Add avatar to users
|
2014-12-09 22:32:54 +01:00 |
|
|
Tom Naessens
|
07966e550d
|
Fix merge conflict code
|
2014-12-09 21:28:19 +01:00 |
|
|
ohsab
|
5d2859ae61
|
Merge branch 'master' of https://github.com/ZeusWPI/Tab
Conflicts:
app/assets/stylesheets/application.css.scss
|
2014-12-09 21:26:19 +01:00 |
|
|
ohsab
|
3ddead7943
|
layout
|
2014-12-09 21:25:34 +01:00 |
|
|
Tom Naessens
|
f1ec9b473e
|
Better link names
|
2014-12-09 21:25:27 +01:00 |
|
|
Tom Naessens
|
62a47b3bf4
|
Fix login flashes on the overview
|
2014-12-09 21:15:24 +01:00 |
|
|
Tom Naessens
|
2d0885b057
|
Decent title
|
2014-12-09 21:03:37 +01:00 |
|
|
Tom Naessens
|
86fc009c3f
|
Merge branch 'master' of github.com:ZeusWPI/Tab
Conflicts:
app/assets/stylesheets/application.css.scss
|
2014-12-09 20:45:53 +01:00 |
|
|
Tom Naessens
|
dc6d0b5d21
|
Fix the whole devise and admins and everythings
|
2014-12-09 20:34:50 +01:00 |
|
|
ohsab
|
91aa7e5644
|
Merge branch 'master' of https://github.com/ZeusWPI/Tab
|
2014-12-09 20:33:23 +01:00 |
|
|
ohsab
|
c2fe9de0ff
|
filles added
|
2014-12-09 20:33:11 +01:00 |
|
Benjamin Cousaert
|
0d94b3e383
|
Merge
|
2014-12-09 20:29:37 +01:00 |
|
|
Benjamin Cousaert
|
9fe6bf7530
|
Add dagschotel to users
|
2014-12-09 20:28:50 +01:00 |
|
|
ohsab
|
f247e6c5ff
|
dagschotel button added
|
2014-12-09 20:26:18 +01:00 |
|
|
Tom Naessens
|
539d491115
|
Merge branch 'master' of github.com:ZeusWPI/Tab
|
2014-12-09 19:45:05 +01:00 |
|
|
Tom Naessens
|
bdf4b6771f
|
Add cancan, fix header, add admins
|
2014-12-09 19:44:58 +01:00 |
|
|
ohsab
|
00dcd98a93
|
overview view mooi gemaakt
|
2014-12-09 19:44:48 +01:00 |
|
|
Benjamin Cousaert
|
465b9198ab
|
Merge branch 'master' of github.com:ZeusWPI/Tab
|
2014-12-09 19:25:55 +01:00 |
|
|
Benjamin Cousaert
|
b1176f2722
|
Aub tom
|
2014-12-09 19:25:49 +01:00 |
|
|
Tom Naessens
|
f894e71ba0
|
Fix the seeds
|
2014-12-09 19:24:34 +01:00 |
|
|
Benjamin Cousaert
|
df4878f722
|
Merge branch 'master' of github.com:ZeusWPI/Tab
|
2014-12-09 18:57:05 +01:00 |
|
|
Benjamin Cousaert
|
da12b71938
|
Remove email from Devise users and use nickname as primary key
|
2014-12-09 18:56:56 +01:00 |
|
|
ohsab
|
b47a2c08dd
|
seeds added
|
2014-12-09 18:46:56 +01:00 |
|
|
Benjamin Cousaert
|
bb234d7463
|
Fix routes for devise
|
2014-12-09 17:28:24 +01:00 |
|
|
Benjamin Cousaert
|
87b246fd2e
|
Merge branch 'cancan'
|
2014-12-09 17:24:03 +01:00 |
|
|
Benjamin Cousaert
|
20c6597336
|
Remove views from user, because devise
|
2014-12-09 17:22:40 +01:00 |
|
|
Benjamin Cousaert
|
da22af605f
|
Add devise to users
|
2014-12-09 17:17:11 +01:00 |
|
|
ohsab
|
18f8f32ee4
|
Merge branch 'master' of https://github.com/ZeusWPI/Tab
|
2014-12-09 17:07:22 +01:00 |
|
|
ohsab
|
44a7b8630d
|
application helper changed
|
2014-12-09 17:07:17 +01:00 |
|
|
Benjamin Cousaert
|
20d968a7ef
|
merge conflict
|
2014-12-09 14:45:18 +01:00 |
|
|
Tom Naessens
|
6cbe661a6d
|
Added flashes to products
|
2014-12-09 14:42:50 +01:00 |
|
|
Tom Naessens
|
1a50fb5cf2
|
Make things a lot more beautiful
|
2014-12-09 14:39:27 +01:00 |
|
|
Tom Naessens
|
68d1e235fc
|
Merge branch 'master' of github.com:ZeusWPI/Tab
|
2014-12-09 13:44:36 +01:00 |
|
|
Tom Naessens
|
fe5f4949e6
|
Remove unused links from footer
|
2014-12-09 13:44:34 +01:00 |
|
|
Tom Naessens
|
a646429565
|
Use decent bootstrap errors
|
2014-12-09 13:41:35 +01:00 |
|
|
ohsab
|
db37c694aa
|
color btn
|
2014-12-09 13:10:36 +01:00 |
|
|
Benjamin Cousaert
|
a52f74d1a1
|
Remove admins
|
2014-12-09 13:10:15 +01:00 |
|
|
ohsab
|
b064cb21ef
|
knopjes
|
2014-12-09 12:08:49 +01:00 |
|
|
ohsab
|
98b4759758
|
new overview
|
2014-12-09 12:01:25 +01:00 |
|
|
ohsab
|
6c50375aba
|
Merge branch 'master' of https://github.com/ZeusWPI/Tab
|
2014-12-09 11:38:19 +01:00 |
|
|
ohsab
|
26cb04dd33
|
overview button
|
2014-12-09 11:38:10 +01:00 |
|
|
Benjamin Cousaert
|
c06982e643
|
Fix controller permitted parameters
|
2014-12-09 11:18:54 +01:00 |
|
|
Benjamin Cousaert
|
6305d3327a
|
install cancan
|
2014-12-09 11:18:18 +01:00 |
|
|
Benjamin Cousaert
|
c36cc797ac
|
Merge branch 'master' of github.com:ZeusWPI/Tab
|
2014-12-09 10:57:46 +01:00 |
|
|
Benjamin Cousaert
|
ee5ebd7ba4
|
Add payment after order create for users
|
2014-12-09 10:57:38 +01:00 |
|
|
ohsab
|
ec3873c8a3
|
new product price
|
2014-12-09 10:38:22 +01:00 |
|
|
Benjamin Cousaert
|
12b3a68972
|
Add total price to order form
|
2014-12-09 09:43:21 +01:00 |
|
|
Benjamin Cousaert
|
3e7658df9f
|
Add devise for admins
|
2014-12-09 07:05:30 +01:00 |
|