Will Marshall 6e5e202461 Merge branch 'master' into laura_and_will ...

Conflicts:
	app/assets/javascripts/darkswarm/services/map_modal.js.coffee
	app/assets/javascripts/darkswarm/services/product.js.coffee
	app/assets/javascripts/templates/map_modal_hub.html.haml
	app/assets/javascripts/templates/map_modal_producer.html.haml
	app/assets/javascripts/templates/partials/contact.html.haml
	app/views/home/_fat.html.haml
	spec/javascripts/unit/darkswarm/services/product_spec.js.coffee

2014-06-19 14:22:23 +10:00

..

archive/features/consumer

Set increased Capybara.default_wait_time globally

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

controllers

Minor refactoring from code review with Rohan

2014-06-19 14:19:14 +10:00

features

Fixing a minor regression

2014-06-19 14:19:15 +10:00

helpers

Starting on on the map

2014-06-06 14:04:45 +10:00

javascripts

Fixing a minor regression

2014-06-19 14:19:15 +10:00

lib

On customer reports, do not show orders through a hub that the current user does not manage

2014-06-19 10:35:32 +10:00

mailers

Fixing the build! Some minor bugs due to mailer changes

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

models

Enterprise user can manage their enterprises' producer properties

2014-06-18 16:04:41 +10:00

requests

Adding our first request spec

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

support

Fix payments coming up as $0, credit card charges failing for the same reason

2014-06-12 11:49:54 +10:00

views

Fix timing error in enterprise supplied products rabl spec

2014-06-12 15:21:35 +10:00

factories.rb

Adding primary taxon field to product

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

spec_helper.rb

Tidy up spec helper, clean database before suite run

2014-05-22 11:00:29 +10:00