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

..

customers

Fixing layout of customers index

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

enterprise_fees

EnterpriseFee admin interface allows selecting no fee

2015-03-16 14:05:04 +11:00

enterprise_groups

permalink editable

2015-05-28 11:27:40 +10:00

enterprise_relationships

Switching enterprise relationships form around

2014-09-05 17:11:57 +10:00

enterprise_roles

Delete specific E2ER in spec

2014-09-11 14:54:51 +10:00

enterprises

Enterprises cannot add themselves to Groups

2015-05-22 15:23:59 +10:00

json

Render enterprise relationships JSON with AMS instead of rabl

2014-08-25 13:07:31 +10:00

order_cycles

Renaming order_cycle_enterprises_for as visible_enterprises

2015-04-11 22:25:23 +10:00

producer_properties

Adding properties tab to admin enterprise edit form

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

shared

fixing side menu ng-show of items

2015-02-27 15:21:23 +11:00

variant_overrides

Show extended variant name/unit info for admin variant overrides

2015-01-29 15:15:28 +11:00