summerscope 9587b2a2ed Merge branch 'laura_and_will' of github.com:openfoodfoundation/openfoodnetwork into laura_and_will ...

Conflicts:
	app/views/producers/_filters.html.haml

2014-07-09 16:18:41 +10:00

..

partials

Dereferencing groups and adding modals to page

2014-06-24 17:15:31 +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

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

hub_modal.html.haml

Dereferencing groups and adding modals to page

2014-06-24 17:15:31 +10:00

loading.html.haml

Fixing map issues, adding a nice pretty loader

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

login.html.haml

Authentication steps test

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

map_modal_producer.html.haml

Tab fixes, new tests, reworking modals

2014-06-24 17:15:31 +10:00

producer_modal.html.haml

Tab fixes, new tests, reworking modals

2014-06-24 17:15:31 +10:00

product_modal.html.haml

Adding product modals in new format

2014-06-27 15:15:41 +10:00

shipping_type_selector.html.haml

Adding query string to search params

2014-07-09 15:45:05 +10:00

signup.html.haml

Authentication steps test

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

taxon_selector.html.haml

Tweak layout on taxon filters

2014-07-09 16:15:27 +10:00