openstreetmap-website/public
Tom Hughes 64f373dc59 Merge branch 'master' into openid
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/new.html.erb
	config/locales/en.yml
	public/stylesheets/common.css
2010-05-11 21:22:43 +01:00
..
api Open up crossdomain policy to allow all headers from everywhere as I can't 2009-09-30 23:47:26 +00:00
export Tweak the attribution string a bit more. 2010-02-25 17:01:19 +00:00
images Rework the signup page 2010-05-09 17:03:51 +01:00
javascripts Replace openID.js with funky rails generated javascript 2010-05-09 12:25:50 +01:00
oauth Open up crossdomain policy to allow all headers from everywhere as I can't 2009-09-30 23:47:26 +00:00
openlayers Update to OpenLayers 2.9.1 2010-05-06 15:08:47 +01:00
opensearch Normalise line endings. 2010-04-19 15:17:18 +01:00
potlatch swf update with Surrey imagery support 2010-05-03 16:47:26 +01:00
stylesheets Merge branch 'master' into openid 2010-05-11 21:22:43 +01:00
.gitignore Ignore yet more files. 2010-04-19 20:06:50 +01:00
403.html First version of blocking feature. Allows both time-based (for map protection) and notice-based (for education) blocks on users. Also introduces user roles and a simple UI for displaying and administering these. 2009-09-28 16:01:00 +00:00
404.html Change /index.php/ in wiki.openstreetmap.org links to /wiki/. This looks nicer 2009-06-02 12:23:37 +00:00
500.html Fix spelling in 500 error page 2009-06-22 13:43:39 +00:00
crossdomain.xml Update cross domain policy to only allow API access. 2008-10-06 23:21:57 +00:00
dispatch.cgi beginning of osm on rails 2006-07-28 21:41:39 +00:00
dispatch.fcgi Don't bother running GC as it doesn't seem to get as much memory back 2009-04-28 14:07:51 +00:00
dispatch.rb beginning of osm on rails 2006-07-28 21:41:39 +00:00
favicon.ico Restore favicon. 2007-07-05 15:36:21 +00:00
google7f093eeaceb75319.html add Google Webmaster tools for Simone Cortesi (OSMF) 2009-06-10 22:58:31 +00:00
google9eece52f22e4ffe5.html Add Google Webmaster Tools Authorisation file for grant@osmf 2009-06-02 10:19:42 +00:00
google25a559a026ae88b2.html Add Google Webmaster Tool Auth file for Nick Black 2009-06-02 15:14:16 +00:00
google642dc7d1c31aa8b2.html Add google webmaster tools authorisation file. 2009-06-02 10:01:20 +00:00
google711b6345f298594f.html add Google Webmaster tools auth for Blackadder 2009-06-02 10:46:42 +00:00
googled06a989d1ccc8364.html Correct google webmaster tools bug. 2010-02-26 12:23:15 +00:00
htaccess.example Rename .htaccess to htacess.example to stop it causing problems when 2009-10-06 17:29:44 +00:00
robots.txt Don't allow robots to fetch user edit lists 2010-04-20 22:40:32 +01:00