Rohan Mitchell e951f80070 Merge branch 'new-product-form' ...

Conflicts:
	app/assets/javascripts/admin/admin.js.coffee

2014-05-24 17:14:32 +10:00

..

_form.html.haml

Adding social media links

2014-05-22 12:12:10 +10:00

_sidebar.html.haml

WIP: removing all payment methods from enterprise edit page

2014-05-21 15:02:59 +10:00

edit.html.haml

Revert content_for changes

2014-05-16 15:12:47 +10:00

index.html.erb

Add stub page for managing enterprise relationships

2014-05-21 11:29:11 +10:00

index.rep

Display supplier name on products for distribution

2013-01-18 14:35:06 +11:00

new.html.haml

Revert content_for changes

2014-05-16 15:12:47 +10:00

show.html.haml

Rename enterprises admin extended description to profile info, add distributor info field

2013-04-26 13:10:32 +10:00