Rohan Mitchell a207f50aeb Merge branch 'master' into delay-devise-emails ...

Conflicts:
	script/run_tests.sh

2015-04-30 12:29:06 +10:00

..

open_food_network/calculator

…

spree

Merge branch 'master' into delay-devise-emails

2015-04-30 12:29:06 +10:00

.gitkeep

…

adjustment_metadata.rb

…

cart.rb

…

customer.rb

Add User#customer_of to look up customers

2015-04-16 10:59:15 +10:00

distributor_shipping_method.rb

…

enterprise_fee_set.rb

Swap param order

2014-12-12 13:33:14 +11:00

enterprise_fee.rb

Adding for_enterprises scope on enterprise fee

2015-04-06 10:24:40 +10:00

enterprise_group.rb

Serialize move_up and move_down methods of groups

2015-02-19 16:51:58 +11:00

enterprise_relationship_permission.rb

…

enterprise_relationship.rb

Adding has_permission method to enterprise_relationship

2015-04-10 12:48:27 +10:00

enterprise_role.rb

…

enterprise_set.rb

Swap param order

2014-12-12 13:33:14 +11:00

enterprise.rb

Send enterprise confirmation emails asynchronously

2015-04-21 16:19:02 +10:00

exchange_fee.rb

…

exchange_variant.rb

…

exchange.rb

Adding an 'involved' scope to exchanges

2015-03-27 15:56:07 +11:00

model_set.rb

Setting both values to blank deletes override

2014-12-12 13:33:14 +11:00

order_cycle_set.rb

Swap param order

2014-12-12 13:33:14 +11:00

order_cycle.rb

OrderCycle#recently_closed doesn't return orders that are open

2015-03-05 17:28:24 +11:00

producer_property.rb

…

product_distribution.rb

…

suburb.rb

…

variant_override_set.rb

Fix bug: When there are variant overrides not owned by the current user, user is unable to make any changes to VOs

2015-03-13 10:45:38 +11:00

variant_override.rb

Add VariantOverride.decrement_stock

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