4008 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rafael Schouten	4fde0ad2d7	Merge branch 'master' into migrate_ent_types	2014-10-01 16:11:20 +10:00
Rafael Schouten	1ec4f2e456	Merge branch 'ent_types_frontend' into migrate_ent_types ... Conflicts: app/models/enterprise.rb	2014-10-01 16:10:43 +10:00
Rafael Schouten	fa41f6dc40	add rollback to migration	2014-10-01 13:02:21 +10:00
Rob Harrington	5497f229e1	Ignoring enterprise ownership before_validations when no owner set	2014-10-01 11:49:46 +10:00
Rafael Schouten	a49991c696	set abilities tests to pending, need to discuss further	2014-09-28 22:55:49 +10:00
Rafael Schouten	dc7c9ea272	commit updated schema	2014-09-28 22:37:26 +10:00
Rafael Schouten	58f13a3e06	update migration	2014-09-28 12:57:27 +10:00
Rafael Schouten	5c0d846643	bugfix sells and is_distributor specs and code	2014-09-28 11:55:46 +10:00
Rafael Schouten	b821107c27	bugfix migration ad specs	2014-09-27 18:14:10 +10:00
Rafael Schouten	beb85e862a	get type > sells migration mostly working	2014-09-27 15:21:27 +10:00
Rafael Schouten	92a40fc842	order mailer edits 0.6.3	2014-09-26 17:21:41 +10:00
Rob Harrington	4b2f1cefa0	Spliting order management abilities out of product management abilities	2014-09-26 17:11:11 +10:00
summerscope	c91d707806	Merge branch 'master' into ent_types_frontend	2014-09-26 15:07:30 +10:00
Rob Harrington	299b0fe5be	Allowing all enterprise users to access products	2014-09-26 15:01:23 +10:00
summerscope	2ea0c89899	Style the modal headers	2014-09-26 15:01:23 +10:00
summerscope	237d129710	Changing the markup to give a class where is a producer	2014-09-26 15:01:23 +10:00
Rafael Schouten	e9c8547ca3	fix enterprsie model logic	2014-09-26 15:01:23 +10:00
summerscope	dee503befb	Tweak language around the long description	2014-09-26 15:01:22 +10:00
summerscope	781fcae946	Change styling for register modals	2014-09-26 15:01:22 +10:00
summerscope	3adf571c1f	Style the modal headers	2014-09-26 14:55:41 +10:00
summerscope	c43b8abcbc	Changing the markup to give a class where is a producer	2014-09-26 14:55:41 +10:00
Rafael Schouten	3406f926fc	fix enterprsie model logic	2014-09-26 14:48:37 +10:00
summerscope	c1460afaee	Tweak language around the long description	2014-09-26 12:07:58 +10:00
summerscope	a73541da71	Change styling for register modals	2014-09-26 12:07:38 +10:00
Rob Harrington	d3c8e4a547	Replacing reference to is_profile	2014-09-26 11:20:55 +10:00
summerscope	a6e8d6906f	Tweak message on profile label	2014-09-26 11:20:09 +10:00
Rob Harrington	be17d80cc4	Fixing hubs service spec	2014-09-25 17:28:01 +10:00
Rob Harrington	85b27f5b51	Adding angularjs-file-upload to spec manifest	2014-09-25 17:25:48 +10:00
Rob Harrington	b55b4e9a0c	Merge branch 'master' into ent_types_frontend	2014-09-25 17:20:15 +10:00
Rob Harrington	33dff551c7	Removing 'show profiles' from producer and shop pages	2014-09-25 17:19:57 +10:00
Rob Harrington	1e31dd88ee	Remove unrequired functions, add has_hub_listing	2014-09-25 17:19:57 +10:00
summerscope	cbc8a62686	STyling for profile only small view	2014-09-25 17:02:41 +10:00
summerscope	3b7cd6d329	Making the styling work for profiles and producers	2014-09-25 16:54:17 +10:00
summerscope	97ae170dd1	Add in profile only use case to styling	2014-09-25 16:40:06 +10:00
summerscope	3812d1eebb	Add more greys	2014-09-25 16:39:48 +10:00
summerscope	2e1b2ffe12	Add italics	2014-09-25 16:04:27 +10:00
summerscope	a068411b7d	Add in class to show when hub is	2014-09-25 16:00:03 +10:00
Rafael Schouten	f8b083e4b7	fix lost hub link	2014-09-25 14:04:10 +10:00
Rob Harrington	f5849e91dc	Adding limit reached modal to registration	2014-09-25 12:25:32 +10:00
Rob Harrington	6fa7d9cbcb	Registration controller checks number of owned enterpises	2014-09-25 12:10:45 +10:00
Rob Harrington	9520eeeb15	can specify attributes for create_enterpise_user	2014-09-25 11:56:18 +10:00
Rafael Schouten	da620f3723	Merge branch 'master' into ent_types_frontend	2014-09-25 10:09:42 +10:00
Rafael Schouten	f8d5b7ede8	refactor enterprise types to six options	2014-09-24 23:30:43 +10:00
Rob Harrington	ed91cd6463	Make sure d1 != d2	2014-09-24 20:48:52 +10:00
Rob Harrington	b5ef24bacb	table matchers use capybara matchers rather than wait_until with micro-sleep	2014-09-24 16:18:59 +10:00
Rob Harrington	f0f165a129	Explicitly create enterprises in order_cycle factory to fix intermittent fail	2014-09-24 14:00:08 +10:00
Rob Harrington	1a86206e1f	Fixing super annoying server reload bug	2014-09-24 13:01:40 +10:00
Rob Harrington	c6d463bf25	Revert "Pending bulk order mgmt specs" ... This reverts commit eead8d665f.	2014-09-20 18:06:42 +10:00
Rob Harrington	b86848269b	Merge branch 'specs' into reg_images	2014-09-19 23:44:31 +10:00
Rob Harrington	5bceb81479	Fixing image upload in onboarding	2014-09-19 23:37:02 +10:00