Rohan Mitchell e951f80070 Merge branch 'new-product-form' ...

Conflicts:
	app/assets/javascripts/admin/admin.js.coffee

2014-05-24 17:14:32 +10:00

..

calculator

Rename OpenFoodWeb namespace to OpenFoodNetwork

2013-10-18 17:29:55 +11:00

spree

Merge branch 'new-product-form'

2014-05-24 17:14:32 +10:00

adjustment_metadata_spec.rb

Add AdjustmentMetadata, for holding info about enterprise fee adjustments at time of creation

2013-08-12 10:00:35 +10:00

cart_spec.rb

Ensure line items only get created in correct orders when adding a product to a cart.

2013-08-14 10:49:55 +10:00

enterprise_fee_spec.rb

Remove trailing relations on destruction for EnterpriseFee and Variant

2014-04-24 13:20:15 +10:00

enterprise_group_spec.rb

Starting on migrations and admin forms

2014-05-20 12:18:27 +10:00

enterprise_relationship_spec.rb

Find enterprise relationships involving any of a number of enterprises

2014-05-22 11:25:37 +10:00

enterprise_spec.rb

Merge branch 'new-product-form'

2014-05-24 17:14:32 +10:00

exchange_spec.rb

When an enterprise user saves an order cycle for which it manages only some of the enterprises involved, do not delete the other exchanges

2014-05-23 11:28:00 +10:00

landing_page_image_spec.rb

New landing page - initial layout and functionality

2013-08-05 17:04:56 +10:00

order_cycle_spec.rb

Fixing bugs, improving dates

2014-04-23 15:46:14 +10:00

product_distribution_spec.rb

Lock enterprise fee adjustments on creation to avoid them being recalculated against order by update hooks

2013-08-19 14:38:51 +10:00

suburb_spec.rb

Suburb auto-complete functionality for the new landing page.

2013-08-12 17:34:56 +10:00