15608 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Rafael Schouten	e480d3a135	rearrange admin sidebars	2014-09-26 13:06:29 +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
Rafael Schouten	ceb978783c	update missed taxon selector filter	2014-09-26 00:25:19 +10:00
Rafael Schouten	4b576d1590	refactor enterprise specs	2014-09-26 00:15:33 +10:00
Rafael Schouten	04c5dff497	fixup merge	2014-09-25 19:47:00 +10:00
Rafael Schouten	55f4415c0d	Merge branch 'master' into cleanup ... Conflicts: app/assets/javascripts/darkswarm/services/hubs.js.coffee app/views/home/_hubs.html.haml app/views/producers/_filters.html.haml app/views/producers/index.html.haml	2014-09-25 19:42:20 +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	6069127733	validate contact email	2014-09-25 15:16:50 +10:00
Rafael Schouten	afd0f76d9e	Merge branch 'master' into bugfix	2014-09-25 14:23:46 +10:00
Rafael Schouten	f8b083e4b7	fix lost hub link	2014-09-25 14:04:10 +10:00
Rafael Schouten	bab9123ca8	delete unused javascript	2014-09-25 14:01:06 +10:00
Rafael Schouten	096324cf5e	bugfix filters	2014-09-25 13:46:08 +10:00
Rafael Schouten	0e2774882f	dry enterprise angular	2014-09-25 13:06:02 +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	3775cd29cb	generalise search filter to any enterprise	2014-09-25 11:34:49 +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
Rafael Schouten	a058af8211	open products in new tab	2014-09-24 17:00:12 +10:00
Rafael Schouten	139da3ac7a	outline inputs with errors	2014-09-24 16:59:57 +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
Rob Harrington	509cf6250a	Explicitly sort managed products	2014-09-19 18:32:03 +10:00
Rob Harrington	07275574b6	Manager can't bulk update owner	2014-09-19 18:31:50 +10:00
Rob Harrington	5d2d619d66	Assigning @spree_api_key for store	2014-09-19 18:31:33 +10:00
Rob Harrington	17ce80a417	Allow new user to create enterprises	2014-09-19 18:31:23 +10:00
summerscope	d86c3cff26	Making enterprise header styles show as turquoise when no shopfront to click through to	2014-09-19 17:48:24 +10:00
summerscope	5e4e939087	Return template markup which was accidentally removed in Rafs merge	2014-09-19 17:47:49 +10:00
Rafael Schouten	559d3b0e4b	fixup the header but needs some styling	2014-09-19 17:24:41 +10:00