Will Marshall edaba844d9 Merge branch 'laura_and_will' into new_cart ...

Conflicts:
	app/views/shop/products/_form.html.haml
	app/views/shop/products/_master.html.haml
	app/views/shop/products/_variants.html.haml

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

..

archive/features/consumer

Set increased Capybara.default_wait_time globally

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

controllers

Merge branch 'laura_and_will' into new_cart

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

features

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

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

helpers

Merge branch 'laura_and_will' into new_cart

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

javascripts

Working version of the cart integration

2014-07-18 14:56:15 +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 'laura_and_will' into new_cart

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

requests

Adding our first request spec

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

serializers

Starting to restructure data injection

2014-07-18 11:21:51 +10:00

support

Rename JS file so that it is loaded after the spree code it is overriding. Admin can't add products outside distribution to an order.

2014-07-16 11:26:22 +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