openfoodnetwork

mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-26 20:56:48 +00:00

Files

Rafael Schouten 55f4415c0d Merge branch 'master' into cleanup

Conflicts:
	app/assets/javascripts/darkswarm/services/hubs.js.coffee
	app/views/home/_hubs.html.haml
	app/views/producers/_filters.html.haml
	app/views/producers/index.html.haml

2014-09-25 19:42:20 +10:00

partials

Return template markup which was accidentally removed in Rafs merge

2014-09-19 17:47:49 +10:00

registration

Adding limit reached modal to registration

2014-09-25 12:25:32 +10:00

active_selector.html.haml

Taxon selection finesse

2014-07-09 10:53:52 +10:00

authentication.html.haml

Changing our composition of producers and hubs

2014-06-17 16:33:43 +10:00

enterprise_modal.html.haml

dry enterprise angular

2014-09-25 13:06:02 +10:00

flash.html.haml

Compacting down our flash messages

2014-06-04 17:13:19 +10:00

forgot.html.haml

Adding reset password stuff

2014-05-09 14:26:07 +10:00

loading.html.haml

Fixing map issues, adding a nice pretty loader

2014-06-12 11:50:28 +10:00

Authentication steps test

2014-05-09 14:13:39 +10:00

price_breakdown_button.html.haml

Fixing markup icon class name was incorrect

2014-09-11 17:13:07 +10:00

price_breakdown.html.haml

refactor and bugfix for tests

2014-09-17 01:07:34 +10:00

price_percentage.html.haml

Change Cost label to Item Cost for price breakdowns

2014-08-06 13:02:37 +10:00

product_modal.html.haml

Set product.largeImage in JS, use for product modal

2014-09-05 15:10:16 +10:00

registration_authentication.html.haml

Getting signup to work and authentication to load in reg specific template

2014-09-11 17:07:07 +10:00

registration.html.haml

Adding the remainder of pages to registration process

2014-09-11 17:07:05 +10:00

shipping_type_selector.html.haml

Pulling some structure out of directives

2014-07-11 12:45:08 +10:00

shop_variant.html.haml