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

..

blank_option.js.coffee

Remove reference to 'Admin' from global namespace

2014-05-23 11:22:12 +10:00

bulk_products.js.coffee

insert clone after cloned product

2015-04-30 17:17:28 +10:00

confirm_handler.js.coffee

Remove reference to 'Admin' from global namespace

2014-05-23 11:22:12 +10:00

data_fetcher.js.coffee

Remove reference to 'Admin' from global namespace

2014-05-23 11:22:12 +10:00

dirty_products.js.coffee

Add fields for variant display name and display as to bpe

2014-06-12 11:49:53 +10:00

dirty_variant_overrides.js.coffee

WIP: Extract variant overrides to own controller - route, controller, views

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

display_properties.js.coffee

Expand All button to show all variants in BPE

2015-05-29 16:51:55 +10:00

enterprise_relationships.js.coffee

Admin can grant create_variant_overrides permission

2015-01-30 11:56:05 +11:00

enterprise_roles.js.coffee

Switch to AMS for enterprise role serialisation

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

enterprises.js.coffee

Further removal of references to 'Admin' from global namespace

2014-05-24 17:15:20 +10:00

indexer.js.coffee

Indexer accepts arbitrary key to index by. Fix bug: Return an object instead of an array.

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

option_value_namer.js.coffee

Extract unit names from OptionValueNamer into VariantUnitManager

2014-07-18 12:39:16 +10:00

paged_fetcher.js.coffee

Extract fetch-by-page from BPE to service

2014-11-21 13:49:09 +11:00

spree_api_auth.js.coffee

Extract Spree API authorisation to service

2014-11-21 13:49:09 +11:00

status_message.js.coffee

Create new variant overrides

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

users.js.coffee

Admin can create enterprise roles

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

variant_overrides.js.coffee

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_unit_manager.js.coffee

Generate variantUnitOptions - DRY

2014-07-18 14:10:42 +10:00