Rafael Schouten 1aa80e53b1 Merge branch 'master' into currency ...

Conflicts:
	app/helpers/injection_helper.rb
	db/suburb_seeds.rb

2014-09-16 10:25:22 +10:00

..

admin

Display enterprise relationship permissions

2014-08-25 13:28:02 +10: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

Moved attributes are actually delcared in the right place for Enterprise Serializer

2014-09-08 15:39:17 +10: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

All the new serializers and some specs

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

product_serializer.rb

Defaulting to OFN logo

2014-07-29 12:55:58 +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

Adding countries and states to registration

2014-09-11 17:07:05 +10: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

add currency localisation

2014-09-08 00:06:53 +10:00