Rohan Mitchell 16741598fd Merge branch 'master' into products-caching ...

Conflicts:
	spec/features/admin/variant_overrides_spec.rb

2016-03-18 09:59:56 +11:00

..

environments

Set the locale to "en" in test environment.

2015-10-07 14:05:50 +11:00

initializers

depricating db2fog.rb initializer due to invalid bucket name

2015-10-21 10:04:28 +11:00

locales

Set public enterprise.email_address at registration

2016-03-04 17:50:04 +11:00

application.rb

Escape HTML entities in JSON

2016-02-24 11:26:37 +11:00

application.yml.example

more verbose example of Discourse config

2016-01-07 22:44:03 +11: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

I18n object file for karma

2015-10-01 16:38:47 +10:00

routes.rb

Merge branch 'master' into products-caching

2016-03-03 09:42:52 +11:00

schedule.rb

Fix integrity checker rake task name

2016-03-02 08:49:36 +11: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