Maikel Linke 903bd21577 Merge remote-tracking branch 'origin/master' into group-pages-merge ...

Conflicts:
	README.markdown
	db/schema.rb

2015-02-13 15:42:36 +11:00

..

calculator

Rename OpenFoodWeb namespace to OpenFoodNetwork

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

spree

Merge remote-tracking branch 'origin/master' into group-pages-merge

2015-02-13 15:42:36 +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

Fixing up a couple of regressions

2014-07-29 13:46: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

Remove trailing relations on destruction for EnterpriseFee and Variant

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

enterprise_group_spec.rb

fixing a bunch of tests

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

enterprise_relationship_spec.rb

Add permitted_by scope to EnterpriseRelationship

2015-01-30 16:36:45 +11:00

enterprise_spec.rb

Make bi-directional relationships

2015-02-13 09:24:48 +11: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

model_set_spec.rb

fixing a bunch of tests

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

order_cycle_spec.rb

Using simple_order_cycle in clone spec

2014-11-28 15:36:34 +11: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

Add VariantOverride.decrement_stock

2015-01-12 10:39:23 +11:00