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

470 commits

Author SHA1 Message Date
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
Ævar Arnfjörð Bjarmason
441b92c3c3 Merge branch 'master' into openID 2010-05-02 08:57:50 +00:00
Andy Allan
cd89a3c662 Move email configuration out of the model and into the config file 2010-05-01 12:36:22 +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
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
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
9deeae3f96 Remove validates_associated_of calls which target the user model as 
we have a number of users with minor validation failures.
 2010-02-25 21:50:09 +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
17a7c69e8d merge 19601:19888 of rails_port into the openID branch 2010-02-06 13:13:52 +00:00
Tom Hughes
5d658d5a34 Fix expiry of cached diary views. 2010-01-27 09:12:25 +00:00
Kai Krueger
84db1d66b7 merge 19364:19600 of rails_port into the openID branch 
renamed migration 049_add_open_id_authentication_tables.rb to
050_add_open_id_authentication_tables.rb
 2010-01-23 15:31:01 +00:00
Tom Hughes
86cbb404e9 Add a sweeper to clean up cache entries when a user's visibility or 
display name changes.
 2010-01-21 11:39:28 +00:00
Tom Hughes
aa27228dea The new message route want the display name now, not the id. Closes #2642. 2010-01-17 09:12:40 +00:00
Tom Hughes
e29e49dc7c Add some caching for trace views. 2010-01-10 17:44:57 +00:00