Rafael Schouten 20a94b4365 Merge branch 'master' into migrate_ent_types ...

Conflicts:
	app/serializers/api/admin/enterprise_serializer.rb

2014-10-07 10:52:26 +11:00

..

calculator

Rename OpenFoodWeb namespace to OpenFoodNetwork

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

spree

fix for_order_cycle test

2014-10-07 00:22:45 +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

Starting on migrations and admin forms

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

enterprise_relationship_spec.rb

Revert 5ede8d1, reinstating a4be0ff..7b89e6a

2014-09-05 15:10:12 +10:00

enterprise_spec.rb

Merge branch 'master' into migrate_ent_types

2014-10-07 10:52:26 +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

order_cycle_spec.rb

bugfix migration ad specs

2014-09-27 18:14:10 +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