Commit graph

103 commits

Author SHA1 Message Date
benji 82be0ceca4 Add more users on overview screen 2015-02-20 09:21:18 +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
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
Tleilaxu b455d17231 Merge branch 'master' of github.com:ZeusWPI/Tab into 21/buttons 2015-02-19 17:13:46 +01:00
Tleilaxu b6283e8c32 Fixed pixel, added style to logo 2015-02-19 17:04:01 +01:00
benji 66a8dc4f68 Merge pull request #23 from ZeusWPI/profile_page_style
Styling on profile pages
2015-02-19 15:44:49 +01:00
Caroline De Brouwer f9e2c7e104 Styling on profile pages 2015-02-19 15:41:12 +01:00
Tleilaxu df87f5f4e6 Used bootstrap button size classes 2015-02-19 15:30:13 +01:00
Tleilaxu 08c37fd80b Bigger order buttons on mobile devices 2015-02-18 21:16:27 +01:00
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 b37573a4be Several small fixes 2015-02-12 14:39:58 +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 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
ohsab 16cf3770a7 layout lichtjes aangepast 2014-12-12 22:02:58 +01:00
ohsab b5eab1dce1 enkele layout fixes 2014-12-12 12:50:13 +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 cfd7f6fc0f Add quickpay link and controller action 2014-12-10 13:21:06 +01:00
ohsab addf41999a layout users monopoly stijl 2014-12-10 05:13:17 +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 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 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 f247e6c5ff dagschotel button added 2014-12-09 20:26:18 +01:00
ohsab 00dcd98a93 overview view mooi gemaakt 2014-12-09 19:44:48 +01:00
Tom Naessens 1a50fb5cf2 Make things a lot more beautiful 2014-12-09 14:39:27 +01:00
ohsab db37c694aa color btn 2014-12-09 13:10:36 +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 26cb04dd33 overview button 2014-12-09 11:38:10 +01:00
Benjamin Cousaert 12b3a68972 Add total price to order form 2014-12-09 09:43:21 +01:00
Benjamin Cousaert 95aaca802f Fix view of orders/new 2014-12-04 17:02:08 +01:00
ohsab 95ea927ba2 Merge branch 'master' of https://github.com/ZeusWPI/Tab 2014-11-25 13:12:51 +01:00
ohsab 69dc9ce05a admin interface 2014-11-25 13:09:55 +01:00
Tom Naessens 96fbe2c4b8 Random dots? 2014-11-25 10:05:00 +01:00
ohsab cd78e5719d order form almost done 2014-11-24 21:45:32 +01:00
ohsab 4318f5b56a 't moet af, orders werken 2014-11-23 21:12:31 +01:00
ohsab c62b064128 producten 2014-11-10 15:52:54 +01:00
MatsMyncke af6f2668e6 logout 2014-11-06 18:56:00 +01:00
MatsMyncke 806dc1d8f7 users en sessies 2014-11-06 18:30:53 +01:00
MatsMyncke 44185e8552 users 2014-11-06 16:25:27 +01:00
MatsMyncke 46b74305bf basis dingen 2014-11-06 14:46:59 +01:00