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

3143 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matt Amos
0d5be22cb5 Merging 16820:16891 from trunk. 2009-08-06 16:24:39 +00:00
Richard Fairhurst
a9a55db130 ibid 2009-08-06 10:49:01 +00:00
Richard Fairhurst
d50288a89f argh, caught out by annoying Ming 0.3>0.4 change. Recommit with correct line widths 2009-08-06 08:26:06 +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
Richard Fairhurst
c0c506adde handful of small fixes 2009-08-05 23:16:22 +00:00
Richard Fairhurst
9968ea4308 bunch of small tweaks 2009-08-05 23:14:27 +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
Richard Fairhurst
b938f26313 ibid 2009-08-05 14:11:13 +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
55e8611653 add secondary_link 2009-08-05 08:51:08 +00:00
Richard Fairhurst
a36c938c85 ibid 2009-08-05 08:49:37 +00:00
Richard Fairhurst
233f3ee527 Potlatch 1.2 2009-08-04 22:24:20 +00:00
Tom Hughes
3faa395788 Use </a> to close <a> tags... 2009-08-04 21:49:54 +00:00
Tom Hughes
7ce7f9b923 Update pr-BR translation. Closes #2130. 2009-08-04 17:10:03 +00:00
Ævar Arnfjörð Bjarmason
627898ead2 Translate the new reset password procedure introduced in [16817] and 
remove obsolete messages that haven't been used since that commit.
 2009-08-04 14:51:55 +00:00
Ævar Arnfjörð Bjarmason
d15bfb396e Remove unused messages that weren't removed in [16817] 2009-08-04 14:51:09 +00:00
Tom Hughes
63f61b5f04 Replace hard coded nwr enumeration support with a more generic 
system for defining enumerations.
 2009-08-04 13:23:36 +00:00
Tom Hughes
9c89bd53bf Require the migration helper code in some more migrations. 2009-08-04 13:17:29 +00:00
Matt Amos
0a122639c9 Ooops. Should have committed the test too. 2009-08-04 13:15:19 +00:00
Matt Amos
e470d8a659 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. 2009-08-04 13:07:11 +00:00
Matt Amos
f50670e34d More translatable strings. 2009-08-04 13:06:21 +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
59eebc05b2 Merge 16817:16819 from trunk. 2009-08-03 23:59:17 +00:00
Tom Hughes
60303ee06b Fixed migration - rails uses remove_index not drop_index. 2009-08-03 23:55:51 +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
Tom Hughes
72402ebc3e Add an index on message sender. 2009-08-03 23:04:41 +00:00
Matt Amos
655dc6787e Reorganised OAuth clients and tokens details page. Made clients info editable and some more stuff translatable in the OAuth pages. 2009-08-03 17:08:40 +00:00
Matt Amos
7c1cde7035 Removed file which isn't needed any more. 2009-08-03 15:20:38 +00:00
Tom Hughes
254ce1eca0 Exclude deleted messages from the new_messages relationship. 2009-08-03 14:33:53 +00:00
Matt Amos
eff06faf46 Moved find_token method into the token class, since that seems a more appropriate place for it. 2009-08-03 14:00:29 +00:00
Matt Amos
45a3acb4e2 Changed required version of OAuth gem, as that exact version wasn't necessary. 2009-08-03 13:59:47 +00:00
Matt Amos
e1ad636f53 Removed debugging statements accidentally committed. 2009-08-03 13:58:59 +00:00
Matt Amos
6e146bfba9 Added foreign keys to some oauth tables. 2009-08-03 13:58:10 +00:00
Jonas Krückel
1288a89bdc uptodate with en.yml 16746 2009-08-02 14:39:42 +00:00
Tom Hughes
dc3aae9060 Update pt-BR translation. Closes #2122. 2009-08-02 08:18:13 +00:00
Thomas Wood
bda35008c8 Fix translation for private data users. 2009-07-31 14:37:37 +00:00
Ævar Arnfjörð Bjarmason
621a144cfc 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.
 2009-07-31 11:54:09 +00:00
Matt Amos
05e2120273 Merged 16488:16743 from trunk. 2009-07-31 10:42:06 +00:00
Matt Amos
44ec85fcad fixed gps_point coordinates and tile. why was this passing the tests before? 2009-07-30 15:19:07 +00:00
Štefan Baebler
9744f9659b translation synced with current en.yml 2009-07-30 15:12:17 +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
Ævar Arnfjörð Bjarmason
e2abf1254b * 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.
 2009-07-29 11:05:17 +00:00
Ævar Arnfjörð Bjarmason
705ae98e9a 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
 2009-07-29 10:56:40 +00:00
Ævar Arnfjörð Bjarmason
6c034ee9fe use I18n.l() instead of strftime(): Changeset dates will now appear localized 2009-07-29 10:43:03 +00:00
Jonas Krückel
718d0ccf3c added translation for delete buttons, uptodate with en.yml 16657 now. 2009-07-28 16:39:11 +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
Ævar Arnfjörð Bjarmason
53aaea1b27 "{{num}} km" in messages not "{{num}}km": Icelandic typographic rules 
dictate that there should be a space between the two.
 2009-07-28 11:25:41 +00:00