Rob Harrington be8038e9d0 Merge branch 'master' into line_item_naming ...

Conflicts:
	lib/open_food_network/order_cycle_management_report.rb
	lib/open_food_network/packing_report.rb

2015-11-12 14:40:11 +11:00

..

adjustments

Add form field to set tax when creating adjustment on order. Display tax included in adjustments on order interface.

2015-11-11 11:53:04 +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

Oops, updating template to make order filtering work

2015-11-05 14:05:14 +11:00

payment_methods

hide configuration on

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

product_properties

User can toggle property inheritence from product property page, and checking the box shows a list of producer properties that will be inherited from

2015-04-22 21:02:07 +10:00

products

bulk product edit: "on demand" for new product

2015-05-20 15:29:35 +10:00

shared

Admin Orders show page uses line_item.full_name to describe line_items

2015-10-28 13:07:32 +11:00

shipping_categories

Syntax

2015-03-12 12:28:35 +11:00

shipping_methods

revome config sidebar from index

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

users

Adding enterprise_limit form element to user edit page

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

variants

Overriding any last references to options_text in the spree codebase

2015-10-28 13:07:31 +11:00