Lynne Davis 2a8ba0bf42 Fixing merge conflicts after rebase

2015-03-03 16:12:07 +11:00

..

assets

User must set the coordinator first when creating an order cycle

2015-02-27 17:24:36 +11:00

controllers

LD: Adding additional functionality for order cycle management reports - adding hub code model, adding temp_controlled bool, adding delivery report

2015-03-03 16:01:42 +11:00

helpers

Using @order_cycle.coordinator instead of @coordinator

2015-02-27 17:24:37 +11:00

mailers

Add rails-i18n gem.

2014-12-03 09:39:35 +11:00

models

Fixing merge conflicts after rebase

2015-03-03 16:12:07 +11:00

overrides

Merge remote-tracking branch 'origin/master' into group-pages-merge

2015-02-13 15:42:36 +11:00

presenters

Simplify exchange products/variants JSON output format, bind angular to this

2013-01-10 10:59:53 +11:00

serializers

Adding manager managment to enterprise edit form

2015-02-12 11:34:58 +11:00

views

Split order_cycle_simple_view logic into index and form scopings

2015-02-27 17:24:36 +11:00