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

Syntax tweaks

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

base_controller_decorator.rb

Display an error message to admin when there are hubs in order cycles that are not ready for checkout

2014-10-31 12:22:02 +11:00

image_settings_controller_decorator.rb

Admin can change the format that Spree::Images are stored/served in

2014-10-16 12:41:11 +11:00

orders_controller_decorator.rb

quick fix: update fees after updating order

2015-04-30 16:29:51 +10:00

overview_controller_decorator.rb

Make admins get multi enterprise dashboard

2014-10-24 17:59:58 +11:00

payment_methods_controller_decorator.rb

Set environment for payment methods unless admin

2014-10-24 18:15:48 +11:00

payments_controller_decorator.rb

Payment Method must belong to a Distributor

2013-08-21 15:14:01 +10:00

products_controller_decorator.rb

Ignoring any new product properties submitted by a non-admin user

2015-04-02 08:55:20 +11:00

reports_controller_decorator.rb

Alllowing payments in payment reports to access soft-deleted payment methods

2015-05-06 11:10:50 +10:00

search_controller_decorator.rb

Admin users can access all users through known_users

2015-02-12 11:34:58 +11:00

shipping_methods_controller_decorator.rb

Rearrange shipping method edit page

2014-06-18 10:21:21 +10:00

variants_controller_decorator.rb

Merge branch 'master' into require_standard_variant

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