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

..

assets

Merge branch 'master' into customers

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

controllers

Merge branch 'master' into customers

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

helpers

Merge branch 'master' into customers

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

jobs

Add jobs for user, order and enterprise emails

2015-04-16 16:54:43 +10:00

mailers

Add rails-i18n gem.

2014-12-03 09:39:35 +11:00

models

Merge branch 'master' into customers

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

overrides

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

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

presenters

Admin can set enterprise fee's tax category

2015-03-05 10:44:25 +11:00

serializers/api

Merge branch 'master' into customers

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

views

Merge branch 'master' into customers

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