Will Marshall c640233ee5 Merge branch 'master' into laura_and_will ...

Conflicts:
	app/assets/javascripts/darkswarm/filters/taxons.js.coffee
	app/models/enterprise.rb
	app/serializers/api/enterprise_serializer.rb
	db/migrate/20140702053145_add_fields_to_distributors_shipping_methods.rb
	db/schema.rb
	spec/helpers/shared_helper_spec.rb
	spec/javascripts/unit/darkswarm/filters/shipping_spec.js.coffee
	spec/javascripts/unit/darkswarm/filters/taxons_spec.js.coffee
	spec/javascripts/unit/darkswarm/services/taxon_spec.js.coffee
	spec/models/enterprise_spec.rb

2014-07-09 11:40:54 +10:00

..

archive/features/consumer

Set increased Capybara.default_wait_time globally

2014-05-02 14:25:32 +10:00

controllers

Update spree and spree_auth_devise

2014-07-04 17:07:58 +10:00

features

Adding a spec to test a regression

2014-07-09 11:33:36 +10:00

helpers

Merge branch 'master' into laura_and_will

2014-07-09 11:40:54 +10:00

javascripts

Tests for the taxon filtering

2014-07-04 15:19:45 +10:00

lib

Fix unreliable spec

2014-07-04 14:39:27 +10:00

mailers

Fixing the build! Some minor bugs due to mailer changes

2014-04-09 12:19:52 +10:00

models

Merge branch 'master' into laura_and_will

2014-07-09 11:40:54 +10:00

requests

Adding our first request spec

2014-05-05 12:10:14 +10:00

serializers

Fix spec fail with taxons by id

2014-07-04 14:39:27 +10:00

support

Adding product modals in new format

2014-06-27 15:15:41 +10:00

views

Temporary fix to get staging working

2014-06-20 13:51:21 +10:00

factories.rb

Adding primary taxon field to product

2014-05-30 14:31:03 +10:00

spec_helper.rb

Adding perftools.rb

2014-07-04 13:51:24 +10:00