Rob Harrington a96cdd5ee7 Merge branch 'master' into line_item_naming ...

Conflicts:
	app/views/admin/order_cycles/edit.html.haml

2015-11-13 09:54:26 +11:00

..

_coordinator_fees.html.haml

Style order cycle fees

2013-08-16 10:36:41 +10:00

_exchange_distributed_products_form.html.haml

Only check editable status of variants when actually selecting

2015-04-09 15:24:45 +10:00

_exchange_form.html.haml

Merge branch 'producer-emails' of https://github.com/folklabs/openfoodnetwork into folklabs-producer-emails

2015-04-29 14:42:17 +10:00

_exchange_supplied_products_form.html.haml

Only check editable status of variants when actually selecting

2015-04-09 15:24:45 +10:00

_form.html.haml

Merge branch 'producer-emails' of https://github.com/folklabs/openfoodnetwork into folklabs-producer-emails

2015-04-29 14:42:17 +10:00

_name_and_timing_form.html.haml

Oopsie!

2015-04-09 13:28:41 +10:00

_row.html.haml

Renaming order_cycle_enterprises_for as visible_enterprises

2015-04-11 22:25:23 +10:00

_simple_form.html.haml

Clean up simple order cycle interface

2014-10-23 15:53:16 +11:00

edit.html.haml

Merge branch 'master' into line_item_naming

2015-11-13 09:54:26 +11:00

index.html.haml

Add column header for extra action column

2015-03-16 12:15:43 +11:00

new.html.haml

WIP: Renaming admin.order_cycles to admin.orderCycles for consistency

2015-11-05 14:40:42 +11:00

set_coordinator.html.haml

Scoping old generalised order cycle helper methods to a specific order cycle

2015-03-27 16:16:10 +11:00