Commit graph

65 commits

Author SHA1 Message Date
Tom Naessens dc50fdec88 Fix some styles 2014-12-09 23:19:03 +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
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 c2fe9de0ff filles added 2014-12-09 20:33:11 +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 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
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
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
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 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 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 95aaca802f Fix view of orders/new 2014-12-04 17:02:08 +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
ohsab 1c0a313fdb header 2014-11-25 16:42:07 +01:00
ohsab fd05ea2d64 header 2014-11-25 16:40:22 +01:00
Benjamin Cousaert c986683273 fix routes 2014-11-25 16:38:08 +01:00
ohsab e2e9582211 HEADER IS GEFIXED SILOX STOP ME HATEN 2014-11-25 16:25:00 +01:00
ohsab 9309ae60dc user show 2014-11-25 16:18:11 +01:00
ohsab 5c07c0b2cc routes fixed, orders need to be nested 2014-11-25 15:27:12 +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
Benjamin Cousaert b423a9d0e8 Add some validations to User and errors to form 2014-11-25 11:30:55 +01:00
ohsab 73e24e2b55 shit werkt met vuile hacks 2014-11-25 02:01:57 +01:00