Commit graph

742 commits

Author SHA1 Message Date
Tom Hughes
db66d47e42 Merge potlatch_010 branch to head. 2008-07-18 11:02:10 +00:00
Tom Hughes
d6e047d7d4 Optimise finding of relations, partially reversing change #8443 but in
a more rails like way.
2008-07-16 23:42:59 +00:00
Tom Hughes
66b0dd135e Tidy up AMF controller and optimise a few rails things. 2008-07-16 23:10:32 +00:00
Tom Hughes
6cf1c82c63 Remove SOTM advert. 2008-07-16 15:27:25 +00:00
Tom Hughes
911e030911 Disable JPEG exports from Osmarender as they are not currently
supported by the MapOf call in the new tiles@home server.
2008-07-16 13:21:16 +00:00
Tom Hughes
34d9360bee Minor tidyups. 2008-07-15 18:23:00 +00:00
Tom Hughes
6fa8647855 Rename unique_nodes to unshared_node_ids to make it's purpose a bit clearer
and rework it to be a bit tidier.
2008-07-15 18:18:37 +00:00
Tom Hughes
50c0333ea6 Revert Potlatch 0.10 from the trunk - we will keep it on the potlatch_010
branch for now until it has been reviewed.
2008-07-09 23:31:00 +00:00
Richard Fairhurst
62a1ec4748 Potlatch 0.10 2008-07-09 22:19:48 +00:00
Shaun McDonald
b2515ec75e Sorts out a problem with the description field and adding users. 2008-07-08 13:43:56 +00:00
Tom Hughes
6644f115c9 Add bounds to map responses. Closes #1011. 2008-07-08 09:52:08 +00:00
Tom Hughes
1e98eb9950 Allow users to remove their image. Closes #1010. 2008-07-07 23:26:41 +00:00
Tom Hughes
9c580277ef Sanitize user descriptions properly. 2008-07-07 08:06:56 +00:00
Tom Hughes
953599970e Capitalise German message correctly. 2008-07-05 23:45:15 +00:00
Tom Hughes
08d1f5aaab Quote default when used as a key in a hash as it is a keyword... 2008-06-28 09:59:47 +00:00
Tom Hughes
97aefa23d0 Merge data browser branch to trunk. 2008-06-27 23:09:05 +00:00
Tom Hughes
9a7db5d63b Refactor to remove some code duplication. 2008-06-26 23:01:55 +00:00
Tom Hughes
abb66fa808 Disable the data browswer when the database is not available. 2008-06-26 17:36:21 +00:00
Tom Hughes
563172b2c8 Minor correction to German translation. 2008-06-25 16:46:25 +00:00
Tom Hughes
65ff860da9 Handle international idiots in a reasonable selection of languages. 2008-06-25 15:18:07 +00:00
Tom Hughes
2677593b33 Try and make message and comment notifications more idiot proof. 2008-06-25 14:41:37 +00:00
Tom Hughes
def60c1935 Railsify relation selection (aka ripping out the f***in SQL). 2008-06-24 23:42:39 +00:00
Tom Hughes
398d5fa329 Improve the layout of the object browser views. 2008-06-24 16:44:45 +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
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
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
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
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
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
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
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