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

..

_actions.html.haml

On admin enterprises listing page, do not show links to pages without perms

2014-08-19 16:15:17 +10:00

_form.html.haml

refactor wysiwyg

2014-10-01 16:07:10 +10:00

_ng_form.html.haml

refactor wysiwyg

2014-10-01 16:07:10 +10:00

_sidebar_enterprise_fees.html.haml

Split sidebar into parts

2014-08-19 16:41:49 +10:00

_sidebar_payment_methods.html.haml

move checks and links in sidebars

2014-09-26 17:58:00 +10:00

_sidebar_shipping_methods.html.haml

move checks and links in sidebars

2014-09-26 17:58:00 +10:00

_sidebar.html.haml

When profile admin only, do not show payment methods, shipping methods or enterprise fees when editing profile

2014-08-19 16:43:18 +10:00

_supplied_product.rabl

Do not show deleted products in order cycle admin

2014-06-12 14:59:27 +10:00

edit.html.haml

When profile admin only, do not show payment methods, shipping methods or enterprise fees when editing profile

2014-08-19 16:43:18 +10:00

for_order_cycle.rabl

For OC, fetch all enterprises we have access to, including those via E2E relationships

2014-08-29 16:38:23 +10:00

index.html.haml

Manager can't bulk update owner

2014-09-19 18:31:50 +10:00

new.html.haml

Angularising Admin enterprises form

2014-07-24 10:16:54 +10:00