]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Sun, 8 Mar 2009 13:02:37 +0000 (13:02 +0000)]
Merge 12304:14009 from trunk.
Tom Hughes [Sun, 8 Mar 2009 12:44:45 +0000 (12:44 +0000)]
Fix for libxml 1.0.0 changes.
Tom Hughes [Sun, 8 Mar 2009 11:34:46 +0000 (11:34 +0000)]
Update to use libxml 1.0.0 gem.
Tom Hughes [Fri, 6 Mar 2009 14:30:01 +0000 (14:30 +0000)]
Fix thinko.
Tom Hughes [Fri, 6 Mar 2009 14:27:40 +0000 (14:27 +0000)]
Put auto discovery links in the document head.
Tom Hughes [Fri, 6 Mar 2009 14:19:54 +0000 (14:19 +0000)]
Declare XML namespace.
Harry Wood [Sun, 1 Mar 2009 22:24:07 +0000 (22:24 +0000)]
setting lon2 correctly. Was displaying one of the bbox numbers wrong
Richard Fairhurst [Thu, 26 Feb 2009 00:26:23 +0000 (00:26 +0000)]
fix backspacing through way to delete it
Richard Fairhurst [Wed, 25 Feb 2009 22:04:22 +0000 (22:04 +0000)]
history stuff should be working now (haha)
Richard Fairhurst [Wed, 25 Feb 2009 01:14:19 +0000 (01:14 +0000)]
further work on 0.6 history (not quite complete yet)
Tom Hughes [Thu, 19 Feb 2009 13:47:43 +0000 (13:47 +0000)]
Add an ACL system to allow key/value pairs to be attached to blocks
of IP addresses, and implement an ACL restriction that allows account
creation to be blocked.
Tom Hughes [Sat, 14 Feb 2009 00:01:39 +0000 (00:01 +0000)]
Go back to using <center> to position the buttons in the left hand
column as IE doesn't seem to cope with CSS based centering.
Tom Hughes [Fri, 13 Feb 2009 21:31:17 +0000 (21:31 +0000)]
Use a root relative URL for the donation button image.
Tom Hughes [Fri, 13 Feb 2009 17:38:40 +0000 (17:38 +0000)]
Replace the PayPal button on the home page with a donate button that
links to the OSM donation site.
Tom Hughes [Fri, 13 Feb 2009 15:55:50 +0000 (15:55 +0000)]
Apparently zero is not false in ruby.
Tom Hughes [Fri, 13 Feb 2009 15:53:33 +0000 (15:53 +0000)]
Remove donate box from front page.
Richard Fairhurst [Fri, 13 Feb 2009 15:12:52 +0000 (15:12 +0000)]
be a bit smarter about enlarging the bbox (note to self: must remember to put this in 0.6 too)
Tom Hughes [Fri, 13 Feb 2009 12:33:54 +0000 (12:33 +0000)]
Put the escapes back again.
Paul Gillard [Wed, 11 Feb 2009 20:47:25 +0000 (20:47 +0000)]
Stylesheet changes to make paragraphs within intro section on left hand side of home page space correctly. Changes tested in:
Firefox 3.0.6 - OSX
Safari 3.2.1 - OSX
Firefox 3.0.6 - Win XP Pro
IE7 7.0.5730 - Win XP Pro
IE6 - WIn XP Pro
Google Chrome 0.2.149.27 - Win XP Pro
Home page now displays correctly in Google Chrome.
Tom Hughes [Wed, 11 Feb 2009 00:18:10 +0000 (00:18 +0000)]
Removed bogus backslash escape.
Tom Hughes [Wed, 11 Feb 2009 00:16:00 +0000 (00:16 +0000)]
Wrap text to make it more readable and adjust the padding on the intro
box to remove the extra space created by addition of paragraph tags.
Tom Hughes [Wed, 11 Feb 2009 00:10:36 +0000 (00:10 +0000)]
Remove bogus backslash escape.
Tom Hughes [Wed, 11 Feb 2009 00:09:58 +0000 (00:09 +0000)]
Remove excessive indenting - tabs are bad people!
Paul Gillard [Tue, 10 Feb 2009 22:50:13 +0000 (22:50 +0000)]
Paul Gillard [Tue, 10 Feb 2009 22:42:45 +0000 (22:42 +0000)]
Ensure homepage source validates.
Matt Amos [Sun, 8 Feb 2009 16:54:28 +0000 (16:54 +0000)]
Test and fix for #1567, for teh betterer osmChange compliance.
Matt Amos [Sun, 8 Feb 2009 16:33:48 +0000 (16:33 +0000)]
Test and fix for issue #1568. Wasn't testing for end element in the right place.
Matt Amos [Sun, 8 Feb 2009 08:28:01 +0000 (08:28 +0000)]
Fix for #1565. Added a couple of tests and fixed another issue with re-used placeholder IDs.
Matt Amos [Sat, 7 Feb 2009 17:45:27 +0000 (17:45 +0000)]
Fixed bug in changeset closing and querying where the number of elements exceeded the maximum. Added a fixture for this.
Tom Hughes [Fri, 6 Feb 2009 10:12:50 +0000 (10:12 +0000)]
Stop robots crawling the object browser.
Tom Hughes [Thu, 5 Feb 2009 22:23:45 +0000 (22:23 +0000)]
Back out hack to setMapCenter and fix the problem in the right place.
Tom Hughes [Thu, 5 Feb 2009 22:06:47 +0000 (22:06 +0000)]
Add donation link to main site.
Frederik Ramm [Tue, 3 Feb 2009 00:57:19 +0000 (00:57 +0000)]
splitting and joining tags is gone for good in 0.6
Thomas Wood [Sat, 31 Jan 2009 13:12:19 +0000 (13:12 +0000)]
Copying across fix for #1547 from trunk
Thomas Wood [Sat, 31 Jan 2009 13:10:16 +0000 (13:10 +0000)]
Pass zoom to map.setCenter as an integer (Closes #1547)
Dirk Stöcker [Thu, 29 Jan 2009 14:19:39 +0000 (14:19 +0000)]
fixed typo
Dirk Stöcker [Thu, 29 Jan 2009 14:19:39 +0000 (14:19 +0000)]
fixed typo
Thomas Wood [Fri, 23 Jan 2009 19:14:21 +0000 (19:14 +0000)]
Set params to sane defaults if unset by client.
Reject creates with no file with 400, model validations will also reject with 400 (as was existing but broken behaviour)
Closes #1510
Thomas Wood [Fri, 23 Jan 2009 01:19:45 +0000 (01:19 +0000)]
Require auth on calls to /trace/create, and pass through to form if called without params. Adjust validations on traces to prevent dual error messages on description (validates_presence_of catches the empty string removed from length validation)
More changes to come for api_create
References #1510
Richard Fairhurst [Wed, 21 Jan 2009 00:31:55 +0000 (00:31 +0000)]
eight zillion more presets for 0.5 Potlatch
Tom Hughes [Mon, 19 Jan 2009 08:31:35 +0000 (08:31 +0000)]
Remove Steve's gratuitous insult.
Steve Coast [Mon, 19 Jan 2009 03:45:41 +0000 (03:45 +0000)]
nicer signup confirmation email
Richard Fairhurst [Wed, 14 Jan 2009 20:15:45 +0000 (20:15 +0000)]
(0.5) use npe.osm.org for all except zoom level 14 (still richard.dev.osm.org for 14, for those occasions when namefinder has eaten the server)
Shaun McDonald [Wed, 14 Jan 2009 00:17:42 +0000 (00:17 +0000)]
Move the ActiveRecord::RecordNotFound to the block, so that it catches the not found in line 327, when a nonexistant way id is searched for.
Richard Fairhurst [Tue, 13 Jan 2009 08:37:58 +0000 (08:37 +0000)]
swap way write with node deletion as per dev@
Richard Fairhurst [Sun, 11 Jan 2009 17:09:43 +0000 (17:09 +0000)]
small versioning fix (plus history rework in progress)
Thomas Wood [Wed, 31 Dec 2008 16:43:44 +0000 (16:43 +0000)]
Revert last commit - too many test failures
Thomas Wood [Wed, 31 Dec 2008 16:33:02 +0000 (16:33 +0000)]
DateTime => Time for consistency in changeset code, ok by shaun.
Thomas Wood [Wed, 31 Dec 2008 16:14:39 +0000 (16:14 +0000)]
Only show changesets that are actually closed in the index view.
Matt Amos [Tue, 23 Dec 2008 15:59:56 +0000 (15:59 +0000)]
removed comments which apparently no-one bothers to read anyway. since no-one reads the comments, changed changeset model to use Time instead of DateTime. will probably have to change it back later, when someone else who doesn't read comments comes along.
Thomas Wood [Tue, 23 Dec 2008 15:47:06 +0000 (15:47 +0000)]
Make browse controller index show recently closed changesets, rather than recently changed nodes.
Thomas Wood [Tue, 23 Dec 2008 15:08:18 +0000 (15:08 +0000)]
Pass the to_user to the view. Tests may follow. Closes #1394
Richard Fairhurst [Tue, 23 Dec 2008 13:09:36 +0000 (13:09 +0000)]
session management on only for :list
Richard Fairhurst [Tue, 23 Dec 2008 13:06:07 +0000 (13:06 +0000)]
view changesets by user
Richard Fairhurst [Thu, 18 Dec 2008 09:20:58 +0000 (09:20 +0000)]
Relations support
Richard Fairhurst [Thu, 18 Dec 2008 00:36:01 +0000 (00:36 +0000)]
remove debug box
Richard Fairhurst [Thu, 18 Dec 2008 00:32:02 +0000 (00:32 +0000)]
Potlatch for API 0.6 now saving ways happily with node versioning... I think
Richard Fairhurst [Thu, 18 Dec 2008 00:10:17 +0000 (00:10 +0000)]
tiny fix
Richard Fairhurst [Wed, 17 Dec 2008 00:30:29 +0000 (00:30 +0000)]
some more putway fixes - this actually creates new ways with 0.6 Potlatch now
Shaun McDonald [Tue, 16 Dec 2008 16:40:59 +0000 (16:40 +0000)]
Fix UTF-8 encoding error char in source file that RichardF introduced
Richard Fairhurst [Tue, 16 Dec 2008 00:40:04 +0000 (00:40 +0000)]
bit more putway stuff
Richard Fairhurst [Tue, 16 Dec 2008 00:23:11 +0000 (00:23 +0000)]
yet more rewriting of putway...
Thomas Wood [Mon, 15 Dec 2008 23:24:09 +0000 (23:24 +0000)]
Add validations for diary entry lat/lons and tests for diary entry validations. Closes #1395
Shaun McDonald [Mon, 15 Dec 2008 19:27:52 +0000 (19:27 +0000)]
Some extra stubs in the amf controller test
Shaun McDonald [Mon, 15 Dec 2008 19:20:24 +0000 (19:20 +0000)]
Fix the transactions, need to set anything that will be returned to nil outside the transaction, otherwise it won't be available after the end of the transaction, when it is returned.
Shaun McDonald [Mon, 15 Dec 2008 18:57:12 +0000 (18:57 +0000)]
bug fix. Adding some transactions to amf controller, and adding the missing version to putway method signature.
Tom Hughes [Mon, 15 Dec 2008 17:45:45 +0000 (17:45 +0000)]
Align table heading properly. Closes #1405.
Shaun McDonald [Sun, 14 Dec 2008 23:16:27 +0000 (23:16 +0000)]
Return, rather than allow a second render to happen. Closes #1407
Shaun McDonald [Fri, 12 Dec 2008 19:29:27 +0000 (19:29 +0000)]
resync from rails_port 11795:12304
Shaun McDonald [Fri, 12 Dec 2008 19:04:28 +0000 (19:04 +0000)]
Log the request on a few requests when there is a bad request, probably should do this in a few more places. This makes it easier to see why we are getting errors/bad requests.
Shaun McDonald [Fri, 12 Dec 2008 18:56:22 +0000 (18:56 +0000)]
removing debug statement
Shaun McDonald [Fri, 12 Dec 2008 18:54:03 +0000 (18:54 +0000)]
Improving the not found handling of preferences. adding a user preference test. adding some utility methods to the test helper
Tom Hughes [Fri, 12 Dec 2008 15:43:02 +0000 (15:43 +0000)]
Add some extra indexes.
Tom Hughes [Fri, 12 Dec 2008 15:17:14 +0000 (15:17 +0000)]
Optimise lookup of traces with a given tag.
Shaun McDonald [Fri, 12 Dec 2008 11:24:40 +0000 (11:24 +0000)]
capture the too many way nodes error, and give the user an error message
Shaun McDonald [Thu, 11 Dec 2008 17:22:15 +0000 (17:22 +0000)]
Making amf controller act more like the xml apis
Shaun McDonald [Thu, 11 Dec 2008 15:05:53 +0000 (15:05 +0000)]
Don't give an error when you access the login page when you are logged in. Instead take you to the page in the referer or the home page.
Shaun McDonald [Thu, 11 Dec 2008 10:38:36 +0000 (10:38 +0000)]
some more progress towards making amf_controller do version checking of nodes before deleting them
Shaun McDonald [Wed, 10 Dec 2008 18:07:30 +0000 (18:07 +0000)]
some further progress to amf controller checking the version numbers.
Matt Amos [Wed, 10 Dec 2008 14:31:07 +0000 (14:31 +0000)]
Added missing version to the pure rails AMF controller. More stringent tests on whichways.
Matt Amos [Wed, 10 Dec 2008 13:23:21 +0000 (13:23 +0000)]
Some fixes to the rails part of the AMF controller and associated test.
Shaun McDonald [Tue, 9 Dec 2008 18:44:11 +0000 (18:44 +0000)]
Some improvements for the XML parsing, as there are somethings that we don't need, like timestamp and visibility, thus hopefully bringing a speedup in the xml parsing. Some more AMF controller fixes, plenty more to go though.
Shaun McDonald [Mon, 8 Dec 2008 15:47:29 +0000 (15:47 +0000)]
count -> size for compatibility with ruby 1.8.6
Shaun McDonald [Mon, 8 Dec 2008 15:32:29 +0000 (15:32 +0000)]
the user id may be negative, so that osmosis can create changesets for users that are anonymous, which it uses a negative id for, as a special id.
Shaun McDonald [Mon, 8 Dec 2008 15:30:19 +0000 (15:30 +0000)]
Adding the ability to see the min/max lat/lon for a changeset in the data browser. Adding file for the nice message that should show when a user is missing in the message controller.
Shaun McDonald [Mon, 8 Dec 2008 14:22:34 +0000 (14:22 +0000)]
Adding some amf create poi tests. Minor bugfix tweaks to the amf controller
Shaun McDonald [Fri, 5 Dec 2008 11:08:58 +0000 (11:08 +0000)]
Fix for the refactoring commited yesterday, based on review by Dave Stubbs
Shaun McDonald [Thu, 4 Dec 2008 17:30:17 +0000 (17:30 +0000)]
Refactoring the amf controller, and all models so that save_with_history! is now private. Everyone should use create_with_history, delete_with_history, and update_from instead. Also gets the amf controller to do version checks in the node/way/relation models. Needs checked. This breaks Potlatch until #1376 is fixed.
Shaun McDonald [Thu, 4 Dec 2008 14:36:21 +0000 (14:36 +0000)]
turning the session off for the changeset controller, to come in line with the other api controllers
Matt Amos [Wed, 3 Dec 2008 18:24:00 +0000 (18:24 +0000)]
Adding missing fixtures to test helper.
Shaun McDonald [Wed, 3 Dec 2008 12:56:02 +0000 (12:56 +0000)]
Deal with active record not found exceptions when creating message. Some tidying of html. For some reason in rails 2.1.2 having a comment at the end of a line, in the view, means that the closing tag needs to be on the next line.
Shaun McDonald [Tue, 2 Dec 2008 18:44:50 +0000 (18:44 +0000)]
adding link to download the full changeset xml
Shaun McDonald [Mon, 1 Dec 2008 18:47:03 +0000 (18:47 +0000)]
Actually set the instance var when closing the changeset
Shaun McDonald [Mon, 1 Dec 2008 18:32:54 +0000 (18:32 +0000)]
ensure that uploads that don't supply a lat and lon for a node. Adding related test and fixing other tests.
Shaun McDonald [Fri, 28 Nov 2008 17:38:23 +0000 (17:38 +0000)]
better handling of duplicate tags. Extra validation in the tests.
Matt Amos [Fri, 28 Nov 2008 12:33:18 +0000 (12:33 +0000)]
Changed duplicate tags test to test the correct code path - was previously failing in libxml, rather than the duplicate tags check.
Shaun McDonald [Thu, 27 Nov 2008 17:06:43 +0000 (17:06 +0000)]
Adding pagination to the changesets, thus allowing you to browe large changesets, without MySQL complaining about memory. Probably needs some fine tuning. You currently can only page one of nodes, ways, and relations, without manually setting the relations. Fixing deprection notice for the classic_pagination plugin.
Matt Amos [Wed, 26 Nov 2008 15:03:50 +0000 (15:03 +0000)]
Adding test to check that users can't update changesets that they don't own.
Matt Amos [Wed, 26 Nov 2008 14:49:56 +0000 (14:49 +0000)]
Moved transaction boundary to cover used-by tests on deletion so that the database can help prevent race conditions.
Matt Amos [Wed, 26 Nov 2008 12:56:42 +0000 (12:56 +0000)]
Moved changeset consistency checks to library code.