openstreetmap-website/config
Tom Hughes 9b10cbccb6 Merge branch 'master' into openid
Conflicts:
	config/locales/is.yml
2010-05-14 22:50:17 +01:00
..
environments Load timecop in the test environment only. 2010-04-19 14:27:51 +01:00
initializers Update various files to match current rails versions 2010-05-13 10:54:16 +01:00
legales Bit more work on the contributor terms page - still very much a work-in-progress. 2010-04-12 23:55:05 +00:00
locales Merge branch 'master' into openid 2010-05-14 22:50:17 +01:00
potlatch Localisation updates from translatewiki.net (2010-05-09) 2010-05-13 23:14:42 +02:00
.gitignore Ignore some files which aren't committed. 2010-04-19 15:20:13 +01:00
application.yml Merge branch 'master' into terms 2010-05-07 22:23:20 +01:00
boot.rb Ubuntu Hardy only has rubygems 1.3.1 and it seems to work 2010-05-13 12:58:22 +01:00
daemons.yml add daemons 2006-12-01 12:06:38 +00:00
environment.rb Merge branch 'master' into openid 2010-05-14 22:50:17 +01:00
key.yml add osmarender key stub, which will need to be completed 2009-06-26 13:07:02 +00:00
languages.yml Update language list. 2009-10-19 23:24:48 +00:00
lighttpd-host-blocks.sh Use a script to pull in host blocks and add some robot blocks from 2009-12-15 22:39:51 +00:00
lighttpd.conf Add a map queue that points at cgimap and direct map calls to it. 2010-02-07 11:05:10 +00:00
mongrel_cluster.yml Normalise line endings. 2010-04-19 15:17:18 +01:00
mysql.example.database.yml Don't store the real database config in svn, instead store examples for Postgres and MySQL. (Reverting Edgemaster's silly revert.) 2009-05-21 14:45:16 +00:00
nginx.conf Add a geocoder backend. 2009-04-21 15:08:36 +00:00
openlayers.cfg Add some extra translations from OpenLayers 2.9 2010-04-23 16:13:39 +01:00
postgres.example.database.yml Don't store the real database config in svn, instead store examples for Postgres and MySQL. (Reverting Edgemaster's silly revert.) 2009-05-21 14:45:16 +00:00
routes.rb Merge branch 'master' into terms 2010-05-07 22:23:20 +01:00
wiki_pages.yml Bump config/wiki_pages.yml with script/misc/update-wiki-pages 2010-05-14 14:22:14 +00:00