Rohan Mitchell 422061f137 Merge branch 'master' into products-caching ...

Conflicts:
	app/controllers/shop_controller.rb
	app/models/enterprise_fee.rb
	app/models/order_cycle.rb
	app/models/variant_override.rb
	db/schema.rb
	lib/open_food_network/products_renderer.rb
	spec/lib/open_food_network/products_renderer_spec.rb

2016-03-03 09:42:52 +11:00

..

account

Formatting dates for account invoices in rails time zone

2015-12-17 11:34:06 +11:00

accounts_and_billing_settings

Using date and time of current timezone

2015-12-10 11:38:41 +11:00

business_model_configuration

Replace with-tip with ofn-with-tip: business model configuration

2016-02-24 11:26:37 +11:00

cache_settings

Display products cache integrity checker results on cache settings admin page

2016-03-02 11:05:03 +11:00

contents

Admin can upload logo for ContentConfig

2015-07-17 16:06:49 +10:00

customers

Pulling bulk actions dropdown out into partial

2016-01-13 18:49:33 +11:00

enterprise_fees

Adding option to 'Inherit From Product' for enterprise_fee tax categories

2016-03-02 11:56:46 +11:00

enterprise_groups

Replace with-tip with ofn-with-tip: enterprise groups

2016-02-24 11:26:37 +11:00

enterprise_relationships

Renaming 'Override Variant Details' permission to 'Add Products To Inventory'

2016-03-02 12:10:49 +11:00

enterprise_roles

Delete specific E2ER in spec

2014-09-11 14:54:51 +10:00

enterprises

Updating text for inventory only product selection setting for enterprises

2016-03-02 12:10:49 +11:00

json

Render enterprise relationships JSON with AMS instead of rabl

2014-08-25 13:07:31 +10:00

order_cycles

OC Coordinators can opt to restrict products in an order cycle to those in their inventory only

2016-03-02 12:10:22 +11:00

producer_properties

Adding properties tab to admin enterprise edit form

2015-04-02 11:30:32 +11:00

shared

Translating variant overrides / inventory page

2016-03-02 12:10:22 +11:00

variant_overrides

Automatically selecting a hub on inventory page when it is the only option

2016-03-02 12:10:49 +11:00