Rob Harrington 439d122e93 Merge branch 'master' into customers ...

Conflicts:
	app/assets/javascripts/admin/bulk_order_management.js.coffee
	app/assets/javascripts/admin/bulk_product_update.js.coffee
	app/assets/javascripts/admin/directives/line_item_upd_attr.js.coffee
	app/views/spree/admin/orders/bulk_management.html.haml
	db/schema.rb
	spec/javascripts/unit/bulk_order_management_spec.js.coffee

2015-06-03 15:19:40 +08:00

..

calculator

Rename OpenFoodWeb namespace to OpenFoodNetwork

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

spree

Merge branch 'master' into customers

2015-06-03 15:19:40 +08: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

Fixing up a couple of regressions

2014-07-29 13:46:38 +10:00

customer_spec.rb

Completed orders require a customer, add association logic

2015-05-13 12:44:38 +10:00

distributor_shipping_method_spec.rb

Code cleanups

2014-07-04 14:39:27 +10:00

enterprise_caching_spec.rb

Caching address and touching enterprise on save

2014-07-04 14:39:26 +10:00

enterprise_fee_spec.rb

Replace 'array.sort.should == expected.sort' pattern with match_array

2015-05-28 10:46:08 +10:00

enterprise_group_spec.rb

Finding unique permalink before validation.

2015-05-28 11:27:40 +10:00

enterprise_relationship_spec.rb

Merge branch 'master' into optimise-shopfront

2015-06-03 10:07:42 +10:00

enterprise_spec.rb

Auto-merge from CI [skip ci]

2015-05-29 14:29:23 +10:00

exchange_spec.rb

Replace 'array.sort.should == expected.sort' pattern with match_array

2015-05-28 10:46:08 +10:00

model_set_spec.rb

fixing a bunch of tests

2015-02-12 16:36:18 +11:00

order_cycle_spec.rb

Merge branch 'master' into optimise-shopfront

2015-06-03 10:07:42 +10:00

product_distribution_spec.rb

Comment out intermittently failing spec - we intend to remove product distributions soon anyway

2014-08-07 17:20:38 +10:00

suburb_spec.rb

Suburb auto-complete functionality for the new landing page.

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

variant_override_spec.rb

Replace 'array.sort.should == expected.sort' pattern with match_array

2015-05-28 10:46:08 +10:00