alexs 24d559cd3a Merge branch 'master' into landing_page ...

Conflicts:
	db/schema.rb
	db/seeds.rb

2013-08-05 17:08:39 +10:00

..

controllers

Fix bulk product edit so that it works with products with a blank available_on field.

2013-07-25 13:51:37 +10:00

features

Enterprise user admin: only allow suppliers and distributors that we manage to be selected when creating and editing products.

2013-08-02 16:08:10 +10:00

helpers

New landing page - initial layout and functionality

2013-08-05 17:04:56 +10:00

javascripts/unit

Remove coordinator fees

2013-07-30 11:55:21 +10:00

lib

Merge branch 'master' into order-cycle-selection

2013-07-23 14:42:57 +10:00

models

Merge branch 'master' into landing_page

2013-08-05 17:08:39 +10:00

support

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

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

factories.rb

Display coordinator fees on admin edit order cycle

2013-07-30 11:34:10 +10:00

spec_helper.rb

New landing page - initial layout and functionality

2013-08-05 17:04:56 +10:00