midgard/tap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Commit graph

  • 6c51972248 footer layout ohsab 2014-12-09 22:36:24 +0100
  • 0216ecfaf5 Don't add user avatars to the repo Tom Naessens 2014-12-09 22:33:57 +0100
  • 4ecfac5070 Add avatar to users Tom Naessens 2014-12-09 22:32:54 +0100
  • 07966e550d Fix merge conflict code Tom Naessens 2014-12-09 21:28:19 +0100
  • 5d2859ae61 Merge branch 'master' of https://github.com/ZeusWPI/Tab ohsab 2014-12-09 21:26:19 +0100
  • 3ddead7943 layout ohsab 2014-12-09 21:25:34 +0100
  • f1ec9b473e Better link names Tom Naessens 2014-12-09 21:25:27 +0100
  • 62a47b3bf4 Fix login flashes on the overview Tom Naessens 2014-12-09 21:15:24 +0100
  • 2d0885b057 Decent title Tom Naessens 2014-12-09 21:03:37 +0100
  • 86fc009c3f Merge branch 'master' of github.com:ZeusWPI/Tab Tom Naessens 2014-12-09 20:45:53 +0100
  • dc6d0b5d21 Fix the whole devise and admins and everythings Tom Naessens 2014-12-09 20:34:50 +0100
  • 91aa7e5644 Merge branch 'master' of https://github.com/ZeusWPI/Tab ohsab 2014-12-09 20:33:23 +0100
  • c2fe9de0ff filles added ohsab 2014-12-09 20:33:11 +0100
  • 0d94b3e383 Merge Benjamin Cousaert 2014-12-09 20:29:37 +0100
  • 9fe6bf7530 Add dagschotel to users Benjamin Cousaert 2014-12-09 20:28:50 +0100
  • f247e6c5ff dagschotel button added ohsab 2014-12-09 20:26:18 +0100
  • 539d491115 Merge branch 'master' of github.com:ZeusWPI/Tab Tom Naessens 2014-12-09 19:45:05 +0100
  • bdf4b6771f Add cancan, fix header, add admins Tom Naessens 2014-12-09 19:44:58 +0100
  • 00dcd98a93 overview view mooi gemaakt ohsab 2014-12-09 19:44:48 +0100
  • 465b9198ab Merge branch 'master' of github.com:ZeusWPI/Tab Benjamin Cousaert 2014-12-09 19:25:55 +0100
  • b1176f2722 Aub tom Benjamin Cousaert 2014-12-09 19:25:49 +0100
  • f894e71ba0 Fix the seeds Tom Naessens 2014-12-09 19:24:34 +0100
  • df4878f722 Merge branch 'master' of github.com:ZeusWPI/Tab Benjamin Cousaert 2014-12-09 18:57:05 +0100
  • da12b71938 Remove email from Devise users and use nickname as primary key Benjamin Cousaert 2014-12-09 18:56:56 +0100
  • b47a2c08dd seeds added ohsab 2014-12-09 18:46:56 +0100
  • bb234d7463 Fix routes for devise Benjamin Cousaert 2014-12-09 17:28:24 +0100
  • 87b246fd2e Merge branch 'cancan' Benjamin Cousaert 2014-12-09 17:24:03 +0100
  • 20c6597336 Remove views from user, because devise Benjamin Cousaert 2014-12-09 17:22:40 +0100
  • da22af605f Add devise to users Benjamin Cousaert 2014-12-09 17:17:11 +0100
  • 18f8f32ee4 Merge branch 'master' of https://github.com/ZeusWPI/Tab ohsab 2014-12-09 17:07:22 +0100
  • 44a7b8630d application helper changed ohsab 2014-12-09 17:07:17 +0100
  • 20d968a7ef merge conflict Benjamin Cousaert 2014-12-09 14:45:18 +0100
  • 6cbe661a6d Added flashes to products Tom Naessens 2014-12-09 14:42:50 +0100
  • 1a50fb5cf2 Make things a lot more beautiful Tom Naessens 2014-12-09 14:39:27 +0100
  • 68d1e235fc Merge branch 'master' of github.com:ZeusWPI/Tab Tom Naessens 2014-12-09 13:44:36 +0100
  • fe5f4949e6 Remove unused links from footer Tom Naessens 2014-12-09 13:44:34 +0100
  • a646429565 Use decent bootstrap errors Tom Naessens 2014-12-09 13:41:35 +0100
  • db37c694aa color btn ohsab 2014-12-09 13:10:36 +0100
  • a52f74d1a1 Remove admins Benjamin Cousaert 2014-12-09 13:10:15 +0100
  • b064cb21ef knopjes ohsab 2014-12-09 12:08:49 +0100
  • 98b4759758 new overview ohsab 2014-12-09 12:01:25 +0100
  • 6c50375aba Merge branch 'master' of https://github.com/ZeusWPI/Tab ohsab 2014-12-09 11:38:19 +0100
  • 26cb04dd33 overview button ohsab 2014-12-09 11:38:10 +0100
  • c06982e643 Fix controller permitted parameters Benjamin Cousaert 2014-12-09 11:18:54 +0100
  • 6305d3327a install cancan Benjamin Cousaert 2014-12-09 11:18:18 +0100
  • c36cc797ac Merge branch 'master' of github.com:ZeusWPI/Tab Benjamin Cousaert 2014-12-09 10:57:46 +0100
  • ee5ebd7ba4 Add payment after order create for users Benjamin Cousaert 2014-12-09 10:57:38 +0100
  • ec3873c8a3 new product price ohsab 2014-12-09 10:38:22 +0100
  • 12b3a68972 Add total price to order form Benjamin Cousaert 2014-12-09 09:43:21 +0100
  • 3e7658df9f Add devise for admins Benjamin Cousaert 2014-12-09 07:05:30 +0100
  • b30b527650 Small commit, for iasoon <3 Benjamin Cousaert 2014-12-08 17:56:48 +0100
  • ebf2275c94 Remove purchase_price from products and rename sale_price Benjamin Cousaert 2014-12-08 17:03:54 +0100
  • b9e42b8bc1 Move logic to model Benjamin Cousaert 2014-12-08 11:41:38 +0100
  • 5efef27454 remove some sql queries Benjamin Cousaert 2014-12-06 17:51:41 +0100
  • c06c8cacd2 Add index action and view for orders Benjamin Cousaert 2014-12-06 12:03:08 +0100
  • c3729a5964 new order with decent rails Benjamin Cousaert 2014-12-05 16:15:07 +0100
  • 7ddd1d5775 Fix bug with count for products in orders Benjamin Cousaert 2014-12-05 07:55:28 +0100
  • 4e4f0c32a2 Add avatar to product edit form and use recources in routes Benjamin Cousaert 2014-12-05 07:24:27 +0100
  • 552f811fea Add paperclip to gems and avatar to products Benjamin Cousaert 2014-12-04 20:32:31 +0100
  • 182932abf5 Add Annotate Gem and some more validations Benjamin Cousaert 2014-12-04 19:50:02 +0100
  • 9e598c5751 Fix controller orders create action Benjamin Cousaert 2014-12-04 19:28:21 +0100
  • 95aaca802f Fix view of orders/new Benjamin Cousaert 2014-12-04 17:02:08 +0100
  • cb17fdc1a7 Merge branch 'master' of github.com:ZeusWPI/Tab Benjamin Cousaert 2014-11-29 11:06:34 +0100
  • 3553901b7c Add counter for number of each product in order Benjamin Cousaert 2014-11-29 11:06:22 +0100
  • a52c50531e clean up ohsab 2014-11-26 12:01:22 +0100
  • b2b9a7a188 clean up ohsab 2014-11-26 11:58:51 +0100
  • 64113790cf belongs_to a single instance of model Benjamin Cousaert 2014-11-25 21:34:29 +0100
  • 1c0a313fdb header ohsab 2014-11-25 16:42:07 +0100
  • fd05ea2d64 header ohsab 2014-11-25 16:40:22 +0100
  • c986683273 fix routes Benjamin Cousaert 2014-11-25 16:38:08 +0100
  • e2e9582211 HEADER IS GEFIXED SILOX STOP ME HATEN ohsab 2014-11-25 16:25:00 +0100
  • 9309ae60dc user show ohsab 2014-11-25 16:18:11 +0100
  • 7d082a64a7 Merge branch 'master' of https://github.com/ZeusWPI/Tab ohsab 2014-11-25 16:16:21 +0100
  • 45d10ca9f7 routes overview fix ohsab 2014-11-25 16:13:04 +0100
  • 5c07c0b2cc routes fixed, orders need to be nested ohsab 2014-11-25 15:27:12 +0100
  • 60bf8030e5 Add many to many relation between orders and products Benjamin Cousaert 2014-11-25 14:27:27 +0100
  • 2575133ce2 product edit fixed ohsab 2014-11-25 13:41:22 +0100
  • 95ea927ba2 Merge branch 'master' of https://github.com/ZeusWPI/Tab ohsab 2014-11-25 13:12:51 +0100
  • 69dc9ce05a admin interface ohsab 2014-11-25 13:09:55 +0100
  • b423a9d0e8 Add some validations to User and errors to form Benjamin Cousaert 2014-11-25 11:30:55 +0100
  • b6cba92124 Don't specify ruby version in gemfile Tom Naessens 2014-11-25 10:16:07 +0100
  • 52eea26c8a Add linked files Tom Naessens 2014-11-25 10:10:47 +0100
  • 96fbe2c4b8 Random dots? Tom Naessens 2014-11-25 10:05:00 +0100
  • 9a97cc94e1 Added capistrano Tom Naessens 2014-11-25 10:00:55 +0100
  • 73e24e2b55 shit werkt met vuile hacks ohsab 2014-11-25 02:01:57 +0100
  • cd78e5719d order form almost done ohsab 2014-11-24 21:45:32 +0100
  • 4318f5b56a 't moet af, orders werken ohsab 2014-11-23 21:12:31 +0100
  • df24bcd58e gefaalde orders Basho 2014-11-10 22:57:37 +0100
  • 6b9e67ba2d kben naar huis ohsab 2014-11-10 17:50:11 +0100
  • d47e9af80c product edits ohsab 2014-11-10 17:06:50 +0100
  • c62b064128 producten ohsab 2014-11-10 15:52:54 +0100
  • 3dd5873a55 orders create Basho 2014-11-10 02:30:42 +0100
  • d3cdb9fcd7 order model Basho 2014-11-09 22:53:39 +0100
  • c54e13978a user acces dingen, toverpoort ohsab 2014-11-06 22:53:11 +0100
  • 44805c3a5a þ ohsab 2014-11-06 21:31:21 +0100
  • a508f56642 ik kom naar de kelder MatsMyncke 2014-11-06 20:07:18 +0100
  • af6f2668e6 logout MatsMyncke 2014-11-06 18:56:00 +0100
  • ec6ca60887 orderslink MatsMyncke 2014-11-06 18:31:47 +0100
  • 806dc1d8f7 users en sessies MatsMyncke 2014-11-06 18:30:53 +0100
  • 44185e8552 users MatsMyncke 2014-11-06 16:25:27 +0100