Rob Harrington 903ed7e507 Merge branch 'master' into variable_weights ...

Conflicts:
	app/assets/javascripts/admin/bulk_order_management.js.coffee
	app/views/spree/admin/orders/bulk_management.html.haml
	app/views/spree/api/line_items/bulk_show.v1.rabl
	spec/features/admin/bulk_order_management_spec.rb

2015-05-21 17:31:33 +10:00

..

for_order_cycle

Replace for_order_cycle rabl template with a serializer

2015-04-10 09:25:40 +10:00

basic_enterprise_fee_serializer.rb

Renaming existing enterprise fee serializer as basic...

2015-04-06 09:47:37 +10:00

basic_enterprise_serializer.rb

Duplicate create basic version of enterprise serializer for lists, make shopfront_message input use textangular

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

basic_order_cycle_serializer.rb

Translating existing order-related rabl templates accross to AMS

2015-05-20 11:45:48 +10:00

enterprise_fee_serializer.rb

Fetching Enterprise Fees for order cycle, using new enterprisefee serializer

2015-04-06 13:06:21 +10:00

enterprise_relationship_permission_serializer.rb

Display enterprise relationship permissions

2014-08-25 13:28:02 +10:00

enterprise_relationship_serializer.rb

Display enterprise relationship permissions

2014-08-25 13:28:02 +10:00

enterprise_role_serializer.rb

Switch to AMS for enterprise role serialisation

2014-08-15 16:09:05 +10:00

enterprise_serializer.rb

Adding manager managment to enterprise edit form

2015-02-12 11:34:58 +11:00

exchange_serializer.rb

Moving order cycle permissions to their own permissions class

2015-04-11 21:11:10 +10:00

id_name_serializer.rb

Rename payment method serializer as id name serializer

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

line_item_serializer.rb

Merge branch 'master' into variable_weights

2015-05-21 17:31:33 +10:00

order_cycle_serializer.rb

Renaming order_cycle_exchanges as visible_exchanges

2015-04-11 22:26:55 +10:00

order_serializer.rb

Translating existing order-related rabl templates accross to AMS

2015-05-20 11:45:48 +10:00

product_serializer.rb

Adding sku to BPE

2015-04-22 21:02:07 +10:00

taxon_serializer.rb

Inject taxons into BPE

2014-08-08 14:05:52 +10:00

units_product_serializer.rb

Translating existing order-related rabl templates accross to AMS

2015-05-20 11:45:48 +10:00

units_variant_serializer.rb

Use full_name on BOM instead of options_text

2015-05-20 14:11:31 +10:00

user_serializer.rb

Admin can create enterprise roles

2014-08-15 16:09:05 +10:00

variant_override_serializer.rb

Creating and then updating the new override updates the same override instead of creating a duplicate

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

variant_serializer.rb

Moving spree namespaced serializers into admin

2015-04-22 21:02:06 +10:00