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

608 commits

Author SHA1 Message Date
Tom Hughes
f03c8637f7 Extract common code for parsing floats 2013-06-24 22:44:17 +01:00
Ian Dees
9d2fed811f Guard against non-numeric lat and lons in nodes and notes 2013-06-24 22:34:09 +01:00
Tom Hughes
d74d4f8d19 Add a reopen API call for notes 2013-06-10 18:52:50 +01:00
Tom Hughes
bd3a7e5f57 Pass the correct locale to Nominatim.describe_location 2013-05-27 18:06:12 +01:00
Tom Hughes
f78c703708 Simplify locale handing in notification emails 2013-05-27 10:53:14 +01:00
Tom Hughes
ea5a19eb4e Use correct locale for note comment notification emails 2013-05-27 10:35:05 +01:00
Tom Hughes
b3e540a6b6 Improve tests for trace RSS feeds 2013-05-10 22:48:26 +01:00
Tom Hughes
9f5787fd20 Make the notification mails for notes show when a note is resolved 2013-04-29 19:26:03 +01:00
Tom Hughes
e932418998 Remove the flatten_comment methd from the Note model 2013-04-26 19:35:20 +01:00
Tom Hughes
97e0d5ad1f Add a new write_notes permission needed for OAuth access to notes 2013-03-28 18:50:18 +00:00
Tom Hughes
898cc828dd Merge branch 'master' into notes 
Conflicts:
	Gemfile.lock
 2013-03-28 00:36:07 +00:00
Tom Hughes
78e8828741 Use changeset and user caches in Changeset#download 2013-03-24 09:52:03 +00:00
Tom Hughes
abd29001a3 Reimplement User#is_friends_with? in a non-insane way 2013-03-24 09:52:03 +00:00
Tom Hughes
3a06235b02 Preload sender/recipient details for messages 2013-03-24 09:52:03 +00:00
Tom Hughes
ae27f7adbe Make the API reject changes to closed notes 2013-02-05 18:08:42 +00:00
Tom Hughes
c12fe5f6e8 Remove redundant return 2013-02-05 17:42:08 +00:00
Tom Hughes
43f39c50a3 Touch notes when new comments are added 2013-02-03 11:06:34 +00:00
Tom Hughes
ba5107ebb5 Remove the author_name field from notes 2012-12-03 14:50:54 +00:00
Tom Hughes
5fe5777a58 Move caching of reverse geocodes to describe_location 2012-12-01 18:18:10 +00:00
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
Tom Hughes
6211895f6e Allow mass assignment of user preference keys and values 2012-11-04 14:41:08 +00:00
Kai Krueger
104727f889 Trust Google and Yahoo to return valid email addresses 
Both Google and Yahoo guarantee that the email address they return
during the OpenID authentication are emails that they have already
verified:

  http://stackoverflow.com/q/5639419

Therefore special case these OpenID providers and automatically
activate the new users account without requiring a separate email
verification step.

This therefore reduces the signup procedure by one step and makes
it easier for new users of these OpenID providers, which cover the
majority of users.
 2012-10-30 19:14:45 +00:00
John Firebaugh
31dae1bac1 Avoid unnecessary array allocations 2012-10-22 08:45:31 +01:00
Paweł Paprota
ad43499205 Implemented Gravatar support 2012-10-18 18:59:38 +01:00
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