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

4276 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
2a635ab28f Start ROTS for user login tests as well as creation tests 2011-05-21 13:35:15 +01:00
Tom Hughes
3f81257fc5 If we start a ROTS instance then kill it when we're done 2011-05-21 12:35:48 +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
9cb8311f02 Merge branch 'openID' of git://git.openstreetmap.org/rails into openid 2011-05-21 12:11:40 +01:00
Mikel Maron
11b5fc0e95 Moved up search box to make it more visible 2011-05-21 11:00:53 +01:00
Tom Hughes
d9a8695fb1 Make sure unused layers are hidden 
When parsing an old style layer configuration string, make sure any
layer which isn't active is marked as invisible so that we don't
include it when generating permalinks. Fixes #3773.
 2011-05-21 10:44:52 +01:00
Tom Hughes
254fc8ebbc Add a C implementation of QuadTile.iterate_tiles_for_area 2011-05-18 00:39:04 +01:00
Tom Hughes
d49e3b0f09 Use a pessimistic version constraint for libxml 
It seems that rails doesn't handle gems wth multiple version
constraints right - it generates invalid install commands. So
we use a pessimistic constraint instead.
 2011-05-17 21:35:59 +01:00
Tom Hughes
e120e59fc0 Handle large bounding box changesets better 
If the bounding box of a changeset is much larger than the map then
there seem to be problems with OL not rendering the feature correctly
so reduce the highlight to just be the extent of the map plus a small
margin in that case.
 2011-05-13 17:27:12 +01:00
Tom Hughes
db9420ba57 Make "all traces" and "your traces" links more consistent 
Make sure we always show the "all traces" and "your traces" links
in the same place and that they don't accidentally inherit parameter
values that we don't really want.

Based on work by Andrzej Zaborowski <balrog@zabor.org>.
 2011-05-13 10:06:16 +01:00
Tom Hughes
2c92bf895f Don't allow libxml 2.0.0 and later to be used 2011-05-11 23:06:19 +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
7e5bbd72eb Fix a few minor issues in the print stylesheet 
Stop the mobile header appearing, and set the size of the attribution.
 2011-05-10 12:24:16 +01:00
Tom Hughes
b42a28067d Make sure the ruby quadtile code give the same result as the C version 2011-05-08 15:18:03 +01:00
Shaun McDonald
e759079423 Update the rss feed logo, to use the new logo. 2011-05-07 23:42:13 +01:00
Shaun McDonald
16592c59f9 Add the .DS_Store file to the gitignore (often added by default). 2011-05-07 23:41:27 +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
924d09229e Set a minimum height for the changeset list map 2011-05-06 16:47:43 +01:00
Siebrand Mazeland
cb24fccb8a Fix unclosed list. Spotted by Mormegil. 2011-05-06 17:08:24 +02:00
Siebrand Mazeland
7dc25a55a9 Localisation updates from http://translatewiki.net. 2011-05-05 23:22:14 +02:00
Tom Hughes
d4c8c3ad18 Use "Deleted at/by" instead of "Edited at/by" for deletes 2011-05-05 20:25:58 +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
Tom Hughes
79ad65895b Don't show the "Nodes" heading for a way with no nodes 2011-05-05 20:25:58 +01:00
Tom Hughes
4ad5d23282 Don't allow headings in the data browser to be split 2011-05-05 20:25:57 +01:00
Tom Hughes
bdee581d44 Improve highlighting of changesets in the changeset list 2011-05-05 20:25:57 +01:00
Tom Hughes
e098d52424 Rearrange changeset list page to put the map beside the list 2011-05-05 20:25:53 +01:00
Tom Hughes
1635c16560 Tidy up code for adding a map to the changeset list page 2011-05-02 15:30:10 +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
39f17cfbe1 Remove unused style rule 2011-05-01 22:53:47 +01:00
Matt Amos
3700b534e4 Change the test for whether the CTs have been seen to use the 
user preferences API call rather than user details, as that one
is no longer blocked.
 2011-05-01 02:34:38 +01:00
Tom Hughes
c738c964aa Removed duplicate require_terms_seen definition 2011-04-29 22:59:39 +01:00
Tom Hughes
17c603d345 Rename SVG version of logo to match PNG logo name 2011-04-29 21:28:48 +01:00
Steve Coast
cf8eb6ebe3 Update to softer logo 2011-04-29 21:26:04 +01:00
Tom Hughes
75d311c5a6 Add config file entry for memcache server list 2011-04-29 21:23:58 +01:00
Tom Hughes
de8e98ac64 Update Potlatch 2 to 2.0-16-g106bbd1 build 2011-04-28 23:05:11 +01:00
Siebrand Mazeland
0ca91134e8 Rename incorrectly named file. 2011-04-26 08:52:50 +02:00
Siebrand Mazeland
54c4e7939f Remove incorrect language file. 2011-04-26 08:50:23 +02:00
Tom Hughes
02e186ee5b Allow user details to be fetched without agreeing terms 2011-04-20 21:17:59 +01:00
Siebrand Mazeland
658762a603 Localisation updates from http://translatewiki.net. 2011-04-20 09:58:59 +02:00
Tom Hughes
7a8d021dc8 Add credit to Direction Générale des Impôts for French data 2011-04-19 00:29:17 +01: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
2f83a56d3c Update Potlatch 2 to 2.0-14-gc925264 build 2011-04-18 12:49:36 +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
2fd52ddf60 Add memcache support 2011-04-17 18:56:50 +01:00
Matt Amos
696fbb4e16 Renumbered sections to be more consistent with subsection numbering style 2011-04-13 13:17:21 +01:00