Will Marshall d85c89b5d2 Merge branch 'master' into maps

2014-06-05 17:12:40 +10:00

..

archive/features/consumer

Set increased Capybara.default_wait_time globally

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

controllers

Starting on on the map

2014-06-05 12:18:26 +10:00

features

Further overlapping elements fixes

2014-06-05 14:49:41 +10:00

helpers

Starting on on the map

2014-06-05 12:18:26 +10:00

javascripts

Finishing off the merge with localStorage refactoring with sekrets

2014-06-04 17:22:10 +10:00

lib

Enterprise user can only add order cycle exchanges where it manages the participant enterprise

2014-05-23 12:18:22 +10:00

mailers

Fixing the build! Some minor bugs due to mailer changes

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

models

Adding presenters to the social media fields

2014-06-04 17:13:18 +10:00

requests

Adding our first request spec

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

support

Merge branch 'new_shop'

2014-05-22 12:40:48 +10:00

views

Revert "Do not show deleted products in order cycle admin"

2014-06-03 12:18:27 +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