]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Sun, 22 Jun 2008 14:46:46 +0000 (14:46 +0000)]
Merge 8377:8381 from trunk.
Tom Hughes [Sun, 22 Jun 2008 14:44:34 +0000 (14:44 +0000)]
Make the polymorphic relation association work properly.
Tom Hughes [Sun, 22 Jun 2008 12:23:43 +0000 (12:23 +0000)]
Merge 7922:8377 from trunk.
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.
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.
Tom Hughes [Sat, 21 Jun 2008 16:19:36 +0000 (16:19 +0000)]
Removed bogus belongs_to user declaration.
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
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
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.
Tom Hughes [Sat, 7 Jun 2008 00:03:27 +0000 (00:03 +0000)]
Let's have one last try...
Tom Hughes [Fri, 6 Jun 2008 23:53:20 +0000 (23:53 +0000)]
Magic foo to make composite_primary_keys 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...
Tom Hughes [Fri, 6 Jun 2008 23:17:56 +0000 (23:17 +0000)]
Switch to rails 2.1.0 release.
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.
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.
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.
Tom Hughes [Tue, 3 Jun 2008 15:12:46 +0000 (15:12 +0000)]
Cope with not having a layer configuration at all.
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.
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.
Richard Fairhurst [Thu, 29 May 2008 19:58:05 +0000 (19:58 +0000)]
fix node relations bug (thanks Dave!)
Richard Fairhurst [Thu, 29 May 2008 01:18:38 +0000 (01:18 +0000)]
Potlatch 0.9c
Tom Hughes [Wed, 28 May 2008 23:46:55 +0000 (23:46 +0000)]
Improve the layout of the browse sidebar a bit.
Tom Hughes [Wed, 28 May 2008 16:37:31 +0000 (16:37 +0000)]
Merge 7744:7922 from trunk.
Richard Fairhurst [Sun, 25 May 2008 08:17:16 +0000 (08:17 +0000)]
Potlatch 0.9b
Richard Fairhurst [Wed, 21 May 2008 15:20:55 +0000 (15:20 +0000)]
temporarily disable OAM (SWF)
Richard Fairhurst [Wed, 21 May 2008 12:01:56 +0000 (12:01 +0000)]
don't set _alpha so often when ways dimmed (SWF)
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.
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
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.
Tom Hughes [Mon, 19 May 2008 09:57:58 +0000 (09:57 +0000)]
Add the cycle map to the main site.
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.
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)
Tom Hughes [Fri, 16 May 2008 10:09:55 +0000 (10:09 +0000)]
Reword the noscript section a bit.
Tom Hughes [Fri, 16 May 2008 10:06:57 +0000 (10:06 +0000)]
Try and make browsers display the search box sanely.
Shaun McDonald [Fri, 16 May 2008 09:44:50 +0000 (09:44 +0000)]
Showing a nice message for browsers with javascript disabled. closes #36
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.
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.
Richard Fairhurst [Mon, 12 May 2008 10:18:57 +0000 (10:18 +0000)]
splash screen
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
Richard Fairhurst [Sun, 11 May 2008 20:16:09 +0000 (20:16 +0000)]
Potlatch 0.9a
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.
Tom Hughes [Sun, 11 May 2008 14:42:44 +0000 (14:42 +0000)]
Fix what looks like an accidental change to the stylesheeet.
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.
Tom Hughes [Fri, 9 May 2008 23:22:26 +0000 (23:22 +0000)]
Merge 7452:7744 from trunk.
Tom Hughes [Fri, 9 May 2008 14:10:10 +0000 (14:10 +0000)]
Add the marker to the map correctly.
Richard Fairhurst [Thu, 8 May 2008 10:24:17 +0000 (10:24 +0000)]
Potlatch 0.9
Tom Hughes [Wed, 7 May 2008 11:05:17 +0000 (11:05 +0000)]
Remove bogus apostrophe.
Tom Hughes [Tue, 6 May 2008 16:57:40 +0000 (16:57 +0000)]
Tidy up handling of unknown traces.
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.
Tom Hughes [Mon, 5 May 2008 23:01:05 +0000 (23:01 +0000)]
Fix replying to diary comments, and tidy a few things up.
Tom Hughes [Mon, 5 May 2008 22:52:19 +0000 (22:52 +0000)]
Quote reply messages properly.
Tom Hughes [Mon, 5 May 2008 22:46:56 +0000 (22:46 +0000)]
Reinstate stripping of Re: prefixes that Steve dropped...
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.
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.
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.)
Steve Coast [Sat, 3 May 2008 14:45:15 +0000 (14:45 +0000)]
fix migration to remove original stupid index hopefully
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
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
Steve Coast [Sat, 3 May 2008 14:07:48 +0000 (14:07 +0000)]
make public button a bit nicer
Steve Coast [Sat, 3 May 2008 14:02:53 +0000 (14:02 +0000)]
nicer reply messages, bug 529
Steve Coast [Sat, 3 May 2008 13:25:34 +0000 (13:25 +0000)]
ability to delete messages
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
Richard Fairhurst [Thu, 1 May 2008 08:27:14 +0000 (08:27 +0000)]
Option to disable thick ways
Tom Hughes [Thu, 1 May 2008 08:04:34 +0000 (08:04 +0000)]
Include the marker on the larger map link during HTML export.
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.
Tom Hughes [Thu, 1 May 2008 07:49:28 +0000 (07:49 +0000)]
Merge HTML export branch to trunk.
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
Richard Fairhurst [Wed, 30 Apr 2008 22:59:30 +0000 (22:59 +0000)]
Potlatch 0.8c
Christopher Schmidt [Wed, 30 Apr 2008 11:45:28 +0000 (11:45 +0000)]
link goes into external frame, not in the iframe
Tom Hughes [Wed, 30 Apr 2008 08:44:57 +0000 (08:44 +0000)]
Tidy things up a bit.
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.
Christopher Schmidt [Wed, 30 Apr 2008 02:50:53 +0000 (02:50 +0000)]
add support for setting a specific marker location on the map.
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.
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.
Tom Hughes [Tue, 29 Apr 2008 17:23:22 +0000 (17:23 +0000)]
Fix attribution strings.
Tom Hughes [Tue, 29 Apr 2008 17:11:22 +0000 (17:11 +0000)]
Cosmetic tidy up, and fix hardcoding of server name.
Christopher Schmidt [Tue, 29 Apr 2008 14:41:59 +0000 (14:41 +0000)]
round numbers
Christopher Schmidt [Tue, 29 Apr 2008 13:57:26 +0000 (13:57 +0000)]
add support for HTML export to export tabk
Christopher Schmidt [Tue, 29 Apr 2008 13:19:24 +0000 (13:19 +0000)]
start of work on UI
Christopher Schmidt [Tue, 29 Apr 2008 13:08:26 +0000 (13:08 +0000)]
Add static embed-friendly html page.
Christopher Schmidt [Tue, 29 Apr 2008 11:58:12 +0000 (11:58 +0000)]
Create branch for HTML export from export tab.
Richard Fairhurst [Tue, 29 Apr 2008 10:34:20 +0000 (10:34 +0000)]
preset typo
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.
Richard Fairhurst [Sun, 27 Apr 2008 22:00:48 +0000 (22:00 +0000)]
add turning_circle to autocomplete
Tom Hughes [Sun, 27 Apr 2008 15:40:48 +0000 (15:40 +0000)]
Underline links in the SOTM box.
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.
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.
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.
Tom Hughes [Sun, 27 Apr 2008 12:18:19 +0000 (12:18 +0000)]
Include tags in GPX success and failure mails. Closes #480.
Richard Fairhurst [Sun, 27 Apr 2008 11:47:19 +0000 (11:47 +0000)]
attempted fix for access from osm.org (as opposed to www.osm.org)
Christopher Schmidt [Sat, 26 Apr 2008 16:33:26 +0000 (16:33 +0000)]
destroy the box handler as well
Christopher Schmidt [Sat, 26 Apr 2008 16:15:45 +0000 (16:15 +0000)]
Don't load things if the layer is already visible: if that's the case, we should already be loading.
Richard Fairhurst [Sat, 26 Apr 2008 12:43:40 +0000 (12:43 +0000)]
might help if I committed the SWF...
Tom Hughes [Fri, 25 Apr 2008 09:04:56 +0000 (09:04 +0000)]
Unbreak Richard's warning messages. Closes #864.
Richard Fairhurst [Wed, 23 Apr 2008 23:44:01 +0000 (23:44 +0000)]
avoid inducing despair in relations-related circumstances
Tom Hughes [Wed, 23 Apr 2008 17:39:09 +0000 (17:39 +0000)]
Tidy up RSS links a bit.
Christopher Schmidt [Wed, 23 Apr 2008 16:46:47 +0000 (16:46 +0000)]
start no longer uses these nodes: don't query for them
Christopher Schmidt [Wed, 23 Apr 2008 16:41:33 +0000 (16:41 +0000)]
browseclass no longer used
Christopher Schmidt [Wed, 23 Apr 2008 16:40:18 +0000 (16:40 +0000)]
no longer need stylesheet change
Christopher Schmidt [Wed, 23 Apr 2008 16:39:20 +0000 (16:39 +0000)]
define type earlier