Rohan Mitchell 5fac29d2ed Do not merge current and incomplete orders when logging in - fixes #20

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

..

controllers

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

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

features

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

2013-08-13 11:40:54 +10:00

helpers

Remove use of deprecated rspec syntax

2013-08-13 09:11:26 +10:00

javascripts/unit

Find enterprises participating in an order cycle

2013-08-14 09:48:45 +10:00

lib

Remove shipping method field from product distributions

2013-08-13 10:14:51 +10:00

models

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

2013-08-13 11:40:54 +10:00

support

Drop itemwise shipping method use in tests

2013-08-13 09:11:25 +10:00

factories.rb

Drop itemwise shipping method use in tests

2013-08-13 09:11:25 +10:00

spec_helper.rb

Stubbed out geolocation.

2013-08-07 18:03:41 +10:00