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

445 commits

Author SHA1 Message Date
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
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
314b734aa5 Introduce some caching for diary views. 2010-01-09 16:43:38 +00:00
Shaun McDonald
094855be22 Actually the changeset doesn't need an id attribute in the xml. It is simply fetched as a parameter in the url. Thanks for pointing it out Frederik. We really need more tests so that things like this are thought about more before committing potentially significant changes. 2009-12-15 23:53:19 +00:00
Shaun McDonald
43a28065b1 Change the way that the changeset parsing is done, so that it is in line with the nodes/ways/relations and gives much nicer error messages. Adding some tests too to back up those changes. 2009-12-06 02:13:30 +00:00
Tom Hughes
57a05a40fc Make diary comment creation work again. 2009-11-15 11:00:54 +00:00
Tom Hughes
634565c5d3 Add support for logical deletion of diary entries and comments. 2009-11-14 15:57:08 +00:00
Tom Hughes
19e6486870 Quote the from address explicitly as rails seems to be failing to do 
it, though it looks like it should from a quick glance at the source.
 2009-11-06 16:03:19 +00:00
Tom Hughes
23b8672bc9 Add support for processing incoming mail messages in reply to message 
notifications and diary comment notifications, turning the maill messages
into reply messages through the site messaging system.
 2009-11-05 23:16:20 +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
1e3b3c1f10 Refactored user_role and controller. Now much more DRY. 2009-10-01 17:15:34 +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
95c3d640a4 Tried to DRY the user_blocks controller. Moved the configuration of the blocking periods into application.yml. 2009-09-30 15:44:29 +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
77ce1b2809 Ignore empty tags. Closes #2311. 2009-09-24 23:27:13 +00:00
Tom Hughes
63b399c9b2 Update to rails 2.3.4 for security fixes. 2009-09-04 08:45:38 +00:00
Tom Hughes
73340e1780 Add support for reloading the language table. 2009-09-03 21:55:42 +00:00
Tom Hughes
d227589a63 Merge oauth branch at r17138 to trunk. 2009-08-18 20:01:56 +00:00
Tom Hughes
0f6dda6050 Qualify SCALE properly - apparently object visibility when running the 
test suite is not the same as when running live... Rails FAIL!
 2009-08-16 10:36:16 +00:00
Matt Amos
d0e47d30e4 Fixes bug #2152 by preventing over-expansion of bboxes beyond the world range. 2009-08-16 00:19:18 +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
Matt Amos
bb84a78a09 Made XML parsing routines raise an exception if the document is valid XML, but not valid as an OSM document. This is now the same behaviour as when the document isn't valid XML. 2009-08-06 17:28:49 +00:00
Tom Hughes
cbbfdf3948 Merge 16743:16811 from trunk. 2009-08-03 23:50:47 +00:00