Rob Harrington 439d122e93 Merge branch 'master' into customers ...

Conflicts:
	app/assets/javascripts/admin/bulk_order_management.js.coffee
	app/assets/javascripts/admin/bulk_product_update.js.coffee
	app/assets/javascripts/admin/directives/line_item_upd_attr.js.coffee
	app/views/spree/admin/orders/bulk_management.html.haml
	db/schema.rb
	spec/javascripts/unit/bulk_order_management_spec.js.coffee

2015-06-03 15:19:40 +08:00

..

admin

Merge branch 'master' into customers

2015-06-03 15:19:40 +08: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

Serialize taxons and relatives in expected format

2015-05-29 14:03:44 +10:00

id_name_serializer.rb

Adding product property filter to shop page

2015-03-06 11:22:52 +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

When loading products for shopfront, load all master variants in one go

2015-05-27 15:44:01 +10: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

Display extended variant name in quick cart

2015-03-13 12:58:53 +11:00