1679 Commits

Author	SHA1	Message	Date
Rob Harrington	e9a6c9d0ce	Adding header to welcome page	2014-10-23 14:50:56 +11:00
Rob Harrington	67c82e81de	Fixing form on welcome page	2014-10-23 14:41:00 +11:00
Rob Harrington	bcc8198019	Merge in changes on remote branch	2014-10-23 14:30:56 +11:00
Rob Harrington	77c0e36ed6	Adding input validation to welcome page	2014-10-23 14:23:50 +11:00
summerscope	694724d177	Refactoring and styling Welcome screen dashboard admin WIP	2014-10-23 14:23:35 +11:00
Rob Harrington	7d9c5f9e2c	Adding form elements for submission of sells preferences on welcome page	2014-10-23 11:40:11 +11:00
summerscope	842e239893	Make selector containers anchors	2014-10-23 10:56:30 +11:00
Rob Harrington	f60a9d7bd5	Fiddling with styling	2014-10-22 19:13:17 +11:00
Rob Harrington	262972a911	Adding basic angular to welcome form	2014-10-22 19:02:39 +11:00
Rob Harrington	fef97314cb	Adding basic layout of welcome page for new users	2014-10-22 18:26:18 +11:00
Rob Harrington	7113875a45	Adding welcome page to overview controller	2014-10-22 16:49:32 +11:00
Rob Harrington	8120023094	Fixing indentation	2014-10-22 16:33:43 +11:00
Rob Harrington	3d938b3450	Shifting dashboard rendering from partials to templates	2014-10-22 12:30:07 +11:00
Rob Harrington	8bf472e970	Split dashboard into single and multiple enterprise views	2014-10-22 12:21:25 +11:00
Rob Harrington	338ba74652	Only show enterprise partial when no enterprises exist	2014-10-17 17:15:49 +11:00
Rob Harrington	a6bc9e66f6	Only send one enterprise creation confirmation email	2014-10-17 12:29:51 +11:00
Rob Harrington	28807d4f4d	Merge migrate_ent_types into reg	2014-10-17 10:20:48 +11:00
Rafael Schouten	1150e69500	fix visible bug	2014-10-17 03:59:48 +11:00
summerscope	8d01bb7ebf	Pretty responsive email template!!!!!!!!	2014-10-16 16:45:15 +11:00
Rafael Schouten	425105174e	return space remover	2014-10-16 16:26:50 +11:00
Rafael Schouten	c5afd8cebf	move visible filter to pages, and use category	2014-10-16 16:26:50 +11:00
Rafael Schouten	f0a3296e52	change enterprise category name ans use symbols instead of strings	2014-10-16 16:26:49 +11:00
Rob Harrington	c59662758c	Add alerts for unconfirmed enterprises to overview page	2014-10-15 15:46:21 +11:00
Rob Harrington	908c242d36	Confirmation email when creating enterprise	2014-10-15 10:48:05 +11:00
Rafael Schouten	e7b847542f	bugfix tab selection	2014-10-08 01:59:56 +11:00
Rafael Schouten	20a94b4365	Merge branch 'master' into migrate_ent_types ... Conflicts: app/serializers/api/admin/enterprise_serializer.rb	2014-10-07 10:52:26 +11:00
Rafael Schouten	9b6db2bff4	simplify tab selection	2014-10-07 10:49:57 +11:00
Rafael Schouten	6fc36a3e6c	swap redundant producer modal for general enterprise modal	2014-10-07 10:48:04 +11:00
Rafael Schouten	ec6805f573	use shared partial for no results	2014-10-06 23:51:19 +11:00
Rafael Schouten	881e82e825	add some angular documentation	2014-10-06 22:59:06 +11:00
Rafael Schouten	9eb770aed7	fix sidebar show/hide	2014-10-05 01:44:40 +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	01063367c4	clickable show profiles label	2014-10-04 00:59:17 +10:00
Rafael Schouten	77e354f9f6	Merge branch 'master' into wys	2014-10-03 16:47:11 +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
Rafael Schouten	526ab8b80f	use is_distributor bool	2014-10-02 16:28:01 +10:00
Rafael Schouten	4c1fc5671f	Minor fixes	2014-10-02 10:43:17 +10:00
Rafael Schouten	62f7114fa1	Merge branch 'cleanup' into migrate_ent_types ... Conflicts: app/views/home/_hubs.html.haml	2014-10-02 10:02:08 +10:00
Rafael Schouten	47dc001735	merge has_shopfront and is_distibutor	2014-10-01 20:27:53 +10:00
Rafael Schouten	3877bed62b	use enterprise modal	2014-10-01 18:51:49 +10:00
Rafael Schouten	4fde0ad2d7	Merge branch 'master' into migrate_ent_types	2014-10-01 16:11:20 +10:00
Rafael Schouten	3a14a26bc6	refactor wysiwyg	2014-10-01 16:07:10 +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	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	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
Rafael Schouten	e480d3a135	rearrange admin sidebars	2014-09-26 13:06:29 +10:00