Rohan Mitchell c6db1d440c Merge branch 'add_shipping_category' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-add_shipping_category ...

Conflicts:
	app/overrides/spree/admin/products/new/replace_form.html.haml.deface
	app/views/spree/order_mailer/confirm_email.text.haml

2015-01-09 12:30:19 +11:00

..

image_settings/edit

Admin can change the format that Spree::Images are stored/served in

2014-10-16 12:41:11 +11:00

orders

Orders page doesn't crash when orders have no distributor

2014-11-21 10:15:40 +11:00

payment_methods

hide configuration on

2014-10-03 11:46:00 +10:00

products

Merge branch 'add_shipping_category' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-add_shipping_category

2015-01-09 12:30:19 +11:00

shared

Remove short wait, show variant overrides tab in admin

2014-12-12 13:33:14 +11:00

shipping_methods

revome config sidebar from index

2014-10-25 19:03:56 +11:00

tax_settings/edit

Tax category dropdown on create product form

2014-11-23 15:18:16 +00:00

users

Adding enterprise_limit form element to user edit page

2014-09-11 15:19:24 +10:00

variants/_form

Do not show unit value or description when product does not have a unit-related option type

2014-02-19 12:07:53 +11:00