rails.git
9 years agoAdd support for suspended and confirmed users
Tom Hughes [Sat, 1 May 2010 15:13:47 +0000 (16:13 +0100)]
Add support for suspended and confirmed users

Replace the existing "active" and "visible" with an enumerated status
that allows for extra cases. Currently we have "suspended" for users
who hve triggered the spam detector and "confirmed" for users that have
triggered the detector but have been confirmed as vald by an admin.

9 years agoInclude the user description in the spam score
Tom Hughes [Sat, 1 May 2010 10:22:37 +0000 (11:22 +0100)]
Include the user description in the spam score

9 years agoAdd a user index to diary comments
Tom Hughes [Thu, 29 Apr 2010 23:21:57 +0000 (00:21 +0100)]
Add a user index to diary comments

9 years agoAdd a spam_score method to the user model
Tom Hughes [Thu, 29 Apr 2010 23:18:53 +0000 (00:18 +0100)]
Add a spam_score method to the user model

9 years agoImplement OSM.spam_score to return a spam score for a piece of text
Tom Hughes [Wed, 28 Apr 2010 23:29:49 +0000 (00:29 +0100)]
Implement OSM.spam_score to return a spam score for a piece of text

9 years agoUpdate to OpenLayers 2.9.1
Tom Hughes [Thu, 6 May 2010 14:08:47 +0000 (15:08 +0100)]
Update to OpenLayers 2.9.1

9 years agoLocalisation updates from translatewiki.net (2010-05-05)
Siebrand Mazeland [Wed, 5 May 2010 22:24:27 +0000 (00:24 +0200)]
Localisation updates from translatewiki.net (2010-05-05)

9 years agoMerge branch 'master' into terms
Tom Hughes [Wed, 5 May 2010 14:29:48 +0000 (15:29 +0100)]
Merge branch 'master' into terms

9 years agoLocalisation updates from translatewiki.net (2010-05-04)
Siebrand Mazeland [Mon, 3 May 2010 22:37:48 +0000 (00:37 +0200)]
Localisation updates from translatewiki.net (2010-05-04)

Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
9 years agoswf update with Surrey imagery support
Grant Slater [Sun, 2 May 2010 13:32:54 +0000 (14:32 +0100)]
swf update with Surrey imagery support

9 years agoRunaway HTML in f28f28f24a61ce4a8956c220f04df5980d4dbd65 made all the interface BOLD
Ævar Arnfjörð Bjarmason [Sun, 2 May 2010 12:12:04 +0000 (12:12 +0000)]
Runaway HTML in f28f28f24a61ce4a8956c220f04df5980d4dbd65 made all the interface BOLD

9 years agoTranslate the most common OpenID messages into Icelandic
Ævar Arnfjörð Bjarmason [Sun, 2 May 2010 11:31:38 +0000 (11:31 +0000)]
Translate the most common OpenID messages into Icelandic

9 years agoswf update with Surrey imagery support
Grant Slater [Sun, 2 May 2010 13:32:54 +0000 (14:32 +0100)]
swf update with Surrey imagery support

9 years agoIdiot proof message, say "using the form below"
Ævar Arnfjörð Bjarmason [Sun, 2 May 2010 11:04:42 +0000 (11:04 +0000)]
Idiot proof message, say "using the form below"

9 years agoMake "Your OpenID is not associated with a OpenStreetMap account yet" message valid...
Ævar Arnfjörð Bjarmason [Sun, 2 May 2010 11:02:25 +0000 (11:02 +0000)]
Make "Your OpenID is not associated with a OpenStreetMap account yet" message valid HTML

It was introduced in ebcc988376b0dad8a0969803d52b1073420c77b7 by Kai Krueger

9 years agoM-x untabify Kai Krueger's ebcc988376b0dad8a0969803d52b1073420c77b7
Ævar Arnfjörð Bjarmason [Sun, 2 May 2010 10:48:06 +0000 (10:48 +0000)]
M-x untabify Kai Krueger's ebcc988376b0dad8a0969803d52b1073420c77b7

9 years agoOnly apply openid_url class to <input> boxes
Ævar Arnfjörð Bjarmason [Sun, 2 May 2010 10:46:31 +0000 (10:46 +0000)]
Only apply openid_url class to <input> boxes

This was already implicitly the case since it was only used on
<input>. Just narrow down the CSS rule.

9 years agoMerge remote branch 'apmon/openID' into openID
Ævar Arnfjörð Bjarmason [Sun, 2 May 2010 10:24:06 +0000 (10:24 +0000)]
Merge remote branch 'apmon/openID' into openID

9 years agoMerge branch 'master' of git://git.openstreetmap.org/rails into openID
Kai Krueger [Sun, 2 May 2010 10:15:13 +0000 (11:15 +0100)]
Merge branch 'master' of git://git.openstreetmap.org/rails into openID

9 years agoAdd test for OpenID login and signup
Kai Krueger [Sun, 2 May 2010 10:04:51 +0000 (11:04 +0100)]
Add test for OpenID login and signup

The tests need the ROTS (Ruby OpenID Test Server) running.
ROTS can be found at http://github.com/roman/rots
If ROTS is not running, there will be 4 failed test cases, but otherwise
things should work

9 years agoAdd an extra null pointer check that can trigger in tests
Kai Krueger [Sun, 2 May 2010 10:03:45 +0000 (11:03 +0100)]
Add an extra null pointer check that can trigger in tests

9 years agoMerge branch 'master' into openID
Ævar Arnfjörð Bjarmason [Sun, 2 May 2010 08:57:50 +0000 (08:57 +0000)]
Merge branch 'master' into openID

9 years agoMake a missing string translatable. Add a note about not needing a password with...
Kai Krueger [Sun, 2 May 2010 00:06:30 +0000 (01:06 +0100)]
Make a missing string translatable. Add a note about not needing a password with OpenID

9 years agoImprove hiding of openid field on signup screen
Tom Hughes [Sat, 1 May 2010 18:18:06 +0000 (19:18 +0100)]
Improve hiding of openid field on signup screen

9 years agoForgott to commit a javascript file
Kai Krueger [Sat, 1 May 2010 18:03:31 +0000 (19:03 +0100)]
Forgott to commit a javascript file

9 years agoHide OpenID url on signup page to make it less confusing
Kai Krueger [Sat, 1 May 2010 17:48:20 +0000 (18:48 +0100)]
Hide OpenID url on signup page to make it less confusing

9 years agoRemove a superfluous styling
Kai Krueger [Sat, 1 May 2010 16:55:16 +0000 (17:55 +0100)]
Remove a superfluous styling

9 years agoAdd tag for Surrey Air Survey
Grant Slater [Sat, 1 May 2010 15:01:45 +0000 (16:01 +0100)]
Add tag for Surrey Air Survey

9 years agoMake it a bit clear when you try and login with openID and your openID isn't associat...
Kai Krueger [Sat, 1 May 2010 12:49:51 +0000 (13:49 +0100)]
Make it a bit clear when you try and login with openID and your openID isn't associated with a OSM account yet

9 years agoMove email configuration out of the model and into the config file
Andy Allan [Sat, 1 May 2010 11:36:22 +0000 (12:36 +0100)]
Move email configuration out of the model and into the config file

9 years agoFine tweek the size of the OpenID logos
Kai Krueger [Sat, 1 May 2010 10:29:23 +0000 (11:29 +0100)]
Fine tweek the size of the OpenID logos

9 years agoAdd the OpenID logo to all openid url entry textfields for clarity
Kai Krueger [Sat, 1 May 2010 10:25:47 +0000 (11:25 +0100)]
Add the OpenID logo to all openid url entry textfields for clarity

9 years agoLocalisation updates from translatewiki.net (2010-04-30)
Siebrand Mazeland [Fri, 30 Apr 2010 11:57:31 +0000 (13:57 +0200)]
Localisation updates from translatewiki.net (2010-04-30)

Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
9 years agoUpdated rails translations from http://github.com/svenfuchs/rails-i18n
Tom Hughes [Fri, 30 Apr 2010 08:18:35 +0000 (09:18 +0100)]
Updated rails translations from github.com/svenfuchs/rails-i18n

9 years agoFix YAML syntax error introduced in d67b9d73024558587828273dd8afa3da8d27889b. Thanks...
Siebrand Mazeland [Thu, 29 Apr 2010 21:25:51 +0000 (23:25 +0200)]
Fix YAML syntax error introduced in d67b9d73024558587828273dd8afa3da8d27889b. Thanks to avar for helping out.

9 years ago* updates in newline usage on the license_page messages
Siebrand Mazeland [Thu, 29 Apr 2010 21:12:24 +0000 (23:12 +0200)]
* updates in newline usage on the license_page messages
* remove trailing whitespace

9 years agoMerge branch 'master' of git://git.openstreetmap.org/rails
Siebrand Mazeland [Thu, 29 Apr 2010 20:58:18 +0000 (22:58 +0200)]
Merge branch 'master' of git://git.openstreetmap.org/rails

9 years agoUpdate config/wiki_pages.yml with script/misc/update-wiki-pages
Ævar Arnfjörð Bjarmason [Thu, 29 Apr 2010 13:21:40 +0000 (13:21 +0000)]
Update config/wiki_pages.yml with script/misc/update-wiki-pages

16 new values. Mainly French and Russian.

9 years agoFix mangling of wikipedia links
Tom Hughes [Wed, 28 Apr 2010 17:48:56 +0000 (18:48 +0100)]
Fix mangling of wikipedia links

Bail out straight away if the tag value is a URL rather than waiting
until we have parsed the key as we may change the value in the process
of parsing the key.

9 years agoReplaced the Google and Yahoo logos with nicer ones
Kai Krueger [Tue, 27 Apr 2010 21:06:10 +0000 (22:06 +0100)]
Replaced the Google and Yahoo logos with nicer ones

9 years agoMerge remote branch 'remotes/apmon/openID' into openID
Ævar Arnfjörð Bjarmason [Tue, 27 Apr 2010 20:50:01 +0000 (20:50 +0000)]
Merge remote branch 'remotes/apmon/openID' into openID

9 years agoDon't display an image border for images in the OpenID login box
Ævar Arnfjörð Bjarmason [Tue, 27 Apr 2010 20:48:08 +0000 (20:48 +0000)]
Don't display an image border for images in the OpenID login box

9 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

9 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

9 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

9 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

9 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

9 years agoFix link broken in feb9582 due to routes.rb changes
Ævar Arnfjörð Bjarmason [Tue, 27 Apr 2010 15:18:24 +0000 (15:18 +0000)]
Fix link broken in feb9582 due to routes.rb changes

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

9 years agoMerge branch 'master' into terms
Tom Hughes [Tue, 27 Apr 2010 10:22:25 +0000 (11:22 +0100)]
Merge branch 'master' into terms

9 years agoImprove layout of buttons on contributor terms page
Tom Hughes [Tue, 27 Apr 2010 10:04:41 +0000 (11:04 +0100)]
Improve layout of buttons on contributor terms page

9 years agoMake the decline button a real button
Tom Hughes [Tue, 27 Apr 2010 09:45:49 +0000 (10:45 +0100)]
Make the decline button a real button

Make the decline button on the terms page a real form submit button
and have the server redirect to the wiki as it's the only way to get
something that will actually look the same as a button on all the
different browsers.

9 years agoPressing agree creates the account now rather than activating it
Tom Hughes [Tue, 27 Apr 2010 09:06:40 +0000 (10:06 +0100)]
Pressing agree creates the account now rather than activating it

9 years agoAjaxify the country selection on the terms page
Tom Hughes [Tue, 27 Apr 2010 09:01:40 +0000 (10:01 +0100)]
Ajaxify the country selection on the terms page

9 years agoSome styling changes. Changed drop-down into radio buttons. Tried, and failed, to...
Matt Amos [Mon, 26 Apr 2010 23:36:44 +0000 (00:36 +0100)]
Some styling changes. Changed drop-down into radio buttons. Tried, and failed, to get the 'decline' link to look like a button.

9 years agoLocalisation updates from translatewiki.net (2010-04-26)
Siebrand Mazeland [Mon, 26 Apr 2010 20:04:27 +0000 (22:04 +0200)]
Localisation updates from translatewiki.net (2010-04-26)

Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
9 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.

9 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

9 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.

9 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.

9 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

9 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

9 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

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

9 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.

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

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

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

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

9 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'

9 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

9 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.

9 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

9 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)

9 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

9 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

9 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

9 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

9 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

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

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

9 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

9 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

9 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

9 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

9 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

9 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.

9 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

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

9 years agoMerge branch 'master' into terms
Tom Hughes [Mon, 19 Apr 2010 20:05:54 +0000 (21:05 +0100)]
Merge branch 'master' into terms

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

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

9 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.

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

9 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.

9 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)

9 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)

9 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.

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

9 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)