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

1344 commits

Author SHA1 Message Date
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
Tom Hughes
f0f111aced Make a few more things translatable. 2009-06-03 08:06:03 +00:00
Tom Hughes
11f457e842 Use "confirm_email" instead "confirm email" in resource names so it 
matches the method name.
 2009-06-03 07:42:40 +00:00
Ævar Arnfjörð Bjarmason
9a051df2d2 * Made "Account not active" and "Couldn't log in with those details" translatable 2009-06-03 01:42:55 +00:00
Ævar Arnfjörð Bjarmason
6bcc50e274 * Made the "Confirmed your account/email" messages translatable 
* Changed "Something went wrong" error to "you've already used that token". From reading the code that's the only time it's displayed
 2009-06-03 01:31:35 +00:00
Ævar Arnfjörð Bjarmason
e70e2dbe9f Change /index.php/ in wiki.openstreetmap.org links to /wiki/. This looks nicer 2009-06-02 12:23:37 +00:00
Tom Hughes
cd48e2d1f7 Remove left over code from original diary language implementation that 
was stopping editing from being able to change the language.
 2009-06-02 08:56:49 +00:00
Tom Hughes
0f7301b64f Correct translation name. 2009-06-02 08:40:16 +00:00
Tom Hughes
1be7bb8a04 Make a few more strings translatable in the diary entry controller 
and tidy up the translations for some of the partials.
 2009-06-02 08:13:41 +00:00
Tom Hughes
95595ee7f0 Internationalise the trace controller. Fixes #1894. 2009-06-02 07:45:31 +00:00
Shaun McDonald
2875a2c4b3 more tranlations for validations. Bug fix for the missing translation of the gps upload 2009-06-01 18:09:24 +00:00
Tom Hughes
705f93e810 Fix misspelt resource name. 2009-06-01 08:50:20 +00:00
Shaun McDonald
f3bcdd85d7 Some more i18n html titles 2009-05-31 16:51:20 +00:00
Tom Hughes
168036d3a2 Add a simple edit control for the user's preferred languages. 2009-05-31 15:22:59 +00:00
Tom Hughes
0e96027a20 Sort out storage and use of user preferred languages. 2009-05-31 14:55:45 +00:00
Tom Hughes
3d906fe8c6 Merge 15165:15373 from trunk. 2009-05-31 11:32:32 +00:00
Tom Hughes
5b3b288fc2 Add a list of languages and fix a few issues with the schema. Also get 
language selection for diary entries working.
 2009-05-30 16:37:21 +00:00