2949 Commits

Author	SHA1	Message	Date
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	e480d3a135	rearrange admin sidebars	2014-09-26 13:06:29 +10:00
Rafael Schouten	6069127733	validate contact email	2014-09-25 15:16:50 +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
Rob Harrington	d3e72b5a2a	Adding images to registration process	2014-09-19 12:41:24 +10:00
Rafael Schouten	e9dd863462	Merge branch 'master' into payment_description ... Conflicts: app/views/spree/order_mailer/confirm_email.text.erb	2014-09-17 17:07:43 +10:00
Rafael Schouten	83b19ee632	fix haml and formatting on confirm email	2014-09-17 16:56:44 +10:00
Rafael Schouten	79fd8ed98b	dubug mail template	2014-09-17 15:37:38 +10:00
Rafael Schouten	e618c4c2c0	add payment description to checkout	2014-09-17 14:56:29 +10:00
Rafael Schouten	1c9bb906d1	Merge branch 'currency' of https://github.com/openfoodfoundation/openfoodnetwork into currency	2014-09-17 13:21:56 +10:00
Rafael Schouten	ac3c3f9f6c	remove to_f on decimals	2014-09-17 13:19:34 +10:00
rafaqz	98ba135d49	Explain weird spree override	2014-09-17 13:12:27 +10:00
Rafael Schouten	b6fd3a11fa	remove old mailer	2014-09-17 11:54:06 +10:00
Rafael Schouten	f79dfed6ef	use haml for mailer	2014-09-17 11:53:47 +10:00
Rafael Schouten	01c98bf6e4	refactor and bugfix for tests	2014-09-17 01:07:34 +10:00
Rafael Schouten	49476b17e8	fix typos and add missing helper	2014-09-16 16:10:48 +10:00
Rafael Schouten	1aa80e53b1	Merge branch 'master' into currency ... Conflicts: app/helpers/injection_helper.rb db/suburb_seeds.rb	2014-09-16 10:25:22 +10:00
summerscope	cc9d2ebbac	Modal styling fixes for scrolling on mobile view	2014-09-12 16:01:25 +10:00
summerscope	799bfae6e4	Revert "Add commented-out scrolling code. Return false from click handlers." ... This reverts commit dbefd43f07.	2014-09-12 15:51:20 +10:00
summerscope	c365047d0c	Short description goes back in producer fat view until we can clean up the HTML formatting	2014-09-12 15:40:12 +10:00
Rohan Mitchell	dbefd43f07	Add commented-out scrolling code. Return false from click handlers.	2014-09-12 15:33:02 +10:00
summerscope	42fccd1bdf	Merging master into my branch to make it up to date	2014-09-12 14:48:19 +10:00
summerscope	3cff83b7a5	Kill the outside modal close button styling once and for all	2014-09-12 14:42:58 +10:00
summerscope	0dd33e6635	Modal styling updates ated trying to fix mobile scrolling issue. getting there.	2014-09-12 13:40:00 +10:00
Rob H	bcca8c5c0d	Merging master into all the things	2014-09-12 13:28:30 +10:00
Rob H	f5048ecf7c	Sends confirmation email when Enterprise is created	2014-09-12 13:24:17 +10:00
Rohan Mitchell	4fb30f2942	When removing outgoing exchanges, do not removing variants from other outgoing exchanges	2014-09-12 12:50:04 +10:00
Rob H	5c7ab2efa3	Restrict editing of ownership and type in enterprise api controller	2014-09-12 12:47:16 +10:00
Rob H	cc65faadd0	Specing out enterprise registration service properly	2014-09-12 11:48:17 +10:00
summerscope	a28eaba31a	Turn off price graph pop overs for small devices	2014-09-12 11:45:13 +10:00
Rohan Mitchell	e50bbeaefb	Edit product form shows permitted suppliers	2014-09-12 11:33:47 +10:00
summerscope	1c5a495d5c	Making icons smaller, adding a bit of background shadow to pop them out	2014-09-12 11:29:41 +10:00
Rohan Mitchell	033fe88513	New product form shows permitted suppliers	2014-09-12 11:07:59 +10:00
summerscope	bfa71942fe	Tweaks to input placeholder label	2014-09-12 11:02:28 +10:00
summerscope	01397b2e49	Tweaks to filter box	2014-09-12 11:01:35 +10:00
Rob H	6ee3010fa7	Differentiation of on-boarding process by url	2014-09-12 11:00:34 +10:00
summerscope	ecacde41dd	Tweaks to big input for small screens	2014-09-12 11:00:10 +10:00
summerscope	126e9e82a6	Add in blues for use	2014-09-12 10:58:51 +10:00
summerscope	9c33be911c	Update placeholder label	2014-09-12 10:49:59 +10:00
summerscope	6d7fd6dc94	Add in logic to change right hand label if this is the current hub	2014-09-12 10:48:33 +10:00
Rob H	12f5e48479	Replace is not with isnt - damn you CoffeeScript	2014-09-11 17:58:38 +10:00
summerscope	de64a5154b	Fixing markup icon class name was incorrect	2014-09-11 17:13:07 +10:00
Rob H	048a741a2c	Plugging final two registration pages into validation	2014-09-11 17:11:53 +10:00