3011 Commits

Author	SHA1	Message	Date
Rafael Schouten	e75a964703	Merge branch 'master' into raf_bugfix	2014-10-03 14:26:08 +10:00
Rafael Schouten	929839cb9f	hide configuration on	2014-10-03 11:46:00 +10:00
Rafael Schouten	ff4f8f63af	Merge branch 'master' into raf_bugfix ... Conflicts: app/views/spree/order_mailer/confirm_email.text.haml	2014-10-02 19:06:30 +10:00
Rob Harrington	5f4b2a752b	Product controller loads correct data for create and update actions	2014-10-02 12:32:26 +10:00
Rob Harrington	5497f229e1	Ignoring enterprise ownership before_validations when no owner set	2014-10-01 11:49:46 +10:00
Rafael Schouten	a2dff2305f	space in order confirm mailer	2014-09-30 19:39:56 +10:00
Rafael Schouten	dee869a273	move checks and links in sidebars	2014-09-26 17:58:00 +10:00
Rafael Schouten	92a40fc842	order mailer edits	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
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
Rafael Schouten	e480d3a135	rearrange admin sidebars	2014-09-26 13:06:29 +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	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	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
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
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	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
Rafael Schouten	883e5f1095	Merge branch 'ent_types_frontend' of https://github.com/openfoodfoundation/openfoodnetwork into ent_types_frontend ... Conflicts: app/assets/javascripts/templates/partials/enterprise_header.html.haml	2014-09-19 17:22:29 +10:00
Rafael Schouten	abc5a215a2	add map modals, profile filters and bugfixes	2014-09-19 17:07:07 +10:00
summerscope	919f87df58	change modal styling to improve look of Close button, overall layout for modals	2014-09-19 16:46:19 +10:00
Rafael Schouten	cf13115d57	bugfix is_profile bool	2014-09-19 16:44:51 +10:00
summerscope	408f7b7f10	Modals styling refine for small use cases	2014-09-19 16:44:43 +10:00
Rafael Schouten	e4991d4528	reorganise and document enterprise categories	2014-09-19 16:44:28 +10:00
summerscope	09cc3c6285	Styling for hero image underlay used on enterprises- adjust min heights for different text use cases	2014-09-19 16:44:16 +10:00