Rohan Mitchell 4a30f27b3d Merge branch '266reportsbranch' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-266reportsbranch ...

Conflicts:
	app/controllers/spree/admin/reports_controller_decorator.rb
	spec/models/spree/order_spec.rb

2014-12-19 09:38:02 +11:00

..

assets

new rails 3.1.4 app

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

open_food_network

Merge branch '266reportsbranch' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-266reportsbranch

2014-12-19 09:38:02 +11:00

seed_data

New landing page - initial layout and functionality

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

spree

Extract sign_in_as_user method, test managed orders API access for normal user and enterprise user

2014-04-24 13:20:16 +10:00

tasks

Fix #242 - foreign key constraint error on load_sample_data

2014-09-05 15:10:14 +10:00

templates/erb/scaffold

Add default simple_form configuration, locales, scaffold

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