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

633 commits

Author SHA1 Message Date
Tom Hughes
654d22ed2e Return the body of a note comment as a rich text object 2012-10-15 22:34:55 +01:00
Tom Hughes
92ce228cbe Get note comment notification working again 2012-10-14 16:01:34 +01:00
Tom Hughes
0037502426 Merge branch 'master' into notes 
Conflicts:
	Gemfile.lock
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb
 2012-10-13 15:55:34 +01:00
Paweł Paprota
67a03d44a1 Display a diary entry count on the user page 2012-10-07 16:17:01 +01:00
Matt Amos
8523f53099 Added a test for trac ticket 4471, and fixed the issue. 2012-09-21 09:07:21 +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 MacWright
221ca3c1fa Improve user page navigation menu 
Add counts to edits, blocks, and traces; don't show blocks if there
are none; and move OAuth to the settings page.
 2012-08-10 08:26:48 +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
Andy Allan
2c67c079ac Don't show coordinates for deleted nodes 2012-07-11 14:42:01 +01:00
Tom Hughes
53fe84fbef Delete tokens for an application when the application is deleted 2012-04-23 21:30:41 +01:00
Matt Amos
c8971a545c Removed user checks from to_xml_node, as these should already be 
handled at the controller level.
 2012-04-05 13:53:48 +01:00
Matt Amos
59280377bf Fixed redaction attribute on old nodes and ways, added same 
functionality to relations.
 2012-04-05 13:53:44 +01:00
Matt Amos
0330e10943 Set defaults properly on redaction model, and remove unnecessary 
guards around update.
 2012-04-05 13:53:32 +01:00
Matt Amos
eca8f6e849 Used unredacted scope rather than explicit SQL 2012-04-05 13:52:04 +01:00
Matt Amos
851de28303 Added redactions resource 2012-04-05 13:50:15 +01:00
Matt Amos
7c2ca3efb1 Fixed AMF controller methods to hide redacted nodes 2012-04-05 13:50:11 +01:00
Matt Amos
8bfb5cae8a Added relation redaction logic, same as node and way logic, plus tests 2012-04-05 13:49:46 +01:00
Matt Amos
990f3eba40 Altered old_way stuff to be Railsy like old_node is now 2012-04-05 13:49:43 +01:00
Kai Krueger
72e59b49fa Copy the redaction code from nodes to ways 2012-04-05 13:49:39 +01:00
Kai Krueger
7d41b926cf Expose redactions through the node history API calls 
Add the show_redactions=true parameter to the old_node_controller
and add a redacted attribute in node XML output.
 2012-04-05 13:48:36 +01:00
Matt Amos
67182f824e Fixing review comments 
Added scoping for unredacted items, cleaned up authorization and
railsified old_node_controller.
 2012-04-05 13:46:40 +01:00
Matt Amos
67dd9e4c9d Adding first cut of Redactions support 
Redactions support hiding historical versions of elements and
collecting meta-data about that action together.
 2012-04-05 13:46:36 +01:00
Tom Hughes
f3c9f4edb4 Adjust spam scoring to try and reduce false positives 2012-03-20 13:28:57 +00:00
Tom Hughes
7be823bb11 Treat messages received by email as plain text 
Move creation of a message from an email into the message model and
adjust the logic to treat messages received by email as plain text.
 2012-03-17 16:37:00 +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
6aca6cfabf Merge branch 'master' into openstreetbugs 
Conflicts:
	config/routes.rb
	db/structure.sql
 2012-03-10 15:30:25 +00:00
Tom Hughes
917d7324a6 Avoid mass assignment error in spam observer 2012-03-10 14:42:09 +00:00
Tom Hughes
b471d757ca Removed expiry code for bogus trace URLs that no longer exist 2012-03-10 13:05: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
6f88f4d03f Fix mass assignment issues 2012-03-09 00:34:16 +00:00
Tom Hughes
67017dbca4 User errors.add(:base) instead of the removed errors.add_to_base() 2012-03-09 00:32:57 +00:00
Tom Hughes
2e1d9f3348 Make setting of a default status for new notes work 2012-03-09 00:31:53 +00:00
Tom Hughes
e660e60966 Merge branch 'master' into openstreetbugs 
Conflicts:
	Gemfile
	Gemfile.lock
	lib/migrate.rb
 2012-03-08 18:23:27 +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
5564bcabbf Detect changes to the user image correctly 2012-03-03 00:11:42 +00:00
Tom Hughes
f2150a94cf Serve up paperclip attachments in a cache friendly way 2012-02-21 12:31:38 +00:00
Tom Hughes
92feab9112 Make sure we don't inherit old tags when parsing XML for objects 2012-02-15 17:48:17 +00:00
Tom Hughes
5a8c4faf3e Replace deprecated methods with modern equivalents 2012-02-15 17:48:17 +00:00
Tom Hughes
9930b03388 Remove remnants of old lower case relation member types 2012-02-15 17:48:16 +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
5e9414365c Make ACLs match when the address is equal 2012-02-12 14:53:07 +00:00
Tom Hughes
a16b45eb6a Add convenience methods to make ACL use simpler 2012-02-08 22:38:02 +00:00