Commit graph

3201 commits

Author SHA1 Message Date
Ævar Arnfjörð Bjarmason
19c5f8aeaa M-x untabify the OpenID branch 2010-04-20 23:47:23 +00:00
Ævar Arnfjörð Bjarmason
9448eab143 Merge branch 'master' into openID 2010-04-20 23:41:14 +00:00
Tom Hughes
7a8fe086cd Don't allow robots to fetch user edit lists 2010-04-20 22:40:32 +01:00
Tom Hughes
9816c7dd0a Merge branch 'wikilinks' 2010-04-20 21:47:57 +01:00
Tom Hughes
e3fc033c1e Ignore some more generated files 2010-04-20 21:41:57 +01: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
Tom Hughes
88aa34f61b Update wiki link style to use the current default format 2010-04-20 14:21:23 +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
2e202460e6 Check that the token is valid before using it. 2010-04-20 11:05:55 +01: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
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