Maikel Linke 903bd21577 Merge remote-tracking branch 'origin/master' into group-pages-merge ...

Conflicts:
	README.markdown
	db/schema.rb

2015-02-13 15:42:36 +11:00

..

enterprise_fees_controller.rb

Sort enterprises by name on enterprise fees admin page

2014-02-26 15:38:41 +11:00

enterprise_groups_controller.rb

make groups editable by group owners

2015-02-05 12:05:39 +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

Merge remote-tracking branch 'origin/master' into group-pages-merge

2015-02-13 15:42:36 +11:00

order_cycles_controller.rb

Revert 5ede8d1, reinstating a4be0ff..7b89e6a

2014-08-29 16:38:10 +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

Load correct set of variant override producers, use variant_override_enterprises_per_hub, tighten specs

2015-02-04 11:20:08 +11:00