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

..

environments

Install and configure dalli for staging and production environments

2014-07-04 14:39:27 +10:00

initializers

Merge branch 'master' into config

2014-10-25 15:29:53 +11:00

locales

Add missing translation for welcome_to

2014-12-03 15:19:25 +11:00

application.rb

Add Pin Payments gateway

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

application.yml.example

Remove CONTACT_STRING config - Rob has an admin-managable override for this coming soon

2014-11-20 15:59:06 +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

Starting to prettify with Laura

2014-04-22 15:46:14 +10:00

environment.rb

Rename application from Openfoodweb to Openfoodnetwork

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

ng-test.conf.js

update karma config

2014-10-17 04:01:36 +11:00

routes.rb

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

2014-12-19 09:38:02 +11: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