Maikel Linke 0b4a43d77a Merge remote-tracking branch 'origin/master' into i18n-replace-strings-in-views ...

Conflicts:
	app/views/shared/menu/_cart.html.haml
	app/views/spree/order_mailer/confirm_email_for_shop.html.haml

2015-09-16 16:32:16 +10:00

..

environments

Make config reset for all tests more robust. Add cache isolation for parallel specs.

2015-06-24 14:02:45 +10:00

initializers

Auto-merge from CI [skip ci]

2015-06-16 14:12:16 +10:00

locales

Merge remote-tracking branch 'origin/master' into i18n-replace-strings-in-views

2015-09-16 16:32:16 +10:00

application.rb

Undo last change, it broke asset precompilation. Rename style.css to scss for inclusion and force recompilation of all assets.

2015-06-16 18:25:44 +10: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

Add angular-slideables to js test include

2015-06-26 16:07:23 +10:00

routes.rb

Redirecting /products/:id to /

2015-08-21 15:18:31 +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

Do not preload_app with unicorn, update newrelic agent so that it doesn't require this setting.

2015-06-10 17:03:56 +10:00