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

..

bulk_product_update_spec.rb

Merge branch 'master' into product-amount-units

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

cms_spec.rb

Fixed specs broken by new temp landing page (take 1).

2013-08-20 11:05:06 +10:00

enterprise_fees_spec.rb

After saving, maintain filter on enterprise fees by enterprise

2013-10-30 17:36:54 +11:00

enterprise_groups_spec.rb

Position enterprise groups

2013-10-30 14:46:49 +11:00

enterprise_user_spec.rb

Add permissions to enterprise users so they can manage their own products.

2013-08-02 11:51:25 +10:00

enterprises_spec.rb

Update group membership for enterprise

2013-10-30 11:27:39 +11:00

order_cycles_spec.rb

Provide explicit ordering for intermittently failing spec

2014-01-09 12:09:50 +11:00

orders_spec.rb

Enterprise manager can create an order

2013-08-27 10:05:55 +10:00

payment_method_spec.rb

Sort payment methods by name

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

products_spec.rb

Patching some further regression bugs

2014-01-07 15:28:11 +11:00

reports_spec.rb

Fix product lists not matching when saving changes to product unit+values fields

2014-01-10 15:43:45 +11:00

shipping_methods_spec.rb

Fix inconsistent test fails - insignificant ordering

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