benji
|
8e386f413f
|
Product dependency is fixed
|
2015-02-04 16:49:19 +01:00 |
|
|
benji
|
6b05067dc6
|
tis kapot
|
2015-02-04 16:10:47 +01:00 |
|
|
benji
|
9e72274629
|
add stock to products and some clean up
|
2015-01-15 00:39:34 +01:00 |
|
|
benji
|
49dc9201b6
|
Some changes to user profile page and other fixes
|
2015-01-13 13:06:42 +01:00 |
|
|
benji
|
aa97b51ca6
|
Small changes to user show page, remove lots of sql queries
|
2015-01-09 19:15:48 +01:00 |
|
|
benji
|
466b479ffd
|
<3 relix
|
2015-01-09 13:12:19 +01:00 |
|
|
benji
|
7684f54120
|
Remove redirects for root and put logic in routes
|
2015-01-09 12:31:14 +01:00 |
|
|
benji
|
f595b0dba9
|
Add controller action to define root based on user role
|
2015-01-06 20:33:11 +01:00 |
|
|
benji
|
db23fd2181
|
Add koelkast to users
|
2015-01-06 20:18:01 +01:00 |
|
|
Benjamin Cousaert
|
b0fec45150
|
cancancan permissions
|
2014-12-17 07:31:51 +01:00 |
|
|
Benjamin Cousaert
|
26f66f8bff
|
Add cancancan to admins
|
2014-12-15 19:43:02 +01:00 |
|
|
Benjamin Cousaert
|
ef5abb6324
|
Merge branch 'feature/17/products-tabs'
|
2014-12-15 19:08:54 +01:00 |
|
|
Benjamin Cousaert
|
4075fd24a1
|
Merge branch 'feature/17/products-tabs' of https://github.com/ZeusWPI/Tab into feature/17/products-tabs
|
2014-12-15 19:05:22 +01:00 |
|
|
Benjamin Cousaert
|
b7cd3a7060
|
Add info about order
|
2014-12-15 18:56:13 +01:00 |
|
ohsab
|
16cf3770a7
|
layout lichtjes aangepast
|
2014-12-12 22:02:58 +01:00 |
|
Tom Naessens
|
f5b97d9b5d
|
Move all tab to front
|
2014-12-12 13:41:40 +01:00 |
|
|
Tom Naessens
|
4acfd007f7
|
Remove gandalf partner flash
|
2014-12-12 13:21:05 +01:00 |
|
|
ohsab
|
b5eab1dce1
|
enkele layout fixes
|
2014-12-12 12:50:13 +01:00 |
|
|
Tom Naessens
|
587a0bdb7b
|
Add all tab
|
2014-12-11 12:41:53 +01:00 |
|
|
ohsab
|
cab0c1a688
|
syntax foutje gefixt
|
2014-12-11 01:14:54 +01:00 |
|
|
Tom Naessens
|
0b0d780e91
|
Tabs <3
|
2014-12-10 22:06:36 +01:00 |
|
|
Tom Naessens
|
e76a139205
|
Add the migrations, add the category to the form
|
2014-12-10 21:25:21 +01:00 |
|
|
Tom Naessens
|
1e0f04ada2
|
Initially disable the btn-dec
|
2014-12-10 20:47:56 +01:00 |
|
|
Benjamin Cousaert
|
cb94f2dbb8
|
Add schulden csv voor iepoev
|
2014-12-10 16:17:55 +01:00 |
|
|
Benjamin Cousaert
|
bbc8901353
|
Let use choose his dagschotel
|
2014-12-10 14:18:56 +01:00 |
|
|
Benjamin Cousaert
|
cfd7f6fc0f
|
Add quickpay link and controller action
|
2014-12-10 13:21:06 +01:00 |
|
|
Benjamin Cousaert
|
744f8090ba
|
Add orders_count and ordering on overview
|
2014-12-10 10:09:53 +01:00 |
|
|
Benjamin Cousaert
|
f6a37a80cf
|
Fix balance and order paying
|
2014-12-10 10:00:00 +01:00 |
|
|
Benjamin Cousaert
|
11097ccfb9
|
fix some shit
|
2014-12-10 09:20:12 +01:00 |
|
|
ohsab
|
e1ee373b92
|
foutje
|
2014-12-10 05:24:30 +01:00 |
|
|
ohsab
|
addf41999a
|
layout users monopoly stijl
|
2014-12-10 05:13:17 +01:00 |
|
|
Tom Naessens
|
0b80a17940
|
Merge index and overview
|
2014-12-10 01:03:22 +01:00 |
|
|
Tom Naessens
|
9b026c7f25
|
Yuy, even nicer forms
|
2014-12-10 00:45:49 +01:00 |
|
|
Tom Naessens
|
3eeaaf3835
|
Clean javascript is clean <3
|
2014-12-10 00:38:48 +01:00 |
|
|
Tom Naessens
|
dc50fdec88
|
Fix some styles
|
2014-12-09 23:19:03 +01:00 |
|
|
Tom Naessens
|
2eee65ccf8
|
Merge branch 'master' of github.com:ZeusWPI/Tab
Conflicts:
app/assets/stylesheets/orders.css.scss
|
2014-12-09 22:50:43 +01:00 |
|
|
Tom Naessens
|
b7a97f4753
|
Heights heights heights
|
2014-12-09 22:49:35 +01:00 |
|
|
ohsab
|
6c51972248
|
footer layout
|
2014-12-09 22:36:24 +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
|
b1176f2722
|
Aub tom
|
2014-12-09 19:25:49 +01:00 |
|
|
Benjamin Cousaert
|
da12b71938
|
Remove email from Devise users and use nickname as primary key
|
2014-12-09 18:56: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 |
|
|
Benjamin Cousaert
|
b30b527650
|
Small commit, for iasoon <3
|
2014-12-08 17:56:48 +01:00 |
|
|
Benjamin Cousaert
|
b9e42b8bc1
|
Move logic to model
|
2014-12-08 11:41:38 +01:00 |
|
|
Benjamin Cousaert
|
5efef27454
|
remove some sql queries
|
2014-12-06 17:51:41 +01:00 |
|
|
Benjamin Cousaert
|
c06c8cacd2
|
Add index action and view for orders
|
2014-12-06 12:03:08 +01:00 |
|
|
Benjamin Cousaert
|
c3729a5964
|
new order with decent rails
|
2014-12-05 16:15:07 +01:00 |
|
|
Benjamin Cousaert
|
7ddd1d5775
|
Fix bug with count for products in orders
|
2014-12-05 07:55:28 +01:00 |
|
|
Benjamin Cousaert
|
4e4f0c32a2
|
Add avatar to product edit form and use recources in routes
|
2014-12-05 07:24:27 +01:00 |
|
|
Benjamin Cousaert
|
552f811fea
|
Add paperclip to gems and avatar to products
|
2014-12-04 20:32:31 +01:00 |
|
|
Benjamin Cousaert
|
182932abf5
|
Add Annotate Gem and some more validations
|
2014-12-04 19:50:02 +01:00 |
|
|
Benjamin Cousaert
|
9e598c5751
|
Fix controller orders create action
|
2014-12-04 19:28:21 +01:00 |
|
|
Benjamin Cousaert
|
95aaca802f
|
Fix view of orders/new
|
2014-12-04 17:02:08 +01:00 |
|
|
Benjamin Cousaert
|
cb17fdc1a7
|
Merge branch 'master' of github.com:ZeusWPI/Tab
|
2014-11-29 11:06:34 +01:00 |
|
|
Benjamin Cousaert
|
3553901b7c
|
Add counter for number of each product in order
|
2014-11-29 11:06:22 +01:00 |
|
|
ohsab
|
a52c50531e
|
clean up
|
2014-11-26 12:01:22 +01:00 |
|
|
ohsab
|
b2b9a7a188
|
clean up
|
2014-11-26 11:58:51 +01:00 |
|
|
Benjamin Cousaert
|
64113790cf
|
belongs_to a single instance of model
|
2014-11-25 21:34:29 +01:00 |
|
|
ohsab
|
1c0a313fdb
|
header
|
2014-11-25 16:42:07 +01:00 |
|
|
ohsab
|
fd05ea2d64
|
header
|
2014-11-25 16:40:22 +01:00 |
|