15608 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Rafael Schouten	cf13115d57	bugfix is_profile bool	2014-09-19 16:44:51 +10:00
summerscope	408f7b7f10	Modals styling refine for small use cases	2014-09-19 16:44:43 +10:00
Rafael Schouten	e4991d4528	reorganise and document enterprise categories	2014-09-19 16:44:28 +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	1c0196cf5d	Change language for Kirsten	2014-09-19 16:25:34 +10:00
Rob Harrington	c6acbc6810	Assigning @spree_api_key for store	2014-09-19 16:09:26 +10:00
Rob Harrington	eeb54f3f76	Allow new user to create enterprises	2014-09-19 15:30:53 +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	544e6e074a	Stop being lazy	2014-09-19 14:38:59 +10:00
Rob Harrington	d3e72b5a2a	Adding images to registration process	2014-09-19 12:41:24 +10:00
Rafael Schouten	f9cbdcee0a	swap profile name	2014-09-19 12:18:02 +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	64fdbcf04f	update enterprise type spec	2014-09-18 18:17:31 +10:00
Rafael Schouten	0d5106d571	refactor enterprise type logic and fix icons	2014-09-18 18:15:28 +10:00
summerscope	9a4ba5aa1f	Producer page styling and logic for markup	2014-09-18 16:15:14 +10:00
summerscope	e1769e638d	More styling for producer page	2014-09-18 16:14:53 +10:00
summerscope	24ca1b064a	Tweak language for help popover	2014-09-18 15:34:56 +10:00
summerscope	0b59ca2dc1	Turning Show Profiles checkbox back on ready for logic	2014-09-18 15:33:44 +10:00
summerscope	7f4bccc956	fix anchor angular for link to hub shopfront	2014-09-18 15:22: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	1fdcbbec40	Merge branch 'ent_types_frontend' of https://github.com/openfoodfoundation/openfoodnetwork into ent_types_frontend	2014-09-18 15:15:01 +10:00
Rafael Schouten	bd922085c4	icons and entity category logic	2014-09-18 15:14:55 +10:00
summerscope	c42f83b6b1	Tweak markup to show producer name and write logic for link around producer if also own shopfront	2014-09-18 15:13:48 +10:00
Rafael Schouten	d75076e1c9	producer icons and inital link logic	2014-09-18 13:59:47 +10:00
Rafael Schouten	21628ed069	Merge branch 'master' into ent_types_frontend2	2014-09-17 17:45:55 +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
rafaqz	ee6b71b140	Merge pull request #260 from openfoodfoundation/currency ... Merge Currency branch	2014-09-17 13:47:37 +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
Rafael Schouten	6829636f11	comit ng-tst changes elsewhere	2014-09-17 13:19:08 +10:00
rafaqz	98ba135d49	Explain weird spree override	2014-09-17 13:12:27 +10:00
Rafael Schouten	4a93e9e94f	Merge branch 'master' into currency	2014-09-17 12:49:10 +10:00
Rafael Schouten	a5680e611e	add example yml	2014-09-17 12:05:28 +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
Rob Harrington	0fdbcc0023	Make dates consistent	2014-09-17 11:39:39 +10:00
Rob Harrington	eead8d665f	Pending bulk order mgmt specs	2014-09-17 11:39:20 +10:00
Rafael Schouten	01c98bf6e4	refactor and bugfix for tests	2014-09-17 01:07:34 +10:00
Rob Harrington	22e61d9834	TEMP: spit out variables in failing oc spec	2014-09-16 23:47:34 +10:00
Rob Harrington	279c5925ef	Add helpers to registration spec to counter JS weirdness	2014-09-16 23:46:34 +10:00
Rob Harrington	9e2e96d19e	Schema weirdness	2014-09-16 23:45:36 +10:00
Rafael Schouten	49476b17e8	fix typos and add missing helper	2014-09-16 16:10:48 +10:00