Commit graph

1122 commits

Author SHA1 Message Date
Tom Hughes
398d5fa329 Improve the layout of the object browser views. 2008-06-24 16:44:45 +00:00
Tom Hughes
0cb97bd7d9 Merge 8381:8390 from trunk. 2008-06-22 15:24:12 +00:00
Tom Hughes
cfc14f1ddc Make GeoRecord inject class methods correctly when included. 2008-06-22 15:22:13 +00:00
Tom Hughes
d69a518b9e Merge 8377:8381 from trunk. 2008-06-22 14:46:46 +00:00
Tom Hughes
b72fedb162 Make the polymorphic relation association work properly. 2008-06-22 14:44:34 +00:00
Tom Hughes
960d13488a Merge 7922:8377 from trunk. 2008-06-22 12:23:43 +00:00
Tom Hughes
2cf15b549e Add support for putting the site in an offline mode where it operates
without a database but with most features disabled.
2008-06-22 12:10:32 +00:00
Tom Hughes
b527d27674 Use a polymorphic association to model relation members and add
associations for upward links from objects to relations that they
are a part of.
2008-06-21 17:38:17 +00:00
Tom Hughes
a21824f754 Removed bogus belongs_to user declaration. 2008-06-21 16:19:36 +00:00
Richard Fairhurst
550ebc6c82 trap for #971 until I can work out why it's doing it 2008-06-11 14:45:36 +00:00
Shaun McDonald
955122e412 Replacing the non existant image with a pending text on the trace page 2008-06-10 17:17:32 +00:00
Tom Hughes
7d9bf3634c Work around the fact that exists? no longer works for models with
no primary key.
2008-06-07 22:40:39 +00:00
Tom Hughes
e8293baf8f Let's have one last try... 2008-06-07 00:03:27 +00:00
Tom Hughes
d29defa7cc Magic foo to make composite_primary_keys work. 2008-06-06 23:53:20 +00:00
Tom Hughes
e7346e5903 Go back to rails 2.0.2 for now as 2.1.0 doesn't quite work... 2008-06-06 23:32:21 +00:00
Tom Hughes
4fc6b982dd Switch to rails 2.1.0 release. 2008-06-06 23:17:56 +00:00
Tom Hughes
cdf12b7a33 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.
2008-06-05 23:27:52 +00:00
Tom Hughes
e2539b7126 Switch to rails 2.0.2 as Debian/Ubuntu is able to handle it now. 2008-06-05 23:06:29 +00:00
Tom Hughes
91bcc44021 Make sure the diary tab always links to the global diary rather than
a specific user's diary. Closes #956.
2008-06-05 21:20:30 +00:00
Tom Hughes
2829bf79d0 Cope with not having a layer configuration at all. 2008-06-03 15:12:46 +00:00
Tom Hughes
c25a20ff13 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.
2008-06-02 12:45:24 +00:00
Tom Hughes
48000eb09a Require a form post to finally confirm an account to stop
accidental confirmations.
2008-05-29 20:43:58 +00:00
Richard Fairhurst
b8569b1e13 fix node relations bug (thanks Dave!) 2008-05-29 19:58:05 +00:00
Richard Fairhurst
af8fee92f0 Potlatch 0.9c 2008-05-29 01:18:38 +00:00
Tom Hughes
f053c84723 Improve the layout of the browse sidebar a bit. 2008-05-28 23:46:55 +00:00
Tom Hughes
88105d9c64 Merge 7744:7922 from trunk. 2008-05-28 16:37:31 +00:00
Richard Fairhurst
fc98b97e59 Potlatch 0.9b 2008-05-25 08:17:16 +00:00
Richard Fairhurst
6e30a771e5 temporarily disable OAM (SWF) 2008-05-21 15:20:55 +00:00
Richard Fairhurst
764d08ff6f don't set _alpha so often when ways dimmed (SWF) 2008-05-21 12:01:56 +00:00
Tom Hughes
436012c697 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.
2008-05-20 23:37:06 +00:00
Shaun McDonald
de5e96585b 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 2008-05-20 15:25:18 +00:00
Tom Hughes
e758e520e7 Make the "larger map" link on an HTML export point at the right layer. 2008-05-19 10:00:52 +00:00
Tom Hughes
0623e88d39 Add the cycle map to the main site. 2008-05-19 09:57:58 +00:00
Tom Hughes
a401b59242 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.
2008-05-16 10:42:51 +00:00
Richard Fairhurst
889ee9e368 fix revert to cope with moved nodes properly (OH NOES I updated some SQL) 2008-05-16 10:32:53 +00:00
Tom Hughes
f08c9de073 Reword the noscript section a bit. 2008-05-16 10:09:55 +00:00
Tom Hughes
1ea1c62d15 Try and make browsers display the search box sanely. 2008-05-16 10:06:57 +00:00
Shaun McDonald
1f59ad76ef Showing a nice message for browsers with javascript disabled. closes #36 2008-05-16 09:44:50 +00:00
Tom Hughes
18777b41ea Tidy up map browse code and qualify various global names to avoid
any risk of conflicts.
2008-05-15 16:57:34 +00:00
Tom Hughes
e62eacd8d3 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.
2008-05-15 09:34:45 +00:00
Richard Fairhurst
f365881a62 splash screen 2008-05-12 10:18:57 +00:00
Richard Fairhurst
e2cfc813f3 hmmm, probably best not to gratuitously send the same request every second 2008-05-11 20:25:11 +00:00
Richard Fairhurst
3b02a27190 Potlatch 0.9a 2008-05-11 20:16:09 +00:00
Tom Hughes
cf9f5ba933 Add maximiseMap() and minimiseMap() functions to the edit page to allow the
size of the editing area to be toggled.
2008-05-11 16:15:35 +00:00
Tom Hughes
75f160aeb4 Fix what looks like an accidental change to the stylesheeet. 2008-05-11 14:42:44 +00:00
Tom Hughes
4d8ea0eed0 Only add the data layer to the main map, and use the visibility changed
event to handle turning the data layer on and off.
2008-05-11 14:41:11 +00:00
Tom Hughes
5620d7263a Merge 7452:7744 from trunk. 2008-05-09 23:22:26 +00:00
Tom Hughes
369c81a414 Add the marker to the map correctly. 2008-05-09 14:10:10 +00:00
Richard Fairhurst
b2289c29d4 Potlatch 0.9 2008-05-08 10:24:17 +00:00
Tom Hughes
801f02fdd9 Remove bogus apostrophe. 2008-05-07 11:05:17 +00:00