Commit graph

456 commits

Author SHA1 Message Date
Caroline De Brouwer
5b5c454e0e Merge conflict 2015-02-12 16:19:41 +01:00
Caroline De Brouwer
52b397e250 Stijltjes op producten en al een beetje op profiles 2015-02-12 16:14:11 +01:00
benji
3b1a571b0b Euro helper fix negative numbers, and reverse orders of orders on user#show 2015-02-12 15:31:32 +01:00
benji
b37573a4be Several small fixes 2015-02-12 14:39:58 +01:00
benji
f745de8153 remove pictures required 2015-02-10 13:04:35 +01:00
benji
f37bc6acb0 rails 4.2 2015-02-10 09:00:29 +01:00
benji
835f08b60c Fix order bug 2015-02-10 08:33:51 +01:00
benji
7642e35d5d Add db/seeds and fix two minor bugs 2015-02-10 07:15:25 +01:00
benji
d653c6ca84 Put back file I shouldn't have removed 2015-02-09 17:14:33 +01:00
benji
cf8ec8da6e Some clean up 2015-02-09 17:06:24 +01:00
benji
3676068fd9 Add papertrail and paginate orders on user page 2015-02-09 13:23:38 +01:00
benji
b260d90328 Add formatted form builder 2015-02-09 11:58:43 +01:00
benji
39e96305b6 Add stock form 2015-02-08 10:11:23 +01:00
benji
ca3045fbbf Add undo button for quickpay/dagschotel 2015-02-04 19:03:50 +01:00
benji
9e4563fbd1 fix minor bug 2015-02-04 17:09:42 +01:00
benji
4b05623a96 fix price bug for products 2015-02-04 17:05:02 +01:00
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
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