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

2067 commits

Author SHA1 Message Date
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
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
2a635ab28f Start ROTS for user login tests as well as creation tests 2011-05-21 13:35:15 +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
f4928d0e95 Rename a number of methods in the map_bugs controller 2011-05-18 00:36:02 +01:00
Tom Hughes
c7bb260b4c User an RJS template for the javascript response 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
ff9fb4f9c2 Make the edit action default to z17 
If an attempt is made to invoke an editor without specifying a zoom
level (as with the GPX edit links) then default to z17 instead of z14
to avoid trying to load too much data. Fixes #3728.
 2011-05-18 00:35:59 +01:00
Tom Hughes
22bef89d1a Use quad tiling to select bugs in an area 
Remove the _no_quadtile versiond of the selection routines and switch
to using the ordinary ones but with a (large) limit applied on the size
of the area to prevent us spending ages working out the list of tiles
to be selected.
 2011-05-18 00:35:56 +01:00
Tom Hughes
cbcbd7a4a4 Don't add a geographic condition when fetching an RSS feed with no bbox 2011-05-08 10:50:25 +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
6aec21b5b8 Merge the gpx_bugs action into the main get_bugs action 2011-05-07 17:30:53 +01:00
Tom Hughes
cc311ff301 Get returning of bugs as GPX files working 2011-05-07 14:54:22 +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
42e72d5591 Make the edit action default to z17 
If an attempt is made to invoke an editor without specifying a zoom
level (as with the GPX edit links) then default to z17 instead of z14
to avoid trying to load too much data. Fixes #3728.
 2011-05-07 00:05:49 +01:00
Tom Hughes
e7cd90f4b4 Merge branch 'master' into openstreetbugs 2011-05-06 22:56:47 +01:00
Mikel Maron
48929e8781 Add a map to the changeset list page 
Add a map to the changeset list page, with a bounding box for each
changeset and highighting when the mouse is placed over either a box
on the map or a row of the table.
 2011-05-01 22:55:28 +01:00
Tom Hughes
0a3087cd7d Merge remote-tracking branch 'apmon/openstreetbugs2' into openstreetbugs 2011-04-29 17:06:10 +01:00
Tom Hughes
af68e07272 Merge branch 'master' into openstreetbugs 2011-04-29 17:05:59 +01:00
Kai Krueger
b3d62bb85a Send notification emails when someone comments on a map bug report 2011-04-27 12:01:52 -06:00
Tom Hughes
02e186ee5b Allow user details to be fetched without agreeing terms 2011-04-20 21:17:59 +01:00
Kai Krueger
3d3f3982a0 users.visible has changed to users.status 2011-04-19 23:59:50 -06:00
Kai Krueger
001ff5764b Merge branch 'master' into openstreetbugs2 2011-04-19 22:00:30 -06:00
Tom Hughes
37b6418f72 Revert "Allow user details to be fetched without agreeing terms" 
This reverts commit ddd12b03e1.
 2011-04-18 23:04:42 +01:00
Tom Hughes
ddd12b03e1 Allow user details to be fetched without agreeing terms 2011-04-18 22:23:48 +01:00
Tom Hughes
6f7eb8f0e8 Don't require terms to be agreed when logging out 2011-04-18 09:04:57 +01:00
Matt Amos
c21aa5933a Added flash notice for CTs decline 
Also ensured that CTs are either accepted or declined and cannot
be inadvertently bypassed.
 2011-04-18 00:29:15 +01:00
Tom Hughes
2ba5067fcf Use report_error so Potlatch can see the errors 2011-04-17 21:45:04 +01:00
Tom Hughes
8024a38be4 Make sure "please read the terms" error is issued in the right language 2011-04-17 20:33:49 +01:00
Tom Hughes
b77c6fe8ae Improve recognition of OAuth referers for triggering of slim mode 2011-04-06 13:24:08 +01:00
Tom Hughes
685a35524a Try and patch up poor browser language selections 
The HTTP RFC says that a language range specified by a browser only
matches a resource whose language tag is the same, or longer. This
means that a browser language range of de-DE will not match a resource
with a language tag of de.

Because of this browsers should always send the generic range, such
as de, as a secondary choice after a more specific range like de-DE.

Some browers don't this however, so if we don't get a language match
we try and patch up the list of language ranges by inserting the
more generic ranges.
 2011-04-04 22:44:43 +01:00
Tom Hughes
4b20afd51e Preserve the referer at the end of account creation 2011-04-03 13:46:18 +01:00
Tom Hughes
097fb390b8 Only show login/signup in slim mode when used from oauth 2011-04-03 13:46:18 +01:00
Andy Allan
6edbcc12df Use slim layout for OAuth pages too 2011-04-03 13:46:17 +01:00
Andy Allan
7b57119146 Another approach, but this time without scattering stuff all over the methods 2011-04-03 13:46:17 +01:00
Andy Allan
0531a7dfa1 Ah, that doesn't work due to 'bugs' in the way layouts work - only the last command has any effect 2011-04-03 13:46:17 +01:00
Andy Allan
5531c0bf34 Use the slim layout on the login page 2011-04-03 13:46:16 +01:00
Tom Hughes
0169453855 Make sure the user is redirect correctly after seeing the terms 2011-04-03 13:46:16 +01:00
Tom Hughes
392aa71015 Tidy up a few things 2011-04-03 13:46:16 +01:00
Matt Amos
8b12abd5bb Phase 2 CTs implementation and tests, with config parameter 2011-04-03 13:46:16 +01:00
Matt Amos
f3ff36418b Fixed bug in changeset queries 
The 'or' condition needed to be bracketed within larger 'and' expression.
 2011-03-15 13:56:55 +00: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
Tom Hughes
f20a85a5c5 Allow the client to request errors as an XML document 2010-12-15 23:58:59 +00:00
Tom Hughes
3472c1d429 Channel all error reporting through report_error 2010-12-12 16:25:01 +00:00
Tom Hughes
7369b7427c Remove bogus trailing slash from GPX namespace URL 2010-12-02 19:23:38 +00:00
Tom Hughes
aa4a8fdc81 Replace JOSM editing option with generic Remote Control option 2010-12-01 09:25:27 +00:00
Tom Hughes
409576eea0 Make launching of Potlatch 2 from the GPS trace list work 2010-11-30 17:11:49 +00:00
Tom Hughes
9c2de4039c Add an explicit "default editor" option to the user settings 2010-11-29 12:20:23 +00:00