Rohan Mitchell 3013870bd6 Merge branch 'master' into product-amount-units ...

Conflicts:
	config/ng-test.conf.js

2013-12-06 14:33:59 +11:00

..

assets

Basic styling for variant unit fields on BPE

2013-12-06 14:30:38 +11:00

controllers

Remove unnecessary require

2013-12-05 15:16:51 +11:00

helpers

Colour order cycle rows based on their status

2013-11-22 11:31:04 +11:00

mailers

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

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

models

Make variant unit fields attr_accessible

2013-12-05 15:16:52 +11:00

overrides

Rearrange columns

2013-11-21 14:42:28 +11:00

presenters

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

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

views

Merge branch 'master' into product-amount-units

2013-12-06 14:33:59 +11:00