summerscope 62e8a913fa Merge branch 'laura_and_will' into icon_font

2014-06-04 11:09:37 +10:00

..

assets

Adding X from new icon font to modal

2014-06-03 11:48:11 +10:00

controllers

Merge master (with primary taxons restored)

2014-05-30 15:45:48 +10:00

helpers

Dropping current producers, switching to suppliers and using Angular

2014-05-29 16:12:58 +10:00

mailers

Adding a signup confirmation email

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

models

Initialise primary taxon in migration instead of in model callback

2014-06-03 11:29:54 +10:00

overrides

Remove unused overrides for primary taxons and product/new

2014-05-30 15:48:36 +10:00

presenters

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

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

views

Merge branch 'laura_and_will' into icon_font

2014-06-04 11:09:37 +10:00