openstreetmap-website/config
Tom Hughes 0d3a9ed9cb Merge branch 'master' into openstreetbugs
Conflicts:
	Gemfile.lock
	app/views/browse/_map.html.erb
	app/views/user/view.html.erb
	config/locales/en.yml
	config/openlayers.cfg
	db/structure.sql
	vendor/assets/openlayers/OpenLayers.js
2012-08-22 20:52:08 +01:00
..
environments Update precompile lists for changes to OpenLayers styles 2012-08-02 22:28:55 +01:00
initializers Merge branch 'master' into openstreetbugs 2012-08-22 20:52:08 +01:00
legales Renumbered sections to be more consistent with subsection numbering style 2011-04-13 13:17:21 +01:00
locales Merge branch 'master' into openstreetbugs 2012-08-22 20:52:08 +01:00
potlatch Locale maintenance: 2012-06-29 11:33:37 +00:00
.gitignore Rename application.yml to example.application.yml 2010-08-13 22:50:18 +01:00
application.rb Fixed for offline mode 2012-03-20 13:45:10 +00:00
boot.rb Update to rails 3.0.5, arel 2.0.9 and composite_primary_keys 3.1.4 2011-11-14 09:42:48 +00:00
daemons.yml add daemons 2006-12-01 12:06:38 +00:00
environment.rb Update to rails 3 2011-11-14 09:42:40 +00:00
example.application.yml Merge branch 'master' into openstreetbugs 2012-08-22 20:52:08 +01:00
example.database.yml Stop pretending we support MySQL 2012-02-08 14:08:49 +00:00
key.yml Improve the Osmarender key 2011-01-17 10:16:52 +00:00
languages.yml Locale maintenance: 2012-06-29 11:33:37 +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
nginx.conf Add a geocoder backend. 2009-04-21 15:08:36 +00:00
openlayers.cfg Merge branch 'master' into openstreetbugs 2012-08-22 20:52:08 +01:00
preinitializer.rb Update to rails 3 2011-11-14 09:42:40 +00:00
routes.rb Merge branch 'master' into openstreetbugs 2012-08-22 20:52:08 +01:00
wiki_pages.yml wiki_pages: Run script/misc/update-wiki-pages 2010-09-21 16:19:54 +01:00