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

1699 commits

Author SHA1 Message Date
Æ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
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
Tom Hughes
54ae072d1e Add UX review recruiting script to signup page. 2010-03-16 21:13:16 +00:00
Tom Hughes
7f1691e878 Update the inbox link in the greeting bar when messages are marked 
as read or unread.
 2010-03-14 16:02:30 +00:00
Tom Hughes
a7d304d20f Require the session ID to log somebody out - if it isn't given we just 
show a confirmation page. Closes #2792.
 2010-03-14 15:29:53 +00:00
Tom Hughes
89b8d48e98 Fix warnings. 2010-03-11 18:52:35 +00:00
Tom Hughes
ed0375ec89 Use the small PanZoom control on the user map instead of the 
full PanZoomBar control.
 2010-03-11 18:29:35 +00:00
Tom Hughes
dcbc807526 Improve user popups on friend/nearby mapper maps. 2010-03-11 18:23:22 +00:00
Tom Hughes
94f19ce3b3 Use a better HTML sanitizer that makes sure the HTML is well formed and 
can add rel="nofollow" to links.
 2010-03-06 15:38:13 +00:00
Tom Hughes
30ae9fb928 Fix broken </div> tag. 2010-03-06 11:37:38 +00:00
Tom Hughes
74852271c9 Fix the selection of the message to be deleted. 2010-03-06 00:26:32 +00:00
Tom Hughes
318c7a9854 Tidy up the stylesheets, removing lots of ancient, unused junk and 
trying to group everything else together in more logical fashion.
 2010-03-03 15:46:16 +00:00
Tom Hughes
0813f88bc7 Don't try and show distances to friends if the user has no 
home location set. Closes #2766.
 2010-03-02 16:42:45 +00:00
Tom Hughes
77a3d8d24e Move image size hint to avoid issues with LTR languages. Closes #2755. 2010-03-01 12:12:02 +00:00
Tom Hughes
5e9ae68fb2 Make friend notification messages include a link to add a reciprocal 
friendship if it doesn't already exist. Closes #2754.
 2010-03-01 12:08:11 +00:00
Tom Hughes
9d35062ba3 Add a "friendly" date/time format and use it whenever we are printing 
dates and times on the web site.

Also try and improve formatting of message pages a but, and include the
image of the recipient when viewing a sent message.
 2010-02-28 16:57:22 +00:00
Tom Hughes
4ebc48618e Get the location for "Where Am I?" from the view tab's link instead of 
by asking the map so that it works in edit mode as well. Closes #2383.
 2010-02-28 16:04:30 +00:00
Tom Hughes
b90567e197 Tidy up error handling in the message controller, and make it redirect to 
the login page if you are logged in as the wrong user. Closes #1569.
 2010-02-28 15:13:06 +00:00
Tom Hughes
938cbcd862 Allow a logged in user to relogin as a different user just by visiting 
the login page.
 2010-02-28 14:36:07 +00:00
Tom Hughes
198281ffa9 Add user images to lists of diary entries. 2010-02-28 09:01:19 +00:00
Tom Hughes
6758efb10f Add a note to the user image upload suggesting an appropriate size. 2010-02-28 08:55:01 +00:00
Ævar Arnfjörð Bjarmason
92339552d1 use i18n kthx 2010-02-28 05:13:00 +00:00
Tom Hughes
3e8d809250 Add user images to diary view. 2010-02-28 00:24:33 +00:00
Tom Hughes
44fdad8478 Add a border to user images. 2010-02-28 00:11:17 +00:00
Tom Hughes
56336763de Align relation membership details to the top. 2010-02-27 23:58:26 +00:00
Tom Hughes
891a337b32 Show the "anonymous user" picture for users with no picture. 2010-02-27 18:12:27 +00:00
Tom Hughes
acd72861ed Rework the user details screen to be less crap... Highlights include: 
- Map is smaller and placed to the side with lists of friends
    and nearby users (now excluding friends) beside it.

  - Map includes friends as well as nearby users.

  - Friend and nearby user lists include photos and links to
    friend/unfriend as appropriate.

  - OAuth settings link moved up with all the other links in the
    main navigation bar.

The addition of friends to the map also carries through to the user
settings page.
 2010-02-27 18:11:04 +00:00
Tom Hughes
ec172871ae If Nominatim can't give us a location, just return the coordinates. 2010-02-27 12:58:23 +00:00
Tom Hughes
e076d824bf Make sure we report "no results" when Nominatim's reverse geocoder fails 
to find any results.
 2010-02-27 12:52:30 +00:00
Tom Hughes
0b913efd05 Use Nominatim to reverse geocode diary location information and display 
a friendly human readable location instead of some coordinates.
 2010-02-27 12:41:56 +00:00
Kai Krueger
bbf30e76e4 merge 19889:20181 of rails_port into the openID branch 
merge conflicts with the remember_me functionality
 2010-02-27 11:21:15 +00:00
Tom Hughes
1df4234c72 Remote "change my settings" link from user page as it duplicates the 
main "my settings" link at the top of the page.
 2010-02-27 00:14:13 +00:00
Tom Hughes
696aa8b5a8 Remote the user settings page to make it a bit more readable. 2010-02-27 00:12:16 +00:00