Commit graph

81 commits

Author SHA1 Message Date
benji cc9e4ed6b3 Merge master 2015-08-25 16:05:13 +02:00
benji b7f40f8832 Add possibility to remove products from the offer without breaking stuff 2015-08-25 15:53:27 +02:00
David Vandorpe 91945b6983 Senpai Silox Styling Suggestions 2015-07-08 13:31:32 +02:00
David Vandorpe 849d9ce04b Product calories: DB migration + Model update + attribute permit 2015-07-07 20:11:37 +02:00
benji 2f71e95a81 Add private option to users 2015-06-30 22:30:34 +02:00
benji ec36ac619f use english locale 2015-04-04 03:38:29 +02:00
benji eda0d86e74 Fix #47 2015-04-04 03:26:25 +02:00
benji d8f77442ab comma and empty token in development 2015-04-04 01:51:11 +02:00
benji 0105c30a36 secrets 2015-04-04 01:47:02 +02:00
benji be9c967db2 Add slack notification 2015-04-04 01:44:28 +02:00
benji 0bcbc20702 change index of products in table view 2015-03-28 14:36:07 +01:00
benji e4e717084b put back database_authenticatable to users, fix empty avatar form bug 2015-03-25 17:49:37 +01:00
benji efd4dcbb2c Replace multistep registration by default avatar from identicon 2015-03-23 11:54:15 +01:00
benji 33ffcfdb9b remove database_authenticatable from user and fix paths 2015-03-21 17:58:49 +01:00
benji 3ecb2b53d8 Add user avatar after user creation 2015-03-20 03:57:00 +01:00
benji 7a5b1f20dd tests and travis succeeding 2015-03-20 02:33:37 +01:00
benji 6ca2ecebc2 Change devise to handle oauth 2015-03-20 02:21:56 +01:00
benji eaa076b508 Add oauth 2015-03-19 22:37:16 +01:00
benji a4245c1331 Change users to table, fix seeds and remove name and lastname from users 2015-03-19 17:38:59 +01:00
benji 6ec27acaf8 Refactor dagschotel and make test succeed again 2015-03-19 16:22:55 +01:00
benji 191517bda7 Lot of styles, and some other stuff 2015-03-19 14:59:37 +01:00
benji 0c06c4bedb Change some css and refactor some controller actions 2015-03-12 13:25:11 +01:00
benji 01c777baa1 Do some extra shit 2015-03-10 11:37:48 +01:00
benji 0bca2c8c23 gitignore 2015-03-03 16:40:06 +01:00
benji b8b89aa779 Add order button on user profile page 2015-03-02 16:10:54 +01:00
benji cec6a43ca1 Extra css on start page 2015-02-20 13:34:48 +01:00
benji 82be0ceca4 Add more users on overview screen 2015-02-20 09:21:18 +01:00
benji 78a0ae15bf re-add pictures 2015-02-17 15:35:15 +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 7642e35d5d Add db/seeds and fix two minor bugs 2015-02-10 07:15:25 +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 ca3045fbbf Add undo button for quickpay/dagschotel 2015-02-04 19:03:50 +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 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 db23fd2181 Add koelkast to users 2015-01-06 20:18:01 +01:00
Benjamin Cousaert 26f66f8bff Add cancancan to admins 2014-12-15 19:43:02 +01:00
Tom Naessens e76a139205 Add the migrations, add the category to the form 2014-12-10 21:25:21 +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
Tom Naessens 4ecfac5070 Add avatar to users 2014-12-09 22:32:54 +01:00
Benjamin Cousaert 0d94b3e383 Merge 2014-12-09 20:29:37 +01:00
Benjamin Cousaert 9fe6bf7530 Add dagschotel to users 2014-12-09 20:28:50 +01:00
Tom Naessens bdf4b6771f Add cancan, fix header, add admins 2014-12-09 19:44:58 +01:00