]> git.openstreetmap.org Git - rails.git/log
rails.git
15 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.

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

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

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

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

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

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

15 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

15 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

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

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

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

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

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

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

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

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

15 years agoRemoving id's so that the ids are generated, and it makes it easier to deal with...
Shaun McDonald [Wed, 4 Jun 2008 16:35:00 +0000 (16:35 +0000)]
Removing id's so that the ids are generated, and it makes it easier to deal with referential tests. Now have messages and users with basic tests. Using http://api.rubyonrails.com/classes/Fixtures.html.

15 years agoimproved messages fixtures. Additional user fixture (for sending messages between...
Shaun McDonald [Wed, 4 Jun 2008 06:48:49 +0000 (06:48 +0000)]
improved messages fixtures. Additional user fixture (for sending messages between the users). Checking that an empty message fails.

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

15 years agoAdding some additional node fixtures to test edge cases. Having a bit of an issue...
Shaun McDonald [Mon, 2 Jun 2008 17:27:32 +0000 (17:27 +0000)]
Adding some additional node fixtures to test edge cases. Having a bit of an issue as the too far north and south tests aren't working as expected, even so the too far east and west ones are.

15 years agoYou can now test nodes. This test needs looked at again, as it currently doesn't...
Shaun McDonald [Mon, 2 Jun 2008 15:28:03 +0000 (15:28 +0000)]
You can now test nodes. This test needs looked at again, as it currently doesn't test the node tags

15 years agoFixing indentation
Shaun McDonald [Mon, 2 Jun 2008 15:22:17 +0000 (15:22 +0000)]
Fixing indentation

15 years agoFixing indentation
Shaun McDonald [Mon, 2 Jun 2008 15:13:29 +0000 (15:13 +0000)]
Fixing indentation

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

15 years agosort the default test database user and password.
Shaun McDonald [Mon, 2 Jun 2008 11:00:09 +0000 (11:00 +0000)]
sort the default test database user and password.
Adding new test for the user

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

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

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

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

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

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

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

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

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

15 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

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

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

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

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

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

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

15 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

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

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

15 years agoapi06: remove debugging output.
Gabriel Ebner [Tue, 13 May 2008 13:42:03 +0000 (13:42 +0000)]
api06: remove debugging output.

15 years agoapi06: simplify diff uploading.
Gabriel Ebner [Tue, 13 May 2008 13:24:31 +0000 (13:24 +0000)]
api06: simplify diff uploading.

15 years agoapi06: diff upload: don't read the whole request into memory.
Gabriel Ebner [Tue, 13 May 2008 12:53:59 +0000 (12:53 +0000)]
api06: diff upload: don't read the whole request into memory.

Note: libxml-ruby-0.5.4 will segfault on this:
https://rubyforge.org/tracker/index.php?func=detail&aid=20117&group_id=494&atid=1971

15 years agoapi06: Fix OSM::APIVersionMismatchError.render_opts
Gabriel Ebner [Tue, 13 May 2008 12:32:43 +0000 (12:32 +0000)]
api06: Fix OSM::APIVersionMismatchError.render_opts

15 years agoapi06: fix syntax errors.
Gabriel Ebner [Tue, 13 May 2008 12:27:38 +0000 (12:27 +0000)]
api06: fix syntax errors.

15 years agoapi06: simplify exception handling and add exception handling to the diff
Gabriel Ebner [Tue, 13 May 2008 12:15:06 +0000 (12:15 +0000)]
api06: simplify exception handling and add exception handling to the diff
upload.

15 years agoThe ordering of these shouldn't have mattered, but it did, because I didn't put a...
Christopher Schmidt [Mon, 12 May 2008 21:12:30 +0000 (21:12 +0000)]
The ordering of these shouldn't have mattered, but it did, because I didn't put a regex filter on my :id, so "upload" was being treated as an ID (which clearly wouldn't work); This fix obviates the need for r7789, sorry about that.

15 years agoapi06: Fix typo.
Gabriel Ebner [Mon, 12 May 2008 21:11:51 +0000 (21:11 +0000)]
api06: Fix typo.

15 years agoapi06: s/delete_with_relations_and_history/delete_with_history/g
Gabriel Ebner [Mon, 12 May 2008 21:10:38 +0000 (21:10 +0000)]
api06: s/delete_with_relations_and_history/delete_with_history/g

15 years agoapi06: Move version-checking into the models, raising an exception on mismatch
Gabriel Ebner [Mon, 12 May 2008 21:05:11 +0000 (21:05 +0000)]
api06: Move version-checking into the models, raising an exception on mismatch
(still not implemented for delete requests though.)

15 years agoapi06: Make diff uploading work again.
Gabriel Ebner [Mon, 12 May 2008 20:43:35 +0000 (20:43 +0000)]
api06: Make diff uploading work again.

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

15 years agonode.tags is now (apparently) the same as tags_as_hash.
Christopher Schmidt [Mon, 12 May 2008 01:22:04 +0000 (01:22 +0000)]
node.tags is now (apparently) the same as tags_as_hash.

15 years agomake error_message spit out the message text to the user as well as
Christopher Schmidt [Sun, 11 May 2008 23:12:54 +0000 (23:12 +0000)]
make error_message spit out the message text to the user as well as
putting it in the header.

15 years agoundo composite keys change on old_ndoe
Christopher Schmidt [Sun, 11 May 2008 23:02:06 +0000 (23:02 +0000)]
undo composite keys change on old_ndoe

15 years agofrom_xml sets a version on nodes
Christopher Schmidt [Sun, 11 May 2008 22:27:40 +0000 (22:27 +0000)]
from_xml sets a version on nodes

15 years agoadd to_xml method for oldnode
Christopher Schmidt [Sun, 11 May 2008 22:26:46 +0000 (22:26 +0000)]
add to_xml method for oldnode

15 years agospit out whether the changeset is open in the xml
Christopher Schmidt [Sun, 11 May 2008 22:26:11 +0000 (22:26 +0000)]
spit out whether the changeset is open in the xml

15 years agoprevent update of any object without providing the correct/current
Christopher Schmidt [Sun, 11 May 2008 21:49:33 +0000 (21:49 +0000)]
prevent update of any object without providing the correct/current
version as part of the XML. This affects update-only at this time:
DELETE doesn't work the same way because we don't provide the data as
part of a DELETE

15 years agoMake capabilities report the current version for from/to version
Christopher Schmidt [Sun, 11 May 2008 21:23:38 +0000 (21:23 +0000)]
Make capabilities report the current version for from/to version
identifier

15 years agochange 'no nodes' response to use API_VERSION in output
Christopher Schmidt [Sun, 11 May 2008 21:21:30 +0000 (21:21 +0000)]
change 'no nodes' response to use API_VERSION in output

15 years agoadd support for closing changesets
Christopher Schmidt [Sun, 11 May 2008 21:18:42 +0000 (21:18 +0000)]
add support for closing changesets

15 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

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

15 years agoadd FIXME FIXME FIXME for serializing changes in a changeset
Christopher Schmidt [Sun, 11 May 2008 20:07:47 +0000 (20:07 +0000)]
add FIXME FIXME FIXME for serializing changes in a changeset

15 years agoAdd support for accessing changesets as XML through the API via the
Christopher Schmidt [Sun, 11 May 2008 20:03:17 +0000 (20:03 +0000)]
Add support for accessing changesets as XML through the API via the
changeset controller "read" method

15 years agoMake edits return version numbers as plain text strings
Christopher Schmidt [Sun, 11 May 2008 19:47:19 +0000 (19:47 +0000)]
Make edits return version numbers as plain text strings

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

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

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

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

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

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

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

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

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

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

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

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

15 years agoapi06: Fix normal way and relation uploading (i.e. not as part of a diff).
Gabriel Ebner [Mon, 5 May 2008 22:41:32 +0000 (22:41 +0000)]
api06: Fix normal way and relation uploading (i.e. not as part of a diff).
(I'm sorry that I couldn't commit it earlier, but I didn't have access to an
internet connection until now.)

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

15 years agoapi06: Diff upload works now (but no integration with changesets whatsoever as
Gabriel Ebner [Sun, 4 May 2008 15:56:10 +0000 (15:56 +0000)]
api06: Diff upload works now (but no integration with changesets whatsoever as
of now)

15 years agoapi06: Fix diff uploading (still doesn't give a useful response):
Gabriel Ebner [Sun, 4 May 2008 15:16:58 +0000 (15:16 +0000)]
api06: Fix diff uploading (still doesn't give a useful response):
Modification and deletion works fine now.  Rollback also works apparently.
Just auto increment doesn't get reset.

15 years agoThe current_way_nodes table is already an InnoDB table.
Tom Hughes [Sun, 4 May 2008 14:50:53 +0000 (14:50 +0000)]
The current_way_nodes table is already an InnoDB table.

15 years agoapi06: Fix diff uploading (creation works fine now)
Gabriel Ebner [Sun, 4 May 2008 14:37:12 +0000 (14:37 +0000)]
api06: Fix diff uploading (creation works fine now)

15 years agoapi06: Preliminary support for diff uploading. This will not return anything
Gabriel Ebner [Sun, 4 May 2008 13:52:43 +0000 (13:52 +0000)]
api06: Preliminary support for diff uploading.  This will not return anything
useful and the code will need some heavy refactoring.

15 years agoapi06: Fix tag parsing in the node-tags-normalization helper, as suggested by
Gabriel Ebner [Sun, 4 May 2008 13:51:45 +0000 (13:51 +0000)]
api06: Fix tag parsing in the node-tags-normalization helper, as suggested by
Jon Burgess.

15 years agoapi06: Use 2-byte ints and check malloc return value.
Gabriel Ebner [Sun, 4 May 2008 12:03:05 +0000 (12:03 +0000)]
api06: Use 2-byte ints and check malloc return value.

15 years agoapi06: Fix bounds check.
Gabriel Ebner [Sun, 4 May 2008 11:50:12 +0000 (11:50 +0000)]
api06: Fix bounds check.

15 years agoapi06: 013_populate_node_tags_and_remove_helper: Initialize memory.
Gabriel Ebner [Sun, 4 May 2008 11:44:36 +0000 (11:44 +0000)]
api06: 013_populate_node_tags_and_remove_helper: Initialize memory.

15 years agobuffer overrun fix
Frederik Ramm [Sun, 4 May 2008 11:43:04 +0000 (11:43 +0000)]
buffer overrun fix

15 years agoAdd timestamp indexes to current_ways and current_relations.
Tom Hughes [Sun, 4 May 2008 11:33:09 +0000 (11:33 +0000)]
Add timestamp indexes to current_ways and current_relations.

15 years agoStick with rails 2.0.1...
Tom Hughes [Sun, 4 May 2008 11:32:49 +0000 (11:32 +0000)]
Stick with rails 2.0.1...

15 years agoMerge 7649:7673 from trunk.
Tom Hughes [Sun, 4 May 2008 11:26:36 +0000 (11:26 +0000)]
Merge 7649:7673 from trunk.

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