alexs 24d559cd3a Merge branch 'master' into landing_page ...

Conflicts:
	db/schema.rb
	db/seeds.rb

2013-08-05 17:08:39 +10:00

..

assets

new rails 3.1.4 app

2012-03-27 10:10:26 +11:00

chili

Update order confirmation email in line with changes in spree

2013-07-23 14:00:29 +10:00

open_food_web

Feature toggle order cycles.

2013-07-23 15:57:43 +10:00

seed_data

New landing page - initial layout and functionality

2013-08-05 17:04:56 +10:00

spree

Fix our monkey-patch of spree's order merging to accomodate orders having an order cycle

2013-04-05 15:00:42 +11:00

tasks

Fix loading of initial data to ensure there is an itemwise shipping method.

2013-08-01 10:52:06 +10:00

templates/erb/scaffold

Add default simple_form configuration, locales, scaffold

2012-06-19 10:29:26 +10:00