Rohan Mitchell 4491d3cc73 Merge branch 'legacy-login-fix' of https://github.com/victornava/openfoodnetwork into victornava-legacy-login-fix ...

Conflicts:
	app/views/admin/order_cycles/_row.html.haml
	spec/features/admin/order_cycles_spec.rb

2015-03-16 12:14:54 +11:00

..

enterprise_fees_controller.rb

Admin can set enterprise fee's tax category

2015-03-05 10:44:25 +11:00

enterprise_groups_controller.rb

Extract data fetching from views

2015-02-20 11:17:01 +11:00

enterprise_relationships_controller.rb

Render enterprise relationships JSON with AMS instead of rabl

2014-08-25 13:07:31 +10:00

enterprise_roles_controller.rb

Admin can delete enterprise roles

2014-08-15 16:09:06 +10:00

enterprises_controller.rb

When enterprise user creates an enterprise, make it a hub if they have other hubs

2015-03-13 16:06:42 +11:00

order_cycles_controller.rb

Create a 'Show More' button at the top of the page, next to New Order on on admin order cycles index page

2015-03-11 13:14:45 +11:00

producer_properties_controller.rb

Producer properties routes use enterprise permalink

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

resource_controller.rb

Move admin non-Spree controllers out of Spree namespace

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

variant_overrides_controller.rb

Fix bug: When there are variant overrides not owned by the current user, user is unable to make any changes to VOs

2015-03-13 10:45:38 +11:00