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
Thomas Wood
ec26e06706 5 character patch to only output duplicated nodes once in a way/full call 
Unit tests not run - problems on this system
Fixes #2327
 2009-09-29 02:55:35 +00:00
Tom Hughes
b8afd4fbf3 Fix comment typo. 2009-09-24 23:27:45 +00:00
Tom Hughes
2297dc9074 Wrap GPX API calls with the API error handler, and make sure the create 
method throws on error so it can be trapped and reported. Closes #2310.
 2009-09-24 23:15:35 +00:00
Ævar Arnfjörð Bjarmason
9b7e39dc49 I moved Potlatch's locales but didn't update this, which broke all i18n 2009-09-23 23:34:43 +00:00
Ævar Arnfjörð Bjarmason
5a76b08868 oops, removing debugging code 2009-09-23 17:36:51 +00:00
Ævar Arnfjörð Bjarmason
65eec82978 [2304]: Split the default English i18n parameter in Potlatch out to a YAML file 2009-09-23 17:08:46 +00:00
Tom Hughes
fc5261ece5 Remove remaining trailing spaces from translations. 2009-09-22 20:15:09 +00:00
Tom Hughes
06a17b6bc6 Treat an explicit public=0 argument as meaning private. 2009-09-12 16:46:25 +00:00
Matt Amos
69ab396f08 Fixed bug when oauthorizing with a token which no longer exists (merged 17416 from oauth branch). 2009-09-01 10:25:53 +00:00
Tom Hughes
783748b1e5 Tidy up. 2009-08-31 23:32:03 +00:00
Tom Hughes
543e8c5503 Fix backwards compatibility code to handle an old style public 
attribute correctly. Closes #2242.
 2009-08-31 23:28:51 +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
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
Tom Hughes
1ce8368f64 Remove debugging. 2009-08-19 08:04:42 +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
9fec2fd137 Call the set_locale filter for oauth methods which display web 
pages to the user. Closes #2203.
 2009-08-19 07:45:24 +00:00
Tom Hughes
43d9b32012 Remove explicit specification of I18n.local as the locale in resource 
lookups - it's the default anyway.
 2009-08-18 20:21:25 +00:00
Tom Hughes
d227589a63 Merge oauth branch at r17138 to trunk. 2009-08-18 20:01:56 +00:00
Štefan Baebler
803acea032 fixing interpolation error with per language rss feeds that was introduced in [16903] 2009-08-18 19:36:58 +00:00
Tom Hughes
cd8bb0dc57 Log unexpected exceptions raised by API calls. 2009-08-15 11:35:43 +00:00
Tom Hughes
9617ca2acc Identifiable traces should be trated as private in the trace list. 2009-08-13 17:59:38 +00:00
Tom Hughes
e8a2a15ea1 The "public" field no longer exists in gpx_files. 2009-08-13 17:57:14 +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
Ævar Arnfjörð Bjarmason
127241cdff Make the diary RSS feed translatable 2009-08-07 01:03:42 +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
Tom Hughes
e48e4ccbd3 Send an appropriate Vary header when we negotiate the language to stop 
caches doing the wrong thing. Closes #1995.
 2009-08-05 20:35:28 +00:00
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
Matt Amos
d75bc6ef69 Use method rather than direct access to member for the current token. 2009-08-04 12:59:02 +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
05e2120273 Merged 16488:16743 from trunk. 2009-07-31 10:42:06 +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
64fb530581 Merge 16110:16487 from trunk. 2009-07-14 08:03:24 +00:00
Tom Hughes
942ca1ff23 Merge 16355:16480 from trunk. 2009-07-13 23:28:02 +00:00