Rohan Mitchell 610a4c03fe Merge branch 'master' into redesign ...

Conflicts:
	app/controllers/home_controller.rb
	app/views/producers/index.html.haml
	app/views/shared/menu/_mobile_menu.html.haml
	app/views/shop/products/_form.html.haml
	config/routes.rb
	spec/controllers/shops_controller_spec.rb

2015-06-10 18:27:50 +10:00

..

admin

add spec_helper to customers_controller_spec

2015-06-05 14:25:45 +10:00

api

Allowing calls to Api::OrderCyclesController#accessible to specify :as => 'distributor' or 'producer'

2015-05-07 12:50:54 +10:00

spree

Merge branch 'master' into require_standard_variant

2015-05-28 15:08:13 +10:00

base_controller_spec.rb

Load active distributors where they're needed rather than in most controllers

2015-05-27 15:44:01 +10:00

cart_controller_spec.rb

Fixing broken specs

2015-04-17 13:00:20 +10:00

checkout_controller_spec.rb

Creating simple_order_cycle instead of order_cycle

2014-11-28 12:29:47 +11:00

enterprise_confirmations_controller_spec.rb

On enterprise confirmation: create a new user based on enterprise contact email if one does not already exist, and add it as a manager

2015-04-17 10:24:37 +10:00

enterprises_controller_spec.rb

Moving permalink check action to enterprise controller

2015-01-22 10:19:42 +11:00

groups_controller_spec.rb

Dereferencing groups and adding modals to page

2014-06-24 17:15:31 +10:00

registration_controller_spec.rb

Remove unrequired store registration action

2014-10-17 11:01:39 +11:00

shop_controller_spec.rb

Merge branch 'master' into optimise-shopfront

2015-06-03 10:07:42 +10:00

shops_controller_spec.rb

Merge branch 'master' into redesign

2015-06-10 18:27:50 +10:00

user_passwords_controller_spec.rb

Run password reset job for spec that requires it

2015-04-22 07:32:22 +10:00

user_registrations_controller_spec.rb

Don't override devise's after_sign_in_path_for, use specific before filters for user sessions and registrations controllers instead

2015-04-16 16:56:27 +10:00