Rafael Schouten 89ce4ba632 Merge branch 'master' into bugfix ...

Conflicts:
	app/models/enterprise.rb

2014-10-21 08:51:23 +11:00

..

orders

Syntax tweaks

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

base_controller_decorator.rb

Patching up admin redirects to be MOAR UNIVERSAL

2014-05-30 12:52:14 +10: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

Swtich API key injection over to helper

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

overview_controller_decorator.rb

bugfix sells and is_distributor specs and code

2014-09-28 11:55:46 +10:00

payment_methods_controller_decorator.rb

Overriding payment method load_data to hide Bogus Gateways

2014-08-09 12:52:00 +10:00

payments_controller_decorator.rb

Payment Method must belong to a Distributor

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

products_controller_decorator.rb

Product controller loads correct data for create and update actions

2014-10-02 12:32:26 +10:00

reports_controller_decorator.rb

Merge branch 'migrate_ent_types' into bugfix

2014-10-18 07:37:41 +11:00

shipping_methods_controller_decorator.rb

Rearrange shipping method edit page

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

variants_controller_decorator.rb

Variants controller #search filters by distribution

2014-07-16 10:31:12 +10:00