Rob Harrington be8038e9d0 Merge branch 'master' into line_item_naming ...

Conflicts:
	lib/open_food_network/order_cycle_management_report.rb
	lib/open_food_network/packing_report.rb

2015-11-12 14:40:11 +11:00

..

environments

JS feature specs completing before cleaning db

2015-09-16 15:38:09 +10:00

initializers

depricating db2fog.rb initializer due to invalid bucket name

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

locales

Merge branch 'master' into line_item_naming

2015-11-12 14:40:11 +11: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

Hack down routes available for Admin::LineItemsController

2015-11-05 17:18:32 +11:00

schedule.rb

Redesignating all references to user_invoices as account_invoices

2015-09-17 22:38:28 +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