David Cook bf3c5c6dd6 Merge branch 'master' into reports-completed-only ...

Conflicts:
	app/controllers/spree/admin/reports_controller_decorator.rb

2013-08-30 16:42:00 +10:00

..

assets

Enterprise manager can bulk edit products

2013-08-22 11:21:49 +10:00

controllers

Merge branch 'master' into reports-completed-only

2013-08-30 16:42:00 +10:00

helpers

Fix error when generating checkout email when distributor_info is nil

2013-08-20 09:19:23 +10:00

mailers

Move strip_html to main app, fixes context-sensitive chili feature spec fail

2013-07-22 16:21:32 +10:00

models

Comments

2013-08-30 16:28:02 +10:00

overrides

Shipping method has a distributor, admin can create and edit

2013-08-30 11:43:45 +10:00

presenters

Simplify exchange products/variants JSON output format, bind angular to this

2013-01-10 10:59:53 +11:00

views

Fix admin create order - remove override on spree address form, update to spree patched to fix respond_override (spree issue #2210), fix nil state error

2013-08-23 14:00:31 +10:00