Rafael Schouten f3fc70ebf0 Merge branch 'master' into raf_bugfix ...

Conflicts:
	app/assets/stylesheets/admin/openfoodnetwork.css.scss

2014-10-04 12:51:55 +10:00

..

enterprise_fees

Giving an example name for an enterprise fee.

2014-09-05 15:10:11 +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 'master' into raf_bugfix

2014-10-04 12:51:55 +10:00

json

Render enterprise relationships JSON with AMS instead of rabl

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

order_cycles

Revert 5ede8d1, reinstating a4be0ff..7b89e6a

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