Rohan Mitchell 1531c476e3 Merge branch 'master' into require_standard_variant ...

Conflicts:
	spec/controllers/spree/admin/variants_controller_spec.rb

2015-05-08 13:45:31 +10:00

..

orders

Adding new loading animation to replace ugly and large gif

2015-01-16 17:06:40 +11:00

overview

Dedicated new enterprise form

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

payment_methods

WIP: angularised provider settings for payment method works on create (for admin only at this stage)

2014-08-08 17:47:50 +10:00

products

Merging master branch into require_standard_variant

2015-04-29 14:30:49 +10:00

reports

Revert "Display header for Xero invoices report"

2015-05-01 14:55:26 +10:00

shared

Rename div update-status-message to status-message

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

taxons

Adding taxon preview (big) to the admin UI

2014-06-19 14:18:52 +10:00

variants

Edit Orders: more variant info in variant search

2015-04-23 10:17:01 +10:00