Rohan Mitchell 952353da8c Merge branch 'bulk-product-edit' into combined/single-order-patches-and-bulk-product-edit ...

Conflicts:
	spec/features/admin/bulk_product_update_spec.rb

2015-05-29 15:08:30 +10:00

..

admin

Merge branch 'bulk-product-edit' into combined/single-order-patches-and-bulk-product-edit

2015-05-29 15:08:30 +10:00

darkswarm

Updating product model specs to reflect changes to properties

2015-04-23 15:37:41 +10:00

bulk_order_management_spec.js.coffee

Merge branch 'master' into variable_weights

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

bulk_product_update_spec.js.coffee

Merge branch 'bulk-product-edit' into combined/single-order-patches-and-bulk-product-edit

2015-05-29 15:08:30 +10:00

order_cycle_spec.js.coffee

Only check editable status of variants when actually selecting

2015-04-09 15:24:45 +10:00