]> git.openstreetmap.org Git - rails.git/log
rails.git
16 years agoRevert to rails 2.0.1 again
Tom Hughes [Tue, 22 Jan 2008 18:00:30 +0000 (18:00 +0000)]
Revert to rails 2.0.1 again

16 years agoPut the daemons generator plugin back.
Tom Hughes [Tue, 22 Jan 2008 17:58:04 +0000 (17:58 +0000)]
Put the daemons generator plugin back.

16 years agoun-commented sqlsessionstore
Xin Zheng [Tue, 22 Jan 2008 17:23:25 +0000 (17:23 +0000)]
un-commented sqlsessionstore

16 years agoadded rspec on rails as external
Xin Zheng [Tue, 22 Jan 2008 17:22:49 +0000 (17:22 +0000)]
added rspec on rails as external

16 years agoRename requires.rb to composite_primary_keys.rb so we have one file for
Tom Hughes [Tue, 22 Jan 2008 17:16:08 +0000 (17:16 +0000)]
Rename requires.rb to composite_primary_keys.rb so we have one file for
each system we are initialising.

16 years agoremoved require ruby-debug line
Xin Zheng [Tue, 22 Jan 2008 16:56:13 +0000 (16:56 +0000)]
removed require ruby-debug line

16 years agoadded rspec folder/files
Xin Zheng [Tue, 22 Jan 2008 16:55:14 +0000 (16:55 +0000)]
added rspec folder/files

16 years agochanging back to rails 2.0.1
Xin Zheng [Tue, 22 Jan 2008 16:51:07 +0000 (16:51 +0000)]
changing back to rails 2.0.1

16 years agoextracted require statement from environment.rb to intializers/requires.rb
Xin Zheng [Tue, 22 Jan 2008 16:50:14 +0000 (16:50 +0000)]
extracted require statement from environment.rb to intializers/requires.rb

16 years agoreplace whichways with rails-friendly code
Steve Coast [Tue, 22 Jan 2008 16:44:17 +0000 (16:44 +0000)]
replace whichways with rails-friendly code

16 years agoadded RSpec and RSpec on Rails
Xin Zheng [Tue, 22 Jan 2008 16:39:09 +0000 (16:39 +0000)]
added RSpec and RSpec on Rails

16 years agomake amf_controller use rails objects, and stuff, in the getway method. You need...
Steve Coast [Tue, 22 Jan 2008 15:00:54 +0000 (15:00 +0000)]
make amf_controller use rails objects, and stuff, in the getway method. You need to install the multipart keys plugin now, see the README.

16 years agoonly show map to actual user
Steve Coast [Tue, 22 Jan 2008 12:16:08 +0000 (12:16 +0000)]
only show map to actual user

16 years agoretab amf controller, it was getting annoying
Steve Coast [Tue, 22 Jan 2008 12:10:17 +0000 (12:10 +0000)]
retab amf controller, it was getting annoying

16 years agodocument amf_controller types for SteveC
Richard Fairhurst [Tue, 22 Jan 2008 00:54:37 +0000 (00:54 +0000)]
document amf_controller types for SteveC

16 years agoadded mac os x instructions for db function creation
Xin Zheng [Mon, 21 Jan 2008 17:43:56 +0000 (17:43 +0000)]
added mac os x instructions for db function creation

16 years agoadd last-modified header to relation read
Steve Coast [Mon, 21 Jan 2008 17:42:57 +0000 (17:42 +0000)]
add last-modified header to relation read

16 years agoemit last-modified headers on nodes and ways
Steve Coast [Mon, 21 Jan 2008 17:41:57 +0000 (17:41 +0000)]
emit last-modified headers on nodes and ways

16 years agoShow nearby users map in account view page
Steve Coast [Mon, 21 Jan 2008 17:15:33 +0000 (17:15 +0000)]
Show nearby users map in account view page

16 years agocomments
Richard Fairhurst [Mon, 21 Jan 2008 16:07:39 +0000 (16:07 +0000)]
comments

16 years agoslight bugfixes and improved WinIE behaviour (?)
Richard Fairhurst [Mon, 21 Jan 2008 15:04:43 +0000 (15:04 +0000)]
slight bugfixes and improved WinIE behaviour (?)

16 years agoShow comment counts in diary entry lists.
Tom Hughes [Fri, 18 Jan 2008 18:26:19 +0000 (18:26 +0000)]
Show comment counts in diary entry lists.

16 years agoGet pagination links right.
Tom Hughes [Fri, 18 Jan 2008 18:22:47 +0000 (18:22 +0000)]
Get pagination links right.

16 years agoAdd pagination to diary entry lists.
Tom Hughes [Fri, 18 Jan 2008 18:20:15 +0000 (18:20 +0000)]
Add pagination to diary entry lists.

16 years agomaybe this will work
Richard Fairhurst [Fri, 18 Jan 2008 16:39:10 +0000 (16:39 +0000)]
maybe this will work

16 years agoSTUPID EVIL IE AAAAAARGH
Richard Fairhurst [Fri, 18 Jan 2008 16:35:50 +0000 (16:35 +0000)]
STUPID EVIL IE AAAAAARGH

16 years agoalways redraw window if redopropertywindow is set
Richard Fairhurst [Fri, 18 Jan 2008 12:22:13 +0000 (12:22 +0000)]
always redraw window if redopropertywindow is set

16 years agoInclude a comment link in the diary RSS feed.
Tom Hughes [Fri, 18 Jan 2008 10:43:21 +0000 (10:43 +0000)]
Include a comment link in the diary RSS feed.

16 years agoFix diary RSS feed.
Tom Hughes [Fri, 18 Jan 2008 00:57:48 +0000 (00:57 +0000)]
Fix diary RSS feed.

16 years agoAdd support for commenting on, and replying to, diary entries.
Tom Hughes [Thu, 17 Jan 2008 23:12:25 +0000 (23:12 +0000)]
Add support for commenting on, and replying to, diary entries.

16 years ago0.6c: bunch of minor improvements and bugfixes
Richard Fairhurst [Thu, 17 Jan 2008 22:28:21 +0000 (22:28 +0000)]
0.6c: bunch of minor improvements and bugfixes

16 years agoSet MIME type correctly for diary RSS feeds.
Tom Hughes [Wed, 16 Jan 2008 10:28:57 +0000 (10:28 +0000)]
Set MIME type correctly for diary RSS feeds.

16 years agoTidy up message sensitisation a bit more, and add sensitisation of
Tom Hughes [Wed, 16 Jan 2008 10:02:42 +0000 (10:02 +0000)]
Tidy up message sensitisation a bit more, and add sensitisation of
information in the diary RSS feeds.

16 years agoMake the message reply link prefill the title with "Re: original title".
Tom Hughes [Tue, 15 Jan 2008 19:05:17 +0000 (19:05 +0000)]
Make the message reply link prefill the title with "Re: original title".

Closes #634.

16 years agoAutomatically convert links in diary postings into HTML links.
Tom Hughes [Tue, 15 Jan 2008 18:31:23 +0000 (18:31 +0000)]
Automatically convert links in diary postings into HTML links.

16 years agoAdd a few more escape calls to prevent nasty HTML being rendered. Also
Tom Hughes [Tue, 15 Jan 2008 18:22:08 +0000 (18:22 +0000)]
Add a few more escape calls to prevent nasty HTML being rendered. Also
switch to using sanitize() instead of h() to escape message bodies. This
is not quite as safe as there is no guarantee that the HTML scanner it
uses will find everything, but is does allow benign HTML tags to be
displayed again.

16 years ago0.6b: cycle through ways on top of each other
Richard Fairhurst [Tue, 15 Jan 2008 10:29:14 +0000 (10:29 +0000)]
0.6b: cycle through ways on top of each other

16 years agoDon't try and limit the address space if the OS does not support it.
Tom Hughes [Tue, 15 Jan 2008 00:41:07 +0000 (00:41 +0000)]
Don't try and limit the address space if the OS does not support it.

16 years agoEscape message titles and bodies. This is an emergency fix as some genius
Tom Hughes [Tue, 15 Jan 2008 00:26:01 +0000 (00:26 +0000)]
Escape message titles and bodies. This is an emergency fix as some genius
has decided to report this XSS problem to a public mailing list. Unfortunately
it means that some functionality (links in messages etc) has been lost for now.

16 years agoPoint people at the wiki when GPX imports fail.
Tom Hughes [Thu, 10 Jan 2008 12:15:34 +0000 (12:15 +0000)]
Point people at the wiki when GPX imports fail.

16 years agoOverride options correctly.
Tom Hughes [Tue, 8 Jan 2008 23:13:02 +0000 (23:13 +0000)]
Override options correctly.

16 years agoBack out attempt to commit partial support for POIs as this is not at
Tom Hughes [Tue, 8 Jan 2008 18:23:56 +0000 (18:23 +0000)]
Back out attempt to commit partial support for POIs as this is not at
all ready for prime time yet.

16 years agobegan callback code for feature lookup
Nick Whitelegg [Mon, 7 Jan 2008 20:45:56 +0000 (20:45 +0000)]
began callback code for feature lookup

16 years agobegan callback code for feature lookup
Nick Whitelegg [Mon, 7 Jan 2008 20:44:16 +0000 (20:44 +0000)]
began callback code for feature lookup

16 years agochecked in local db config unintentioally- reversed
Nick Whitelegg [Mon, 7 Jan 2008 20:26:40 +0000 (20:26 +0000)]
checked in local db config unintentioally- reversed

16 years agoBegan code for feature lookup: implemented code to respond to mouse click and latlon...
Nick Whitelegg [Mon, 7 Jan 2008 20:25:12 +0000 (20:25 +0000)]
Began code for feature lookup: implemented code to respond to mouse click and latlon to non spherical Mercator (for the postgis database)

16 years agoStop trying to report on the number of ways with tags because (a) almost all
Tom Hughes [Mon, 7 Jan 2008 00:33:54 +0000 (00:33 +0000)]
Stop trying to report on the number of ways with tags because (a) almost all
ways have tags so it isn't very interesting and (b) it locks up the API every
night as it involved a join to a MyISAM table.

16 years agoAdd migration to add an index on node_id to way_nodes. This index was added
Tom Hughes [Mon, 7 Jan 2008 00:30:44 +0000 (00:30 +0000)]
Add migration to add an index on node_id to way_nodes. This index was added
to the live database a month or so back to support rollback in Potlatch.

16 years agoMark mails as auto submitted. Closes #627.
Tom Hughes [Sun, 6 Jan 2008 13:21:50 +0000 (13:21 +0000)]
Mark mails as auto submitted. Closes #627.

16 years agoFix typo. Closes #628.
Tom Hughes [Sun, 6 Jan 2008 13:14:44 +0000 (13:14 +0000)]
Fix typo. Closes #628.

16 years agoMigrate web site to use rails 2.0.1.
Tom Hughes [Sun, 6 Jan 2008 12:17:58 +0000 (12:17 +0000)]
Migrate web site to use rails 2.0.1.

16 years agoUpdate GPX daemon control script to match current template from the
Tom Hughes [Sat, 5 Jan 2008 16:16:36 +0000 (16:16 +0000)]
Update GPX daemon control script to match current template from the
daemons plugin.

16 years agoFix picture generation to avoid truncating the sides of the image for
Tom Hughes [Sat, 5 Jan 2008 15:23:04 +0000 (15:23 +0000)]
Fix picture generation to avoid truncating the sides of the image for
a trace that is wider than it is tall.

16 years agoPotlatch 0.6a: small bugfixes, read GPX waypoints
Richard Fairhurst [Fri, 4 Jan 2008 00:26:46 +0000 (00:26 +0000)]
Potlatch 0.6a: small bugfixes, read GPX waypoints

16 years agoUpdate the links when the active layers change.
Tom Hughes [Wed, 2 Jan 2008 09:54:19 +0000 (09:54 +0000)]
Update the links when the active layers change.

Closes #622.

16 years agoMake the Maplint layer off by default.
Tom Hughes [Mon, 31 Dec 2007 11:33:21 +0000 (11:33 +0000)]
Make the Maplint layer off by default.

16 years agoDon't set the layers argument if the caller didn't specify it.
Tom Hughes [Mon, 31 Dec 2007 10:13:36 +0000 (10:13 +0000)]
Don't set the layers argument if the caller didn't specify it.

16 years agoAdd a maplint layer to the map. Note that the t@h server currently serves
Tom Hughes [Mon, 31 Dec 2007 09:08:30 +0000 (09:08 +0000)]
Add a maplint layer to the map. Note that the t@h server currently serves
solid grey tiles for tiles which are not in the database which limits the
utility of this.

Closes #484.

16 years agoAdd a Maplint layer (OpenLayers.Layer.OSM.Maplint) class. Note that the
Tom Hughes [Mon, 31 Dec 2007 09:06:22 +0000 (09:06 +0000)]
Add a Maplint layer (OpenLayers.Layer.OSM.Maplint) class. Note that the
t@h server currently serves solid grey tiles for tiles which are not in
the database which limits the utility of this.

Closes #612.

16 years agoDon't show the marker layer in the layer switcher.
Tom Hughes [Sun, 30 Dec 2007 17:27:47 +0000 (17:27 +0000)]
Don't show the marker layer in the layer switcher.

16 years agozoom level for Yahoo
Richard Fairhurst [Mon, 24 Dec 2007 21:32:55 +0000 (21:32 +0000)]
zoom level for Yahoo

16 years agodon't ignore outdated baselayer values; fix maximum zoom
Richard Fairhurst [Mon, 24 Dec 2007 21:18:59 +0000 (21:18 +0000)]
don't ignore outdated baselayer values; fix maximum zoom

16 years agoPotlatch 0.6: autocomplete keys/values
Richard Fairhurst [Sun, 23 Dec 2007 13:41:26 +0000 (13:41 +0000)]
Potlatch 0.6: autocomplete keys/values

16 years agoautocomplete (not compiled for now) and start of tile support
Richard Fairhurst [Sun, 23 Dec 2007 12:59:59 +0000 (12:59 +0000)]
autocomplete (not compiled for now) and start of tile support

16 years agoBan (for now at least) searching of nodes, and searching for a key
Tom Hughes [Sat, 22 Dec 2007 11:55:15 +0000 (11:55 +0000)]
Ban (for now at least) searching of nodes, and searching for a key
without giving a value as both of these will lock the server up for
a long time.

16 years agoThird time lucky - what it really wants is a hash of node IDs...
Tom Hughes [Thu, 20 Dec 2007 10:33:25 +0000 (10:33 +0000)]
Third time lucky - what it really wants is a hash of node IDs...

16 years agoThe to_xml_node method for a way wants a list of node IDs, not a list
Tom Hughes [Thu, 20 Dec 2007 10:23:46 +0000 (10:23 +0000)]
The to_xml_node method for a way wants a list of node IDs, not a list
of nodes...

16 years agoPass the node list to to_xml_node when outputting a way so that it
Tom Hughes [Thu, 20 Dec 2007 10:21:22 +0000 (10:21 +0000)]
Pass the node list to to_xml_node when outputting a way so that it
lists the nodes in the way properly.

16 years agoOptimise tag searching of ways and relations a bit more...
Tom Hughes [Thu, 20 Dec 2007 10:15:45 +0000 (10:15 +0000)]
Optimise tag searching of ways and relations a bit more...

16 years agoOptimise search queries for ways and relations to stand some chance
Tom Hughes [Thu, 20 Dec 2007 09:50:08 +0000 (09:50 +0000)]
Optimise search queries for ways and relations to stand some chance
of being efficient.

16 years agoattempt fix for anon users
Richard Fairhurst [Wed, 12 Dec 2007 20:17:12 +0000 (20:17 +0000)]
attempt fix for anon users

16 years agoenable revert
Richard Fairhurst [Sun, 9 Dec 2007 15:20:47 +0000 (15:20 +0000)]
enable revert

16 years agofix POI moving bug
Richard Fairhurst [Fri, 7 Dec 2007 17:30:20 +0000 (17:30 +0000)]
fix POI moving bug

16 years agoSet extent information for the marker layer.
Tom Hughes [Fri, 7 Dec 2007 00:15:21 +0000 (00:15 +0000)]
Set extent information for the marker layer.

16 years agoChange postcode searches to use z15 instead of z12.
Tom Hughes [Fri, 7 Dec 2007 00:12:49 +0000 (00:12 +0000)]
Change postcode searches to use z15 instead of z12.

16 years agoMake sure we load OpenLayers resources from the right place.
Tom Hughes [Thu, 6 Dec 2007 18:59:36 +0000 (18:59 +0000)]
Make sure we load OpenLayers resources from the right place.

16 years agoTry and make asset tagging actually work.
Tom Hughes [Thu, 6 Dec 2007 18:42:45 +0000 (18:42 +0000)]
Try and make asset tagging actually work.

16 years agoMove scale/resolution configuration to the base layers so that
Tom Hughes [Thu, 6 Dec 2007 14:18:30 +0000 (14:18 +0000)]
Move scale/resolution configuration to the base layers so that
people dragging in our customer layers don't need to worry about
setting the magic numbers.

16 years agoSet the number of zoom levels for the marker layer based on the
Tom Hughes [Thu, 6 Dec 2007 13:46:56 +0000 (13:46 +0000)]
Set the number of zoom levels for the marker layer based on the
maximum number of zoom levels of any of the base layers.

16 years agoUse the z13 key for z13 and over.
Tom Hughes [Wed, 5 Dec 2007 12:15:41 +0000 (12:15 +0000)]
Use the z13 key for z13 and over.

16 years agoSet number of zoom levels on a per layer basis. Closes #603.
Tom Hughes [Tue, 4 Dec 2007 00:42:08 +0000 (00:42 +0000)]
Set number of zoom levels on a per layer basis. Closes #603.

16 years agoDROP TEMPORARY TABLE so Tom can turn the privs down
Richard Fairhurst [Mon, 3 Dec 2007 17:15:07 +0000 (17:15 +0000)]
DROP TEMPORARY TABLE so Tom can turn the privs down

16 years agomove preset tags and colours into config files
Richard Fairhurst [Sat, 1 Dec 2007 10:32:35 +0000 (10:32 +0000)]
move preset tags and colours into config files

16 years agoReenable trace uploads.
Tom Hughes [Sat, 1 Dec 2007 00:34:55 +0000 (00:34 +0000)]
Reenable trace uploads.

16 years agofurther refinement to revert
Richard Fairhurst [Fri, 30 Nov 2007 20:52:38 +0000 (20:52 +0000)]
further refinement to revert

16 years agoDisable GPX uploads.
Tom Hughes [Fri, 30 Nov 2007 18:49:55 +0000 (18:49 +0000)]
Disable GPX uploads.

16 years agoslight revert changes
Richard Fairhurst [Fri, 30 Nov 2007 18:40:57 +0000 (18:40 +0000)]
slight revert changes

16 years agoRemove executable flag from Potlatch presets file.
Tom Hughes [Fri, 30 Nov 2007 18:22:36 +0000 (18:22 +0000)]
Remove executable flag from Potlatch presets file.

16 years agonew key for z13. revised keys to z8, z10, z11, z12
Steve Chilton [Fri, 30 Nov 2007 13:00:31 +0000 (13:00 +0000)]
new key for z13. revised keys to z8, z10, z11, z12

16 years agoSpecify display_name and tag explicitly when generating pagination links
Tom Hughes [Fri, 30 Nov 2007 01:27:14 +0000 (01:27 +0000)]
Specify display_name and tag explicitly when generating pagination links
as they don't always seem to be default correctly. Closes #561.

16 years agoHide the OpenLayers attribution control when printing - we print an
Tom Hughes [Wed, 28 Nov 2007 23:59:39 +0000 (23:59 +0000)]
Hide the OpenLayers attribution control when printing - we print an
attribution under the map anyway. Also add a border round the map when
printing.

16 years agoshow nearest 10 users (request by Blackadder)
Richard Fairhurst [Wed, 28 Nov 2007 22:07:24 +0000 (22:07 +0000)]
show nearest 10 users (request by Blackadder)

16 years agoMake attribution less cheesy.
Tom Hughes [Wed, 28 Nov 2007 19:25:46 +0000 (19:25 +0000)]
Make attribution less cheesy.

16 years agoUse the new OSM OpenLayers stuff.
Tom Hughes [Wed, 28 Nov 2007 19:24:58 +0000 (19:24 +0000)]
Use the new OSM OpenLayers stuff.

16 years agoAdd a javascript file to provide OSM layers for OpenStreetMap.
Tom Hughes [Wed, 28 Nov 2007 18:59:05 +0000 (18:59 +0000)]
Add a javascript file to provide OSM layers for OpenStreetMap.

16 years agoClear gotele and gotdate when we see the start of a trkpt element to
Tom Hughes [Mon, 26 Nov 2007 16:28:28 +0000 (16:28 +0000)]
Clear gotele and gotdate when we see the start of a trkpt element to
avoid inheriting previous data.

16 years agobugfix for non-intersecting intersections (trac #592)
Richard Fairhurst [Mon, 26 Nov 2007 14:29:31 +0000 (14:29 +0000)]
bugfix for non-intersecting intersections (trac #592)

16 years agoForce new users to enter their email address twice to try and avoid so
Tom Hughes [Sun, 25 Nov 2007 12:38:48 +0000 (12:38 +0000)]
Force new users to enter their email address twice to try and avoid so
many incorrect email addresses with typos in...

16 years agoWhen asked for ways which use a node, or relations which use some given
Tom Hughes [Sat, 24 Nov 2007 14:47:50 +0000 (14:47 +0000)]
When asked for ways which use a node, or relations which use some given
object, return 200 OK with an empty document if not matches are found
rather than 400 Bad Request (for ways) or 404 Not Found (for relations).

16 years agoWork round ruby's horribly broken URI.escape that deliberately doesn't
Tom Hughes [Sat, 24 Nov 2007 14:36:21 +0000 (14:36 +0000)]
Work round ruby's horribly broken URI.escape that deliberately doesn't
escape most characters which have special meaning in URIs...