Matt Amos
e93becd304
Node controller wasn't using the right name for an exception class.
2009-08-05 11:28:49 +00:00
Richard Fairhurst
233f3ee527
Potlatch 1.2
2009-08-04 22:24:20 +00:00
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
4afacf3410
Fix the changeset feed to put the description in as raw HTML so we
...
can include links instead of having to create a separate link free
version of it.
2009-07-30 11:25:33 +00:00
Ævar Arnfjörð Bjarmason
b06b6c2ce9
Atom readers (Firefox/Liferea) don't like when we embed XHTML anchors
...
in the description. So adjust the code that creates the changeset
browser title/description to emit a XHTML and plaintext version with
the HTML and Atom output can use, respectively.
Also:
* Split up @title into @title and @heading as elsewhere
* Turn the username on the user / user+bbox browser into a link to the userpage
* Say "Changesets" instead of "Recent changes". Unlike Wikipedia the changes on OSM aren't guaranteed to be recent, they're just going to be the latest
2009-07-29 18:44:51 +00:00
Matt Amos
586d7befce
Fixed dumb-arse bug with wrong variable name. Added tag cleanup and checking on nodes which are part of ways (i.e: not 'POIs' in potlatch terminology).
2009-07-28 16:09:13 +00:00
Matt Amos
4826032d18
Added methods to strip those non-XML control characters from tags in AMF controller and give an error if there's invalid UTF-8.
2009-07-27 16:54:00 +00:00
Tom Hughes
581c243e0e
Allow messages to be deleted from the outbox as well as the inbox.
2009-07-23 17:41:50 +00:00
Tom Hughes
f3bf0c8b14
Add the ability for a recipient to (logically) delete a message from
...
their INBOX so they no longer see it.
2009-07-23 15:22:44 +00:00
Tom Hughes
bf0e4291a2
Don't use the (unset) value of I18n.locale to try and select a language
...
as the one we want is in lang so just use that. Fixes #2071 .
2009-07-16 20:26:18 +00:00
Tom Hughes
07211afe3e
Select the language for Potlatch indepdently of the web site.
2009-07-16 07:37:49 +00:00
Richard Fairhurst
6599fe0586
Potlatch 1.1a
2009-07-16 01:20:47 +00:00
Tom Hughes
25d0017b18
Fix compatible_language_from in the http_accept_language plugin to
...
correctly follow the RFC 2616 language selection algorithm and then
revert to the previous way of selecting languages.
2009-07-15 23:42:56 +00:00
Tom Hughes
1368f194da
Try preferred_language_from as it looks for an exact match - only if that
...
fails do we fall back to compatible_language_from which will take any
language where the first token matches. Fixes #2069 .
2009-07-15 23:29:07 +00:00
Tom Hughes
a5ab006122
Lookup the user before setting the locale. Fixes #2068 .
2009-07-15 18:21:32 +00:00
Ævar Arnfjörð Bjarmason
5d33aaa332
Potlatch's i18n support predates our Rails i18n effort, so it was
...
still doing its own language detection.
Scrap that and use I18n.locale instead, now Potlatch is guaranteed to
use whatever translation the rest of the site uses.
I've tested this by switching the language in preferences back and
forth, and also ensured that Potlatch will fall back on English if the
specified language doesn't exist in its list of translations.
2009-07-14 21:55:40 +00:00
Tom Hughes
942ca1ff23
Merge 16355:16480 from trunk.
2009-07-13 23:28:02 +00:00
Æ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
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
