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

96 commits

Author SHA1 Message Date
Tom Hughes
c00a3e948a Avoid using string interpolation in conditions 2011-11-14 09:42:48 +00:00
Tom Hughes
0dba53c023 Declare callbacks explicitly 2011-11-14 09:42:43 +00:00
Tom Hughes
ce7b651eb2 Merge branch 'master' into openid 2011-06-10 19:11:08 +01:00
Tom Hughes
31b2d45108 Only check some user validations when the field has changed 2011-06-07 00:22:23 +01:00
Tom Hughes
11aff90f63 Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/login.html.erb
	public/stylesheets/common.css
 2011-02-10 14:10:19 +00:00
Andy Allan
33a039e849 Show the latest changeset for each of the contacts on the user page 2010-12-17 13:36:53 +00:00
Andy Allan
6d51e77880 Use configuration variables for limiting nearby users, and bump the number to 30 2010-12-17 13:18:26 +00:00
Tom Hughes
0a52a4eb07 Implement automatic OAuth setup for Potlatch 2 2010-11-29 12:20:22 +00:00
Matt Amos
cd66a5db99 Initial work on support for multiple editors 2010-11-29 12:20:21 +00:00
Tom Hughes
03fb042591 Merge branch 'master' into openid 2010-07-28 21:39:46 +01:00
Tom Hughes
b4a22eee71 Reject leading and trailing whitespace in display names 2010-06-28 17:47:05 +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
5d3992daca Tell users their account has been suspended when they try and login 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
Tom Hughes
8b781bb18b Include the user description in the spam score 2010-05-06 17:18:34 +01:00
Tom Hughes
937b576bf5 Add a spam_score method to the user model 2010-05-06 17:18:33 +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
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
7f28b7342c Improve email address validation and add validation of the new 
email address field. Closes #2744.
 2010-02-25 19:15:54 +00:00
Kai Krueger
ca558c692e This is the initial implementation of login via OpenID 
This is the patch presented in trac ticket #2500

With this commit, it is possible to assosciate an openID
to an existing OSM account. Once associated, it is possible
to either login via OpenID, or as always via username and password.

Other aspects, such as account creation and the need for a valid email
are unchanged.
 2010-01-10 17:41:32 +00:00
Tom Hughes
5a2ad3655b Replace a couple calls to inject with more readble constructs. 2009-10-01 20:39:04 +00:00
Tom Hughes
8217c55523 Correct comment. 2009-10-01 20:24:53 +00:00
Matt Amos
77851bac7b Added better messages and error handling in a couple of places. Added integration checks to ensure that the blocking is actually working. Tests FTW. 2009-09-30 17:39:42 +00:00
Matt Amos
ca06b3c7b1 New migration to add better auditing to user_roles and better column names there and on user_blocks. Added a helper for displaying block status messages. 2009-09-29 16:44:03 +00:00
Matt Amos
daa2496024 First version of blocking feature. Allows both time-based (for map protection) and notice-based (for education) blocks on users. Also introduces user roles and a simple UI for displaying and administering these. 2009-09-28 16:01:00 +00:00
Tom Hughes
63b399c9b2 Update to rails 2.3.4 for security fixes. 2009-09-04 08:45:38 +00:00
Tom Hughes
908a6ef409 Merge 16891:17044 from trunk. 2009-08-13 17:18:08 +00:00
Tom Hughes
565171486f Add extra visibility options for GPS traces, and enhance the API call 
that returns trace data to return more information if the owner of the
trace has allowed it. Based on a patch from Matt Amos.
 2009-08-13 17:06:11 +00:00
Tom Hughes
cbbfdf3948 Merge 16743:16811 from trunk. 2009-08-03 23:50:47 +00:00
Tom Hughes
254ce1eca0 Exclude deleted messages from the new_messages relationship. 2009-08-03 14:33:53 +00:00
Matt Amos
05e2120273 Merged 16488:16743 from trunk. 2009-07-31 10:42:06 +00:00
Tom Hughes
70cf737626 Ignore deleted traces when returning a user's traces. Fixes #2093. 2009-07-23 17:45:28 +00:00
Tom Hughes
581c243e0e Allow messages to be deleted from the outbox as well as the inbox. 2009-07-23 17:41:50 +00:00
Tom Hughes
f3bf0c8b14 Add the ability for a recipient to (logically) delete a message from 
their INBOX so they no longer see it.
 2009-07-23 15:22:44 +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
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
Tom Hughes
5de81dc4b0 More work on optimisation the location of nearby users - it turns out 
that getting the database to do the filtering is much better as it
avoids us constructing thousands of user objects only to then throw
most of them away again.
 2009-06-05 09:30:31 +00:00
Tom Hughes
857eeae8b2 Optimise the finding of nearby users a bit. 2009-06-05 08:27:45 +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
5294e4d989 Send notification messages in the target user's language. 2009-05-31 16:10:53 +00:00
Tom Hughes
0e96027a20 Sort out storage and use of user preferred languages. 2009-05-31 14:55:45 +00:00
Shaun McDonald
53b4d645d8 First stage of i18n. Some migrations and extra plugins. 2009-05-22 18:36:17 +00:00
Tom Hughes
83aa2655f5 Null descriptions are not allowed. 2009-04-25 22:26:56 +00:00
Tom Hughes
77a34278ca Backout broken attempt at making case insensitive authentication work 
on Postgres. As implemented this forces a table scan to authenticate
users which is ridiculous to save people pressing the shift key.
 2009-04-23 23:46:45 +00:00
Shaun McDonald
f1a0331081 Hack a way to make the email and display name case insensitive for logging in, based on a suggestion by firefishy to use ILIKE. Changes requested from users on mailing list. Includes some tests to check the case insensitivity of the username, and and e-mail address on login. 2009-04-23 19:20:08 +00:00
Matt Amos
afcb345014 Moved a bunch of time functions into UTC. Fixes bugs which we only see for 4 hours a year. 2009-03-29 01:31:04 +00:00
Shaun McDonald
721dd9c27d resync from rails_port 11795:12304 2008-12-12 19:29:27 +00:00
Tom Hughes
2a121cfc41 Add a delete method for the user model. 2008-11-25 23:53:21 +00:00
Shaun McDonald
55d511bf21 Remember whether the user set the public checkbox on GPX upload as a user preference. Closes #827 2008-11-18 20:22:09 +00:00