]>
git.openstreetmap.org Git - rails.git/log
Siebrand Mazeland [Sun, 9 May 2010 17:06:31 +0000 (19:06 +0200)]
Localisation updates from translatewiki.net (2010-05-09)
Tom Hughes [Mon, 10 May 2010 13:02:48 +0000 (14:02 +0100)]
Rework the login method to make it a bit clearer
Ævar Arnfjörð Bjarmason [Sun, 9 May 2010 15:56:00 +0000 (15:56 +0000)]
Updated README to points to the wiki, git etc.
Link to the documentation page on the wiki, and hint at say how to
send patches.
Ævar Arnfjörð Bjarmason [Sun, 9 May 2010 15:51:22 +0000 (15:51 +0000)]
README is in Markdown format. Move it to README.mkdn
This way it'll be displayed properly my GitHub and other Markdown
readers.
Tom Hughes [Sun, 9 May 2010 16:12:33 +0000 (17:12 +0100)]
Mark OpenID "what is this?" prompt as a minor note
Tom Hughes [Sun, 9 May 2010 16:03:51 +0000 (17:03 +0100)]
Rework the signup page
Tom Hughes [Sun, 9 May 2010 14:33:35 +0000 (15:33 +0100)]
Rework the login page to make it a bit cleaner
Tom Hughes [Sun, 9 May 2010 11:26:40 +0000 (12:26 +0100)]
Merge branch 'master' into openid
Tom Hughes [Sun, 9 May 2010 11:25:50 +0000 (12:25 +0100)]
Replace openID.js with funky rails generated javascript
Tom Hughes [Sun, 9 May 2010 10:40:08 +0000 (11:40 +0100)]
Remove an unused resource and fix a few grammar issues
Tom Hughes [Sun, 9 May 2010 07:44:17 +0000 (08:44 +0100)]
Only set pending users to active on a password reset
When resetting a password only activate pending users, otherwise a
confirmed user's account gets set back to active and may then get
suspended by the spam scorer.
Ævar Arnfjörð Bjarmason [Sat, 8 May 2010 18:56:42 +0000 (18:56 +0000)]
Rename open_id_authentication_tables migration to avoid clash
If there's another migration on master before this gets merged this'll
probably have to be changed again.
Ævar Arnfjörð Bjarmason [Sat, 8 May 2010 18:10:25 +0000 (18:10 +0000)]
Bump config/wiki_pages.yml with script/misc/update-wiki-pages
Ævar Arnfjörð Bjarmason [Sat, 8 May 2010 18:09:40 +0000 (18:09 +0000)]
Implicitly update config/wiki_pages.yml if it exists, and chmod +x
This makes:
script/misc/update-wiki-pages
from the top-level just work.
Tom Hughes [Sat, 8 May 2010 16:49:27 +0000 (17:49 +0100)]
Add script to update spam block ACLs
Maintain a set of ACLs which block account creation for an IP address
which has had more than two users suspended or removed in the last 28 days.
Tom Hughes [Fri, 7 May 2010 21:28:07 +0000 (22:28 +0100)]
Merge branch 'master' into openid
Conflicts:
app/controllers/user_controller.rb
Tom Hughes [Fri, 7 May 2010 13:08:25 +0000 (14:08 +0100)]
Redirect after processing user changes
After we have processed the requested user changes, redirect back
to the list so that the resulting page is reloadable without getting
resubmission warnings from the browser.
Tom Hughes [Fri, 7 May 2010 13:08:07 +0000 (14:08 +0100)]
Preserve parameters in pagination links
Tom Hughes [Fri, 7 May 2010 13:07:39 +0000 (14:07 +0100)]
Preserve the page number when submitting the form
Tom Hughes [Fri, 7 May 2010 10:09:54 +0000 (11:09 +0100)]
Fix statistics script to reflect changes to user model
Tom Hughes [Fri, 7 May 2010 09:01:24 +0000 (10:01 +0100)]
Redirect back to settings after updating user settings
When we've saved a user's settings, redirect back to their settings
page instead of just rerendering so that a suspended user check will
be done.
Tom Hughes [Fri, 7 May 2010 09:00:24 +0000 (10:00 +0100)]
Redirect suspended users to an information page
If the current session is for a logged in user and that user has
been suspended then log them out and redirect them to a page
explaining that their account has been suspended.
Tom Hughes [Fri, 7 May 2010 08:29:38 +0000 (09:29 +0100)]
Don't try and display IP address for users without one
Tom Hughes [Fri, 7 May 2010 08:05:55 +0000 (09:05 +0100)]
Display total user count correctly in user list
Tom Hughes [Fri, 7 May 2010 08:03:12 +0000 (09:03 +0100)]
Link the username in the user list to their profile
Tom Hughes [Thu, 6 May 2010 21:11:55 +0000 (22:11 +0100)]
Fix tests for changes to user model
Tom Hughes [Thu, 6 May 2010 21:11:38 +0000 (22:11 +0100)]
Fix user visibility check
Tom Hughes [Thu, 6 May 2010 21:01:45 +0000 (22:01 +0100)]
Fix typo
Tom Hughes [Thu, 6 May 2010 20:52:27 +0000 (21:52 +0100)]
Fix user visibility check
Tom Hughes [Tue, 4 May 2010 13:44:28 +0000 (14:44 +0100)]
Add a user list view for administrators
Tom Hughes [Mon, 3 May 2010 16:09:37 +0000 (17:09 +0100)]
Tell users their account has been suspended when they try and login
Tom Hughes [Sat, 1 May 2010 17:28:41 +0000 (18:28 +0100)]
Merge all the user status changing methods into one
Tom Hughes [Sat, 1 May 2010 16:30:37 +0000 (17:30 +0100)]
Show administrators the status and spam score for a user
Tom Hughes [Sat, 1 May 2010 16:03:18 +0000 (17:03 +0100)]
Suspend users if their spam score gets too high
Use an observer to watch all diary and user updates and, if the user
is not confirmed, chek their spam score and suspend then if it has got
too high.
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.
Tom Hughes [Sat, 1 May 2010 10:22:37 +0000 (11:22 +0100)]
Include the user description in the spam score
Tom Hughes [Thu, 29 Apr 2010 23:21:57 +0000 (00:21 +0100)]
Add a user index to diary comments
Tom Hughes [Thu, 29 Apr 2010 23:18:53 +0000 (00:18 +0100)]
Add a spam_score method to the user model
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
Tom Hughes [Thu, 6 May 2010 14:08:47 +0000 (15:08 +0100)]
Update to OpenLayers 2.9.1
Siebrand Mazeland [Wed, 5 May 2010 22:24:27 +0000 (00:24 +0200)]
Localisation updates from translatewiki.net (2010-05-05)
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>
Grant Slater [Sun, 2 May 2010 13:32:54 +0000 (14:32 +0100)]
swf update with Surrey imagery support
Ævar Arnfjörð Bjarmason [Sun, 2 May 2010 12:12:04 +0000 (12:12 +0000)]
Runaway HTML in
f28f28f24a61ce4a8956c220f04df5980d4dbd65 made all the interface BOLD
Ævar Arnfjörð Bjarmason [Sun, 2 May 2010 11:31:38 +0000 (11:31 +0000)]
Translate the most common OpenID messages into Icelandic
Grant Slater [Sun, 2 May 2010 13:32:54 +0000 (14:32 +0100)]
swf update with Surrey imagery support
Ævar Arnfjörð Bjarmason [Sun, 2 May 2010 11:04:42 +0000 (11:04 +0000)]
Idiot proof message, say "using the form below"
Æ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
Ævar Arnfjörð Bjarmason [Sun, 2 May 2010 10:48:06 +0000 (10:48 +0000)]
Æ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.
Ævar Arnfjörð Bjarmason [Sun, 2 May 2010 10:24:06 +0000 (10:24 +0000)]
Merge remote branch 'apmon/openID' 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
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
Kai Krueger [Sun, 2 May 2010 10:03:45 +0000 (11:03 +0100)]
Add an extra null pointer check that can trigger in tests
Ævar Arnfjörð Bjarmason [Sun, 2 May 2010 08:57:50 +0000 (08:57 +0000)]
Merge branch 'master' into openID
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
Tom Hughes [Sat, 1 May 2010 18:18:06 +0000 (19:18 +0100)]
Improve hiding of openid field on signup screen
Kai Krueger [Sat, 1 May 2010 18:03:31 +0000 (19:03 +0100)]
Forgott to commit a javascript file
Kai Krueger [Sat, 1 May 2010 17:48:20 +0000 (18:48 +0100)]
Hide OpenID url on signup page to make it less confusing
Kai Krueger [Sat, 1 May 2010 16:55:16 +0000 (17:55 +0100)]
Remove a superfluous styling
Grant Slater [Sat, 1 May 2010 15:01:45 +0000 (16:01 +0100)]
Add tag for Surrey Air Survey
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
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
Kai Krueger [Sat, 1 May 2010 10:29:23 +0000 (11:29 +0100)]
Fine tweek the size of the OpenID logos
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
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>
Tom Hughes [Fri, 30 Apr 2010 08:18:35 +0000 (09:18 +0100)]
Updated rails translations from http://github.com/svenfuchs/rails-i18n
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.
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
Siebrand Mazeland [Thu, 29 Apr 2010 20:58:18 +0000 (22:58 +0200)]
Merge branch 'master' of git://git.openstreetmap.org/rails
Æ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.
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.
Kai Krueger [Tue, 27 Apr 2010 21:06:10 +0000 (22:06 +0100)]
Replaced the Google and Yahoo logos with nicer ones
Ævar Arnfjörð Bjarmason [Tue, 27 Apr 2010 20:50:01 +0000 (20:50 +0000)]
Merge remote branch 'remotes/apmon/openID' into openID
Æ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
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
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
Æ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
Ævar Arnfjörð Bjarmason [Tue, 27 Apr 2010 20:03:03 +0000 (20:03 +0000)]
Merge branch 'master' into openID
Kai Krueger [Tue, 27 Apr 2010 19:54:07 +0000 (20:54 +0100)]
Try a different style for the OpenID login page
Æ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
Tom Hughes [Tue, 27 Apr 2010 15:00:10 +0000 (16:00 +0100)]
Tweak the copyright page translation
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>
Æ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.
Ævar Arnfjörð Bjarmason [Mon, 26 Apr 2010 18:01:27 +0000 (18:01 +0000)]
Translate "Copyright & license" into Icelandic
Æ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.
Æ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.
Ævar Arnfjörð Bjarmason [Sat, 24 Apr 2010 12:33:29 +0000 (12:33 +0000)]
Merge branch 'master' into openID
Kai Krueger [Sat, 24 Apr 2010 12:14:54 +0000 (13:14 +0100)]
Correct merge issues in the last merge from master
Tom Hughes [Fri, 23 Apr 2010 15:13:39 +0000 (16:13 +0100)]
Add some extra translations from OpenLayers 2.9
Tom Hughes [Thu, 22 Apr 2010 22:38:07 +0000 (23:38 +0100)]
Fix data browser navigation tooltips
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.
Tom Hughes [Thu, 22 Apr 2010 17:51:46 +0000 (18:51 +0100)]
Update to OpenLayers 2.9
Tom Hughes [Thu, 22 Apr 2010 10:13:14 +0000 (11:13 +0100)]
Merge branch 'copyright'
Tom Hughes [Thu, 22 Apr 2010 09:49:50 +0000 (10:49 +0100)]
Link to API usage policy
Tom Hughes [Thu, 22 Apr 2010 09:41:53 +0000 (10:41 +0100)]
Tweak wikipedia links stuff
Tom Hughes [Thu, 22 Apr 2010 08:09:36 +0000 (09:09 +0100)]
Merge remote branch 'avar/avar/browse-pages-link-to-wikipedia'
Tom Hughes [Wed, 21 Apr 2010 23:43:31 +0000 (00:43 +0100)]
Case #2908: Escape user name in user not found error
Æ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.
Ævar Arnfjörð Bjarmason [Wed, 21 Apr 2010 00:17:05 +0000 (00:17 +0000)]
This script requires perl 5.10