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

Formatting

2015-11-11 11:53:04 +11:00

orders

Cleaning up line items index (BOM)

2015-11-12 10:06:21 +11:00

overview

Adding link to user guide to enterprises index and dashboard

2015-06-12 12:31:57 +08:00

payment_methods

WIP: angularised provider settings for payment method works on create (for admin only at this stage)

2014-08-08 17:47:50 +10:00

products

Pulling out styling for red buttons in admin into more generic .red class

2015-11-06 09:52:48 +11:00

reports

Adding tweaks that have been missed from merges

2015-10-30 11:54:06 +11:00

shared

Rename div update-status-message to status-message

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

tax_settings

Adding tax settings for billing enterprise users

2015-09-17 22:38:13 +10:00

taxons

Adding taxon preview (big) to the admin UI

2014-06-19 14:18:52 +10:00

variants

Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module"

2015-10-28 13:08:50 +11:00