]>
git.openstreetmap.org Git - rails.git/log
Richard Fairhurst [Fri, 7 Aug 2009 00:25:00 +0000 (00:25 +0000)]
small parallel way fix, plus handy new 'join' keypress (J)
Ævar Arnfjörð Bjarmason [Thu, 6 Aug 2009 22:19:03 +0000 (22:19 +0000)]
Translated user account creation message
Balló György [Thu, 6 Aug 2009 19:25:09 +0000 (19:25 +0000)]
Updated Hungarian translation of OpenStreetMap website
Matt Amos [Thu, 6 Aug 2009 17:28:49 +0000 (17:28 +0000)]
Made XML parsing routines raise an exception if the document is valid XML, but not valid as an OSM document. This is now the same behaviour as when the document isn't valid XML.
Matt Amos [Thu, 6 Aug 2009 16:24:39 +0000 (16:24 +0000)]
Merging 16820:16891 from trunk.
Richard Fairhurst [Thu, 6 Aug 2009 10:49:01 +0000 (10:49 +0000)]
ibid
Richard Fairhurst [Thu, 6 Aug 2009 08:26:06 +0000 (08:26 +0000)]
argh, caught out by annoying Ming 0.3>0.4 change. Recommit with correct line widths
Tom Hughes [Wed, 5 Aug 2009 23:39:24 +0000 (23:39 +0000)]
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.
Richard Fairhurst [Wed, 5 Aug 2009 23:16:22 +0000 (23:16 +0000)]
handful of small fixes
Richard Fairhurst [Wed, 5 Aug 2009 23:14:27 +0000 (23:14 +0000)]
bunch of small tweaks
Tom Hughes [Wed, 5 Aug 2009 20:35:28 +0000 (20:35 +0000)]
Send an appropriate Vary header when we negotiate the language to stop
caches doing the wrong thing. Closes #1995.
Richard Fairhurst [Wed, 5 Aug 2009 14:11:13 +0000 (14:11 +0000)]
ibid
Matt Amos [Wed, 5 Aug 2009 11:28:49 +0000 (11:28 +0000)]
Node controller wasn't using the right name for an exception class.
Richard Fairhurst [Wed, 5 Aug 2009 08:51:08 +0000 (08:51 +0000)]
add secondary_link
Richard Fairhurst [Wed, 5 Aug 2009 08:49:37 +0000 (08:49 +0000)]
ibid
Richard Fairhurst [Tue, 4 Aug 2009 22:24:20 +0000 (22:24 +0000)]
Potlatch 1.2
Tom Hughes [Tue, 4 Aug 2009 21:49:54 +0000 (21:49 +0000)]
Use </a> to close <a> tags...
Tom Hughes [Tue, 4 Aug 2009 17:10:03 +0000 (17:10 +0000)]
Update pr-BR translation. Closes #2130.
Ævar Arnfjörð Bjarmason [Tue, 4 Aug 2009 14:51:55 +0000 (14:51 +0000)]
Translate the new reset password procedure introduced in [16817] and
remove obsolete messages that haven't been used since that commit.
Ævar Arnfjörð Bjarmason [Tue, 4 Aug 2009 14:51:09 +0000 (14:51 +0000)]
Remove unused messages that weren't removed in [16817]
Tom Hughes [Tue, 4 Aug 2009 13:23:36 +0000 (13:23 +0000)]
Replace hard coded nwr enumeration support with a more generic
system for defining enumerations.
Tom Hughes [Tue, 4 Aug 2009 13:17:29 +0000 (13:17 +0000)]
Require the migration helper code in some more migrations.
Matt Amos [Tue, 4 Aug 2009 13:15:19 +0000 (13:15 +0000)]
Ooops. Should have committed the test too.
Matt Amos [Tue, 4 Aug 2009 13:07:11 +0000 (13:07 +0000)]
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.
Matt Amos [Tue, 4 Aug 2009 13:06:21 +0000 (13:06 +0000)]
More translatable strings.
Matt Amos [Tue, 4 Aug 2009 12:59:02 +0000 (12:59 +0000)]
Use method rather than direct access to member for the current token.
Tom Hughes [Tue, 4 Aug 2009 00:14:03 +0000 (00:14 +0000)]
Tweak the password reset pages a bit.
Tom Hughes [Mon, 3 Aug 2009 23:59:17 +0000 (23:59 +0000)]
Merge 16817:16819 from trunk.
Tom Hughes [Mon, 3 Aug 2009 23:55:51 +0000 (23:55 +0000)]
Fixed migration - rails uses remove_index not drop_index.
Tom Hughes [Mon, 3 Aug 2009 23:50:47 +0000 (23:50 +0000)]
Merge 16743:16811 from trunk.
Tom Hughes [Mon, 3 Aug 2009 23:42:29 +0000 (23:42 +0000)]
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.
Tom Hughes [Mon, 3 Aug 2009 23:04:41 +0000 (23:04 +0000)]
Add an index on message sender.
Matt Amos [Mon, 3 Aug 2009 17:08:40 +0000 (17:08 +0000)]
Reorganised OAuth clients and tokens details page. Made clients info editable and some more stuff translatable in the OAuth pages.
Matt Amos [Mon, 3 Aug 2009 15:20:38 +0000 (15:20 +0000)]
Removed file which isn't needed any more.
Tom Hughes [Mon, 3 Aug 2009 14:33:53 +0000 (14:33 +0000)]
Exclude deleted messages from the new_messages relationship.
Matt Amos [Mon, 3 Aug 2009 14:00:29 +0000 (14:00 +0000)]
Moved find_token method into the token class, since that seems a more appropriate place for it.
Matt Amos [Mon, 3 Aug 2009 13:59:47 +0000 (13:59 +0000)]
Changed required version of OAuth gem, as that exact version wasn't necessary.
Matt Amos [Mon, 3 Aug 2009 13:58:59 +0000 (13:58 +0000)]
Removed debugging statements accidentally committed.
Matt Amos [Mon, 3 Aug 2009 13:58:10 +0000 (13:58 +0000)]
Added foreign keys to some oauth tables.
Jonas Krückel [Sun, 2 Aug 2009 14:39:42 +0000 (14:39 +0000)]
uptodate with en.yml 16746
Tom Hughes [Sun, 2 Aug 2009 08:18:13 +0000 (08:18 +0000)]
Update pt-BR translation. Closes #2122.
Thomas Wood [Fri, 31 Jul 2009 14:37:37 +0000 (14:37 +0000)]
Fix translation for private data users.
Ævar Arnfjörð Bjarmason [Fri, 31 Jul 2009 11:54:09 +0000 (11:54 +0000)]
Change the messages on the changeset page so that @heading is succinct
and @description has more detail. This looks better than having the
two be equivalent and the <h1> would sometimes overflow the page with
long usernames.
Matt Amos [Fri, 31 Jul 2009 10:42:06 +0000 (10:42 +0000)]
Merged 16488:16743 from trunk.
Matt Amos [Thu, 30 Jul 2009 15:19:07 +0000 (15:19 +0000)]
fixed gps_point coordinates and tile. why was this passing the tests before?
Štefan Baebler [Thu, 30 Jul 2009 15:12:17 +0000 (15:12 +0000)]
translation synced with current en.yml
Tom Hughes [Thu, 30 Jul 2009 11:25:33 +0000 (11:25 +0000)]
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.
Ævar Arnfjörð Bjarmason [Wed, 29 Jul 2009 18:44:51 +0000 (18:44 +0000)]
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
Ævar Arnfjörð Bjarmason [Wed, 29 Jul 2009 11:05:17 +0000 (11:05 +0000)]
* Turn the hardcoded #<%= changeset.id %> into t('msg', :id =>
changeset.id). Some languages may have a different numeric
indicator than the ASCII pound symbol
* Instead of including a column on :user/edits with a "more" link
make the changeset ID link to the changeset page.
Ævar Arnfjörð Bjarmason [Wed, 29 Jul 2009 10:56:40 +0000 (10:56 +0000)]
Updated this using the en.yml file in the ruby.git distribution for reference
* Numbers are now correctly formatted
* Added source code comments
* Finished error message translations
Ævar Arnfjörð Bjarmason [Wed, 29 Jul 2009 10:43:03 +0000 (10:43 +0000)]
use I18n.l() instead of strftime(): Changeset dates will now appear localized
Jonas Krückel [Tue, 28 Jul 2009 16:39:11 +0000 (16:39 +0000)]
added translation for delete buttons, uptodate with en.yml 16657 now.
Matt Amos [Tue, 28 Jul 2009 16:09:13 +0000 (16:09 +0000)]
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).
Ævar Arnfjörð Bjarmason [Tue, 28 Jul 2009 11:25:41 +0000 (11:25 +0000)]
"{{num}} km" in messages not "{{num}}km": Icelandic typographic rules
dictate that there should be a space between the two.
Ævar Arnfjörð Bjarmason [Tue, 28 Jul 2009 11:22:29 +0000 (11:22 +0000)]
Ignore geocoder.search_osm_namefinder.* messages that I don't intend to translate
Ævar Arnfjörð Bjarmason [Tue, 28 Jul 2009 11:19:14 +0000 (11:19 +0000)]
New translations for message -> Delete
Matt Amos [Mon, 27 Jul 2009 16:59:14 +0000 (16:59 +0000)]
Fix compatibility with older versions of the ruby std lib (i.e: the one on cruise.osm.org)
Matt Amos [Mon, 27 Jul 2009 16:54:00 +0000 (16:54 +0000)]
Added methods to strip those non-XML control characters from tags in AMF controller and give an error if there's invalid UTF-8.
Štefan Baebler [Sat, 25 Jul 2009 11:47:39 +0000 (11:47 +0000)]
changed component name in trac
Tom Hughes [Thu, 23 Jul 2009 17:45:28 +0000 (17:45 +0000)]
Ignore deleted traces when returning a user's traces. Fixes #2093.
Tom Hughes [Thu, 23 Jul 2009 17:41:50 +0000 (17:41 +0000)]
Allow messages to be deleted from the outbox as well as the inbox.
Tom Hughes [Thu, 23 Jul 2009 15:22:44 +0000 (15:22 +0000)]
Add the ability for a recipient to (logically) delete a message from
their INBOX so they no longer see it.
Tom Hughes [Thu, 23 Jul 2009 15:07:26 +0000 (15:07 +0000)]
Prevent message date/time from wrapping.
Tom Hughes [Thu, 23 Jul 2009 15:05:44 +0000 (15:05 +0000)]
Remove surplus whitespace.
Tom Hughes [Tue, 21 Jul 2009 20:23:07 +0000 (20:23 +0000)]
Update the :en and :sl pluralizers to default to :other if a more
specific key does not exist. This then allows r16613 to be reverted
as there is no need to distinguish the cases. Fixes #2087.
Tom Hughes [Tue, 21 Jul 2009 13:21:01 +0000 (13:21 +0000)]
Add (dummy) pluralization data for browse.way_details.also_part_of to
stop the web site throwing errors in Slovenian.
Tom Hughes [Tue, 21 Jul 2009 12:20:02 +0000 (12:20 +0000)]
Make sure we always call fileparse() in scalar context.
Tom Hughes [Tue, 21 Jul 2009 11:30:19 +0000 (11:30 +0000)]
Make right hand side of browser view able to grow beyond 250 pixels.
Tom Hughes [Tue, 21 Jul 2009 11:14:50 +0000 (11:14 +0000)]
Prevent browser navigation control from wrapping.
Tom Hughes [Tue, 21 Jul 2009 09:51:33 +0000 (09:51 +0000)]
Use File::Basename instead of having our own half-arsed version.
Davide Prade [Mon, 20 Jul 2009 15:10:20 +0000 (15:10 +0000)]
Minor change
Štefan Baebler [Mon, 20 Jul 2009 05:30:00 +0000 (05:30 +0000)]
fixed the interpolation error, related to #2079
Ævar Arnfjörð Bjarmason [Sat, 18 Jul 2009 16:55:50 +0000 (16:55 +0000)]
Return to the Icelandic main page after signup
Simone Cortesi [Sat, 18 Jul 2009 16:39:05 +0000 (16:39 +0000)]
fixing italian translation
Tom Hughes [Thu, 16 Jul 2009 20:26:18 +0000 (20:26 +0000)]
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.
Richard Fairhurst [Thu, 16 Jul 2009 14:37:17 +0000 (14:37 +0000)]
and the binary
Tom Hughes [Thu, 16 Jul 2009 14:32:42 +0000 (14:32 +0000)]
Set a pointRadius on the object style so nodes are visible. Fixes #2070.
Tom Hughes [Thu, 16 Jul 2009 07:42:34 +0000 (07:42 +0000)]
Remove executable permission from SWF files.
Tom Hughes [Thu, 16 Jul 2009 07:37:49 +0000 (07:37 +0000)]
Select the language for Potlatch indepdently of the web site.
Richard Fairhurst [Thu, 16 Jul 2009 01:24:46 +0000 (01:24 +0000)]
remove debug statement
Richard Fairhurst [Thu, 16 Jul 2009 01:20:47 +0000 (01:20 +0000)]
Potlatch 1.1a
Tom Hughes [Wed, 15 Jul 2009 23:42:56 +0000 (23:42 +0000)]
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.
Tom Hughes [Wed, 15 Jul 2009 23:29:07 +0000 (23:29 +0000)]
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.
Tom Hughes [Wed, 15 Jul 2009 18:21:32 +0000 (18:21 +0000)]
Lookup the user before setting the locale. Fixes #2068.
Balló György [Wed, 15 Jul 2009 18:08:07 +0000 (18:08 +0000)]
Updated Hungarian translation of OpenStreetMap website
Tom Hughes [Wed, 15 Jul 2009 13:34:14 +0000 (13:34 +0000)]
Say which way is too long.
Tom Hughes [Wed, 15 Jul 2009 11:33:21 +0000 (11:33 +0000)]
Fix changeset paging.
Tom Hughes [Tue, 14 Jul 2009 23:10:39 +0000 (23:10 +0000)]
Remove bogus executable permissions.
Ævar Arnfjörð Bjarmason [Tue, 14 Jul 2009 22:23:38 +0000 (22:23 +0000)]
New Potlatch translations pulled in as a result of http://wiki.openstreetmap.org/index.php?title=Template%3APotlatch%2FTranslation&diff=302859&oldid=301148
Ævar Arnfjörð Bjarmason [Tue, 14 Jul 2009 22:06:12 +0000 (22:06 +0000)]
Updated Hungarian translation from the wiki
Ævar Arnfjörð Bjarmason [Tue, 14 Jul 2009 21:55:40 +0000 (21:55 +0000)]
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.
Ævar Arnfjörð Bjarmason [Tue, 14 Jul 2009 21:40:50 +0000 (21:40 +0000)]
Delete the old localised.yaml file Potlatch used before it was split into per-language files
Tom Hughes [Tue, 14 Jul 2009 19:48:21 +0000 (19:48 +0000)]
Fix send message links for friends and nearby mappers. Fixes #2065.
Jonas Krückel [Tue, 14 Jul 2009 15:25:24 +0000 (15:25 +0000)]
new translations
Jonas Krückel [Tue, 14 Jul 2009 15:00:01 +0000 (15:00 +0000)]
uptodate with en.yml 16486
Tom Hughes [Tue, 14 Jul 2009 08:03:24 +0000 (08:03 +0000)]
Merge 16110:16487 from trunk.
Ævar Arnfjörð Bjarmason [Tue, 14 Jul 2009 00:59:44 +0000 (00:59 +0000)]
Translated new string introduced in the changeset_browser merge
Ævar Arnfjörð Bjarmason [Tue, 14 Jul 2009 00:50:38 +0000 (00:50 +0000)]
Use pluralization for showing that a changeset has 1/many node/nodes
way/ways relation/relations
Ævar Arnfjörð Bjarmason [Tue, 14 Jul 2009 00:46:39 +0000 (00:46 +0000)]
use the same text for informing the user that tags are delimited by
commas in both the upload & edit form
Tom Hughes [Mon, 13 Jul 2009 23:52:32 +0000 (23:52 +0000)]
Merge changeset browser branch to trunk.