rails.git
12 years agoMagic foo to make composite_primary_keys work.
Tom Hughes [Fri, 6 Jun 2008 23:53:20 +0000 (23:53 +0000)]
Magic foo to make composite_primary_keys work.

12 years agoGo back to rails 2.0.2 for now as 2.1.0 doesn't quite work...
Tom Hughes [Fri, 6 Jun 2008 23:32:21 +0000 (23:32 +0000)]
Go back to rails 2.0.2 for now as 2.1.0 doesn't quite work...

12 years agoSwitch to rails 2.1.0 release.
Tom Hughes [Fri, 6 Jun 2008 23:17:56 +0000 (23:17 +0000)]
Switch to rails 2.1.0 release.

12 years agoDon't use comma to separate values in the location cookie, as rails 2.0.2 will
Tom Hughes [Thu, 5 Jun 2008 23:27:52 +0000 (23:27 +0000)]
Don't use comma to separate values in the location cookie, as rails 2.0.2 will
treat comma (as well as semicolon) as a cookie separate. Also change the name
of the location cookie to avoid problems parsing old ones.

12 years agoSwitch to rails 2.0.2 as Debian/Ubuntu is able to handle it now.
Tom Hughes [Thu, 5 Jun 2008 23:06:29 +0000 (23:06 +0000)]
Switch to rails 2.0.2 as Debian/Ubuntu is able to handle it now.

12 years agoMake sure the diary tab always links to the global diary rather than
Tom Hughes [Thu, 5 Jun 2008 21:20:30 +0000 (21:20 +0000)]
Make sure the diary tab always links to the global diary rather than
a specific user's diary. Closes #956.

12 years agoCope with not having a layer configuration at all.
Tom Hughes [Tue, 3 Jun 2008 15:12:46 +0000 (15:12 +0000)]
Cope with not having a layer configuration at all.

12 years agoDon't try and parse an empty string as a layer config, and cope a bit
Tom Hughes [Mon, 2 Jun 2008 12:45:24 +0000 (12:45 +0000)]
Don't try and parse an empty string as a layer config, and cope a bit
better if we do hit the end of the string. Closes #942.

12 years agoRequire a form post to finally confirm an account to stop
Tom Hughes [Thu, 29 May 2008 20:43:58 +0000 (20:43 +0000)]
Require a form post to finally confirm an account to stop
accidental confirmations.

12 years agofix node relations bug (thanks Dave!)
Richard Fairhurst [Thu, 29 May 2008 19:58:05 +0000 (19:58 +0000)]
fix node relations bug (thanks Dave!)

12 years agoPotlatch 0.9c
Richard Fairhurst [Thu, 29 May 2008 01:18:38 +0000 (01:18 +0000)]
Potlatch 0.9c

12 years agoPotlatch 0.9b
Richard Fairhurst [Sun, 25 May 2008 08:17:16 +0000 (08:17 +0000)]
Potlatch 0.9b

12 years agotemporarily disable OAM (SWF)
Richard Fairhurst [Wed, 21 May 2008 15:20:55 +0000 (15:20 +0000)]
temporarily disable OAM (SWF)

12 years agodon't set _alpha so often when ways dimmed (SWF)
Richard Fairhurst [Wed, 21 May 2008 12:01:56 +0000 (12:01 +0000)]
don't set _alpha so often when ways dimmed (SWF)

12 years agoMake the layer attribute a bit less fragile - base layers and overlays are
Tom Hughes [Tue, 20 May 2008 23:37:06 +0000 (23:37 +0000)]
Make the layer attribute a bit less fragile - base layers and overlays are
now treated separately so that adding a new base laser doesn't break things.

12 years agoAdd a check to make sure that a node/way/relation doesn't already exist in the relati...
Shaun McDonald [Tue, 20 May 2008 15:25:18 +0000 (15:25 +0000)]
Add a check to make sure that a node/way/relation doesn't already exist in the relation as part of the preconditions. closes #718

12 years agoMake the "larger map" link on an HTML export point at the right layer.
Tom Hughes [Mon, 19 May 2008 10:00:52 +0000 (10:00 +0000)]
Make the "larger map" link on an HTML export point at the right layer.

12 years agoAdd the cycle map to the main site.
Tom Hughes [Mon, 19 May 2008 09:57:58 +0000 (09:57 +0000)]
Add the cycle map to the main site.

12 years agoYet another at fixing the layout of the search box. Seems to work now
Tom Hughes [Fri, 16 May 2008 10:42:51 +0000 (10:42 +0000)]
Yet another at fixing the layout of the search box. Seems to work now
on FF2, IE7, Operand and Safari though we are giving space away on FF.

12 years agofix revert to cope with moved nodes properly (OH NOES I updated some SQL)
Richard Fairhurst [Fri, 16 May 2008 10:32:53 +0000 (10:32 +0000)]
fix revert to cope with moved nodes properly (OH NOES I updated some SQL)

12 years agoReword the noscript section a bit.
Tom Hughes [Fri, 16 May 2008 10:09:55 +0000 (10:09 +0000)]
Reword the noscript section a bit.

12 years agoTry and make browsers display the search box sanely.
Tom Hughes [Fri, 16 May 2008 10:06:57 +0000 (10:06 +0000)]
Try and make browsers display the search box sanely.

12 years agoShowing a nice message for browsers with javascript disabled. closes #36
Shaun McDonald [Fri, 16 May 2008 09:44:50 +0000 (09:44 +0000)]
Showing a nice message for browsers with javascript disabled. closes #36

12 years agoRemove bogus action attribute from the submit button - it should have
Tom Hughes [Thu, 15 May 2008 09:34:45 +0000 (09:34 +0000)]
Remove bogus action attribute from the submit button - it should have
no effect as there is no such attribute defined, but Opera seems to
decide that it should post the form to that URL instead of the one
give on the form element.

12 years agosplash screen
Richard Fairhurst [Mon, 12 May 2008 10:18:57 +0000 (10:18 +0000)]
splash screen

12 years agohmmm, probably best not to gratuitously send the same request every second
Richard Fairhurst [Sun, 11 May 2008 20:25:11 +0000 (20:25 +0000)]
hmmm, probably best not to gratuitously send the same request every second

12 years agoPotlatch 0.9a
Richard Fairhurst [Sun, 11 May 2008 20:16:09 +0000 (20:16 +0000)]
Potlatch 0.9a

12 years agoAdd maximiseMap() and minimiseMap() functions to the edit page to allow the
Tom Hughes [Sun, 11 May 2008 16:15:35 +0000 (16:15 +0000)]
Add maximiseMap() and minimiseMap() functions to the edit page to allow the
size of the editing area to be toggled.

12 years agoAdd the marker to the map correctly.
Tom Hughes [Fri, 9 May 2008 14:10:10 +0000 (14:10 +0000)]
Add the marker to the map correctly.

12 years agoPotlatch 0.9
Richard Fairhurst [Thu, 8 May 2008 10:24:17 +0000 (10:24 +0000)]
Potlatch 0.9

12 years agoRemove bogus apostrophe.
Tom Hughes [Wed, 7 May 2008 11:05:17 +0000 (11:05 +0000)]
Remove bogus apostrophe.

12 years agoTidy up handling of unknown traces.
Tom Hughes [Tue, 6 May 2008 16:57:40 +0000 (16:57 +0000)]
Tidy up handling of unknown traces.

12 years agoBackout message deletion functionality as it has unfortunate side effects
Tom Hughes [Tue, 6 May 2008 16:35:24 +0000 (16:35 +0000)]
Backout message deletion functionality as it has unfortunate side effects
as it also removes the message from the sender's outbox.

12 years agoFix replying to diary comments, and tidy a few things up.
Tom Hughes [Mon, 5 May 2008 23:01:05 +0000 (23:01 +0000)]
Fix replying to diary comments, and tidy a few things up.

12 years agoQuote reply messages properly.
Tom Hughes [Mon, 5 May 2008 22:52:19 +0000 (22:52 +0000)]
Quote reply messages properly.

12 years agoReinstate stripping of Re: prefixes that Steve dropped...
Tom Hughes [Mon, 5 May 2008 22:46:56 +0000 (22:46 +0000)]
Reinstate stripping of Re: prefixes that Steve dropped...

12 years agoRework the new Go button on the search form so that it actually stands
Tom Hughes [Mon, 5 May 2008 16:39:33 +0000 (16:39 +0000)]
Rework the new Go button on the search form so that it actually stands
some chance of rendering as intended.

It's still not really ideal to steal space from the seach box of course...

Closes #589.

12 years agoGo back to using user_id+k as the primary key for user preferences but
Tom Hughes [Sun, 4 May 2008 11:18:38 +0000 (11:18 +0000)]
Go back to using user_id+k as the primary key for user preferences but
actually using the composite primary key extension this time so that it
really works.

Also stop update_one tring to render a non-existent view, and add a
delete_one method to allow preferences to be deleted.

12 years agorails_port: fix migration to create a primary key with auto increment (don't
Gabriel Ebner [Sat, 3 May 2008 14:56:43 +0000 (14:56 +0000)]
rails_port: fix migration to create a primary key with auto increment (don't
know if that will actually generate valid keys if there is already data in the
table.)

12 years agofix migration to remove original stupid index hopefully
Steve Coast [Sat, 3 May 2008 14:45:15 +0000 (14:45 +0000)]
fix migration to remove original stupid index hopefully

12 years agofix bug 871 - show a good error message if gps trace not found
Steve Coast [Sat, 3 May 2008 14:29:01 +0000 (14:29 +0000)]
fix bug 871 - show a good error message if gps trace not found

12 years agoadd a go button to the search form as in bug 589
Steve Coast [Sat, 3 May 2008 14:18:22 +0000 (14:18 +0000)]
add a go button to the search form as in bug 589

12 years agomake public button a bit nicer
Steve Coast [Sat, 3 May 2008 14:07:48 +0000 (14:07 +0000)]
make public button a bit nicer

12 years agonicer reply messages, bug 529
Steve Coast [Sat, 3 May 2008 14:02:53 +0000 (14:02 +0000)]
nicer reply messages, bug 529

12 years agoability to delete messages
Steve Coast [Sat, 3 May 2008 13:25:34 +0000 (13:25 +0000)]
ability to delete messages

12 years agoadd individual user preference read/write, and default all new users to having public...
Steve Coast [Sat, 3 May 2008 12:57:48 +0000 (12:57 +0000)]
add individual user preference read/write, and default all new users to having public data

12 years agoOption to disable thick ways
Richard Fairhurst [Thu, 1 May 2008 08:27:14 +0000 (08:27 +0000)]
Option to disable thick ways

12 years agoInclude the marker on the larger map link during HTML export.
Tom Hughes [Thu, 1 May 2008 08:04:34 +0000 (08:04 +0000)]
Include the marker on the larger map link during HTML export.

12 years agoReduce the expiry for OpenLayers resources (which are not subject to
Tom Hughes [Thu, 1 May 2008 07:55:23 +0000 (07:55 +0000)]
Reduce the expiry for OpenLayers resources (which are not subject to
rails asset tagging) to one week, and set a one week expiry for the
new static HTML page used for HTML export.

12 years agoMerge HTML export branch to trunk.
Tom Hughes [Thu, 1 May 2008 07:49:28 +0000 (07:49 +0000)]
Merge HTML export branch to trunk.

12 years agolarger map link is now raw html for better google-linking capability, rather
Christopher Schmidt [Thu, 1 May 2008 00:00:20 +0000 (00:00 +0000)]
larger map link is now raw html for better google-linking capability, rather
than generated by javascript

12 years agoPotlatch 0.8c
Richard Fairhurst [Wed, 30 Apr 2008 22:59:30 +0000 (22:59 +0000)]
Potlatch 0.8c

12 years agolink goes into external frame, not in the iframe
Christopher Schmidt [Wed, 30 Apr 2008 11:45:28 +0000 (11:45 +0000)]
link goes into external frame, not in the iframe

12 years agoTidy things up a bit.
Tom Hughes [Wed, 30 Apr 2008 08:44:57 +0000 (08:44 +0000)]
Tidy things up a bit.

12 years agoadd support for showing osmarender layer instead of mapnik layer, style the vector...
Christopher Schmidt [Wed, 30 Apr 2008 03:11:47 +0000 (03:11 +0000)]
add support for showing osmarender layer instead of mapnik layer, style the vector layer so it looks like a marker.

12 years agoadd support for setting a specific marker location on the map.
Christopher Schmidt [Wed, 30 Apr 2008 02:50:53 +0000 (02:50 +0000)]
add support for setting a specific marker location on the map.

12 years agoSimplify a couple things that no longer need to be so complex.
Christopher Schmidt [Wed, 30 Apr 2008 02:48:26 +0000 (02:48 +0000)]
Simplify a couple things that no longer need to be so complex.

12 years agoimprovements to embed.html, now uses bbox instead of lon/lat/zoom, and has more human...
Christopher Schmidt [Wed, 30 Apr 2008 01:00:40 +0000 (01:00 +0000)]
improvements to embed.html, now uses bbox instead of lon/lat/zoom, and has more human readable layer definition, and has support for marker other than the middle of the map.

12 years agoFix attribution strings.
Tom Hughes [Tue, 29 Apr 2008 17:23:22 +0000 (17:23 +0000)]
Fix attribution strings.

12 years agoCosmetic tidy up, and fix hardcoding of server name.
Tom Hughes [Tue, 29 Apr 2008 17:11:22 +0000 (17:11 +0000)]
Cosmetic tidy up, and fix hardcoding of server name.

12 years agoround numbers
Christopher Schmidt [Tue, 29 Apr 2008 14:41:59 +0000 (14:41 +0000)]
round numbers

12 years agoadd support for HTML export to export tabk
Christopher Schmidt [Tue, 29 Apr 2008 13:57:26 +0000 (13:57 +0000)]
add support for HTML export to export tabk

12 years agostart of work on UI
Christopher Schmidt [Tue, 29 Apr 2008 13:19:24 +0000 (13:19 +0000)]
start of work on UI

12 years agoAdd static embed-friendly html page.
Christopher Schmidt [Tue, 29 Apr 2008 13:08:26 +0000 (13:08 +0000)]
Add static embed-friendly html page.

12 years agoCreate branch for HTML export from export tab.
Christopher Schmidt [Tue, 29 Apr 2008 11:58:12 +0000 (11:58 +0000)]
Create branch for HTML export from export tab.

12 years agopreset typo
Richard Fairhurst [Tue, 29 Apr 2008 10:34:20 +0000 (10:34 +0000)]
preset typo

12 years agoIE was getting confused by having a div with an id of "map" and a
Tom Hughes [Mon, 28 Apr 2008 09:49:27 +0000 (09:49 +0000)]
IE was getting confused by having a div with an id of "map" and a
link anchor with a name of "map". Closes #865.

12 years agoadd turning_circle to autocomplete
Richard Fairhurst [Sun, 27 Apr 2008 22:00:48 +0000 (22:00 +0000)]
add turning_circle to autocomplete

12 years agoUnderline links in the SOTM box.
Tom Hughes [Sun, 27 Apr 2008 15:40:48 +0000 (15:40 +0000)]
Underline links in the SOTM box.

12 years agoMake sure the recorded first point for a trace really is the first
Tom Hughes [Sun, 27 Apr 2008 12:27:46 +0000 (12:27 +0000)]
Make sure the recorded first point for a trace really is the first
point and not the last. Closes #709.

12 years agoAdvise new users to signup on the wiki as well. Closes #738.
Tom Hughes [Sun, 27 Apr 2008 12:26:10 +0000 (12:26 +0000)]
Advise new users to signup on the wiki as well. Closes #738.

12 years agoReport a friendly error for attempts to reference a user that does
Tom Hughes [Sun, 27 Apr 2008 12:21:32 +0000 (12:21 +0000)]
Report a friendly error for attempts to reference a user that does
not exist. Closes #805.

12 years agoInclude tags in GPX success and failure mails. Closes #480.
Tom Hughes [Sun, 27 Apr 2008 12:18:19 +0000 (12:18 +0000)]
Include tags in GPX success and failure mails. Closes #480.

12 years agoattempted fix for access from osm.org (as opposed to www.osm.org)
Richard Fairhurst [Sun, 27 Apr 2008 11:47:19 +0000 (11:47 +0000)]
attempted fix for access from osm.org (as opposed to osm.org)

12 years agomight help if I committed the SWF...
Richard Fairhurst [Sat, 26 Apr 2008 12:43:40 +0000 (12:43 +0000)]
might help if I committed the SWF...

12 years agoUnbreak Richard's warning messages. Closes #864.
Tom Hughes [Fri, 25 Apr 2008 09:04:56 +0000 (09:04 +0000)]
Unbreak Richard's warning messages. Closes #864.

12 years agoavoid inducing despair in relations-related circumstances
Richard Fairhurst [Wed, 23 Apr 2008 23:44:01 +0000 (23:44 +0000)]
avoid inducing despair in relations-related circumstances

12 years agoTidy up RSS links a bit.
Tom Hughes [Wed, 23 Apr 2008 17:39:09 +0000 (17:39 +0000)]
Tidy up RSS links a bit.

12 years agoTidy up template.
Tom Hughes [Wed, 23 Apr 2008 13:15:04 +0000 (13:15 +0000)]
Tidy up template.

12 years agowarn if user tries to upload 8bn traces at once
Richard Fairhurst [Wed, 23 Apr 2008 11:57:01 +0000 (11:57 +0000)]
warn if user tries to upload 8bn traces at once

12 years agoRestore the appearance of input buttons.
Tom Hughes [Wed, 23 Apr 2008 09:06:06 +0000 (09:06 +0000)]
Restore the appearance of input buttons.

12 years agoPut back the SOTM advert on the front page, updated for SOTM2008.
Tom Hughes [Wed, 23 Apr 2008 08:17:52 +0000 (08:17 +0000)]
Put back the SOTM advert on the front page, updated for SOTM2008.

12 years agoFix typo.
Tom Hughes [Wed, 23 Apr 2008 07:43:33 +0000 (07:43 +0000)]
Fix typo.

12 years agoStyle password fields (and textareas) to match text input fields.
Tom Hughes [Wed, 23 Apr 2008 07:41:58 +0000 (07:41 +0000)]
Style password fields (and textareas) to match text input fields.

12 years agomust remember not to commit new version while Potlatch users are in IRC
Richard Fairhurst [Tue, 22 Apr 2008 21:59:52 +0000 (21:59 +0000)]
must remember not to commit new version while Potlatch users are in IRC

12 years agoPotlatch 0.8b
Richard Fairhurst [Tue, 22 Apr 2008 21:32:26 +0000 (21:32 +0000)]
Potlatch 0.8b

12 years agoTweak export startup to stop silly image sizes being reported.
Tom Hughes [Mon, 21 Apr 2008 08:14:15 +0000 (08:14 +0000)]
Tweak export startup to stop silly image sizes being reported.

12 years agoMake sure the export button is enabled if we switch away from mapnik
Tom Hughes [Sun, 20 Apr 2008 10:31:03 +0000 (10:31 +0000)]
Make sure the export button is enabled if we switch away from mapnik
export, and that the mapnik image size is updated correctly.

12 years agoClose down export properly when the sidebar is closed.
Tom Hughes [Sun, 20 Apr 2008 08:38:47 +0000 (08:38 +0000)]
Close down export properly when the sidebar is closed.

12 years agoSuppress the PanZoomBar control from printed output.
Tom Hughes [Sun, 20 Apr 2008 08:24:04 +0000 (08:24 +0000)]
Suppress the PanZoomBar control from printed output.

12 years agoRework export to not rely on ctrl+drag to select an area.
Tom Hughes [Sat, 19 Apr 2008 16:58:03 +0000 (16:58 +0000)]
Rework export to not rely on ctrl+drag to select an area.

12 years agoDo the transform the right way round.
Tom Hughes [Sat, 19 Apr 2008 14:32:40 +0000 (14:32 +0000)]
Do the transform the right way round.

12 years agoUse the right variable for the marker position.
Tom Hughes [Sat, 19 Apr 2008 14:29:18 +0000 (14:29 +0000)]
Use the right variable for the marker position.

12 years agoUse the right variable for the event.
Tom Hughes [Sat, 19 Apr 2008 14:27:57 +0000 (14:27 +0000)]
Use the right variable for the event.

12 years agoAdd numZoomLevels to the map.
Tom Hughes [Sat, 19 Apr 2008 14:00:11 +0000 (14:00 +0000)]
Add numZoomLevels to the map.

12 years agoMake openSidebar() work with no argument.
Tom Hughes [Sat, 19 Apr 2008 13:52:31 +0000 (13:52 +0000)]
Make openSidebar() work with no argument.

12 years agoMark map responses as attachments.
Tom Hughes [Sat, 19 Apr 2008 13:35:02 +0000 (13:35 +0000)]
Mark map responses as attachments.

12 years agoMake export tab work from non-view pages.
Tom Hughes [Sat, 19 Apr 2008 13:29:24 +0000 (13:29 +0000)]
Make export tab work from non-view pages.

12 years agoHeaders is an array not a function...
Tom Hughes [Sat, 19 Apr 2008 13:29:10 +0000 (13:29 +0000)]
Headers is an array not a function...

12 years agoMerge 7296:7427 from export branch to trunk.
Tom Hughes [Sat, 19 Apr 2008 13:14:30 +0000 (13:14 +0000)]
Merge 7296:7427 from export branch to trunk.