Will Marshall 20d7484134 Merge branch 'master' into laura_and_will ...

Conflicts:
	app/assets/javascripts/darkswarm/services/order.js.coffee

2014-07-28 13:43:31 +10:00

..

gateway

…

ability_decorator.rb

Enterprise user can manage their enterprises' producer properties

2014-06-18 16:04:41 +10:00

address_decorator.rb

Caching address and touching enterprise on save

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

adjustment_decorator.rb

…

classification_decorator.rb

cleaning up touches

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

gateway_decorator.rb

…

line_item_decorator.rb

…

order_decorator.rb

Ajax submission of max quantity

2014-07-28 13:33:13 +10:00

order_populator_decorator.rb

Ajax submission of max quantity

2014-07-28 13:33:13 +10:00

payment_method_decorator.rb

…

product_decorator.rb

Change error message for blank Product Category

2014-07-23 15:46:17 +10:00

product_option_type_decorator.rb

…

product_set.rb

…

shipping_method_decorator.rb

Adding tests and full touch behaviour for caching

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

taxon_decorator.rb

Store all images in a consistent path, compatible with development, and support S3 all round

2014-07-17 11:07:34 +10:00

user_decorator.rb

…

variant_decorator.rb

Add Spree::Variant.in_order_cycle

2014-07-16 09:33:59 +10:00