392 Commits

Author	SHA1	Message	Date
benji	f4cc8a9a27	Fix #43	2015-04-03 21:27:03 +02:00
benji	0bcbc20702	change index of products in table view	2015-03-28 14:36:07 +01:00
benji	4e651882e9	Add seeds for don	2015-03-26 12:45:45 +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	a97a64b6db	Fix user_avatar url	2015-03-21 13:00:24 +01:00
benji	6cbf3df70e	No root path when session present	2015-03-20 04:54:44 +01:00
benji	67285d8107	Add logout button for sessions	2015-03-20 04:20:39 +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	bbf6adef38	remove text field for search	2015-03-19 18:46:41 +01:00
benji	46fd14a0a5	tests working	2015-03-19 18:04:58 +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	3a11861bb0	Fix html validator on numberfield	2015-03-10 12:14:54 +01:00
benji	01c777baa1	Do some extra shit	2015-03-10 11:37:48 +01:00
benji	35fc8ecc77	Add test for placing order	2015-03-09 13:17:41 +01:00
benji	ec597ff1aa	Merge branch 'master' of https://github.com/ZeusWPI/Tab	2015-03-05 10:17:04 +01:00
benji	c99fc4e492	Remove complexity from formbuilder	2015-03-05 10:16:58 +01:00
benji	bb36147721	Merge pull request #27 from ZeusWPI/test_coverage ... Test coverage	2015-03-04 20:17:08 +01:00
benji	ea93a4c456	Remove ugly constraint	2015-03-03 20:11:50 +01:00
Tleilaxu	72cfaadfe3	Fixed pixel	2015-03-03 19:45:13 +01:00
benji	0bca2c8c23	gitignore	2015-03-03 16:40:06 +01:00
benji	7d367a154d	Only show button on own user page	2015-03-02 16:11:44 +01:00
benji	b8b89aa779	Add order button on user profile page	2015-03-02 16:10:54 +01:00
benji	35876715f6	Add contextmenu for keyboard	2015-02-20 15:05:11 +01:00
benji	cec6a43ca1	Extra css on start page	2015-02-20 13:34:48 +01:00
benji	1c6be64e5c	Merge branch 'master' of https://github.com/ZeusWPI/Tab	2015-02-20 09:21:24 +01:00
benji	82be0ceca4	Add more users on overview screen	2015-02-20 09:21:18 +01:00
benji	c2d5db70df	Merge pull request #25 from ZeusWPI/21/buttons ... 21/buttons	2015-02-19 18:14:35 +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
benji	d8cf9e443e	Clarify schuld in orders/new	2015-02-19 18:12:57 +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
benji	c642bf69c9	Remove footer for koelkast	2015-02-19 17:25:55 +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
benji	78a0ae15bf	re-add pictures	2015-02-17 15:35:15 +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	3b1a571b0b	Euro helper fix negative numbers, and reverse orders of orders on user#show	2015-02-12 15:31:32 +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	f37bc6acb0	rails 4.2	2015-02-10 09:00:29 +01:00
benji	835f08b60c	Fix order bug	2015-02-10 08:33:51 +01:00
benji	7642e35d5d	Add db/seeds and fix two minor bugs	2015-02-10 07:15:25 +01:00
benji	d653c6ca84	Put back file I shouldn't have removed	2015-02-09 17:14:33 +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	b260d90328	Add formatted form builder	2015-02-09 11:58:43 +01:00
benji	39e96305b6	Add stock form	2015-02-08 10:11:23 +01:00
benji	ca3045fbbf	Add undo button for quickpay/dagschotel	2015-02-04 19:03:50 +01:00
benji	9e4563fbd1	fix minor bug	2015-02-04 17:09:42 +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	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	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	466b479ffd	<3 relix	2015-01-09 13:12:19 +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
benji	db23fd2181	Add koelkast to users	2015-01-06 20:18:01 +01:00
Benjamin Cousaert	b0fec45150	cancancan permissions	2014-12-17 07:31:51 +01:00
Benjamin Cousaert	26f66f8bff	Add cancancan to admins	2014-12-15 19:43:02 +01:00
Benjamin Cousaert	ef5abb6324	Merge branch 'feature/17/products-tabs'	2014-12-15 19:08:54 +01:00
Benjamin Cousaert	4075fd24a1	Merge branch 'feature/17/products-tabs' of https://github.com/ZeusWPI/Tab into feature/17/products-tabs	2014-12-15 19:05:22 +01:00
Benjamin Cousaert	b7cd3a7060	Add info about order	2014-12-15 18:56:13 +01:00
ohsab	16cf3770a7	layout lichtjes aangepast	2014-12-12 22:02:58 +01:00
Tom Naessens	f5b97d9b5d	Move all tab to front	2014-12-12 13:41:40 +01:00
Tom Naessens	4acfd007f7	Remove gandalf partner flash	2014-12-12 13:21:05 +01:00
ohsab	b5eab1dce1	enkele layout fixes	2014-12-12 12:50:13 +01:00
Tom Naessens	587a0bdb7b	Add all tab	2014-12-11 12:41:53 +01:00
ohsab	cab0c1a688	syntax foutje gefixt	2014-12-11 01:14:54 +01:00
Tom Naessens	0b0d780e91	Tabs <3	2014-12-10 22:06:36 +01:00
Tom Naessens	e76a139205	Add the migrations, add the category to the form	2014-12-10 21:25:21 +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	bbc8901353	Let use choose his dagschotel	2014-12-10 14:18:56 +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
ohsab	e1ee373b92	foutje	2014-12-10 05:24:30 +01:00
ohsab	addf41999a	layout users monopoly stijl	2014-12-10 05:13:17 +01:00
Tom Naessens	0b80a17940	Merge index and overview	2014-12-10 01:03:22 +01:00
Tom Naessens	9b026c7f25	Yuy, even nicer forms	2014-12-10 00:45:49 +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	4ecfac5070	Add avatar to users	2014-12-09 22:32:54 +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	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	91aa7e5644	Merge branch 'master' of https://github.com/ZeusWPI/Tab	2014-12-09 20:33:23 +01:00
ohsab	c2fe9de0ff	filles added	2014-12-09 20:33:11 +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
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	bb234d7463	Fix routes for devise	2014-12-09 17:28:24 +01:00
Benjamin Cousaert	87b246fd2e	Merge branch 'cancan'	2014-12-09 17:24:03 +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
ohsab	18f8f32ee4	Merge branch 'master' of https://github.com/ZeusWPI/Tab	2014-12-09 17:07:22 +01:00
ohsab	44a7b8630d	application helper changed	2014-12-09 17:07:17 +01:00
Benjamin Cousaert	20d968a7ef	merge conflict	2014-12-09 14:45:18 +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
Benjamin Cousaert	a52f74d1a1	Remove admins	2014-12-09 13:10:15 +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	6c50375aba	Merge branch 'master' of https://github.com/ZeusWPI/Tab	2014-12-09 11:38:19 +01:00
ohsab	26cb04dd33	overview button	2014-12-09 11:38:10 +01:00
Benjamin Cousaert	c06982e643	Fix controller permitted parameters	2014-12-09 11:18:54 +01:00
Benjamin Cousaert	6305d3327a	install cancan	2014-12-09 11:18:18 +01:00
Benjamin Cousaert	c36cc797ac	Merge branch 'master' of github.com:ZeusWPI/Tab	2014-12-09 10:57:46 +01:00
Benjamin Cousaert	ee5ebd7ba4	Add payment after order create for users	2014-12-09 10:57:38 +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	3e7658df9f	Add devise for admins	2014-12-09 07:05:30 +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	5efef27454	remove some sql queries	2014-12-06 17:51:41 +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	182932abf5	Add Annotate Gem and some more validations	2014-12-04 19:50:02 +01:00
Benjamin Cousaert	9e598c5751	Fix controller orders create action	2014-12-04 19:28:21 +01:00
Benjamin Cousaert	95aaca802f	Fix view of orders/new	2014-12-04 17:02:08 +01:00
Benjamin Cousaert	cb17fdc1a7	Merge branch 'master' of github.com:ZeusWPI/Tab	2014-11-29 11:06:34 +01:00
Benjamin Cousaert	3553901b7c	Add counter for number of each product in order	2014-11-29 11:06:22 +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
Benjamin Cousaert	64113790cf	belongs_to a single instance of model	2014-11-25 21:34:29 +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	7d082a64a7	Merge branch 'master' of https://github.com/ZeusWPI/Tab	2014-11-25 16:16:21 +01:00
ohsab	45d10ca9f7	routes overview fix	2014-11-25 16:13:04 +01:00
ohsab	5c07c0b2cc	routes fixed, orders need to be nested	2014-11-25 15:27:12 +01:00
Benjamin Cousaert	60bf8030e5	Add many to many relation between orders and products	2014-11-25 14:27:27 +01:00
ohsab	2575133ce2	product edit fixed	2014-11-25 13:41:22 +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
Tom Naessens	96fbe2c4b8	Random dots?	2014-11-25 10:05:00 +01:00
ohsab	73e24e2b55	shit werkt met vuile hacks	2014-11-25 02:01:57 +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
Basho	df24bcd58e	gefaalde orders	2014-11-10 22:57:37 +01:00
ohsab	6b9e67ba2d	kben naar huis	2014-11-10 17:50:11 +01:00
ohsab	d47e9af80c	product edits	2014-11-10 17:06:50 +01:00
ohsab	c62b064128	producten	2014-11-10 15:52:54 +01:00
Basho	3dd5873a55	orders create	2014-11-10 02:30:42 +01:00
Basho	d3cdb9fcd7	order model	2014-11-09 22:53:39 +01:00
ohsab	c54e13978a	user acces dingen, toverpoort	2014-11-06 22:53:11 +01:00
ohsab	44805c3a5a	þ	2014-11-06 21:31:21 +01:00
MatsMyncke	a508f56642	ik kom naar de kelder	2014-11-06 20:07:18 +01:00
MatsMyncke	af6f2668e6	logout	2014-11-06 18:56:00 +01:00
MatsMyncke	ec6ca60887	orderslink	2014-11-06 18:31:47 +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