cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3866 commits 4 branches 1 tag 499 MiB
Commit graph

1422 commits

Author SHA1 Message Date
Ævar Arnfjörð Bjarmason
735493837b Merge branch 'master' into openID 2010-04-24 12:33:29 +00:00
Tom Hughes
a97ae09d2a Add some extra translations from OpenLayers 2.9 2010-04-23 16:13:39 +01:00
Tom Hughes
4763272982 Fix data browser navigation tooltips 2010-04-22 23:38:07 +01:00
Tom Hughes
8197ab3f82 Merge branch 'copyright' 2010-04-22 11:13:14 +01:00
Tom Hughes
d2585ea044 Tweak wikipedia links stuff 2010-04-22 10:41:53 +01:00
Ævar Arnfjörð Bjarmason
9bfa6059be Link to wikipedia articles on wikipedia=* tags 
The semantics are as documented on
http://wiki.openstreetmap.org/wiki/Key:wikipedia, i.e.:

    # English Wikipedia article Foobar
    wikipedia=Foobar
    # German Wikipedia article Foobar
    wikipedia:de=Foobar
    wikipedia=de:Foobar

If someone gives a http:// link we just pass it through.
 2010-04-21 01:46:50 +00:00
Ævar Arnfjörð Bjarmason
9448eab143 Merge branch 'master' into openID 2010-04-20 23:41:14 +00:00
Tom Hughes
546250f60b Load wiki link data at startup and shorten some file names 2010-04-20 21:05:22 +01:00
Tom Hughes
d6755356e0 Improve the browse helper code use to generate wiki links 2010-04-20 19:04:12 +01:00
Tom Hughes
da74fbb769 Fix wiki scraper to find tag pages as well as key pages 2010-04-20 18:48:59 +01:00
Ævar Arnfjörð Bjarmason
8eead8a870 Ticket #2245: Link from /browse/* pages to the wiki key/value pages 2010-04-20 12:55:14 +00:00
Tom Hughes
d36fab2913 Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/login.html.erb
	config/locales/en.yml
 2010-04-20 00:41:03 +01:00
Tom Hughes
7a5ac0394d Merge branch 'master' into copyright 2010-04-19 21:57:13 +01:00
Tom Hughes
4b2ac2ea2b Merge branch 'master' into terms 2010-04-19 21:05:54 +01:00
Tom Hughes
ec24889541 Ignore some files which aren't committed. 2010-04-19 15:20:13 +01:00
Tom Hughes
a36185b22f Normalise line endings. 2010-04-19 15:17:18 +01:00
Translatewiki
3513138b99 Localisation updates from translatewiki.net (2010-04-18) 2010-04-19 14:28:03 +01:00
Translatewiki
b7ceec9c88 Localisation updates from translatewiki.net (2010-04-18) 2010-04-19 14:28:03 +01:00
Translatewiki
45152a8ddf Localisation updates from translatewiki.net (2010-04-14) 2010-04-19 14:28:03 +01:00
Translatewiki
3c8e55e7ae Localisation updates from translatewiki.net (2010-04-14) 2010-04-19 14:28:03 +01:00
Translatewiki
7e837dd558 Localisation updates from translatewiki.net (2010-04-09) 2010-04-19 14:28:02 +01:00
Translatewiki
a1654ef19c Localisation updates from translatewiki.net (2010-04-09) 2010-04-19 14:28:02 +01:00
Richard Fairhurst
4e7ccfd9d8 always forget this one 2010-04-19 14:28:02 +01:00
Translatewiki
4ab5438485 Localisation updates from translatewiki.net (2010-04-08) 2010-04-19 14:28:02 +01:00
Translatewiki
ab2f4308ef Localisation updates from translatewiki.net (2010-04-08) 2010-04-19 14:28:02 +01:00
Tom Hughes
aab8b230ec Load timecop in the test environment only. 2010-04-19 14:27:51 +01:00
Matt Amos
9a9e13af90 Bit more work on the contributor terms page - still very much a work-in-progress. 2010-04-12 23:55:05 +00:00
Tom Hughes
db691133d3 Revert copyright page from the trunk for now. 2010-04-07 09:45:41 +00:00
Translatewiki
159860eeb4 Localisation updates from translatewiki.net (2010-04-07) 2010-04-06 22:32:09 +00:00
Translatewiki
e51fd7758d Localisation updates from translatewiki.net (2010-04-07) 2010-04-06 22:30:21 +00:00
Translatewiki
9ad6634823 Localisation updates from translatewiki.net (2010-04-07) 2010-04-06 22:25:20 +00:00
Translatewiki
3374c0751f Localisation updates from translatewiki.net (2010-04-07) 2010-04-06 22:20:45 +00:00
Tom Hughes
97f294076f Tweak the new copyright page a bit. 2010-04-06 20:11:33 +00:00
Richard Fairhurst
da059269f9 add OS StreetView (and a D keypress for the Ubuntu types) 2010-04-06 14:22:21 +00:00
Richard Fairhurst
ecbd526956 New, more helpful and compliant copyright page 2010-04-06 13:55:33 +00:00
Shaun McDonald
a2c4462db2 Seems that the Rails.env doesn't consistently work. Removing condition in config/environment.rb 2010-04-03 21:31:35 +00:00
Shaun McDonald
9dabe69032 Adding timecop as a gem dependency when in development env. This allows for time based tests to be accurate/consistent. It will stop the random error on the api_controller_test#test_changes_simple, when you are on a slow machine/have bad timing. 2010-04-03 21:02:20 +00:00
Translatewiki
6e14bf5ec7 Localisation updates from translatewiki.net (2010-04-03) 2010-04-03 13:36:40 +00:00
Translatewiki
a2a75fd102 Localisation updates from translatewiki.net (2010-04-03) 2010-04-03 13:35:56 +00:00
Tom Hughes
898c47e647 Present the contributor terms as part of the initial signup instead of 
during the account confirmation step.
 2010-03-26 18:55:17 +00:00
Translatewiki
fe11898c3a Localisation updates from translatewiki.net (2010-03-23) 2010-03-23 20:21:01 +00:00
Translatewiki
81c89e8547 Localisation updates from translatewiki.net (2010-03-23) 2010-03-23 20:20:45 +00:00
Tom Hughes
6732ff07b9 Rework the PD question on the confirmation screen. 2010-03-23 17:50:54 +00:00
Matt Amos
9cff6985ff Updated URI of dev server instance. 2010-03-22 23:48:20 +00:00
Matt Amos
b99e870291 Initial version of contributor terms changes. 2010-03-22 22:51:09 +00:00
Tom Hughes
aa90ace7b4 Add placeholder file for nb translations and arrange to merge nb and 
no translations at startup.
 2010-03-18 22:33:05 +00:00
Translatewiki
a2b438f0d7 Localisation updates from translatewiki.net (2010-03-17) 2010-03-17 21:48:01 +00:00
Translatewiki
3e2d5275a8 Localisation updates from translatewiki.net (2010-03-17) 2010-03-17 21:47:18 +00:00
Tom Hughes
a7d304d20f Require the session ID to log somebody out - if it isn't given we just 
show a confirmation page. Closes #2792.
 2010-03-14 15:29:53 +00:00
Translatewiki
1f9183aa8d Localisation updates from translatewiki.net (2010-03-13) 2010-03-12 23:54:23 +00:00