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

..

controllers

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

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

customers

Fixing layout of customers index

2015-05-14 12:37:55 +10:00

directives

Merge branch 'master' into customers

2015-06-03 15:19:40 +08:00

dropdown

Moving toggle_column directive to index_utils

2015-05-13 12:44:33 +10: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

index_utils

Removing obsolete dataSubmitter service

2015-05-14 11:38:55 +10: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

UnitsCtrl can interpret unit_value_with_description without a separating space

2015-04-24 12:15:35 +10:00

services

Merge branch 'master' into customers

2015-06-03 15:19:40 +08: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

BOM uses columns controller from index utils module

2015-05-13 12:44:34 +10:00

all.js

Adding ngTagsInput to admin assets

2015-05-13 12:44:36 +10:00

bulk_order_management.js.coffee

Merge branch 'master' into customers

2015-06-03 15:19:40 +08:00

bulk_product_update.js.coffee

Merge branch 'master' into customers

2015-06-03 15:19:40 +08: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