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

..

controllers

When fetching products for variant overrides admin, fetch all overridable products

2015-02-04 10:16:34 +11:00

directives

Variable Weights: Adding ability to update the weight/volume of a line_item after checkout. The price of the line_item is automatically updated to reflect the value of the new weight.

2015-05-09 19:10:55 +01:00

enterprise_groups

textAngular editor for group description

2015-04-15 17:13:10 +10:00

enterprises

Adding properties tab to admin enterprise edit form

2015-04-02 11:30:32 +11:00

filters

Only show products that the chosen hub can add to an order cycle

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

order_cycles

Only check editable status of variants when actually selecting

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

payment_methods

Split out payment and shipping methods from admin enterprises controller as services

2015-01-22 12:19:41 +11:00

products

Convert variant_unit_options to a method, camelcase

2014-07-18 12:44:58 +10:00

services

Admin can grant create_variant_overrides permission

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

shipping_methods

Split out payment and shipping methods from admin enterprises controller as services

2015-01-22 12:19:41 +11:00

side_menu

Adding ability to show and hide menu items

2014-12-19 14:03:59 +11:00

taxons

Fix broken JS spec

2015-01-15 13:43:38 +11:00

users

Adding manager managment to enterprise edit form

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

utils

Moving navigation check to controller

2015-01-22 10:19:44 +11:00

admin.js.coffee

Moving taxons into its own module, adding preferred shopfront taxon order to enterprise

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

all.js

Side menu for enterprise group page

2015-01-15 15:04:21 +11:00

bulk_order_management.js.coffee

Merge branch 'master' into variable_weights

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

bulk_product_update.js.coffee

Adding sku to BPE

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

dropdown.js.coffee

BOM interface cleanup

2014-04-06 19:22:17 +10:00

enterprise_fees.js

Enterprise fees admin page for a specific enterprise auto-selects that enterprise for new fees and only allows selection of managed enterprises

2013-10-30 17:00:05 +11:00

order_cycle.js.erb.coffee

Only check editable status of variants when actually selecting

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

util.js.erb

Dedicated new enterprise form

2014-12-19 14:05:24 +11:00

variant_autocomplete_with_distribution_filter.js.coffee

Rename JS file so that it is loaded after the spree code it is overriding. Admin can't add products outside distribution to an order.

2014-07-16 11:26:22 +10:00