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
7e5c998a87 Only set pending users to active on a password reset 
When resetting a password only activate pending users, otherwise a
confirmed user's account gets set back to active and may then get
suspended by the spam scorer.
 2010-05-09 08:44:17 +01:00
Tom Hughes
160429e62d Merge branch 'master' into openstreetbugs 
Conflicts:
	lib/osm.rb
 2010-05-07 22:29:09 +01:00
Tom Hughes
f85681c5ce Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
 2010-05-07 22:28:07 +01:00
Tom Hughes
303e5d3eb9 Merge branch 'master' into terms 
Conflicts:
	config/application.yml
	lib/osm.rb
	public/stylesheets/common.css
 2010-05-07 22:23:20 +01:00
Tom Hughes
1eba060929 Redirect after processing user changes 
After we have processed the requested user changes, redirect back
to the list so that the resulting page is reloadable without getting
resubmission warnings from the browser.
 2010-05-07 14:27:52 +01:00
Tom Hughes
7774237a11 Redirect back to settings after updating user settings 
When we've saved a user's settings, redirect back to their settings
page instead of just rerendering so that a suspended user check will
be done.
 2010-05-07 10:01:24 +01:00
Tom Hughes
9230721a1f Redirect suspended users to an information page 
If the current session is for a logged in user and that user has
been suspended then log them out and redirect them to a page
explaining that their account has been suspended.
 2010-05-07 10:00:24 +01:00
Tom Hughes
3026da0cb0 Fix user visibility check 2010-05-06 22:11:38 +01:00
Tom Hughes
97c2406ae4 Fix user visibility check 2010-05-06 21:52:27 +01:00
Tom Hughes
ae8c0b3baf Add a user list view for administrators 2010-05-06 20:55:02 +01:00
Tom Hughes
5d3992daca Tell users their account has been suspended when they try and login 2010-05-06 17:18:34 +01:00
Tom Hughes
552a647810 Merge all the user status changing methods into one 2010-05-06 17:18:34 +01:00
Tom Hughes
5a54630b57 Add support for suspended and confirmed users 
Replace the existing "active" and "visible" with an enumerated status
that allows for extra cases. Currently we have "suspended" for users
who hve triggered the spam detector and "confirmed" for users that have
triggered the detector but have been confirmed as vald by an admin.
 2010-05-06 17:18:34 +01:00
Ævar Arnfjörð Bjarmason
acf518e5c3 M-x untabify Kai Krueger's ebcc988376 2010-05-02 10:48:06 +00: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
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
Kai Krueger
5027a70fec It was not possible to remove an OpenID from your user profile 2010-04-27 21:34:41 +01:00
Tom Hughes
276c29cb31 Make the decline button a real button 
Make the decline button on the terms page a real form submit button
and have the server redirect to the wiki as it's the only way to get
something that will actually look the same as a button on all the
different browsers.
 2010-04-27 10:45:49 +01:00
Tom Hughes
adb0883d17 Ajaxify the country selection on the terms page 2010-04-27 10:01:40 +01:00
Matt Amos
972278a223 Some styling changes. Changed drop-down into radio buttons. Tried, and failed, to get the 'decline' link to look like a button. 2010-04-27 00:36:44 +01: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
Kai Krueger
e4cb614e59 Correct merge issues in the last merge from master 2010-04-24 12:33:12 +00:00
Ævar Arnfjörð Bjarmason
19c5f8aeaa M-x untabify the OpenID branch 2010-04-20 23:47:23 +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
acbc99ac16 Merge branch 'master' into openstreetbugs 2010-04-19 21:30:42 +01:00
Tom Hughes
4b2ac2ea2b Merge branch 'master' into terms 2010-04-19 21:05:54 +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
Matt Amos
9a9e13af90 Bit more work on the contributor terms page - still very much a work-in-progress. 2010-04-12 23:55:05 +00:00
Kai Krueger
abf3358ce5 Fixed some minor bugs and add tests to spot them 2010-03-27 11:45:36 +00:00
Tom Hughes
898c47e647 Present the contributor terms as part of the initial signup instead of 
during the account confirmation step.
 2010-03-26 18:55:17 +00:00
Matt Amos
b99e870291 Initial version of contributor terms changes. 2010-03-22 22:51:09 +00:00
Kai Krueger
c3bf919e3e Reuse the map_bug_comment table as a more general history table of map_bugs including close and reopen events 
This helps the rss feed to work on a per event basis rather than on a per bug basis
 2010-03-21 12:12:05 +00:00
Kai Krueger
59a6ed0e20 Don't limit get map_bugs to a small Area, by disabling the quadtile index for those searches 
The volumn of bugs seem small enough to get away with normal or GiST indexes (not included yet)

Also includes some other fixes
 2010-03-20 11:59:23 +00:00
Kai Krueger
03f733c4f4 Merge -r 20198:20540 from trunc into openstreetbugs branch 2010-03-18 12:42:23 +00:00
Kai Krueger
35bbf82c20 Fixup some error handling in map bugs 2010-03-17 23:39:59 +00:00
Kai Krueger
c9a3f91f69 List bugs submited or commented on by user 2010-03-15 00:10:41 +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
Kai Krueger
81113f37b7 Fixup some of the rss output and geocode bugs using nominatim 2010-03-14 10:47:16 +00:00
Kai Krueger
3344e60846 back out the registration of the gpx mime type, as it didn't seem work 2010-03-14 00:14:35 +00:00
Kai Krueger
458402813c try and make the OpenStreetBugs API a bit more consistent with the rest of the API 2010-03-13 22:21:48 +00:00
Kai Krueger
01aa270315 Add a browse page for bugs 2010-03-13 13:45:02 +00:00
Kai Krueger
09895069c5 support json format in getBugs, add a limit and name parameter 2010-03-07 18:41:01 +00:00
Tom Hughes
74852271c9 Fix the selection of the message to be deleted. 2010-03-06 00:26:32 +00:00
Kai Krueger
d0e291552e Allow for different formats to the getBugs call 
This is a rudimentary initial version of a GPX and a rss
format for looking at bugs in an area.
 2010-03-04 22:30:42 +00:00
Kai Krueger
eac7348ad2 Split comment field out of map bugs table 
Rather than have all comments in a single text field, have each comment in its own entry
and only combine them back on output
 2010-03-01 21:05:40 +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
Kai Krueger
42822a8b89 An initial (incomplete) "proof of concept" integration of an OpenStreetBugs interface into the rails port 
This is a (start of a) reimplementation of the api at http://github.com/emka/openstreetbugs/tree/master/api/0.1/
into rails

The client side code is taken from http://wiki.openstreetmap.org/wiki/OpenStreetBugs/New_Client

This is ment as a mockup to perhaps use as a basis to further discuss how best to integrate a map bug reporting system

It currently uses (more or less) the openstreetbugs api specification. But this api feels rather inconsistent with the
rest of the rails_port api, so depending on discussions might still need some significant changes.
 2010-02-28 09:30:40 +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