4023 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rob Harrington	6e699b2e8b	Mailer tests	2014-10-15 11:52:04 +11:00
Rob Harrington	908c242d36	Confirmation email when creating enterprise	2014-10-15 10:48:05 +11:00
Rob Harrington	b8b19368df	WIP: Making enterprise emails confirmable	2014-10-10 16:54:38 +11:00
Rafael Schouten	f0c9e7cd44	fix for tests, remove open in new tab	2014-10-04 13:12:36 +10:00
Rafael Schouten	f3fc70ebf0	Merge branch 'master' into raf_bugfix ... Conflicts: app/assets/stylesheets/admin/openfoodnetwork.css.scss	2014-10-04 12:51:55 +10:00
Rafael Schouten	884c111240	fix failing tests	2014-10-04 11:56:35 +10:00
Rafael Schouten	a0494b136f	test that email is validated	2014-10-03 17:32:04 +10:00
Rafael Schouten	c088c47a49	add email to enterprise params	2014-10-03 17:31:46 +10:00
Rafael Schouten	77e354f9f6	Merge branch 'master' into wys	2014-10-03 16:47:11 +10:00
Rafael Schouten	dee471b1c7	move text angular files	2014-10-03 16:43:56 +10:00
Rafael Schouten	bdd9e19efe	specs - add text angular dep and long descrioption provider	2014-10-03 16:42:37 +10:00
Rafael Schouten	34ceb9c226	style text box	2014-10-03 16:06:15 +10:00
Rafael Schouten	bb24e1ce88	sanitize long_description html before injection	2014-10-03 16:06:04 +10:00
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	d707ba1a70	remove nokugiri from gemfile.lock	2014-10-02 19:08:37 +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
Rafael Schouten	412bf8f638	cleanup gemfile	2014-10-01 17:16:09 +10:00
Rafael Schouten	b647f9382f	revert included file	2014-10-01 17:11:00 +10:00
Rafael Schouten	3a14a26bc6	refactor wysiwyg	2014-10-01 16:07:10 +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	726340fc86	configure textAngular on enterprise edit page	2014-09-30 18:20:45 +10:00
Rafael Schouten	823923f828	add textAngular javascript	2014-09-30 15:09:43 +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 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
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	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