Rafael Schouten 05782b6ec1 Merge branch 'ent_types_frontend' of https://github.com/openfoodfoundation/openfoodnetwork into ent_types_frontend

2014-09-12 09:59:55 +10:00

..

assets

Fixing markup icon class name was incorrect

2014-09-11 17:13:07 +10:00

controllers

Charge customers for their shipping fee

2014-09-10 14:01:36 +10:00

helpers

Bulk Order Management works with navigation helper override

2014-09-06 00:34:27 +10:00

mailers

Adding a signup confirmation email

2014-04-08 18:06:49 +10:00

models

16 enterprise categories from four checks.

2014-09-12 01:50:36 +10:00

overrides

Admin can list enterprise roles

2014-08-15 16:09:04 +10:00

presenters

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

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

serializers

16 enterprise categories from four checks.

2014-09-12 01:50:36 +10:00

views

Merging master into this branch to keep repository up to date

2014-09-11 16:33:44 +10:00