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

270 commits

Author SHA1 Message Date
Tom Hughes
7599f98957 Merge branch 'master' into notes 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/common.css.scss
	app/helpers/application_helper.rb
 2012-11-20 19:08:30 +00:00
Tom Hughes
ec6f14df0c Use counter caches to improve spam scoring 
Now that we have the counter caches we can take all edits and traces
into account without incurring the cost of having to scan the database
to count them all.
 2012-11-12 09:39:44 +00:00
Paweł Paprota
ad43499205 Implemented Gravatar support 2012-10-18 18:59:38 +01:00
Tom Hughes
4d91fe3dd9 Merge branch 'master' into openstreetbugs 
Conflicts:
	Gemfile
	app/helpers/application_helper.rb
	app/views/site/index.html.erb
 2012-09-20 16:01:24 +01:00
Tom Hughes
adcf9edc54 Clear the openid URL when an account is deleted 2012-09-05 15:33:01 +01:00
Tom Hughes
0d3a9ed9cb Merge branch 'master' into openstreetbugs 
Conflicts:
	Gemfile.lock
	app/views/browse/_map.html.erb
	app/views/user/view.html.erb
	config/locales/en.yml
	config/openlayers.cfg
	db/structure.sql
	vendor/assets/openlayers/OpenLayers.js
 2012-08-22 20:52:08 +01:00
Tom Hughes
fbabed694b Improve blocks on/by links on user pages 
All block related links are now only shown if the user has given
or received any blocks, and include a count of active blocks.
 2012-08-10 08:27:37 +01:00
Tom Hughes
a770d020f9 Replace deprecated update_attribute method 2012-07-27 12:32:13 +01:00
Tom Hughes
07df3f9809 Clear pass_crypt_confirmation when encrypting a new password 
If we change pass_crypt (by encrypting it) without clearing the
confirmation then the user record becomes invalid.
 2012-07-27 12:05:19 +01:00
Tom Hughes
e4be816ca0 Don't allow hash signs in usernames 2012-07-23 12:59:50 +01:00
Tom Hughes
5af8d51865 Don't allow percent signs in usernames 2012-07-23 10:38:29 +01:00
Tom Hughes
f3c9f4edb4 Adjust spam scoring to try and reduce false positives 2012-03-20 13:28:57 +00:00
Tom Hughes
8f4a9a4b87 Make spam scoring work with new rich text system 2012-03-17 16:36:58 +00:00
Tom Hughes
aa4205482a Treat all newly entered blocks of text as Markdown 2012-03-17 16:36:55 +00:00
Tom Hughes
6de8c2e6b3 Get the per-user note list view working again 2012-03-09 12:54:19 +00:00
Tom Hughes
1340fca8f1 Turn on mass assignment protection 
Require any attribute that is going to be mass assigned to be
whitelisted, and whitelist those attributes which need it
 2012-03-06 08:54:45 +00:00
Tom Hughes
f2150a94cf Serve up paperclip attachments in a cache friendly way 2012-02-21 12:31:38 +00:00
Tom Hughes
e70396d70b Replace the file_column plugin with paperclip 2012-02-15 17:48:15 +00:00
Tom Hughes
52be0e81a0 Reduce the effect of the user description on the spam score 2012-02-15 16:24:43 +00:00
Tom Hughes
78db9e72bb Convert friend changeset selection to use Arel queries 2011-12-15 21:47:43 +00:00
Tom Hughes
293265a00b Look up names and emails case insensitively for authentication 
If the name entered is not found then try a case insensitive lookup
and if that finds a single result then use it.
 2011-12-13 21:25:37 +00:00
Tom Hughes
af2b13c2c1 Require user names and emails to be case insensitively unique 
Any existing clashes are allowed to remain for now, byt any new
accounts, or changes to names on existing accounts, must be unique
without regard to case.
 2011-12-12 19:11:06 +00:00
Tom Hughes
3227f40193 Make more use of named scopes 2011-11-14 09:42:51 +00:00
Tom Hughes
8ae5d94b2f Update some more queries to use AREL in place of deprecated methods 2011-11-14 09:42:51 +00:00
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