Rohan Mitchell 29235cd2cb Merge branch 'master' into product-amount-units ...

Conflicts:
	app/assets/javascripts/admin/bulk_product_update.js.coffee
	spec/spec_helper.rb

2014-01-14 15:34:05 +11:00

..

calculator

Rename OpenFoodWeb namespace to OpenFoodNetwork

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

spree

Merge branch 'master' into product-amount-units

2014-01-14 15:34:05 +11: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

Removing a product from cart removes its fees

2013-08-19 12:19:03 +10:00

enterprise_group_spec.rb

Position enterprise groups

2013-10-30 14:46:49 +11:00

enterprises_spec.rb

Test and implementation: dropping inclusion of product_distributions from active Distributors on front page - BugHerd#125

2013-11-01 14:48:23 +11:00

exchange_spec.rb

Remove order sensitivity in specs

2013-12-17 15:25:17 +11: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

Removing a pointless test

2014-01-06 15:56:28 +11: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