alexs 845f7bb8d7 Merge branch 'master' of github.com:eaterprises/openfoodweb

2013-08-21 10:50:08 +10:00

..

assets

new rails 3.1.4 app

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

chili

Summarise distribution charges: order confirm page and email

2013-08-20 16:26:46 +10:00

open_food_web

Removed search box and distributor/supplier sidebar from the hub page.

2013-08-21 10:49:43 +10:00

seed_data

New landing page - initial layout and functionality

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

spree

Do not merge current and incomplete orders when logging in - fixes #20

2013-08-14 10:44:02 +10:00

tasks

Revert payment method changes that broke the build: 5f7cbe3, 5a3ad8e, 3ffe732, 2d305b5, 08babee, 6f73f41, 77329b5, 4be2fe5

2013-08-20 10:47:56 +10:00

templates/erb/scaffold

Add default simple_form configuration, locales, scaffold

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