8189 Commits

Author	SHA1	Message	Date
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
Rafael Schouten	9448e1cbe4	add figaro env config	2014-09-16 00:13:43 +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
Rafael Schouten	9a1b524915	fix icon font class	2014-09-12 12:21:40 +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
Rafael Schouten	309ddece89	make profile icons work	2014-09-12 10:38:04 +10:00
Rafael Schouten	3ea29df111	12 option entity categories	2014-09-12 10:11:59 +10:00
Rafael Schouten	05782b6ec1	Merge branch 'ent_types_frontend' of https://github.com/openfoodfoundation/openfoodnetwork into ent_types_frontend	2014-09-12 09:59:55 +10:00
Rafael Schouten	f33a9e1a58	16 enterprise categories from four checks.	2014-09-12 01:50:36 +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
Rob H	19565a5f3b	Rename service	2014-09-11 17:10:59 +10:00
Rob H	fc0afae51c	Adding form validation to contact page	2014-09-11 17:10:59 +10:00
Rob H	454e4c971a	Adding validation to address page	2014-09-11 17:10:59 +10:00
Rob H	34841f8543	Refactoring registration form controller	2014-09-11 17:10:59 +10:00
Rob H	412e906ed3	Adding basic validation to reg process	2014-09-11 17:10:59 +10:00
summerscope	8d570286a1	Adding in sexy logic to add color to name depending on type	2014-09-11 17:10:58 +10:00
summerscope	f8c761f492	Comment out unused section, set column layout to match previous step	2014-09-11 17:10:58 +10:00
summerscope	e0fff552f9	Adjust button layout at bottom of page	2014-09-11 17:10:58 +10:00
summerscope	4d8796669b	Adding in pretty alert boxes, yay!	2014-09-11 17:10:58 +10:00
summerscope	dc5506d06b	Adjust button layout at bottom of page	2014-09-11 17:10:58 +10:00
summerscope	100d672eef	Adjust button layout at bottom of page	2014-09-11 17:10:58 +10:00
summerscope	6486e41576	More styling for registration	2014-09-11 17:10:08 +10:00
summerscope	a5fefbe6bb	More styling for register form	2014-09-11 17:10:07 +10:00
summerscope	912b7a8f95	Add a color class for global use	2014-09-11 17:10:07 +10:00