Commit graph

134 commits

Author SHA1 Message Date
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
Donvittorio
809c828160 Update README.md 2014-12-12 22:03:41 +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
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