Commit graph

134 commits

Author SHA1 Message Date
Tom Hughes
39cbc9d653 Tweak the password reset pages a bit. 2009-08-04 00:14:03 +00:00
Tom Hughes
e890528aac Rework password reset system to do away with the second email and instead
just allow the user (providing they possess a valid token from the first
email) to enter a new password on the site.
2009-08-03 23:42:29 +00:00
Tom Hughes
35d5e9d19d Fix send message links for friends and nearby mappers. Fixes #2065. 2009-07-14 19:48:21 +00:00
Tom Hughes
9a32033209 Merge 16216:16355 from trunk. 2009-07-05 23:47:40 +00:00
Ævar Arnfjörð Bjarmason
a08215633c When two users are <1 km apart display the distance between them in
meters, not kilometers.

Solves ticket:2028
2009-07-04 21:35:09 +00:00
Tom Hughes
f4571eeb7c Revert r16046.
DO NOT COMMIT MAJOR ENHANCEMENTS TO TRUNK WITHOUT TALKING TO ME FIRST.
2009-06-23 02:48:38 +00:00
Matt Amos
b8f6dbd403 Adding initial version of the OAuth token authentication method. This adds basic OAuth support for registering apps, getting and revoking keys, etc... The tokens come with 6 separate permissions bits; read/write user preferences, write diaries, write API and read/write GPS traces. Needs more tests. 2009-06-22 16:54:37 +00:00
Thomas Wood
ff03138a97 merge 15807:16012 from rails_port 2009-06-19 22:53:16 +00:00
Thomas Wood
98a86836d2 Commit avar's patch (+ fix for user not found) to change message sending URL to be by user name rather than id.
(Closes #1920)
2009-06-19 22:33:16 +00:00
Tom Hughes
edaddbedae Merge 15722:15806 from head and adjust new views to rails 2 style names. 2009-06-09 21:50:37 +00:00
Tom Hughes
2e2f212472 Rename views to rails 2 style names. 2009-06-09 20:50:14 +00:00
Tom Hughes
6378c21ecb Fixup links to changeset lists. 2009-06-08 11:57:48 +00:00
Ævar Arnfjörð Bjarmason
d8d3d21a2c Use {{count}} instead of {{distance}} for kilometer count as {{count}} is a magical enumerated variable in Rails. 2009-06-07 22:14:22 +00:00
Tom Hughes
03dc9ec8cb Make links to user edits work again. 2009-06-07 11:44:41 +00:00
Ævar Arnfjörð Bjarmason
db51d7f3dd Added & cleaned up messages relating to a given user not existing
The following pages now have a <title> that can be set in localizations:

 * /user/USER_DOES_NOT_EXIST
 * /user/USER_DOES_NOT_EXIST/diary
 * /user/USER_DOES_NOT_EXIST/traces
 * /message/*/ID_DOES_NOT_EXIST

In addition I've cleaned up the i18n message keys of all the
''no_such_user.rhtml'' pages involved. They now all use
title/heading/body for the <title>, <h2> and <p> respectively. And the
message key {{user}} instead of {{name}}.
2009-06-06 13:15:53 +00:00
Tom Hughes
c372f6cc18 Set the OpenLayers locale when creating a map. 2009-06-04 20:37:59 +00:00
Tom Hughes
11f457e842 Use "confirm_email" instead "confirm email" in resource names so it
matches the method name.
2009-06-03 07:42:40 +00:00
Ævar Arnfjörð Bjarmason
e70e2dbe9f Change /index.php/ in wiki.openstreetmap.org links to /wiki/. This looks nicer 2009-06-02 12:23:37 +00:00
Shaun McDonald
36497d8268 Fix wrong translation key in nearby user list. Hopefully fixes #1885 2009-05-31 23:24:26 +00:00
Tom Hughes
90f6dac51e Remove bogus datetime translation. 2009-05-31 17:57:11 +00:00
Tom Hughes
f832d4d54b Fix bogus date translation. 2009-05-31 17:50:00 +00:00
Tom Hughes
f9c1884610 Improve layout of user options page. 2009-05-31 15:39:02 +00:00
Tom Hughes
168036d3a2 Add a simple edit control for the user's preferred languages. 2009-05-31 15:22:59 +00:00
Shaun McDonald
e9bea64bf6 Add the ago translation in the user account view that was missed. 2009-05-31 11:30:53 +00:00
Shaun McDonald
f508cfb05f Fix a few typos 2009-05-30 15:57:49 +00:00
Shaun McDonald
3a599519eb Some more of the user account translations. Custom generate method for languages, that doesn't appear to work. Setting user language on create. Start translations in controllers. Diary entries can now be saved. 2009-05-30 14:04:42 +00:00
Shaun McDonald
ea2baaee3b friend map translations 2009-05-29 17:19:04 +00:00
Shaun McDonald
18292dcc43 new de translation. More of the user view translated. 2009-05-29 17:04:17 +00:00
Shaun McDonald
486803f84b Typo in site key. More of the user view i18n'ed 2009-05-29 15:44:27 +00:00
Shaun McDonald
f2f9d797d5 Half the user view translated. 2009-05-29 15:10:36 +00:00
Thomas Wood
6a2fda5a99 Fix html: closing <a> tag. 2009-04-30 06:50:51 +00:00
Thomas Wood
600d5b3a46 Further clarify descriptive texts regarding public editing. 2009-04-27 18:23:43 +00:00
Tom Hughes
fd6f00b069 Merge api06 branch to trunk. 2009-04-20 09:12:03 +00:00
Tom Hughes
e9c2c64884 Don't register a setHome handler unless we have the flag checkbox
prsent on the page.
2009-04-19 11:00:37 +00:00
Thomas Wood
776d2d7bc2 Return "Make my edits" button to functioning state, positioning is unfortunate, but it cannot be inside the page's form. I've made a compromise of the two states. 2009-04-09 17:06:53 +00:00
Harry Wood
663416ae0b fix 'edits' link. action was renamed 'list_user' 2009-03-26 23:43:34 +00:00
Harry Wood
afe8dd51ec Add 'history' tab + Move 'recent changes' changeset list to re-use the same _changeset.rhtml partial 2009-03-23 16:39:59 +00:00
Tom Hughes
7184ae0096 Add tabindex values to make sure links are not in the tab order when
navigating forms.
2009-03-08 16:12:07 +00:00
Tom Hughes
c8ee135104 Merge 12304:14009 from trunk. 2009-03-08 13:02:37 +00:00
Tom Hughes
10b71ba2f6 Add an ACL system to allow key/value pairs to be attached to blocks
of IP addresses, and implement an ACL restriction that allows account
creation to be blocked.
2009-02-19 13:47:43 +00:00
Dirk Stöcker
2746a2e103 fixed typo 2009-01-29 14:19:39 +00:00
Dirk Stöcker
4c2564e1af fixed typo 2009-01-29 14:19:39 +00:00
Tom Hughes
90bb0580e4 Remove Steve's gratuitous insult. 2009-01-19 08:31:35 +00:00
Steve Coast
ec7e89f757 nicer signup confirmation email 2009-01-19 03:45:41 +00:00
Richard Fairhurst
cc90867183 view changesets by user 2008-12-23 13:06:07 +00:00
Harry Wood
2a20c57a8e cosmetic tweaks to 'login' and 'create account' screens 2008-11-09 12:17:53 +00:00
Harry Wood
43b3998657 cosmetic tweaks to user settings form + move 'Mapper since' field onto user profile view 2008-11-08 19:03:25 +00:00
Daniel Silverstone
7d786c32ed Make the confrm button into a confirm button 2008-11-08 14:11:45 +00:00
Tom Hughes
791062569d Tidy up diary code a bit. 2008-08-24 15:12:20 +00:00
Tom Hughes
64ecd02f0b Allow users to change their email address. Closes #546. 2008-08-13 11:39:33 +00:00