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

Conflicts:
	lib/open_food_network/order_cycle_management_report.rb
	lib/open_food_network/packing_report.rb

2015-11-12 14:40:11 +11:00

..

assets

Cleaning up line items index (BOM)

2015-11-12 10:06:21 +11:00

controllers

Merge branch 'master' into line_item_naming

2015-11-12 14:40:11 +11:00

helpers

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

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

jobs

Account invoice jobs run according to rails config time zone rather than system time zone

2015-10-23 12:33:05 +11:00

mailers

Adding invoice action to orders controller, to allow sending of invoice email

2015-10-16 17:25:40 +11:00

models

Merge branch 'master' into line_item_naming

2015-11-12 14:40:11 +11:00

overrides

Merge branch 'master' into line_item_naming

2015-11-12 14:40:11 +11:00

presenters

Admin can set enterprise fee's tax category

2015-03-05 10:44:25 +11:00

serializers/api

Line items serialiser gives a sensible value for max_quantity

2015-11-12 09:47:12 +11:00

views

Merge branch 'master' into line_item_naming

2015-11-12 14:40:11 +11:00