Rohan Mitchell 29235cd2cb Merge branch 'master' into product-amount-units ...

Conflicts:
	app/assets/javascripts/admin/bulk_product_update.js.coffee
	spec/spec_helper.rb

2014-01-14 15:34:05 +11:00

..

controllers

Fix inconsistent test fails - insignificant ordering

2014-01-08 15:11:46 +11:00

features

Merge branch 'master' into product-amount-units

2014-01-14 15:34:05 +11:00

helpers

We can now hit the index page

2013-12-05 15:07:46 +11:00

javascripts/unit

Merge branch 'master' into product-amount-units

2014-01-14 15:34:05 +11:00

lib

Making some changes to the data on the products inventory page

2013-12-13 11:39:45 +11:00

mailers

Fixing some breaking bugs in the refactored mailer

2013-12-13 15:40:23 +11:00

models

Merge branch 'master' into product-amount-units

2014-01-14 15:34:05 +11:00

support

Allow select_distribution to take no order_cycle

2014-01-08 11:38:21 +11:00

views/suburbs

Added tests for suburbs JSON.

2013-08-15 11:40:09 +10:00

factories.rb

Add product units and amount fields to product and variant models, add validations

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

spec_helper.rb

Merge branch 'master' into product-amount-units

2014-01-14 15:34:05 +11:00