Rohan Mitchell 83e3c6815d Merge branch 'checkout-changes' ...

Conflicts:
	.rvmrc
	app/helpers/application_helper.rb

2013-01-22 10:30:51 +11:00

..

admin

Bulk update order cycle opening/closing times

2012-12-02 15:43:05 +11:00

spree

Merge branch 'checkout-changes'

2013-01-22 10:30:51 +11:00

application_controller.rb

Move presentation to presenter, display calculator fields

2012-11-22 14:37:38 +11:00

base_controller.rb

WIP Move non-admin non-Spree controllers out of Spree namespace

2012-10-25 10:45:39 +11:00

enterprises_controller.rb

Move select_distributor and deselect_distributor actions from enterprises controller to orders controller

2012-11-28 10:54:11 +11:00