Rob H 3b8c41840f Merge branch 'master' of github.com:andrewspinks/openfoodweb ...

Conflicts:
	app/models/spree/line_item_decorator.rb
	db/migrate/20120919013335_add_shipping_method_to_line_items.rb

2012-10-03 10:27:19 +10:00

..

assets

Add jquery and jquery_ujs includes to admin/all.js, as these have been removed from spree/admin/spree_core.js

2012-09-22 09:20:27 +10:00

controllers

Do not delete shipping method referenced by a line item

2012-10-02 12:15:09 +10:00

helpers

Fix OrdersHelper for upgraded spree

2012-09-21 16:36:50 +10:00

mailers

new rails 3.1.4 app

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

models

Merge branch 'master' of github.com:andrewspinks/openfoodweb

2012-10-03 10:27:19 +10:00

overrides

Display product descriptions as HTML in checkout

2012-09-13 13:05:12 +10:00

views

Fix checkout totals, also amend factories for valid test shipping method data

2012-09-21 12:35:01 +10:00