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

Conflicts:
	Gemfile

2013-07-23 18:02:28 +10:00

..

controllers

Merge branch 'master' into order-cycle-selection

2013-07-23 14:42:57 +10:00

features

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

2013-07-23 18:02:28 +10:00

helpers

Selecting an order cycle highlights valid distributor choices

2013-03-08 15:17:23 +11:00

javascripts/unit

Fix broken delete action for variants

2013-07-23 10:43:08 +10:00

lib

Merge branch 'master' into order-cycle-selection

2013-07-23 14:42:57 +10:00

models

Fix selection of itemwise shipping method that broke after the spree upgrade.

2013-07-23 15:46:07 +10:00

support

Fix test regressions with multiple 'Save and Continue' buttons in checkout

2013-07-23 17:48:54 +10:00

factories.rb

Merge branch 'add-capture-order-shortcut-deface'

2013-07-23 16:55:33 +10:00

spec_helper.rb

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

2013-07-23 18:02:28 +10:00