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

760 commits

Author SHA1 Message Date
Ævar Arnfjörð Bjarmason
2153fb6efd Fixed a bug in how fields in /message/new were being pre-filled out. 
When someone went to /message/new/:user the "Subject" are would be
pre-filled out with t('message.new.title'). The problem was that the
@title template variable was being used for two purposes, to set the
HTML <title> AND to pre-fill out the subject.

We don't always want these two to be the same, but sometimes we
do. E.g. when someone replies to a diary entry and visits
/message/new/:user?title=Foo we want Foo in the <title> and in the
pre-filled out Subject, and the same goes for replying to a message.

So I've split up the @title variable into @title and @subject.
 2009-07-12 16:01:49 +00:00
Tom Hughes
f5e14bcc48 Don't send a noification email if somebody comments on their own diary 
entry. Fixes #2053.
 2009-07-11 13:24:57 +00:00
Richard Fairhurst
8eb77ef5e1 "list mode" should really be "live mode" :) 2009-07-08 22:29:45 +00:00
Richard Fairhurst
369202787b Potlatch 1.1 (server code) 2009-07-08 20:52:02 +00:00
Tom Hughes
9a32033209 Merge 16216:16355 from trunk. 2009-07-05 23:47:40 +00:00
Tom Hughes
671fc09bfc Correct resource name. 2009-07-03 17:44:21 +00:00
Štefan Baebler
8a80162db1 additional translations in geocoder describer 2009-07-03 06:38:43 +00:00
Tom Hughes
06b2d278ea Make the search box load each set of results separately so that one 
service being slow doesn't delay the response from others.
 2009-07-02 16:12:38 +00:00
Tom Hughes
b52327bf89 Fix warnings arising from geocoder translations, and use count magic 
for the distance translation.
 2009-06-30 23:45:32 +00:00
Štefan Baebler
c4965a1700 made geocoder results translatable. It could probably be improved but am not sure how. 2009-06-29 23:36:57 +00:00
Tom Hughes
6baccfaddd Merge 16110:16216 from trunk. 2009-06-29 16:50:34 +00:00
Štefan Baebler
bfdce9c933 localized geocoder search results 2009-06-28 18:00:11 +00:00
Ævar Arnfjörð Bjarmason
34b147266c Change the feature commited in [16174] to use the main map view 
instead of being located at /map.
 2009-06-27 15:34:26 +00:00
Ævar Arnfjörð Bjarmason
8bc8e537b2 Introducing a new /browse/{node,way,relation,changeset}/{id}/map page 
which is slippy map covering the screen showing the map data that is
in the small map at /browse/{node,way,relation,changeset}/{id}.

/browse/{node,way,relation,changeset}/{id} now contains a link to both
"View Larger Map" which has been changed to link to this new map
feature, and "View on main map" which as before links to the area
showing the feature on the main slippy map.

/browse/{node,way,relation,changeset}/{id}/map supports permalinks
using its own hacked version of updateLocation() (which doesn't set a
cookie), but shortlinks are not supported. The Edit/History/Export
links link back to the main map.
 2009-06-27 09:30:10 +00:00
Matt Amos
1d8e66016c Adding 'shortlink' functions which will allow URLs like http://osm.org/go/XXXX suitable for use in twitter, etc... 2009-06-25 23:31:53 +00:00
Tom Hughes
e657cff464 Merge 16070:16110 from trunk. 2009-06-25 16:45:26 +00:00
Tom Hughes
02628bed1e Merge 16012:16110 from trunk. 2009-06-25 16:32:05 +00:00
Tom Hughes
817434a2e6 Rework the translatable map key to be driven by a YAML file listing the 
entries to show for each layer and zoom level.
 2009-06-24 23:30:41 +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
Ævar Arnfjörð Bjarmason
be57524849 Add 'diary_entry.no_such_entry.title' for diary entries that don't exist 2009-06-23 00:17:20 +00:00
Ævar Arnfjörð Bjarmason
dfadcc797c Fixed up the <title>/<h2> mess in trace/edit and trace/view 
* @title was never set on trace editing, and thus <h2></h2> was produced
 * Changed split 'trace.view.viewing_trace' into 'trace.view.title' and 'trace.view.heading'
 * Introduced corresponding 'trace.edit.title' and 'trace.edit.heading'
 2009-06-22 23:43:53 +00:00
Ævar Arnfjörð Bjarmason
7253c38234 The <title> wasn't being properly set on /message/new/$user, only on /message/new/$user?title=$title 2009-06-22 19:13:54 +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
2fabbed189 Autoselect new diary entry language to that of last posted entry rather than user's default language. 
(Closes #1967)
 2009-06-20 18:27:03 +00:00
Thomas Wood
07725b4b4b Changeset navigation by a particular user's changesets. 
(Closes #1726)
 2009-06-19 23:56:15 +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
Thomas Wood
80ff70a1ff Extend work started in [15970] to add edit link to way pages on databrowser. 2009-06-18 14:29:28 +00:00
Tom Hughes
5475a9ec35 Revert r15900 for now. 2009-06-14 09:53:42 +00:00
Štefan Baebler
2b290f4994 cleanup 2009-06-14 07:27:24 +00:00
Štefan Baebler
61123eaeb4 Added localized language names with plugin from http://github.com/grosser/i18n_data/tree/master (fixes #1946) 
Diary entries in same language linked (lists and rss)
 2009-06-14 07:25:08 +00:00
Thomas Wood
5123163e92 Remove superfluous "language" from diary strings - it sounds weird (other option would be to change to "the {{language}} language") 2009-06-12 18:48:36 +00:00
Štefan Baebler
98b9ce8f97 diary entries (list and rss) for a given language. 
TODO: language rss link, linking the localized lists
 2009-06-12 06:34:18 +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
3578506797 Add a title to the changeset lists. Closes #1938. 2009-06-08 20:10:09 +00:00
Shaun McDonald
e3693d487a More unit tests for the parsing of the Node.from_xml. Some code clean up to ensure that a node that cannot be parsed will always throw an exception, to be handled by the arround handler. 2009-06-08 18:53:19 +00:00
Tom Hughes
d6ba46b120 Simplify rejection of existing renumbered nodes. 2009-06-08 11:08:18 +00:00
Richard Fairhurst
9cfaeb5460 potential fix for issue encountered on talk 2009-06-08 10:54:06 +00:00
Tom Hughes
9df991e343 Marge all the changeset list methods together into one. 2009-06-07 16:59:58 +00:00
Tom Hughes
396d8ce313 Use some rails magic to avoid having to duplicate all the changeset 
list controller methods for the RSS feeds.
 2009-06-07 11:24:11 +00:00
Tom Hughes
e1cb17faa6 Back out the changeset RSS stuff from the head for now. 2009-06-07 08:03:07 +00:00
Ævar Arnfjörð Bjarmason
e9ab43cd30 The list_bbox_rss won't work at all without a bbox. Thow an error when it's not supplied 2009-06-07 03:06:09 +00:00
Ævar Arnfjörð Bjarmason
0d16fd57d4 Add RSS feed for global recent changes & changes within a bbox. Solves #1737 
This has so much copy/paste code it hurts, the new list*_rss methods
are just copies of the old list* methods, but see #1927 for that.
 2009-06-07 02:39:45 +00:00
Ævar Arnfjörð Bjarmason
011237c2c5 Implement /user/$user/edits/rss, partially solves #1737 2009-06-07 01:32:19 +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
1db05339d3 Don't set the Status header - it is set automatically by the FastCGI code 
and this manually set one conflicts with that and causes a 200 response
in rails 2.3.2 it seems.
 2009-06-04 22:53:05 +00:00
Tom Hughes
2f3e23f6eb Move to version 2.3.2 of rails. 2009-06-04 08:08:24 +00:00
Tom Hughes
afb13ad93e Refactor potlatch error handling. 2009-06-03 16:51:33 +00:00
Tom Hughes
6bc03625a1 Send a Content-Language header with any localised pages. 2009-06-03 12:29:26 +00:00