Rob H 1a0a8ec160 Merge branch 'master' into working

2014-06-20 13:54:52 +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

Merge branch 'master' into working

2014-06-20 13:54:52 +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

Patching Rabl helper

2014-06-19 21:26:51 +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

Tidy up spec helper, clean database before suite run

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