cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3733 commits 4 branches 1 tag 499 MiB
Commit graph

1043 commits

Author SHA1 Message Date
Matt Amos
95c3d640a4 Tried to DRY the user_blocks controller. Moved the configuration of the blocking periods into application.yml. 2009-09-30 15:44:29 +00:00
Matt Amos
ca06b3c7b1 New migration to add better auditing to user_roles and better column names there and on user_blocks. Added a helper for displaying block status messages. 2009-09-29 16:44:03 +00:00
Matt Amos
09c5740b5b Merging 17824:17845 from trunk to blocking branch. 2009-09-29 10:23:31 +00:00
Ævar Arnfjörð Bjarmason
801182d2ea Actually make the last commit work. I thought Ruby's string interpolation syntax worked differently 2009-09-29 10:12:01 +00:00
Ævar Arnfjörð Bjarmason
0197460689 Escape user-supplied JavaScript. Fixes http://lists.openstreetmap.org/pipermail/talk/2009-September/042846.ht 2009-09-29 09:23:11 +00:00
Matt Amos
30d5e783e4 Added a confirmation step to the process of granting and revoking user roles. 2009-09-28 17:35:39 +00:00
Matt Amos
ab1444f338 Truncate long reason texts to not overwhelm the browser window. 2009-09-28 17:30:10 +00:00
Matt Amos
daa2496024 First version of blocking feature. Allows both time-based (for map protection) and notice-based (for education) blocks on users. Also introduces user roles and a simple UI for displaying and administering these. 2009-09-28 16:01:00 +00:00
Ævar Arnfjörð Bjarmason
421b611389 Use i18n() parameters for this JavaScript message instead of ad-hoc 
string concatenation.

See [17712] for why I'm changing this.
 2009-09-20 10:41:57 +00:00
Ævar Arnfjörð Bjarmason
185c7c24ae See [17712] for why I'm changing this 
The 'user.view.mapper since' message is broken. It should be done with
translation parameters. But messages can't include HTML like <b> and I
don't want to experiment with making that work or changing this into a
HTML table that doesn't look crappy.
 2009-09-20 10:25:31 +00:00
Richard Fairhurst
00332614f9 add ability to specify custom background in the query string 2009-09-18 14:11:18 +00:00
Ævar Arnfjörð Bjarmason
658a34714f When displaying objects in /browse/* and in the JavaScript "Data" 
feature use the name key corresponding to the user's
locale. E.g. "name:is" for Icelandic.

This will fall back on "name". The interface will be equivalent unless
the user has selected another language than English in the preferences
and objects with localized name:* tags corresponding to the user's
language are being displayed.
 2009-09-17 23:36:54 +00:00
Tom Hughes
6fafe7f309 Display the changeset comment (if any) as part of the description of 
any object in the data browser. Closes #2282.
 2009-09-15 22:03:09 +00:00
Ævar Arnfjörð Bjarmason
da28349f51 So the way [17620] did it sucked but [17624] broke it unless you 
didn't have any changes because .item_count is the number of edits,
not pages.

Using .page_count works though, Whee!
 2009-09-14 23:36:21 +00:00
Ævar Arnfjörð Bjarmason
835e12925e auto_link() changeset comments in the global/user/bbox/etc history too 
(as well as in changeset detail & atom feeds)
 2009-09-14 23:26:36 +00:00
Tom Hughes
26bd59a1da Output tags to the feed as raw HTML so that links are not escaped (any 
real HTML in the tag has already been escaped). Closes #2264.
 2009-09-14 23:17:52 +00:00
Tom Hughes
9200520395 Escape tag values - there is no reason at all to render things which 
might look like HTML tags in a tag value.
 2009-09-14 23:17:02 +00:00
Tom Hughes
253e8a272d Improve handling of the case where there is only one page of changesets. 2009-09-14 23:04:06 +00:00
Ævar Arnfjörð Bjarmason
466f640138 While we don't have the sanitizing backend to safely solve ticket 
#2264 I'm going to remove the auto_link feature of changeset tags. The
links are broken in all conforming Atom readers at the moment.
 2009-09-14 21:08:17 +00:00
Ævar Arnfjörð Bjarmason
332f8d3a4f Now when all the entries fit on one page a trailing slash won't be 
included after "Showing page %d (%d of %d)"
 2009-09-14 19:42:32 +00:00
Ævar Arnfjörð Bjarmason
2118dd06af Link to username in "Send message to" message 2009-09-14 19:32:29 +00:00
Ævar Arnfjörð Bjarmason
b3ff342e6b There was no "Sorry not found" message for changesets so 
/browse/changeset/123456789 would return the message "Sorry, the with
the id 123456789, could not be found.". It now says "Sorry, the
changeset with the id 123456789, could not be found."
 2009-09-07 12:16:17 +00:00
Tom Hughes
e72ebb7eac Fix file_column plugin to generate absolute URLs without falling over 
in a heap and then use that in the user details view.
 2009-08-31 23:43:15 +00:00
Matt Amos
ade96da19f Added user ID, description, languages and image link to the user details API call. 2009-08-31 23:11:15 +00:00
Tom Hughes
096459404c Format dates in the changeset list so the year is shown. Closes #2232. 2009-08-28 07:55:34 +00:00
Matt Amos
c6bf21a9d0 merge r17141:17256 from trunk 2009-08-25 16:49:52 +00:00
Matt Amos
b34b898451 Added referer URL in user_token so that redirections (e.g: from oauth token requests) are followed after the user has confirmed the sign-up. Added test for the same. 2009-08-25 15:00:32 +00:00
Matt Amos
498832eb37 Re-committing experimental CSS media queries stuff for mobile and other small-screen browsers. 2009-08-19 09:42:33 +00:00
Tom Hughes
173e92edb8 Cleanup some of the oauth stuff: 
- Detabify views.
- Move translations to correct names.
- Make flash messages translatable.
 2009-08-19 07:59:15 +00:00
Tom Hughes
885d29345d Add parentheses to fix warning. 2009-08-18 20:06:33 +00:00
Tom Hughes
d227589a63 Merge oauth branch at r17138 to trunk. 2009-08-18 20:01:56 +00:00
Štefan Baebler
1f007b289c localized link to home location 2009-08-18 18:26:01 +00:00
Matt Amos
1eb58bc607 Reverting experimental stuff in r17121. 2009-08-18 16:33:18 +00:00
Matt Amos
6674873478 Experimental CSS media queries to support iPhone and other small-screen devices. 2009-08-18 16:06:26 +00:00
Tom Hughes
908a6ef409 Merge 16891:17044 from trunk. 2009-08-13 17:18:08 +00:00
Tom Hughes
565171486f Add extra visibility options for GPS traces, and enhance the API call 
that returns trace data to return more information if the owner of the
trace has allowed it. Based on a patch from Matt Amos.
 2009-08-13 17:06:11 +00:00
Tom Hughes
c5349c360f Escape usernames. Closes #2149. 2009-08-08 22:45:56 +00:00
Ævar Arnfjörð Bjarmason
fc9768f34c Add type="html" to <title> so a <title> with "&lt;" will be displayed 
as "<" and not literally as "&lt;".

See section 3.1.1 in RFC 4287
 2009-08-07 12:17:02 +00:00
Ævar Arnfjörð Bjarmason
a6f190eabe Include the changeset comment in the <title> of the Atom feeds if 
there's a changeset comment.

I'm not doing any snipping of the comment so they could run to 255
characters (the max size in the database), but from testing a few feed
clients it looks like they do this pretty well at the client side.
 2009-08-07 00:59:01 +00:00
Matt Amos
0d5be22cb5 Merging 16820:16891 from trunk. 2009-08-06 16:24:39 +00:00
Tom Hughes
e477f68a6c Render the links using partial so we can do the appropriate rendering 
for HTML and Atom versions and hopefully get the escaping right in the
feed. Closes #2135.
 2009-08-05 23:39:24 +00:00
Matt Amos
e470d8a659 Moved oauth_clients page to a sub-page of the user - makes it more obvious that the oauth_clients page is for that specific user. 2009-08-04 13:07:11 +00:00
Matt Amos
f50670e34d More translatable strings. 2009-08-04 13:06:21 +00:00
Tom Hughes
39cbc9d653 Tweak the password reset pages a bit. 2009-08-04 00:14:03 +00:00
Tom Hughes
cbbfdf3948 Merge 16743:16811 from trunk. 2009-08-03 23:50:47 +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
Matt Amos
655dc6787e Reorganised OAuth clients and tokens details page. Made clients info editable and some more stuff translatable in the OAuth pages. 2009-08-03 17:08:40 +00:00
Matt Amos
7c1cde7035 Removed file which isn't needed any more. 2009-08-03 15:20:38 +00:00
Thomas Wood
bda35008c8 Fix translation for private data users. 2009-07-31 14:37:37 +00:00
Matt Amos
05e2120273 Merged 16488:16743 from trunk. 2009-07-31 10:42:06 +00:00