]> git.openstreetmap.org Git - rails.git/log
rails.git
16 years agoOptimise finding of relations, partially reversing change #8443 but in
Tom Hughes [Wed, 16 Jul 2008 23:42:59 +0000 (23:42 +0000)]
Optimise finding of relations, partially reversing change #8443 but in
a more rails like way.

16 years agoTidy up AMF controller and optimise a few rails things.
Tom Hughes [Wed, 16 Jul 2008 23:10:32 +0000 (23:10 +0000)]
Tidy up AMF controller and optimise a few rails things.

16 years agoDefault to using rails.
Tom Hughes [Wed, 16 Jul 2008 22:59:10 +0000 (22:59 +0000)]
Default to using rails.

16 years agoRemote Potlatch projection routines as they are no longer needed.
Tom Hughes [Tue, 15 Jul 2008 23:15:53 +0000 (23:15 +0000)]
Remote Potlatch projection routines as they are no longer needed.

16 years agoMinor tidyups.
Tom Hughes [Tue, 15 Jul 2008 18:23:00 +0000 (18:23 +0000)]
Minor tidyups.

16 years agoRename unique_nodes to unshared_node_ids to make it's purpose a bit clearer
Tom Hughes [Tue, 15 Jul 2008 18:18:37 +0000 (18:18 +0000)]
Rename unique_nodes to unshared_node_ids to make it's purpose a bit clearer
and rework it to be a bit tidier.

16 years agoMove Potlatch configuration to a separate initialiser file.
Tom Hughes [Tue, 15 Jul 2008 18:05:22 +0000 (18:05 +0000)]
Move Potlatch configuration to a separate initialiser file.

16 years agoBranch the rails code for Potlatch 0.10 support.
Tom Hughes [Wed, 9 Jul 2008 23:27:33 +0000 (23:27 +0000)]
Branch the rails code for Potlatch 0.10 support.

16 years agoPotlatch 0.10
Richard Fairhurst [Wed, 9 Jul 2008 22:19:48 +0000 (22:19 +0000)]
Potlatch 0.10

16 years agoSorts out a problem with the description field and adding users.
Shaun McDonald [Tue, 8 Jul 2008 13:43:56 +0000 (13:43 +0000)]
Sorts out a problem with the description field and adding users.

16 years agoAdd bounds to map responses. Closes #1011.
Tom Hughes [Tue, 8 Jul 2008 09:52:08 +0000 (09:52 +0000)]
Add bounds to map responses. Closes #1011.

16 years agoAllow users to remove their image. Closes #1010.
Tom Hughes [Mon, 7 Jul 2008 23:26:41 +0000 (23:26 +0000)]
Allow users to remove their image. Closes #1010.

16 years agoSanitize user descriptions properly.
Tom Hughes [Mon, 7 Jul 2008 08:06:56 +0000 (08:06 +0000)]
Sanitize user descriptions properly.

16 years agoCapitalise German message correctly.
Tom Hughes [Sat, 5 Jul 2008 23:45:15 +0000 (23:45 +0000)]
Capitalise German message correctly.

16 years agoQuote default when used as a key in a hash as it is a keyword...
Tom Hughes [Sat, 28 Jun 2008 09:59:47 +0000 (09:59 +0000)]
Quote default when used as a key in a hash as it is a keyword...

16 years agoMerge data browser branch to trunk.
Tom Hughes [Fri, 27 Jun 2008 23:09:05 +0000 (23:09 +0000)]
Merge data browser branch to trunk.

16 years agoRefactor to remove some code duplication.
Tom Hughes [Thu, 26 Jun 2008 23:01:55 +0000 (23:01 +0000)]
Refactor to remove some code duplication.

16 years agoDisable the data browswer when the database is not available.
Tom Hughes [Thu, 26 Jun 2008 17:36:21 +0000 (17:36 +0000)]
Disable the data browswer when the database is not available.

16 years agoMinor correction to German translation.
Tom Hughes [Wed, 25 Jun 2008 16:46:25 +0000 (16:46 +0000)]
Minor correction to German translation.

16 years agoHandle international idiots in a reasonable selection of languages.
Tom Hughes [Wed, 25 Jun 2008 15:18:07 +0000 (15:18 +0000)]
Handle international idiots in a reasonable selection of languages.

16 years agoTry and make message and comment notifications more idiot proof.
Tom Hughes [Wed, 25 Jun 2008 14:41:37 +0000 (14:41 +0000)]
Try and make message and comment notifications more idiot proof.

16 years agoRailsify relation selection (aka ripping out the f***in SQL).
Tom Hughes [Tue, 24 Jun 2008 23:42:39 +0000 (23:42 +0000)]
Railsify relation selection (aka ripping out the f***in SQL).

16 years agoImprove the layout of the object browser views.
Tom Hughes [Tue, 24 Jun 2008 16:44:45 +0000 (16:44 +0000)]
Improve the layout of the object browser views.

16 years agoMerge 8381:8390 from trunk.
Tom Hughes [Sun, 22 Jun 2008 15:24:12 +0000 (15:24 +0000)]
Merge 8381:8390 from trunk.

16 years agoMake GeoRecord inject class methods correctly when included.
Tom Hughes [Sun, 22 Jun 2008 15:22:13 +0000 (15:22 +0000)]
Make GeoRecord inject class methods correctly when included.

16 years agoMerge 8377:8381 from trunk.
Tom Hughes [Sun, 22 Jun 2008 14:46:46 +0000 (14:46 +0000)]
Merge 8377:8381 from trunk.

16 years agoMake the polymorphic relation association work properly.
Tom Hughes [Sun, 22 Jun 2008 14:44:34 +0000 (14:44 +0000)]
Make the polymorphic relation association work properly.

16 years agoMerge 7922:8377 from trunk.
Tom Hughes [Sun, 22 Jun 2008 12:23:43 +0000 (12:23 +0000)]
Merge 7922:8377 from trunk.

16 years agoAdd support for putting the site in an offline mode where it operates
Tom Hughes [Sun, 22 Jun 2008 12:10:32 +0000 (12:10 +0000)]
Add support for putting the site in an offline mode where it operates
without a database but with most features disabled.

16 years agoUse a polymorphic association to model relation members and add
Tom Hughes [Sat, 21 Jun 2008 17:38:17 +0000 (17:38 +0000)]
Use a polymorphic association to model relation members and add
associations for upward links from objects to relations that they
are a part of.

16 years agoRemoved bogus belongs_to user declaration.
Tom Hughes [Sat, 21 Jun 2008 16:19:36 +0000 (16:19 +0000)]
Removed bogus belongs_to user declaration.

16 years agotrap for #971 until I can work out why it's doing it
Richard Fairhurst [Wed, 11 Jun 2008 14:45:36 +0000 (14:45 +0000)]
trap for #971 until I can work out why it's doing it

16 years agoReplacing the non existant image with a pending text on the trace page
Shaun McDonald [Tue, 10 Jun 2008 17:17:32 +0000 (17:17 +0000)]
Replacing the non existant image with a pending text on the trace page

16 years agoWork around the fact that exists? no longer works for models with
Tom Hughes [Sat, 7 Jun 2008 22:40:39 +0000 (22:40 +0000)]
Work around the fact that exists? no longer works for models with
no primary key.

16 years agoLet's have one last try...
Tom Hughes [Sat, 7 Jun 2008 00:03:27 +0000 (00:03 +0000)]
Let's have one last try...

16 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.

16 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...

16 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.

16 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.

16 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.

16 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.

16 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.

16 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.

16 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.

16 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!)

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

16 years agoImprove the layout of the browse sidebar a bit.
Tom Hughes [Wed, 28 May 2008 23:46:55 +0000 (23:46 +0000)]
Improve the layout of the browse sidebar a bit.

16 years agoMerge 7744:7922 from trunk.
Tom Hughes [Wed, 28 May 2008 16:37:31 +0000 (16:37 +0000)]
Merge 7744:7922 from trunk.

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

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

16 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)

16 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.

16 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

16 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.

16 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.

16 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.

16 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)

16 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.

16 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.

16 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

16 years agoTidy up map browse code and qualify various global names to avoid
Tom Hughes [Thu, 15 May 2008 16:57:34 +0000 (16:57 +0000)]
Tidy up map browse code and qualify various global names to avoid
any risk of conflicts.

16 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.

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

16 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

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

16 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.

16 years agoFix what looks like an accidental change to the stylesheeet.
Tom Hughes [Sun, 11 May 2008 14:42:44 +0000 (14:42 +0000)]
Fix what looks like an accidental change to the stylesheeet.

16 years agoOnly add the data layer to the main map, and use the visibility changed
Tom Hughes [Sun, 11 May 2008 14:41:11 +0000 (14:41 +0000)]
Only add the data layer to the main map, and use the visibility changed
event to handle turning the data layer on and off.

16 years agoMerge 7452:7744 from trunk.
Tom Hughes [Fri, 9 May 2008 23:22:26 +0000 (23:22 +0000)]
Merge 7452:7744 from trunk.

16 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.

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

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

16 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.

16 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.

16 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.

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

16 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...

16 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.

16 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.

16 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.)

16 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

16 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

16 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

16 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

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

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

16 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

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

16 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.

16 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.

16 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.

16 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

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

16 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

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

16 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.

16 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.

16 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.

16 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.

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