David Cook bf3c5c6dd6 Merge branch 'master' into reports-completed-only ...

Conflicts:
	app/controllers/spree/admin/reports_controller_decorator.rb

2013-08-30 16:42:00 +10:00

..

distribution_change_validator_spec.rb

Fix DistributionChangeValidator#variants_available_for_distribution: Do not show products distributed through a different order cycle

2013-06-21 10:34:39 +10:00

feature_toggle_spec.rb

Add FeatureToggle config to replace ENV['OFW_DEPLOYMENT']

2013-07-22 12:11:52 +10:00

group_buy_report_spec.rb

Remove shipping method field from product distributions

2013-08-13 10:14:51 +10:00

order_and_distributor_report_spec.rb

Merge branch 'master' into reports-completed-only

2013-08-30 16:42:00 +10:00

order_cycle_form_applicator_spec.rb

OrderCycleFormApplicator sets exchange fees

2013-08-16 10:22:29 +10:00

order_grouper_spec.rb

Minor formatting changes to Order Group Spec

2012-10-24 16:13:23 +11:00

searcher_spec.rb

Fix product filtering on supplier and distributor pages

2012-11-01 16:37:12 +11:00

split_products_by_distribution_spec.rb

Remove use of deprecated rspec syntax

2013-08-13 09:11:26 +10:00