Rob Harrington be8038e9d0 Merge branch 'master' into line_item_naming ...

Conflicts:
	lib/open_food_network/order_cycle_management_report.rb
	lib/open_food_network/packing_report.rb

2015-11-12 14:40:11 +11:00

..

admin

WIP: BOM Refactor, adding json route for OrderCyclesController#index, loading OCs based on show_more or specific order_close_at_gt

2015-11-05 14:04:29 +11: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 line_item_naming

2015-11-12 14:40:11 +11: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

When encountering StaleObjectError when checking out, retry

2015-07-10 09:42:09 +10:00

enterprise_confirmations_controller_spec.rb

Fixing issue with auto-creation of new contact user for enterprises caused by delayed-job

2015-06-12 01:49:37 +08:00

enterprises_controller_spec.rb

Remove legacy enterprises views - index, suppliers, distributors, show

2015-07-10 09:42:09 +10: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

Use indexed_fees_for for product price

2015-06-18 13:07:52 +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