Rohan Mitchell 610a4c03fe Merge branch 'master' into redesign ...

Conflicts:
	app/controllers/home_controller.rb
	app/views/producers/index.html.haml
	app/views/shared/menu/_mobile_menu.html.haml
	app/views/shop/products/_form.html.haml
	config/routes.rb
	spec/controllers/shops_controller_spec.rb

2015-06-10 18:27:50 +10:00

..

environments

changing default mailer url in development from test.com to 0.0.0.0:3000

2015-05-29 15:24:17 +10:00

initializers

Merge branch 'master' into redesign

2015-06-10 18:27:50 +10:00

locales

Content-manage footer fields

2015-05-06 16:36:10 +10:00

application.rb

Add Pin Payments gateway

2014-12-12 10:59:23 +11:00

application.yml.example

Add ref for country ISO codoes

2015-04-29 14:12:08 +10:00

boot.rb

new rails 3.1.4 app

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

database.travis.yml

Rename database names and user name

2013-10-19 09:43:10 +11:00

database.yml

Initial config for parallel spec running

2015-06-03 14:29:38 +10:00

environment.rb

Rename application from Openfoodweb to Openfoodnetwork

2013-10-18 17:32:22 +11:00

ng-test.conf.js

Use phantomjs for js specs, so we can run them in CI

2015-04-22 16:33:44 +10:00

routes.rb

Merge branch 'master' into redesign

2015-06-10 18:27:50 +10:00

schedule.rb

Put db backups in their own bucket on S3, put db2fog cron commands in schedule.rb

2014-07-16 09:33:59 +10:00

spree.yml

spree install.

2012-03-27 11:06:49 +11:00

unicorn.rb

Increase unicorn timeout so that reports can run over long date range.

2013-05-05 18:42:42 +10:00