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

1730 commits

Author SHA1 Message Date
Ævar Arnfjörð Bjarmason
acf518e5c3 M-x untabify Kai Krueger's ebcc988376 2010-05-02 10:48:06 +00:00
Kai Krueger
9fbd888e04 Merge branch 'master' of git://git.openstreetmap.org/rails into openID 2010-05-02 11:15:13 +01:00
Kai Krueger
9faf30fb45 Add an extra null pointer check that can trigger in tests 2010-05-02 11:03:45 +01: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
Tom Hughes
c079c1f574 Improve hiding of openid field on signup screen 2010-05-01 19:18:06 +01:00
Kai Krueger
799bbc3d9f Hide OpenID url on signup page to make it less confusing 2010-05-01 18:48:20 +01:00
Kai Krueger
6159b48b8f Remove a superfluous styling 2010-05-01 17:55:16 +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
Kai Krueger
058217bc69 Add the OpenID logo to all openid url entry textfields for clarity 2010-05-01 11:25:47 +01:00
Tom Hughes
90d2ed759f Fix mangling of wikipedia links 
Bail out straight away if the tag value is a URL rather than waiting
until we have parsed the key as we may change the value in the process
of parsing the key.
 2010-04-28 18:48:56 +01:00
Kai Krueger
65bcddf7a1 Replaced the Google and Yahoo logos with nicer ones 2010-04-27 22:06:10 +01:00
Kai Krueger
8df391f41f Merge branch 'openID' of git://github.com/avar/osm-website into openID 2010-04-27 21:37:40 +01:00
Kai Krueger
5027a70fec It was not possible to remove an OpenID from your user profile 2010-04-27 21:34:41 +01: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
Tom Hughes
feb9582b07 Tweak the copyright page translation 2010-04-27 16:00:10 +01: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
479b682d38 Correctly indent this if/else clause 
Some of the content of the else was at the same indent level as the
else itself.
 2010-04-24 12:37:51 +00:00
Ævar Arnfjörð Bjarmason
735493837b Merge branch 'master' into openID 2010-04-24 12:33:29 +00:00
Kai Krueger
e4cb614e59 Correct merge issues in the last merge from master 2010-04-24 12:33:12 +00:00
Tom Hughes
4763272982 Fix data browser navigation tooltips 2010-04-22 23:38:07 +01:00
Tom Hughes
54bed8e9c0 Improve layout of data browser pages 
Use float to position the navigation controls and map on the right
rather than a table so that we get more consistent positioning and
avoid forcing the map of the right hand side of the viewport.
 2010-04-22 23:05:20 +01:00
Tom Hughes
8197ab3f82 Merge branch 'copyright' 2010-04-22 11:13:14 +01:00
Tom Hughes
886c859784 Link to API usage policy 2010-04-22 10:49:50 +01:00
Tom Hughes
d2585ea044 Tweak wikipedia links stuff 2010-04-22 10:41:53 +01:00
Tom Hughes
c9a3091ca8 Merge remote branch 'avar/avar/browse-pages-link-to-wikipedia' 2010-04-22 09:09:36 +01:00
Tom Hughes
3008963a4b Case #2908: Escape user name in user not found error 2010-04-22 00:43:31 +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
19c5f8aeaa M-x untabify the OpenID branch 2010-04-20 23:47:23 +00:00
Ævar Arnfjörð Bjarmason
9448eab143 Merge branch 'master' into openID 2010-04-20 23:41:14 +00:00
Tom Hughes
9816c7dd0a Merge branch 'wikilinks' 2010-04-20 21:47:57 +01: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
88aa34f61b Update wiki link style to use the current default format 2010-04-20 14:21:23 +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
2e202460e6 Check that the token is valid before using it. 2010-04-20 11:05:55 +01: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
f576c47525 Ignore whitespace around the commas when splitting a user's list of 
preferred languages. Closes #2891.
 2010-04-19 14:28:03 +01:00
Tom Hughes
a4b1c178c9 Escape geocoder errors. Closes #2892. 2010-04-19 14:28:03 +01:00
Tom Hughes
ae4ece2450 Don't send "408 Request timeout" responses from the data browser as it 
seems to make some browsers automatically retry.
 2010-04-19 14:28:02 +01:00
Tom Hughes
79df86023c Add a keyid attribute to each layer and use it when requesting the 
key instead of trying to use the layer name, which can be translated
which will stop it working. Closes #2876.
 2010-04-19 14:28:02 +01:00
Tom Hughes
db691133d3 Revert copyright page from the trunk for now. 2010-04-07 09:45:41 +00:00
Tom Hughes
97f294076f Tweak the new copyright page a bit. 2010-04-06 20:11:33 +00:00
Richard Fairhurst
ecbd526956 New, more helpful and compliant copyright page 2010-04-06 13:55:33 +00:00
Tom Hughes
8cd377d255 Restrict the fragment caching of the reverse geocode result to only cover 
that lookup and not anything else as the geocode result is only cached once
for all languages.
 2010-03-21 11:33:58 +00:00
Tom Hughes
d6d0a2b1a6 Disable autocompletion for the password fields on the settings page. 2010-03-20 00:01:57 +00:00
Tom Hughes
d99f08314c Load ethnio script over https to avoid browser warnings. 2010-03-17 21:42:48 +00:00