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

Commit graph

  • 28ec934e0a Merge pull request #61 from ZeusWPI/user_edit_styling benji 2015-09-01 17:40:42 +0200
  • 7b345f28a8 Do some styling benji 2015-09-01 17:40:18 +0200
  • 43190104ec Add user avatar to user#show benji 2015-09-01 16:51:21 +0200
  • db6f29b0e5 Merge pull request #60 from ZeusWPI/user_show_styling benji 2015-09-01 16:27:26 +0200
  • 10d52c806d Use actual value for products count instead of fix number benji 2015-09-01 16:21:43 +0200
  • de459fe699 Merge branch 'master' of github.com:ZeusWPI/Tap Tom Naessens 2015-09-01 15:40:24 +0200
  • ea2731f63f Fix tap repos Tom Naessens 2015-09-01 15:40:16 +0200
  • a220397a33 Fix wrong migration benji 2015-09-01 15:12:13 +0200
  • 71db4d600b Merge branch 'master' of github.com:ZeusWPI/Tab Tom Naessens 2015-09-01 15:06:25 +0200
  • 8fdaf44115 Fix deployment Tom Naessens 2015-09-01 15:05:56 +0200
  • 1f2c3bd551 comment right line benji 2015-09-01 15:04:23 +0200
  • d8c6ec8f0b Merge branch 'master' of github.com:ZeusWPI/Tab Tom Naessens 2015-09-01 15:02:21 +0200
  • 4763433b48 Prepare tab for new server Tom Naessens 2015-09-01 15:02:14 +0200
  • 5eb3a65205 Oops benji 2015-09-01 14:54:59 +0200
  • 7014201510 Change some styling benji 2015-09-01 14:52:20 +0200
  • c505f1b665 Comment failing tests benji 2015-08-31 17:39:30 +0200
  • d4dd494c54 Merge pull request #59 from ZeusWPI/remove_debt benji 2015-08-31 16:47:45 +0200
  • c668cc1ab9 cancancan fix benji 2015-08-31 15:35:59 +0200
  • da278491b1 Fix authorization for orders using cancancan benji 2015-08-31 15:10:13 +0200
  • b5017bff9a Remove debt from tab and refactor some code benji 2015-08-31 14:33:15 +0200
  • df91936ff8 Merge branch 'delete_products' benji 2015-08-25 16:05:22 +0200
  • cc9e4ed6b3 Merge master benji 2015-08-25 16:05:13 +0200
  • b7f40f8832 Add possibility to remove products from the offer without breaking stuff benji 2015-08-25 15:53:27 +0200
  • 5d39abafd5 Merge pull request #53 from VandorpeDavid/calories benji 2015-08-24 16:16:27 +0200
  • 652c598722 Merge pull request #55 from VandorpeDavid/out_of_order benji 2015-08-24 16:02:29 +0200
  • 595d8ed282 Forgot to commit helper David Vandorpe 2015-07-08 17:43:20 +0200
  • ee86411d58 Using helper to generate kcal tag As suggested by Benji David Vandorpe 2015-07-08 17:38:51 +0200
  • d397ae7d34 Use of .zero? instead of == 0 David Vandorpe 2015-07-08 17:06:02 +0200
  • 4dcf2c2b1b Merge pull request #54 from VandorpeDavid/negative_purchases benji 2015-07-08 14:37:26 +0200
  • 24f9531192 Senpai Silox Styling Suggestions David Vandorpe 2015-07-08 13:37:19 +0200
  • 91945b6983 Senpai Silox Styling Suggestions David Vandorpe 2015-07-08 13:31:32 +0200
  • 7831520c6f Red border when product is sold out David Vandorpe 2015-07-07 22:36:04 +0200
  • 33b797b5d9 Enforce stock max en 0 min for amount of products in orders Fixes #48 David Vandorpe 2015-07-07 21:47:20 +0200
  • a8055d6f09 Adding calories to several views David Vandorpe 2015-07-07 20:13:37 +0200
  • 849d9ce04b Product calories: DB migration + Model update + attribute permit David Vandorpe 2015-07-07 20:09:58 +0200
  • 5a5fbdf1c9 Fix #38 benji 2015-07-01 23:51:26 +0200
  • dc73128508 Fix #49 benji 2015-07-01 16:49:27 +0200
  • 90e270a03e Avoid long product names of fucking up entire layout benji 2015-07-01 16:19:36 +0200
  • bf52027229 Add image_tag of avatar on user edit page benji 2015-07-01 11:16:08 +0200
  • f5c970af53 Fix css on order_items benji 2015-06-30 23:33:11 +0200
  • 7c7c93f607 Merge pull request #51 from ZeusWPI/private_user benji 2015-06-30 23:32:48 +0200
  • 2f71e95a81 Add private option to users benji 2015-06-30 22:30:34 +0200
  • 97fdd2e24c Change orderitems from text inputs to number fields benji 2015-04-04 04:13:30 +0200
  • ec36ac619f use english locale benji 2015-04-04 03:38:29 +0200
  • eda0d86e74 Fix #47 benji 2015-04-04 03:26:25 +0200
  • 8e5ccfed7a urgh benji 2015-04-04 02:50:26 +0200
  • 48236e1f69 add token for tests benji 2015-04-04 02:09:25 +0200
  • d8f77442ab comma and empty token in development benji 2015-04-04 01:51:11 +0200
  • 0105c30a36 secrets benji 2015-04-04 01:47:02 +0200
  • be9c967db2 Add slack notification benji 2015-04-04 01:44:28 +0200
  • 9ec9f043ed Merge pull request #46 from ZeusWPI/products_list benji 2015-04-03 23:56:48 +0200
  • 99c49db848 change products to table view benji 2015-04-03 23:56:13 +0200
  • bd67675472 add #42 benji 2015-04-03 22:19:47 +0200
  • 9f898fa832 fix #45 benji 2015-04-03 22:01:20 +0200
  • f4cc8a9a27 Fix #43 benji 2015-04-03 21:27:03 +0200
  • 983174b67d add faker to production benji 2015-04-03 16:52:07 +0200
  • 0bcbc20702 change index of products in table view benji 2015-03-28 14:36:07 +0100
  • 044ad2051d fixing tests benji 2015-03-26 12:53:12 +0100
  • 01a1f254d9 Merge branch 'master' of https://github.com/ZeusWPI/Tab benji 2015-03-26 12:45:54 +0100
  • 4e651882e9 Add seeds for don benji 2015-03-26 12:45:45 +0100
  • 17cb194897 Delete .DS_Store benji 2015-03-25 18:35:46 +0100
  • e4e717084b put back database_authenticatable to users, fix empty avatar form bug benji 2015-03-25 17:49:37 +0100
  • 63e9b81754 remove ssl skip - we're secure now benji 2015-03-25 09:11:40 +0100
  • c58c8781b6 Merge pull request #34 from ZeusWPI/clean_user_registration benji 2015-03-23 12:01:34 +0100
  • efd4dcbb2c Replace multistep registration by default avatar from identicon benji 2015-03-23 11:54:15 +0100
  • 33ffcfdb9b remove database_authenticatable from user and fix paths benji 2015-03-21 17:58:49 +0100
  • d687213834 Merge branch 'oauth' benji 2015-03-21 14:52:06 +0100
  • a97a64b6db Fix user_avatar url benji 2015-03-21 13:00:24 +0100
  • c4cee1aac0 Merge pull request #31 from ZeusWPI/oauth benji 2015-03-20 04:56:47 +0100
  • 6cbf3df70e No root path when session present benji 2015-03-20 04:54:44 +0100
  • 67285d8107 Add logout button for sessions benji 2015-03-20 04:20:39 +0100
  • 3ecb2b53d8 Add user avatar after user creation benji 2015-03-20 03:57:00 +0100
  • 7a5b1f20dd tests and travis succeeding benji 2015-03-20 02:33:37 +0100
  • 6ca2ecebc2 Change devise to handle oauth benji 2015-03-20 02:21:56 +0100
  • 342ee1bc0b Set log level to info Tom Naessens 2015-03-20 00:18:54 +0100
  • a94c266428 Add responders gem Tom Naessens 2015-03-20 00:00:03 +0100
  • aeb3fcab37 add capistrano-passenger benji 2015-03-19 23:55:06 +0100
  • d6a41c8823 devise secret key benji 2015-03-19 23:33:59 +0100
  • f81426d30d update environsments production benji 2015-03-19 23:18:18 +0100
  • d4c883e056 Add errbit to tab Tom Naessens 2015-03-19 22:55:40 +0100
  • edef683f86 Merge branch 'master' of github.com:ZeusWPI/Tab Tom Naessens 2015-03-19 22:53:53 +0100
  • c20aec9099 Add ruby version and king Tom Naessens 2015-03-19 22:53:49 +0100
  • ee1c7891aa Merge pull request #29 from ZeusWPI/omniauth benji 2015-03-19 22:37:38 +0100
  • eaa076b508 Add oauth benji 2015-03-19 22:37:16 +0100
  • c9a24e81e2 Add tab omniauth benji 2015-03-19 19:03:17 +0100
  • bbf6adef38 remove text field for search benji 2015-03-19 18:46:41 +0100
  • 46fd14a0a5 tests working benji 2015-03-19 18:04:58 +0100
  • a4245c1331 Change users to table, fix seeds and remove name and lastname from users benji 2015-03-19 17:38:59 +0100
  • 6ec27acaf8 Refactor dagschotel and make test succeed again benji 2015-03-19 16:22:55 +0100
  • 191517bda7 Lot of styles, and some other stuff benji 2015-03-19 14:59:37 +0100
  • 0c06c4bedb Change some css and refactor some controller actions benji 2015-03-12 13:25:11 +0100
  • 3a11861bb0 Fix html validator on numberfield benji 2015-03-10 12:14:54 +0100
  • a0a5785115 Merge pull request #28 from ZeusWPI/keep_cancelled_orders benji 2015-03-10 11:45:43 +0100
  • 01c777baa1 Do some extra shit benji 2015-03-10 11:37:48 +0100
  • a5dbe99d27 Add tests for ordering and quickpay benji 2015-03-10 08:52:16 +0100
  • 35fc8ecc77 Add test for placing order benji 2015-03-09 13:17:41 +0100
  • ec597ff1aa Merge branch 'master' of https://github.com/ZeusWPI/Tab benji 2015-03-05 10:17:04 +0100
  • c99fc4e492 Remove complexity from formbuilder benji 2015-03-05 10:16:58 +0100
  • bb36147721 Merge pull request #27 from ZeusWPI/test_coverage benji 2015-03-04 20:17:08 +0100
  • 88c780b14e Final test benji 2015-03-04 19:59:07 +0100