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

3190 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
16030e0381 Ignore yet more files. 2010-04-19 20:06:50 +01:00
Tom Hughes
8c95ba7838 Ignore some more files. 2010-04-19 16:48:10 +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
Tom Hughes
3e67d08c13 Removed old copy of OpenLayers that was hanging around. 2010-04-19 15:14:47 +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
Tom Hughes
f576c47525 Ignore whitespace around the commas when splitting a user's list of 
preferred languages. Closes #2891.
 2010-04-19 14:28:03 +01:00
Tom Hughes
a4b1c178c9 Escape geocoder errors. Closes #2892. 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
Tom Hughes
7a4c88e7c8 Merge duplicate "support" keys. 2010-04-19 14:28:03 +01:00
Teemu Koskinen
400b27a196 Add Finnish translations for words_connector, two_words_connector and last_word_connector 2010-04-19 14:28:03 +01:00
Tom Hughes
ae4ece2450 Don't send "408 Request timeout" responses from the data browser as it 
seems to make some browsers automatically retry.
 2010-04-19 14:28:02 +01:00
Tom Hughes
fdbdc9f471 Fix typo. 2010-04-19 14:28:02 +01:00
Tom Hughes
79df86023c Add a keyid attribute to each layer and use it when requesting the 
key instead of trying to use the layer name, which can be translated
which will stop it working. Closes #2876.
 2010-04-19 14:28:02 +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
Richard Fairhurst
2a023fcfc8 last point release of Potlatch 1.x... 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
d3e4803333 Update Spanish rails translation from upstream. 2010-04-19 14:28:02 +01:00
Tom Hughes
aa6e6aed2e Add translation to date.abbr_day_names for Saturday. 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
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
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
Matt Amos
11d136e508 Patching fix to test from branch. 2010-03-22 22:56:45 +00:00
Tom Hughes
8cd377d255 Restrict the fragment caching of the reverse geocode result to only cover 
that lookup and not anything else as the geocode result is only cached once
for all languages.
 2010-03-21 11:33:58 +00:00
Tom Hughes
3ea0ddf225 Remove old segment view directory. 2010-03-20 00:02:37 +00:00
Tom Hughes
d6d0a2b1a6 Disable autocompletion for the password fields on the settings page. 2010-03-20 00:01:57 +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
Tom Hughes
3506381789 Rename no-NB and no-NN translations to the correct nb and nn codes. 2010-03-18 21:47:02 +00:00
Tom Hughes
343afa7097 Update rails translations. 2010-03-18 21:36:15 +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
d99f08314c Load ethnio script over https to avoid browser warnings. 2010-03-17 21:42:48 +00:00