Maikel Linke 7c55285708 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into single-order-patches

2015-05-01 14:50:51 +10:00

..

assets

Resolve conflict for overflow dropdown between multiple single-line-selectors on the one page

2015-04-24 16:05:39 +10:00

controllers

Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into single-order-patches

2015-05-01 14:50:51 +10:00

helpers

Moving spree namespaced serializers into admin

2015-04-22 21:02:06 +10:00

jobs

Add jobs for user, order and enterprise emails

2015-04-16 16:54:43 +10:00

mailers

Add rails-i18n gem.

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

models

Allow managers to remove line items from order

2015-05-01 14:49:34 +10:00

overrides

admin order edit: re-label update button to "update and recalculate fees"

2015-05-01 12:05:43 +10:00

presenters

Admin can set enterprise fee's tax category

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

serializers/api

Pulling property values into the shopfront

2015-04-23 13:51:49 +10:00

views

Merge branch 'single-order-patches'

2015-05-01 14:39:17 +10:00