Rohan Mitchell d908701b59 Merge branch 'master' into folklabs-producer-emails ...

Conflicts:
	Gemfile

2015-06-11 17:02:34 +10:00

..

customers_controller.rb

Customers controller responds with json

2015-05-13 12:44:35 +10:00

enterprise_fees_controller.rb

Renaming order_cycle_enterprises_for as visible_enterprises

2015-04-11 22:25:23 +10:00

enterprise_groups_controller.rb

Using permalink in URLs pointing to groups

2015-05-28 11:27:40 +10: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

Handle invalid referer URLs

2015-06-05 12:43:49 +10:00

order_cycles_controller.rb

Avoid serialising entire order cycle when enqueuing OrderCycleNotificationJob

2015-04-29 15:21:05 +10: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

Adding method for determining variant override hubs

2015-03-27 16:09:45 +11:00