Rohan Mitchell 0431e0048c Merge branch 'master' into variant-overrides-frontend ...

Conflicts:
	app/controllers/shop_controller.rb
	app/views/shop/products/_form.html.haml
	spec/controllers/shop_controller_spec.rb

2015-01-12 16:48:51 +11:00

..

admin

Moving taxons into its own module, adding preferred shopfront taxon order to enterprise

2014-12-19 14:04:02 +11:00

address_serializer.rb

Moving to state_name

2014-07-31 15:38:26 +10:00

country_serializer.rb

Adding countries and states to registration

2014-09-11 17:07:05 +10:00

currency_config_serializer.rb

add currency spec file and update some class names

2014-09-10 18:22:33 +10:00

current_order_serializer.rb

Fixing cart total in checkout

2014-08-06 13:59:47 +10:00

enterprise_serializer.rb

Pull out override of 'visible' flag in enterprise serialiser

2014-10-22 15:53:25 +11:00

id_serializer.rb

WIP: Angularise payment methods on enterprise edit page

2014-07-24 10:16:54 +10:00

image_serializer.rb

Starting to restructure data injection

2014-07-18 11:21:51 +10:00

line_item_serializer.rb

Starting to restructure data injection

2014-07-18 11:21:51 +10:00

payment_method_serializer.rb

add payment description to checkout

2014-09-17 14:56:29 +10:00

product_serializer.rb

Merge branch 'master' into variant-overrides-frontend

2015-01-12 16:48:51 +11:00

property_serializer.rb

Spiking out products serializers and caching

2014-07-10 12:46:25 +10:00

shipping_method_serializer.rb

All the new serializers and some specs

2014-07-17 14:23:09 +10:00

state_serializer.rb

Make state abbreviations upper case

2014-10-17 12:29:51 +11:00

taxon_image_serializer.rb

Spiking out products serializers and caching

2014-07-10 12:46:25 +10:00

taxon_serializer.rb

Temporary/demonstration caching behaviour, INCOMPLETE

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

variant_serializer.rb

remove to_f on decimals

2014-09-17 13:19:34 +10:00