Commit graph

3796 commits

Author SHA1 Message Date
Tom Hughes
652dbf5044 Merge branch 'master' into openid
Conflicts:
	config/locales/en.yml
2011-05-31 19:10:31 +01:00
Tom Hughes
bf8bbdc220 Update rails translations 2011-05-31 18:11:31 +01:00
Tom Hughes
beeb77721f Update to Rails 2.3.11
Update the site to use Rails 2.3.11 which also required switching to
the new syntax for interpolated variables in translation strings.
2011-05-31 18:11:31 +01:00
Siebrand Mazeland
f106c93357 Localisation updates from http://translatewiki.net. 2011-05-31 19:04:05 +02:00
Tom Hughes
8d38da6b77 Improve the look of the OpenID enabled login form on mobile devices 2011-05-29 10:17:30 +01:00
Tom Hughes
26b42dbe97 Replace MySpace with AOL in the OpenID login buttons 2011-05-28 00:17:52 +01:00
Tom Hughes
f539c79a56 Make titles on OpenID icons a bit more friendly 2011-05-27 20:41:37 +01:00
Tom Hughes
5cc9e4ed8e Update Potlatch 2 to 2.1-21-g5f128f5 build 2011-05-27 18:56:14 +01:00
Tom Hughes
a37e1b8f70 Merge branch 'master' into openid
Conflicts:
	app/views/user/login.html.erb
2011-05-22 18:01:15 +01:00
Grant Slater
8faad225f0 Update OSM logos to perspective tweaked version 2011-05-22 17:50:29 +01:00
Tom Hughes
c41d0c277e Update Potlatch 2 to 2.1-12-g870b72b build 2011-05-22 17:49:33 +01:00
Tom Hughes
023050840a Improve presentation of supporting links on the terms page 2011-05-22 17:48:16 +01:00
Grant Slater
c7ffb35e8b Correct some minor html validation errors 2011-05-22 16:16:44 +01:00
Grant Slater
20cab5b9bf Add summary + informal translations links to terms page 2011-05-22 15:10:30 +01:00
Tom Hughes
7014cdb32c Only add bbox data to the search form while we submit it
Having the bbox attributes on the search form all the time means
that Firefox will incude them in the arguments if you bookmark the
search using "Add a keyword for this search" on the context menu.
2011-05-22 11:10:28 +01:00
Matt Amos
9105a7e66d Updated to libxml-ruby 2.0.5 and fixed code accordingly.
I've tested this through the unit tests and by hitting it with
bulk_upload.py and neither fail or cause the server to crash or
go into an infinite loop. Both of these things happened randomly
with 1.1.3/4 due to an apparent early deregistration of the
expanded nodes.
2011-05-21 17:36:58 +01:00
Tom Hughes
ddc9446ed8 Update Potlatch 2 to 2.1 build 2011-05-21 17:25:36 +01:00
Tom Hughes
d768ef31c9 Improve layout of OpenID buttons 2011-05-21 14:54:15 +01:00
Tom Hughes
cf82ca0b40 Give OpenID logo images a transparent background 2011-05-21 14:47:54 +01:00
Tom Hughes
4e38994d1b Cleanup merge breakage 2011-05-21 14:05:55 +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
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