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

384 commits

Author SHA1 Message Date
Tom Hughes
81f5c72c76 Merge branch 'master' into openid 2010-06-27 16:29:18 +01:00
Tom Hughes
68368118a6 Add timeout to describe_location and handle exceptions 2010-06-19 07:53:22 +01:00
Ævar Arnfjörð Bjarmason
4806913e18 browse_helper: Correctly link to wiki pages whose keys or values contain spaces 
The update-wiki-pages script normalizes " " to "_" (since MediaWiki
does it by design), but I didn't normalize it back in the
browse_helper.

Consequently objects with tags like "source=Isle of Man Government
aerial imagery (2001)" were never linked to the wiki correctly.
 2010-06-17 13:33:01 +00:00
Tom Hughes
6a3cadb52d Merge branch 'master' into openid 2010-06-16 21:18:44 +01:00
Dan Karran
af217ca140 More historic and tourist-related icons 2010-06-07 22:43:01 +01:00
Dan Karran
2aae01a590 Add strikethrough style to browser when objects are deleted 2010-06-07 22:43:01 +01:00
Tom Hughes
dc35b597a2 Merge branch 'master' into openid 
Conflicts:
	config/locales/is.yml
 2010-06-07 22:24:24 +01:00
Tom Hughes
d516198bbe Update to rails 2.3.8 
Update site to use rails 2.3.8 which also allows us to drop the
globalize2 plugin as the core rails i18n code can now do fallback
and pluralization.
 2010-05-26 19:54:10 +01:00
Tom Hughes
7b9e852c9d Merge branch 'master' into openid 2010-05-16 14:49:45 +01:00
Tom Hughes
6e145a2f38 Rename css_class to link_class for consistency 2010-05-16 12:57:00 +01:00
Tom Hughes
6d3aa7386b Only include tags which affect the icon in the link title 2010-05-16 12:55:10 +01:00
Dan Karran
10dca1b6df Patch from bug #2787 to add icons to data browser pages 2010-05-16 12:12:59 +01:00
Tom Hughes
9b8e28f24b Rework the login method to make it a bit clearer 2010-05-10 14:21:28 +01:00
Tom Hughes
a53c7bf623 Rework the signup page 2010-05-09 17:03:51 +01:00
Tom Hughes
59a6b1973b Rework the login page to make it a bit cleaner 2010-05-09 15:33:35 +01:00
Tom Hughes
ebd109c946 Replace openID.js with funky rails generated javascript 2010-05-09 12:25:50 +01:00
Tom Hughes
90d2ed759f 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.
 2010-04-28 18:48:56 +01:00
Tom Hughes
d2585ea044 Tweak wikipedia links stuff 2010-04-22 10:41:53 +01:00
Ævar Arnfjörð Bjarmason
9bfa6059be 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.
 2010-04-21 01:46:50 +00:00
Tom Hughes
546250f60b Load wiki link data at startup and shorten some file names 2010-04-20 21:05:22 +01:00
Tom Hughes
d6755356e0 Improve the browse helper code use to generate wiki links 2010-04-20 19:04:12 +01:00
Tom Hughes
88aa34f61b Update wiki link style to use the current default format 2010-04-20 14:21:23 +01:00
Ævar Arnfjörð Bjarmason
8eead8a870 Ticket #2245: Link from /browse/* pages to the wiki key/value pages 2010-04-20 12:55:14 +00:00
Tom Hughes
94f19ce3b3 Use a better HTML sanitizer that makes sure the HTML is well formed and 
can add rel="nofollow" to links.
 2010-03-06 15:38:13 +00:00
Tom Hughes
3e8d809250 Add user images to diary view. 2010-02-28 00:24:33 +00:00
Tom Hughes
ec172871ae If Nominatim can't give us a location, just return the coordinates. 2010-02-27 12:58:23 +00:00
Tom Hughes
0b913efd05 Use Nominatim to reverse geocode diary location information and display 
a friendly human readable location instead of some coordinates.
 2010-02-27 12:41:56 +00:00
Tom Hughes
d963aa30b7 Add rel=nofollow to links in tags. Closes #2555. 2009-12-14 09:09:32 +00:00
Tom Hughes
41dfa42edd Sanitize any user supplied HTML before doing link detection or the 
sanitizer will strip the rel=nofollow attributes.
 2009-11-14 16:31:51 +00:00
Tom Hughes
17445a44da Make rel=nofollow actually work - when in doubt trust the source as 
the rails documentation speaks with forked tongue.
 2009-11-14 16:15:26 +00:00
Tom Hughes
6bfa897cfc Add nofollow to user provided links. 2009-11-14 15:11:57 +00:00
Tom Hughes
7dd06b4f88 Fix a few nominatim issues. 2009-11-10 13:35:58 +00:00
Tom Hughes
daf8c80161 Use the bbox to build the URL if there is one. 2009-11-09 09:28:46 +00:00
Tom Hughes
e0cbfe24a5 Escape non-ascii characters in exported HTML. Closes #2075. 2009-10-27 00:59:38 +00:00
Tom Hughes
17e0753962 Use bounding box information to zoom to search results when possible. 2009-10-15 09:27:21 +00:00
Tom Hughes
fb9789929c Fix output of javascript strings - use english strings to walk the 
tree but output strings in the correct locale. Closes #2362.
 2009-10-08 12:25:55 +00:00
Tom Hughes
7de5220090 Merge 17944:17988 from trunk. 2009-10-05 20:25:45 +00:00
Tom Hughes
f4dba81b64 Modify the existing i18n() javascript function to lookup strings in 
the javascript i18n array as well as expanding arguments, and make all
lookups go through it.
 2009-10-02 23:41:19 +00:00
Tom Hughes
596ab82461 Move javascript translations to a separate key based on the path to 
the javascript file that uses them and amend the layout to automatically
find and output all javascript strings.
 2009-10-02 23:33:17 +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
Tom Hughes
fc5261ece5 Remove remaining trailing spaces from translations. 2009-09-22 20:15:09 +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
64fb530581 Merge 16110:16487 from trunk. 2009-07-14 08:03:24 +00:00
Tom Hughes
b450ce9d85 Fix links to changeset feeds. 2009-07-04 12:12:05 +00:00
Ævar Arnfjörð Bjarmason
bc66c8adeb Make the printable_name() function call i18n.t to translate its 
output. Makes e.g. "#{name}, v#{object.version.to_s}" which is used in
the changeset browser translatable.

I'm still not happy with how the anchor is constructed. we're linking
from /browse/changeset/1234 to e.g. node "[[366672999, v1]]" even
though the page we're linking to might take us to that node at version
2. The link should be "[[366672999]], v1" instead.

But that's something to solve later.
 2009-06-28 21:13:27 +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
22292debda Data browser changes, make links more user friendly, displaying name tag where possible. 
Changes to models ok'd (and suggested as temporary solution) by TomH
References #1777
 2009-05-02 00:26:37 +00:00
Shaun McDonald
2ed84e26cd Adding pagination to the changesets, thus allowing you to browe large changesets, without MySQL complaining about memory. Probably needs some fine tuning. You currently can only page one of nodes, ways, and relations, without manually setting the relations. Fixing deprection notice for the classic_pagination plugin. 2008-11-27 17:06:43 +00:00
Tom Hughes
5620d7263a Merge 7452:7744 from trunk. 2008-05-09 23:22:26 +00:00