rails.git
10 years agoMerge branch 'openID' of git://github.com/avar/osm-website into openID
Kai Krueger [Tue, 27 Apr 2010 20:37:40 +0000 (21:37 +0100)]
Merge branch 'openID' of git://github.com/avar/osm-website into openID

10 years agoIt was not possible to remove an OpenID from your user profile
Kai Krueger [Tue, 27 Apr 2010 20:34:41 +0000 (21:34 +0100)]
It was not possible to remove an OpenID from your user profile

10 years agoTweak the OpenID login page
Ævar Arnfjörð Bjarmason [Tue, 27 Apr 2010 20:32:43 +0000 (20:32 +0000)]
Tweak the OpenID login page

  * Replace 'foo' alt text with a real alt text and add title="" text
    too

  * Don't display an "Or" between the two, it's obvious from context
    that it's either-or

  * Display a small OpenID logo next to the login form (from
    http://openid.net/foundation/news/logos/)

  * Fix some indenting / HTML errors in the login table

  * Don't add border: 1px style to the OpenID provider logos. Prettier
    this way and doesn't include inline CSS

10 years agoMerge branch 'master' into openID
Ævar Arnfjörð Bjarmason [Tue, 27 Apr 2010 20:03:03 +0000 (20:03 +0000)]
Merge branch 'master' into openID

10 years agoTry a different style for the OpenID login page
Kai Krueger [Tue, 27 Apr 2010 19:54:07 +0000 (20:54 +0100)]
Try a different style for the OpenID login page

10 years agoTweak the copyright page translation
Tom Hughes [Tue, 27 Apr 2010 15:00:10 +0000 (16:00 +0100)]
Tweak the copyright page translation

10 years agoChange misleading wording on copyright page
Ævar Arnfjörð Bjarmason [Mon, 26 Apr 2010 18:05:51 +0000 (18:05 +0000)]
Change misleading wording on copyright page

Previously it said that you may distribute derived works "under the
same or similar license", now it just says "under the same".

The former form is derived from the cc-by-sa summary:

    http://creativecommons.org/licenses/by-sa/2.0/

But the legal code itself says:

    You may distribute, publicly display, publicly perform, or publicly
    digitally perform a Derivative Work only under the terms of this
    License, a later version of this License with the same License
    Elements as this License, or a Creative Commons iCommons license that
    contains the same License Elements as this
    License (e.g. Attribution-ShareAlike 2.0 Japan)

The intent is obviously to refer to other creative commons
licenses. This makes sense in the context of the creative commons
website. but on our site the reader could infer that he's able to
distribute the map data under similar licenses, such as the GPL, GFDL,
Apache 2 and others.

10 years agoTranslate "Copyright & license" into Icelandic
Ævar Arnfjörð Bjarmason [Mon, 26 Apr 2010 18:01:27 +0000 (18:01 +0000)]
Translate "Copyright & license" into Icelandic

10 years agoEnable localization of the copyright page
Ævar Arnfjörð Bjarmason [Mon, 26 Apr 2010 18:00:02 +0000 (18:00 +0000)]
Enable localization of the copyright page

The copyright page introduced in ecbd526 wasn't localize-able. Rectify
that with a page that:

   * Displays a header in non-English languages indicating that the
     version you're looking at isn't canonical.

   * Links back to the local version from the English one in a
     non-English locale.

Additionally I fixed a regression with the cc_button.png. It now has a
meaningful alt="" text again.

10 years agoCorrectly indent this if/else clause
Ævar Arnfjörð Bjarmason [Sat, 24 Apr 2010 12:37:51 +0000 (12:37 +0000)]
Correctly indent this if/else clause

Some of the content of the else was at the same indent level as the
else itself.

10 years agoMerge branch 'master' into openID
Ævar Arnfjörð Bjarmason [Sat, 24 Apr 2010 12:33:29 +0000 (12:33 +0000)]
Merge branch 'master' into openID

10 years agoCorrect merge issues in the last merge from master
Kai Krueger [Sat, 24 Apr 2010 12:14:54 +0000 (13:14 +0100)]
Correct merge issues in the last merge from master

10 years agoAdd some extra translations from OpenLayers 2.9
Tom Hughes [Fri, 23 Apr 2010 15:13:39 +0000 (16:13 +0100)]
Add some extra translations from OpenLayers 2.9

10 years agoFix data browser navigation tooltips
Tom Hughes [Thu, 22 Apr 2010 22:38:07 +0000 (23:38 +0100)]
Fix data browser navigation tooltips

10 years agoImprove layout of data browser pages
Tom Hughes [Thu, 22 Apr 2010 22:05:20 +0000 (23:05 +0100)]
Improve layout of data browser pages

Use float to position the navigation controls and map on the right
rather than a table so that we get more consistent positioning and
avoid forcing the map of the right hand side of the viewport.

10 years agoUpdate to OpenLayers 2.9
Tom Hughes [Thu, 22 Apr 2010 17:51:46 +0000 (18:51 +0100)]
Update to OpenLayers 2.9

10 years agoMerge branch 'copyright'
Tom Hughes [Thu, 22 Apr 2010 10:13:14 +0000 (11:13 +0100)]
Merge branch 'copyright'

10 years agoLink to API usage policy
Tom Hughes [Thu, 22 Apr 2010 09:49:50 +0000 (10:49 +0100)]
Link to API usage policy

10 years agoTweak wikipedia links stuff
Tom Hughes [Thu, 22 Apr 2010 09:41:53 +0000 (10:41 +0100)]
Tweak wikipedia links stuff

10 years agoMerge remote branch 'avar/avar/browse-pages-link-to-wikipedia'
Tom Hughes [Thu, 22 Apr 2010 08:09:36 +0000 (09:09 +0100)]
Merge remote branch 'avar/avar/browse-pages-link-to-wikipedia'

10 years agoCase #2908: Escape user name in user not found error
Tom Hughes [Wed, 21 Apr 2010 23:43:31 +0000 (00:43 +0100)]
Case #2908: Escape user name in user not found error

10 years agoLink to wikipedia articles on wikipedia=* tags
Ævar Arnfjörð Bjarmason [Wed, 21 Apr 2010 01:46:50 +0000 (01:46 +0000)]
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.

10 years agoThis script requires perl 5.10
Ævar Arnfjörð Bjarmason [Wed, 21 Apr 2010 00:17:05 +0000 (00:17 +0000)]
This script requires perl 5.10

10 years agoMention how to run this script with prove(1)
Ævar Arnfjörð Bjarmason [Wed, 21 Apr 2010 00:16:09 +0000 (00:16 +0000)]
Mention how to run this script with prove(1)

10 years agoDon't re-declare lexical variable
Ævar Arnfjörð Bjarmason [Wed, 21 Apr 2010 00:07:54 +0000 (00:07 +0000)]
Don't re-declare lexical variable

10 years agoThis script no longer screen-scrapes and supports >500 key/values
Ævar Arnfjörð Bjarmason [Wed, 21 Apr 2010 00:04:24 +0000 (00:04 +0000)]
This script no longer screen-scrapes and supports >500 key/values

10 years agoM-x untabify the OpenID branch
Ævar Arnfjörð Bjarmason [Tue, 20 Apr 2010 23:47:23 +0000 (23:47 +0000)]
M-x untabify the OpenID branch

10 years agoMerge branch 'master' into openID
Ævar Arnfjörð Bjarmason [Tue, 20 Apr 2010 23:41:14 +0000 (23:41 +0000)]
Merge branch 'master' into openID

10 years agoDon't allow robots to fetch user edit lists
Tom Hughes [Tue, 20 Apr 2010 21:40:32 +0000 (22:40 +0100)]
Don't allow robots to fetch user edit lists

10 years agoMerge branch 'wikilinks'
Tom Hughes [Tue, 20 Apr 2010 20:47:57 +0000 (21:47 +0100)]
Merge branch 'wikilinks'

10 years agoIgnore some more generated files
Tom Hughes [Tue, 20 Apr 2010 20:41:57 +0000 (21:41 +0100)]
Ignore some more generated files

10 years agoLoad wiki link data at startup and shorten some file names
Tom Hughes [Tue, 20 Apr 2010 20:05:22 +0000 (21:05 +0100)]
Load wiki link data at startup and shorten some file names

10 years agoImprove the browse helper code use to generate wiki links
Tom Hughes [Tue, 20 Apr 2010 18:04:12 +0000 (19:04 +0100)]
Improve the browse helper code use to generate wiki links

10 years agoFix wiki scraper to find tag pages as well as key pages
Tom Hughes [Tue, 20 Apr 2010 17:48:59 +0000 (18:48 +0100)]
Fix wiki scraper to find tag pages as well as key pages

10 years agoUpdate wiki link style to use the current default format
Tom Hughes [Tue, 20 Apr 2010 13:19:05 +0000 (14:19 +0100)]
Update wiki link style to use the current default format

10 years agoTicket #2245: Link from /browse/* pages to the wiki key/value pages
Ævar Arnfjörð Bjarmason [Tue, 20 Apr 2010 12:55:14 +0000 (12:55 +0000)]
Ticket #2245: Link from /browse/* pages to the wiki key/value pages

10 years agoCheck that the token is valid before using it.
Tom Hughes [Tue, 20 Apr 2010 10:05:55 +0000 (11:05 +0100)]
Check that the token is valid before using it.

10 years agoMerge branch 'master' into openid
Tom Hughes [Mon, 19 Apr 2010 23:41:03 +0000 (00:41 +0100)]
Merge branch 'master' into openid

Conflicts:
app/controllers/user_controller.rb
app/views/user/login.html.erb
config/locales/en.yml

10 years agoMerge branch 'master' into copyright
Tom Hughes [Mon, 19 Apr 2010 20:57:13 +0000 (21:57 +0100)]
Merge branch 'master' into copyright

10 years agoIgnore yet more files.
Tom Hughes [Mon, 19 Apr 2010 19:06:50 +0000 (20:06 +0100)]
Ignore yet more files.

10 years agoIgnore some more files.
Tom Hughes [Mon, 19 Apr 2010 15:48:10 +0000 (16:48 +0100)]
Ignore some more files.

10 years agoIgnore some files which aren't committed.
Tom Hughes [Mon, 19 Apr 2010 14:20:13 +0000 (15:20 +0100)]
Ignore some files which aren't committed.

10 years agoNormalise line endings.
Tom Hughes [Mon, 19 Apr 2010 14:17:18 +0000 (15:17 +0100)]
Normalise line endings.

10 years agoRemoved old copy of OpenLayers that was hanging around.
Tom Hughes [Mon, 19 Apr 2010 14:14:47 +0000 (15:14 +0100)]
Removed old copy of OpenLayers that was hanging around.

10 years agoLocalisation updates from translatewiki.net (2010-04-18)
Translatewiki [Sun, 18 Apr 2010 21:39:43 +0000 (21:39 +0000)]
Localisation updates from translatewiki.net (2010-04-18)

10 years agoLocalisation updates from translatewiki.net (2010-04-18)
Translatewiki [Sun, 18 Apr 2010 21:39:30 +0000 (21:39 +0000)]
Localisation updates from translatewiki.net (2010-04-18)

10 years agoIgnore whitespace around the commas when splitting a user's list of
Tom Hughes [Sun, 18 Apr 2010 11:44:53 +0000 (11:44 +0000)]
Ignore whitespace around the commas when splitting a user's list of
preferred languages. Closes #2891.

10 years agoEscape geocoder errors. Closes #2892.
Tom Hughes [Sun, 18 Apr 2010 11:41:15 +0000 (11:41 +0000)]
Escape geocoder errors. Closes #2892.

10 years agoLocalisation updates from translatewiki.net (2010-04-14)
Translatewiki [Wed, 14 Apr 2010 08:33:42 +0000 (08:33 +0000)]
Localisation updates from translatewiki.net (2010-04-14)

10 years agoLocalisation updates from translatewiki.net (2010-04-14)
Translatewiki [Wed, 14 Apr 2010 08:33:10 +0000 (08:33 +0000)]
Localisation updates from translatewiki.net (2010-04-14)

10 years agoMerge duplicate "support" keys.
Tom Hughes [Tue, 13 Apr 2010 11:50:47 +0000 (11:50 +0000)]
Merge duplicate "support" keys.

10 years agoAdd Finnish translations for words_connector, two_words_connector and last_word_connector
Teemu Koskinen [Tue, 13 Apr 2010 11:36:03 +0000 (11:36 +0000)]
Add Finnish translations for words_connector, two_words_connector and last_word_connector

10 years agoDon't send "408 Request timeout" responses from the data browser as it
Tom Hughes [Mon, 12 Apr 2010 13:21:03 +0000 (13:21 +0000)]
Don't send "408 Request timeout" responses from the data browser as it
seems to make some browsers automatically retry.

10 years agoFix typo.
Tom Hughes [Sun, 11 Apr 2010 23:37:09 +0000 (23:37 +0000)]
Fix typo.

10 years agoAdd a keyid attribute to each layer and use it when requesting the
Tom Hughes [Sun, 11 Apr 2010 23:35:10 +0000 (23:35 +0000)]
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.

10 years agoLocalisation updates from translatewiki.net (2010-04-09)
Translatewiki [Thu, 8 Apr 2010 23:20:43 +0000 (23:20 +0000)]
Localisation updates from translatewiki.net (2010-04-09)

10 years agoLocalisation updates from translatewiki.net (2010-04-09)
Translatewiki [Thu, 8 Apr 2010 23:20:27 +0000 (23:20 +0000)]
Localisation updates from translatewiki.net (2010-04-09)

10 years agoalways forget this one
Richard Fairhurst [Thu, 8 Apr 2010 08:28:20 +0000 (08:28 +0000)]
always forget this one

10 years agolast point release of Potlatch 1.x...
Richard Fairhurst [Thu, 8 Apr 2010 00:29:32 +0000 (00:29 +0000)]
last point release of Potlatch 1.x...

10 years agoLocalisation updates from translatewiki.net (2010-04-08)
Translatewiki [Wed, 7 Apr 2010 23:17:31 +0000 (23:17 +0000)]
Localisation updates from translatewiki.net (2010-04-08)

10 years agoLocalisation updates from translatewiki.net (2010-04-08)
Translatewiki [Wed, 7 Apr 2010 23:17:14 +0000 (23:17 +0000)]
Localisation updates from translatewiki.net (2010-04-08)

10 years agoUpdate Spanish rails translation from upstream.
Tom Hughes [Wed, 7 Apr 2010 15:29:14 +0000 (15:29 +0000)]
Update Spanish rails translation from upstream.

10 years agoAdd translation to date.abbr_day_names for Saturday.
Tom Hughes [Wed, 7 Apr 2010 13:17:17 +0000 (13:17 +0000)]
Add translation to date.abbr_day_names for Saturday.

10 years agoLoad timecop in the test environment only.
Tom Hughes [Wed, 7 Apr 2010 10:59:19 +0000 (10:59 +0000)]
Load timecop in the test environment only.

10 years agoRevert copyright page from the trunk for now.
Tom Hughes [Wed, 7 Apr 2010 09:45:41 +0000 (09:45 +0000)]
Revert copyright page from the trunk for now.

10 years agoMake a branch for working on the copyright page.
Tom Hughes [Wed, 7 Apr 2010 09:44:30 +0000 (09:44 +0000)]
Make a branch for working on the copyright page.

10 years agoLocalisation updates from translatewiki.net (2010-04-07)
Translatewiki [Tue, 6 Apr 2010 22:32:09 +0000 (22:32 +0000)]
Localisation updates from translatewiki.net (2010-04-07)

10 years agoLocalisation updates from translatewiki.net (2010-04-07)
Translatewiki [Tue, 6 Apr 2010 22:30:21 +0000 (22:30 +0000)]
Localisation updates from translatewiki.net (2010-04-07)

10 years agoLocalisation updates from translatewiki.net (2010-04-07)
Translatewiki [Tue, 6 Apr 2010 22:25:20 +0000 (22:25 +0000)]
Localisation updates from translatewiki.net (2010-04-07)

10 years agoLocalisation updates from translatewiki.net (2010-04-07)
Translatewiki [Tue, 6 Apr 2010 22:20:45 +0000 (22:20 +0000)]
Localisation updates from translatewiki.net (2010-04-07)

10 years agoTweak the new copyright page a bit.
Tom Hughes [Tue, 6 Apr 2010 20:11:33 +0000 (20:11 +0000)]
Tweak the new copyright page a bit.

10 years agoadd OS StreetView (and a D keypress for the Ubuntu types)
Richard Fairhurst [Tue, 6 Apr 2010 14:22:21 +0000 (14:22 +0000)]
add OS StreetView (and a D keypress for the Ubuntu types)

10 years agoNew, more helpful and compliant copyright page
Richard Fairhurst [Tue, 6 Apr 2010 13:55:33 +0000 (13:55 +0000)]
New, more helpful and compliant copyright page

10 years agoSeems that the Rails.env doesn't consistently work. Removing condition in config...
Shaun McDonald [Sat, 3 Apr 2010 21:31:35 +0000 (21:31 +0000)]
Seems that the Rails.env doesn't consistently work. Removing condition in config/environment.rb

10 years agoAdding timecop as a gem dependency when in development env. This allows for time...
Shaun McDonald [Sat, 3 Apr 2010 21:02:20 +0000 (21:02 +0000)]
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.

10 years agoLocalisation updates from translatewiki.net (2010-04-03)
Translatewiki [Sat, 3 Apr 2010 13:36:40 +0000 (13:36 +0000)]
Localisation updates from translatewiki.net (2010-04-03)

10 years agoLocalisation updates from translatewiki.net (2010-04-03)
Translatewiki [Sat, 3 Apr 2010 13:35:56 +0000 (13:35 +0000)]
Localisation updates from translatewiki.net (2010-04-03)

10 years agoLocalisation updates from translatewiki.net (2010-03-23)
Translatewiki [Tue, 23 Mar 2010 20:21:01 +0000 (20:21 +0000)]
Localisation updates from translatewiki.net (2010-03-23)

10 years agoLocalisation updates from translatewiki.net (2010-03-23)
Translatewiki [Tue, 23 Mar 2010 20:20:45 +0000 (20:20 +0000)]
Localisation updates from translatewiki.net (2010-03-23)

10 years agoPatching fix to test from branch.
Matt Amos [Mon, 22 Mar 2010 22:56:45 +0000 (22:56 +0000)]
Patching fix to test from branch.

10 years agoRestrict the fragment caching of the reverse geocode result to only cover
Tom Hughes [Sun, 21 Mar 2010 11:33:58 +0000 (11:33 +0000)]
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.

10 years agoRemove old segment view directory.
Tom Hughes [Sat, 20 Mar 2010 00:02:37 +0000 (00:02 +0000)]
Remove old segment view directory.

10 years agoDisable autocompletion for the password fields on the settings page.
Tom Hughes [Sat, 20 Mar 2010 00:01:57 +0000 (00:01 +0000)]
Disable autocompletion for the password fields on the settings page.

10 years agoAdd placeholder file for nb translations and arrange to merge nb and
Tom Hughes [Thu, 18 Mar 2010 22:33:05 +0000 (22:33 +0000)]
Add placeholder file for nb translations and arrange to merge nb and
no translations at startup.

10 years agoRename no-NB and no-NN translations to the correct nb and nn codes.
Tom Hughes [Thu, 18 Mar 2010 21:47:02 +0000 (21:47 +0000)]
Rename no-NB and no-NN translations to the correct nb and nn codes.

10 years agoUpdate rails translations.
Tom Hughes [Thu, 18 Mar 2010 21:36:15 +0000 (21:36 +0000)]
Update rails translations.

10 years agoLocalisation updates from translatewiki.net (2010-03-17)
Translatewiki [Wed, 17 Mar 2010 21:48:01 +0000 (21:48 +0000)]
Localisation updates from translatewiki.net (2010-03-17)

10 years agoLocalisation updates from translatewiki.net (2010-03-17)
Translatewiki [Wed, 17 Mar 2010 21:47:18 +0000 (21:47 +0000)]
Localisation updates from translatewiki.net (2010-03-17)

10 years agoLoad ethnio script over https to avoid browser warnings.
Tom Hughes [Wed, 17 Mar 2010 21:42:48 +0000 (21:42 +0000)]
Load ethnio script over https to avoid browser warnings.

10 years agoAdd UX review recruiting script to signup page.
Tom Hughes [Tue, 16 Mar 2010 21:13:16 +0000 (21:13 +0000)]
Add UX review recruiting script to signup page.

10 years agoUpdate the inbox link in the greeting bar when messages are marked
Tom Hughes [Sun, 14 Mar 2010 16:02:30 +0000 (16:02 +0000)]
Update the inbox link in the greeting bar when messages are marked
as read or unread.

10 years agoMake disabled tabs more obvious. Based on patch from Adrian Cochrane.
Tom Hughes [Sun, 14 Mar 2010 15:48:42 +0000 (15:48 +0000)]
Make disabled tabs more obvious. Based on patch from Adrian Cochrane.

10 years agoRequire the session ID to log somebody out - if it isn't given we just
Tom Hughes [Sun, 14 Mar 2010 15:29:53 +0000 (15:29 +0000)]
Require the session ID to log somebody out - if it isn't given we just
show a confirmation page. Closes #2792.

10 years agoUse Prototype methods to find the anchor nodes to make sure they get
Tom Hughes [Sun, 14 Mar 2010 08:48:48 +0000 (08:48 +0000)]
Use Prototype methods to find the anchor nodes to make sure they get
extended with the Prototype extensions on all browsers.

10 years agoLocalisation updates from translatewiki.net (2010-03-13)
Translatewiki [Fri, 12 Mar 2010 23:54:23 +0000 (23:54 +0000)]
Localisation updates from translatewiki.net (2010-03-13)

10 years agoLocalisation updates from translatewiki.net (2010-03-13)
Translatewiki [Fri, 12 Mar 2010 23:53:51 +0000 (23:53 +0000)]
Localisation updates from translatewiki.net (2010-03-13)

10 years agoFix warnings.
Tom Hughes [Thu, 11 Mar 2010 18:52:35 +0000 (18:52 +0000)]
Fix warnings.

10 years agoUse the small PanZoom control on the user map instead of the
Tom Hughes [Thu, 11 Mar 2010 18:29:35 +0000 (18:29 +0000)]
Use the small PanZoom control on the user map instead of the
full PanZoomBar control.

10 years agoImprove user popups on friend/nearby mapper maps.
Tom Hughes [Thu, 11 Mar 2010 18:23:22 +0000 (18:23 +0000)]
Improve user popups on friend/nearby mapper maps.

10 years agoUse CSS to style the disabled tabs.
Tom Hughes [Thu, 11 Mar 2010 08:58:48 +0000 (08:58 +0000)]
Use CSS to style the disabled tabs.