Commit graph

485 commits

Author SHA1 Message Date
Tom Hughes
036632bad3 Avoid noise on console when running tests 2011-11-14 09:42:53 +00:00
Tom Hughes
fc25c3d412 Rename all ID columns that aren't unique
Having a table with a column called ID that is only part of the
primary key really doesn't work as rails likes to treat ID as a
special name so it becomes impossible to assign to it or read it.
2011-11-14 09:42:52 +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
1da4cecaf6 List all objects that are blocking a delete, in a well defined order 2011-11-14 09:42:49 +00:00
Tom Hughes
f8ace8f9e0 Cope with MESSAGES_DOMAIN not being defined 2011-11-14 09:42:48 +00:00
Tom Hughes
c00a3e948a Avoid using string interpolation in conditions 2011-11-14 09:42:48 +00:00
Tom Hughes
3d55db46ed Avoid use of deprecated methods on error objects 2011-11-14 09:42:45 +00:00
Tom Hughes
226c41be69 Update ActiveRecord queries to use arel 2011-11-14 09:42:44 +00:00
Tom Hughes
0dba53c023 Declare callbacks explicitly 2011-11-14 09:42:43 +00:00
Tom Hughes
56df4f3813 Update notifiers to use new ActionMailer API 2011-11-14 09:42:41 +00:00
Tom Hughes
17f4e58e46 Use before_validation with :on rather than before_validation_on_xxx 2011-11-14 09:42:40 +00:00
Tom Hughes
15ab888d0c Make sure asking a node for it's history returns an ordered list 2011-09-14 10:16:44 +01:00
Matt Amos
cb4f1e62a0 Don't compare changeset bbox coordinates when they may be nil
The code assumed that the changeset bounding box would only be
updated with a valid bounding box, but this isn't the case when
dealing with certain corner cases, including when removing
deleted members from relations.
2011-07-06 08:50:08 +01:00
Tom Hughes
ecbad776fb Expire user pages when their image changes 2011-06-15 09:51:56 +01:00
Tom Hughes
ce7b651eb2 Merge branch 'master' into openid 2011-06-10 19:11:08 +01:00
Tom Hughes
85e99d3127 Expire diary pages which contain comments by a user when necessary 2011-06-09 15:22:15 +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
832b96b75a Merge branch 'master' into openid
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/terms.html.erb
	test/fixtures/users.yml
2011-05-21 12:14:56 +01:00
Tom Hughes
6d5c551a7c Simplify URL scheme name matching in OAuth callback URLs a little 2011-05-11 22:24:38 +01:00
Mendhak
9375b397fa Allow any valid (per RFC 3986) scheme name in OAuth callback URLs
Changed the callback_url regex so that you can have custom schemes such
as myapp: or my-lovely-app: instead of just http and https. This should
help with mobile development where users can authorize with OSM in their
browser and are automatically redirected to the registered app.
2011-05-11 22:23:06 +01:00
Tom Hughes
a9ff3bfc4b Remove tags from deleted nodes
When ways or relations are deleted we remove their tags and there
is no reason why nodes should be different.
2011-05-05 20:25:58 +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
e09b187cae Merge branch 'master' into openid
Conflicts:
	app/controllers/user_controller.rb
2010-10-17 10:59:29 +01:00
Tom Hughes
71f1554212 Make trace API a proper CRUD API like other object types 2010-10-11 23:09:27 +01:00
Tom Hughes
9caa2046ca Include description and tags in GPX details API response 2010-10-11 19:10:42 +01:00
Tom Hughes
c016bf6c15 Merge branch 'master' into openid
Conflicts:
	app/controllers/user_controller.rb
2010-10-05 00:23:04 +01:00
Tom Hughes
bddf524c88 Allow users to send themselves a new confirmation email
Add a method which generates a new confirmation email, and provide
links to it from appropriate places.
2010-10-04 21:52:58 +01:00
Tom Hughes
f70feedc65 Merge branch 'master' into openid 2010-09-24 09:35:36 +01:00
Tom Hughes
1c3a9ee62b Update oauth models and controllers for OAuth 1.0a support 2010-09-21 16:20:30 +01:00
Tom Hughes
dd7ef37ec0 Merge branch 'master' into openid
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/terms.html.erb
	config/locales/en.yml
2010-09-06 12:49:10 +01:00
Tom Hughes
f07819d81a Rework application configuration
Use a preinitializer to load the settings from application.yml so
that they are available as early as possible. All settings can also
be overridden using environment variables.

The ad-hoc settins in environment.rb are then moved to this new
system so we have one consistent location for settings.
2010-08-04 22:06:05 +01:00
Tom Hughes
03fb042591 Merge branch 'master' into openid 2010-07-28 21:39:46 +01:00
Tom Hughes
6740cab85b Use the correct name for the interpolation variable 2010-06-29 15:19:54 +01:00
Tom Hughes
2038cd52c6 Include an [OpenStreetMap] prefix on the subject of message notifications
Put back the [OpenStreetMap] prefix to the subject line of email
notifications of messages, but strip it again from any incoming
email replies.
2010-06-29 09:43:30 +01:00
Tom Hughes
b4a22eee71 Reject leading and trailing whitespace in display names 2010-06-28 17:47:05 +01:00
Tom Hughes
81f5c72c76 Merge branch 'master' into openid 2010-06-27 16:29:18 +01:00
Tom Hughes
eefb42334f Use the message title as the subject of notification mails
Make message notification mails use the message title as the subject
so that it is properly perserved when replying by email. Closes #3051.
2010-06-26 16:03:47 +01:00
Tom Hughes
406b46e49b Revert "Switch to using oauth-plugin as a gem"
This reverts commit 41a123334b.
2010-06-07 16:01:04 +01:00
Tom Hughes
41a123334b Switch to using oauth-plugin as a gem
Use the oauth-plugin as a gem instead of carrying a local copy.

This also required that commit eff06faf46 be
reverted as it changed the plugin. I don't think the cosmetic improvement
from that patch is worth the hassle of carrying local changes to the plugin.
2010-05-24 12:58:27 +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
980c2fa301 Suspend users if their spam score gets too high
Use an observer to watch all diary and user updates and, if the user
is not confirmed, chek their spam score and suspend then if it has got
too high.
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