alexs e9110ac752 Merge branch 'master' of github.com:eaterprises/openfoodweb ...

Conflicts:
	Gemfile.lock

2013-08-11 16:59:02 +10:00

..

assets

Base for enterprise search via suburb selector..

2013-08-11 16:57:00 +10:00

controllers

Base for enterprise search via suburb selector..

2013-08-11 16:57:00 +10:00

helpers

Refactor LineItem and clients for new fields

2013-08-06 13:47:17 +10:00

mailers

Move strip_html to main app, fixes context-sensitive chili feature spec fail

2013-07-22 16:21:32 +10:00

models

When updating product distribution charge, skip line items that don't have a product distribution

2013-08-09 15:30:35 +10:00

overrides

Add simple angular cart to the main page.

2013-08-08 18:31:56 +10:00

presenters

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

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

views

Base for enterprise search via suburb selector..

2013-08-11 16:57:00 +10:00