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

Conflicts:
	app/views/checkout/_payment.html.haml
	app/views/checkout/_shipping.html.haml
	app/views/shop/products/_master.html.haml
	app/views/shop/products/_variants.html.haml

2014-07-24 10:39:36 +10:00

..

admin

Add plus icon to new order cycles button

2014-06-20 17:00:36 +10:00

api

Move enterprises api controller out of spree namespace

2014-04-11 19:08:55 +10:00

checkout

Merge branch 'laura_and_will' into new_cart

2014-07-24 10:39:36 +10:00

enterprises

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

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

groups

Unbreaking the groups page

2014-06-27 14:51:55 +10:00

home

Turning of Maps, Groups, and Producers panes

2014-07-18 17:17:42 +10:00

json

Refactoring slightly

2014-06-26 15:17:19 +10:00

layouts

Merge branch 'laura_and_will' into new_cart

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

map

Major refactoring

2014-06-20 16:31:49 +10:00

modals

Removing old product modal

2014-06-27 15:16:08 +10:00

open_food_network

Rename namespaced includes from open_food_web to open_food_network

2013-10-18 17:43:18 +11:00

order_cycles

Adding list view links

2014-02-04 12:01:10 +11:00

producers

Grid system layout for filter buttons for all sizes and breakpoints

2014-07-11 13:10:22 +10:00

products

Renaming everything to Shop

2013-12-05 13:40:05 +11:00

shared

Merge branch 'laura_and_will' into new_cart

2014-07-24 10:39:36 +10:00

shop

Merge branch 'laura_and_will' into new_cart

2014-07-24 10:39:36 +10:00

shopping_shared

Will Marshall will you please read the comment here and help me with all the logix

2014-07-23 16:36:34 +10:00

spree

Require shipping methods to have at least one distributor

2014-07-04 14:05:44 +10:00

user_passwords

Removing nothing special text and patching change password form slightly more

2014-04-08 18:07:55 +10:00