Will Marshall 40f116783c Merge branch 'new_shop' ...

Conflicts:
	app/assets/stylesheets/darkswarm/images.css.sass
	app/views/modals/_producer.html.haml

2014-05-23 16:02:20 +10:00

..

assets

Merge branch 'new_shop'

2014-05-23 16:02:20 +10:00

controllers

When an enterprise user saves an order cycle for which it manages only some of the enterprises involved, do not delete the other exchanges

2014-05-23 11:28:00 +10:00

helpers

When an enterprise user saves an order cycle for which it manages only some of the enterprises involved, do not delete the other exchanges

2014-05-23 11:28:00 +10:00

mailers

Adding a signup confirmation email

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

models

Adding primary taxon field to product

2014-05-23 15:59:06 +10:00

overrides

Adding primary taxon to admin forms

2014-05-23 15:59:06 +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 'new_shop'

2014-05-23 16:02:20 +10:00