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

..

checkout_helper_spec.rb

Patching a couple of borked specs

2014-04-24 09:52:29 +10:00

groups_helper_spec.rb

Adding groups to this branch, also tidying up the shop stuff for Laura

2014-05-16 14:00:33 +10:00

html_helper_spec.rb

Show two linebreaks for end of block level tags, strip whitespace from end of string

2014-03-12 13:52:13 +11:00

injection_helper_spec.rb

All the new serializers and some specs

2014-07-17 14:23:09 +10:00

map_helper_spec.rb

Starting on on the map

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

order_cycles_helper_spec.rb

Removing bangs from stub since it's totes deprecated

2014-02-27 16:15:42 +11:00

products_helper_spec.rb

Remove pry from spec

2013-10-31 16:27:13 +11:00

shared_helper_spec.rb

Moving payment methods and shipping methods into their own services

2014-07-17 14:19:39 +10:00

shop_helper_spec.rb

We can now hit the index page

2013-12-05 15:07:46 +11:00