Commit graph

1186 commits

Author SHA1 Message Date
Ævar Arnfjörð Bjarmason
7fe2f07e47 Make "Your OpenID is not associated with a OpenStreetMap account yet" message valid HTML
It was introduced in ebcc988376 by Kai Krueger
2010-05-02 11:02:25 +00:00
Ævar Arnfjörð Bjarmason
441b92c3c3 Merge branch 'master' into openID 2010-05-02 08:57:50 +00:00
Kai Krueger
900fdde664 Make a missing string translatable. Add a note about not needing a password with OpenID 2010-05-02 01:06:30 +01:00
Grant Slater
4d1fa7adfb Add tag for Surrey Air Survey 2010-05-01 16:01:45 +01:00
Kai Krueger
ebcc988376 Make it a bit clear when you try and login with openID and your openID isn't associated with a OSM account yet 2010-05-01 13:49:51 +01:00
Andy Allan
cd89a3c662 Move email configuration out of the model and into the config file 2010-05-01 12:36:22 +01:00
Siebrand Mazeland
4ef2cb9a71 Localisation updates from translatewiki.net (2010-04-30)
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-04-30 13:57:31 +02:00
Siebrand Mazeland
2b46a0b0e4 Fix YAML syntax error introduced in d67b9d7302. Thanks to avar for helping out. 2010-04-29 23:25:51 +02:00
Siebrand Mazeland
d67b9d7302 * updates in newline usage on the license_page messages
* remove trailing whitespace
2010-04-29 23:12:24 +02:00
Siebrand Mazeland
1ae014afa1 Merge branch 'master' of git://git.openstreetmap.org/rails 2010-04-29 22:58:18 +02:00
Ævar Arnfjörð Bjarmason
f8119bf169 Update config/wiki_pages.yml with script/misc/update-wiki-pages
16 new values. Mainly French and Russian.
2010-04-29 13:21:40 +00:00
Ævar Arnfjörð Bjarmason
79e140641c Tweak the OpenID login page
* Replace 'foo' alt text with a real alt text and add title="" text
    too

  * Don't display an "Or" between the two, it's obvious from context
    that it's either-or

  * Display a small OpenID logo next to the login form (from
    http://openid.net/foundation/news/logos/)

  * Fix some indenting / HTML errors in the login table

  * Don't add border: 1px style to the OpenID provider logos. Prettier
    this way and doesn't include inline CSS
2010-04-27 20:32:43 +00:00
Ævar Arnfjörð Bjarmason
f699368335 Merge branch 'master' into openID 2010-04-27 20:03:03 +00:00
Kai Krueger
f28f28f24a Try a different style for the OpenID login page 2010-04-27 20:54:07 +01:00
Ævar Arnfjörð Bjarmason
5f1fc761fb Fix link broken in feb9582 due to routes.rb changes 2010-04-27 15:18:24 +00:00
Tom Hughes
feb9582b07 Tweak the copyright page translation 2010-04-27 16:00:10 +01:00
Siebrand Mazeland
5dcd2ad70c Localisation updates from translatewiki.net (2010-04-26)
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-04-26 22:04:27 +02:00
Ævar Arnfjörð Bjarmason
59bf6e0a04 Change misleading wording on copyright page
Previously it said that you may distribute derived works "under the
same or similar license", now it just says "under the same".

The former form is derived from the cc-by-sa summary:

    http://creativecommons.org/licenses/by-sa/2.0/

But the legal code itself says:

    You may distribute, publicly display, publicly perform, or publicly
    digitally perform a Derivative Work only under the terms of this
    License, a later version of this License with the same License
    Elements as this License, or a Creative Commons iCommons license that
    contains the same License Elements as this
    License (e.g. Attribution-ShareAlike 2.0 Japan)

The intent is obviously to refer to other creative commons
licenses. This makes sense in the context of the creative commons
website. but on our site the reader could infer that he's able to
distribute the map data under similar licenses, such as the GPL, GFDL,
Apache 2 and others.
2010-04-26 18:05:51 +00:00
Ævar Arnfjörð Bjarmason
ca1283d031 Translate "Copyright & license" into Icelandic 2010-04-26 18:01:27 +00:00
Ævar Arnfjörð Bjarmason
7561eacbf4 Enable localization of the copyright page
The copyright page introduced in ecbd526 wasn't localize-able. Rectify
that with a page that:

   * Displays a header in non-English languages indicating that the
     version you're looking at isn't canonical.

   * Links back to the local version from the English one in a
     non-English locale.

Additionally I fixed a regression with the cc_button.png. It now has a
meaningful alt="" text again.
2010-04-26 18:00:02 +00:00
Ævar Arnfjörð Bjarmason
735493837b Merge branch 'master' into openID 2010-04-24 12:33:29 +00:00
Tom Hughes
a97ae09d2a Add some extra translations from OpenLayers 2.9 2010-04-23 16:13:39 +01:00
Tom Hughes
4763272982 Fix data browser navigation tooltips 2010-04-22 23:38:07 +01:00
Tom Hughes
8197ab3f82 Merge branch 'copyright' 2010-04-22 11:13:14 +01:00
Tom Hughes
d2585ea044 Tweak wikipedia links stuff 2010-04-22 10:41:53 +01:00
Ævar Arnfjörð Bjarmason
9bfa6059be Link to wikipedia articles on wikipedia=* tags
The semantics are as documented on
http://wiki.openstreetmap.org/wiki/Key:wikipedia, i.e.:

    # English Wikipedia article Foobar
    wikipedia=Foobar
    # German Wikipedia article Foobar
    wikipedia:de=Foobar
    wikipedia=de:Foobar

If someone gives a http:// link we just pass it through.
2010-04-21 01:46:50 +00:00
Ævar Arnfjörð Bjarmason
9448eab143 Merge branch 'master' into openID 2010-04-20 23:41:14 +00:00
Tom Hughes
546250f60b Load wiki link data at startup and shorten some file names 2010-04-20 21:05:22 +01:00
Tom Hughes
d6755356e0 Improve the browse helper code use to generate wiki links 2010-04-20 19:04:12 +01:00
Tom Hughes
da74fbb769 Fix wiki scraper to find tag pages as well as key pages 2010-04-20 18:48:59 +01:00
Ævar Arnfjörð Bjarmason
8eead8a870 Ticket #2245: Link from /browse/* pages to the wiki key/value pages 2010-04-20 12:55:14 +00:00
Tom Hughes
d36fab2913 Merge branch 'master' into openid
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/login.html.erb
	config/locales/en.yml
2010-04-20 00:41:03 +01:00
Tom Hughes
7a5ac0394d Merge branch 'master' into copyright 2010-04-19 21:57:13 +01:00
Tom Hughes
ec24889541 Ignore some files which aren't committed. 2010-04-19 15:20:13 +01:00
Tom Hughes
a36185b22f Normalise line endings. 2010-04-19 15:17:18 +01:00
Translatewiki
3513138b99 Localisation updates from translatewiki.net (2010-04-18) 2010-04-19 14:28:03 +01:00
Translatewiki
b7ceec9c88 Localisation updates from translatewiki.net (2010-04-18) 2010-04-19 14:28:03 +01:00
Translatewiki
45152a8ddf Localisation updates from translatewiki.net (2010-04-14) 2010-04-19 14:28:03 +01:00
Translatewiki
3c8e55e7ae Localisation updates from translatewiki.net (2010-04-14) 2010-04-19 14:28:03 +01:00
Translatewiki
7e837dd558 Localisation updates from translatewiki.net (2010-04-09) 2010-04-19 14:28:02 +01:00
Translatewiki
a1654ef19c Localisation updates from translatewiki.net (2010-04-09) 2010-04-19 14:28:02 +01:00
Richard Fairhurst
4e7ccfd9d8 always forget this one 2010-04-19 14:28:02 +01:00
Translatewiki
4ab5438485 Localisation updates from translatewiki.net (2010-04-08) 2010-04-19 14:28:02 +01:00
Translatewiki
ab2f4308ef Localisation updates from translatewiki.net (2010-04-08) 2010-04-19 14:28:02 +01:00
Tom Hughes
aab8b230ec Load timecop in the test environment only. 2010-04-19 14:27:51 +01:00
Tom Hughes
db691133d3 Revert copyright page from the trunk for now. 2010-04-07 09:45:41 +00:00
Translatewiki
159860eeb4 Localisation updates from translatewiki.net (2010-04-07) 2010-04-06 22:32:09 +00:00
Translatewiki
e51fd7758d Localisation updates from translatewiki.net (2010-04-07) 2010-04-06 22:30:21 +00:00
Translatewiki
9ad6634823 Localisation updates from translatewiki.net (2010-04-07) 2010-04-06 22:25:20 +00:00
Translatewiki
3374c0751f Localisation updates from translatewiki.net (2010-04-07) 2010-04-06 22:20:45 +00:00