Will Marshall fc02e7857a Merge branch 'master' into laura_and_will ...

Conflicts:
	app/views/shopping_shared/_contact.html.haml

2014-06-04 17:24:30 +10:00

..

admin

Merge in master

2014-05-30 15:10:13 +10:00

api

Cache expensive options_text call

2014-05-08 20:55:43 +10:00

checkout

WIP: Send credit card details to server on checkout

2014-06-04 16:20:48 +10:00

order_mailer

Changing the order confirmation text with Kirsten

2014-04-11 13:33:13 +10:00

orders

Add new icons

2014-05-30 12:56:56 +10:00

products

Remove add to cart distribution selection, remove distribution change functionality from OrderPopulator, remove now-redundant tests

2014-01-08 11:39:05 +11:00

shared

Removing some unnecessary

2014-05-29 15:41:27 +10:00

user_mailer

Change to new production hostname: openfoodnetwork.org.au

2014-05-09 11:34:52 +10:00

users

Moving User Account to darkswarm

2014-03-28 16:02:32 +11:00

_sidebar.html.haml

WIP Add hub and order cycle display stub with failing tests

2013-03-08 15:18:52 +11:00