Will Marshall 20d7484134 Merge branch 'master' into laura_and_will ...

Conflicts:
	app/assets/javascripts/darkswarm/services/order.js.coffee

2014-07-28 13:43:31 +10:00

..

archive/features/consumer

Set increased Capybara.default_wait_time globally

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

controllers

Merge branch 'master' into laura_and_will

2014-07-28 13:43:31 +10:00

features

Merge branch 'master' into laura_and_will

2014-07-28 13:43:31 +10:00

helpers

Merge branch 'laura_and_will' into new_cart

2014-07-18 17:02:19 +10:00

javascripts

Merge branch 'master' into laura_and_will

2014-07-28 13:43:31 +10:00

lib

Change KL to kL, update specs for ML to kL change

2014-07-17 16:16:08 +10:00

mailers

Fixing the build! Some minor bugs due to mailer changes

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

models

Ajax submission of max quantity

2014-07-28 13:33:13 +10:00

requests

Adding our first request spec

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

serializers

Merge branch 'master' into laura_and_will

2014-07-28 13:43:31 +10:00

support

Further minor regressions

2014-07-28 13:41:38 +10:00

views

Remove most references to suburbs - previously used by new_landing_page, no longer used.

2014-07-17 14:26:04 +10:00

factories.rb

order_with_totals_and_distribut{or,ion}

2014-07-16 10:33:23 +10:00

spec_helper.rb

Add spec helper method for logging in as admin in controller specs

2014-07-16 10:15:27 +10:00