Commit graph

1496 commits

Author SHA1 Message Date
Tom Hughes
d69e9533d1 Fix thinko. 2008-07-19 23:02:04 +00:00
Tom Hughes
c933a4222c Improve error handling. 2008-07-19 22:59:59 +00:00
Tom Hughes
5d5f72b927 More warning fixes. 2008-07-18 22:23:26 +00:00
Tom Hughes
9f8600877b Stop rails moaning. 2008-07-18 21:42:13 +00:00
Shaun McDonald
1bcc2242c0 Make sure that there is a sender and a recipient of a message. New test to make sure that there a message also has a sender and a recipient, as the validates_associated doesn't do anything if they are nil. 2008-07-18 16:44:14 +00:00
Tom Hughes
b9fc5e662b Cope with being asked to find relations for any empty set of objects. 2008-07-18 13:13:28 +00:00
Tom Hughes
509b8ec62a Merged 8899:9136 and 9145 from trunk. 2008-07-18 11:18:39 +00:00
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
c9a171c745 Removing the in_world test from the model since it is included in the geo_record library. Adding visible and version to the nodes and current_nodes fixtures. Adding old node test. Slightly different comparisions. 2008-07-08 18:17:08 +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
700da2b347 Tidy up a bit after shaun's merge... 2008-07-07 16:16:05 +00:00
Shaun McDonald
64a5e21f53 Fixing the resync that I had done wrong at the end of last week on the nodes. All unit tests now do work. More assertions added. Using a scaling factor as a constant, so that the nodes are stored in the db correctly. Using the same scaling factor in the georecord library, to make code more readable, and reduce errors. Removing duplicate code that is in the GeoRecord include library. 2008-07-07 14:20:27 +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
36203ebe26 Don't hardcode the API version in the data browser. 2008-07-04 18:15:42 +00:00
Shaun McDonald
5f8ab9e924 Merge changes from trunk 7673:8632. 2008-07-03 13:06:24 +00:00
Shaun McDonald
0a459023d3 Now all the unit tests work 2008-07-03 10:56:17 +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
Shaun McDonald
b8a7d956bf Fixing indentation 2008-06-02 15:22:17 +00:00
Shaun McDonald
0c2d503f1e Fixing indentation 2008-06-02 15:13:29 +00:00