David Cook 6a303d7db9 Merge branch 'enterprise-reports' ...

Conflicts:
	app/models/spree/ability_decorator.rb

2013-08-30 16:27:13 +10:00

..

admin

Merge branch 'enterprise-reports'

2013-08-30 16:27:13 +10:00

api

Enterprise manager can bulk edit products

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

checkout_controller_decorator.rb

Add before_payment method to checkout controller (fixes issues with spree_paypal_express)

2013-02-20 14:04:10 +11:00

home_controller_decorator.rb

Controllers provide current order cycle for product splitting

2013-04-05 14:30:11 +11:00

orders_controller_decorator.rb

Make adding to cart via spree front end kind of work again.

2013-08-15 15:36:35 +10:00

products_controller_decorator.rb

Controllers provide current order cycle for product splitting

2013-04-05 14:30:11 +11:00

taxons_controller_decorator.rb

Controllers provide current order cycle for product splitting

2013-04-05 14:30:11 +11:00

user_sessions_controller_decorator.rb

Added login to the landing page.

2013-08-06 12:34:22 +10:00