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

961 commits

Author SHA1 Message Date
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
d5295fb485 Return GeoJSON for notes when JSON format is requested 2011-09-18 18:54:39 +01:00
Tom Hughes
3a654c8919 Merge branch 'master' into openstreetbugs 2011-09-18 14:26:59 +01: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
Tom Hughes
72e33046c8 Merge branch 'master' into openstreetbugs 
Conflicts:
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb
 2011-08-13 11:48:04 +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
7c98b41cc8 Merge branch 'master' into openstreetbugs 2011-06-22 22:36:43 +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
8382181635 Tidy up the note controller 
Go through most of the note controller, tidying things up, fixing
a few bugs, and making sure we have tests for everything.
 2011-05-22 17:02:48 +01:00
Tom Hughes
ab2acea49b Tidy up the note_comment model a bit 2011-05-22 11:49:48 +01:00
Tom Hughes
33c0f15990 Tidy up the note model a bit 2011-05-22 11:33:49 +01:00
Tom Hughes
e3b8b89330 Mass rename of "bugs" as "notes" for increased user friendliness 2011-05-21 17:22:31 +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
6cb69b5e4b Simplify URL scheme name matching in OAuth callback URLs a little 2011-05-18 00:36:02 +01:00
Mendhak
03eb6ce048 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-18 00:36:01 +01:00
Tom Hughes
f77a3c75be Add methods to get a bug's author details from the first comment 2011-05-18 00:36:01 +01:00
Tom Hughes
882700c5c8 Rename some columns and indexes in the bug tables 2011-05-18 00:36:00 +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
8852454795 Rename association between map_bugs and map_bug_comment to comments 2011-05-08 00:22:32 +01:00
Tom Hughes
63e9c4771a Always get the bug commenter name from the user if there is one 2011-05-07 17:47:05 +01:00
Tom Hughes
4b0191befd Detabify and tidy up some more of the bugs code 2011-05-07 13:18:42 +01:00
Tom Hughes
e7cd90f4b4 Merge branch 'master' into openstreetbugs 2011-05-06 22:56:47 +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
Kai Krueger
b3d62bb85a Send notification emails when someone comments on a map bug report 2011-04-27 12:01:52 -06:00
Kai Krueger
001ff5764b Merge branch 'master' into openstreetbugs2 2011-04-19 22:00:30 -06: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
a1cb0f04d4 Merge branch 'master' into openstreetbugs 
Conflicts:
	app/views/site/index.html.erb
 2010-10-17 11:02:11 +01: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
6fb8570200 Merge branch 'master' into openstreetbugs 
Conflicts:
	config/environment.rb
	config/routes.rb
 2010-09-06 12:51:50 +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