Rafael Schouten 08cd273be3 Merge branch 'migrate_ent_types' into bugfix ...

Conflicts:
	app/models/spree/ability_decorator.rb

2014-10-18 07:37:41 +11:00

..

enterprise_fees

Giving an example name for an enterprise fee.

2014-07-31 15:21:13 +10:00

enterprise_groups

Adding attr_accessors and paperclip file uploads

2014-05-20 12:18:28 +10:00

enterprise_relationships

Switching enterprise relationships form around

2014-09-05 17:11:57 +10:00

enterprise_roles

Delete specific E2ER in spec

2014-09-11 14:54:51 +10:00

enterprises

Merge branch 'migrate_ent_types' into bugfix

2014-10-18 07:37:41 +11:00

json

Render enterprise relationships JSON with AMS instead of rabl

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

order_cycles

show all permitted enterprises in order cycle summery

2014-10-18 03:26:57 +11:00

producer_properties

Redirect to enterprises index page after updating producer properties

2014-06-18 15:43:22 +10:00

shared

Admin can list enterprise roles

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