3680 Commits

Author	SHA1	Message	Date
Rafael Schouten	3775cd29cb	generalise search filter to any enterprise	2014-09-25 11:34:49 +10:00
Rafael Schouten	da620f3723	Merge branch 'master' into ent_types_frontend	2014-09-25 10:09:42 +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
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
summerscope	408f7b7f10	Modals styling refine for small use cases	2014-09-19 16:44:43 +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
summerscope	5a7175e75d	Tweak markup to make modals fit headers nicely across small sizes	2014-09-19 16:43:31 +10:00
summerscope	4c7fa4eb9f	Fix markup so that text is not nested inside icon markup	2014-09-19 15:19:47 +10:00
summerscope	e5fc3c19e3	Working on refining scroll on modals	2014-09-19 14:41:45 +10:00
Rob Harrington	d3e72b5a2a	Adding images to registration process	2014-09-19 12:41:24 +10:00
Rafael Schouten	527a139f72	Merge branch 'ent_types_frontend' of https://github.com/openfoodfoundation/openfoodnetwork into ent_types_frontend	2014-09-18 18:17:41 +10:00
Rafael Schouten	0d5106d571	refactor enterprise type logic and fix icons	2014-09-18 18:15:28 +10:00
summerscope	e1769e638d	More styling for producer page	2014-09-18 16:14:53 +10:00
summerscope	20a76626b9	Add styling for instance where producer is own shopwfront on producer page	2014-09-18 15:22:29 +10:00
Rafael Schouten	bd922085c4	icons and entity category logic	2014-09-18 15:14:55 +10:00
Rafael Schouten	01c98bf6e4	refactor and bugfix for tests	2014-09-17 01:07:34 +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
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	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
summerscope	1c5a495d5c	Making icons smaller, adding a bit of background shadow to pop them out	2014-09-12 11:29:41 +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
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