]>
git.openstreetmap.org Git - rails.git/log
Shaun McDonald [Mon, 13 Oct 2008 20:48:58 +0000 (20:48 +0000)]
adding changeset stuff for the data browser
Matt Amos [Mon, 13 Oct 2008 17:50:15 +0000 (17:50 +0000)]
Added a bunch more tests on the API 0.6. Fixed node/way/relation from_xml code to disallow duplicate tag keys.
Shaun McDonald [Mon, 13 Oct 2008 17:05:52 +0000 (17:05 +0000)]
now you will actually save the changeset on updating ways. Showing the changeset in the data browser detail.
Shaun McDonald [Mon, 13 Oct 2008 16:11:57 +0000 (16:11 +0000)]
fix so that changeset will be closed without an exception due to double validation
Matt Amos [Mon, 13 Oct 2008 15:46:22 +0000 (15:46 +0000)]
All API 0.6 functional tests now pass.
Matt Amos [Mon, 13 Oct 2008 15:40:32 +0000 (15:40 +0000)]
Fixed up way controller tests for API 0.6.
Shaun McDonald [Mon, 13 Oct 2008 15:39:21 +0000 (15:39 +0000)]
Creating consistency check for creation of nodes, way and relations. Moving some creation code from the controller to the model, and adding error handling on create errors.
Matt Amos [Mon, 13 Oct 2008 15:23:48 +0000 (15:23 +0000)]
Fixed problems with the relations functional tests.
Matt Amos [Mon, 13 Oct 2008 14:38:32 +0000 (14:38 +0000)]
Fixed xml method of old way model.
Shaun McDonald [Mon, 13 Oct 2008 14:34:04 +0000 (14:34 +0000)]
moving the check consistency to it's own file so that checks will be able to be loaded into the way and relation models, without loading the node stuff.
Matt Amos [Mon, 13 Oct 2008 14:29:30 +0000 (14:29 +0000)]
Fix to_xml method of old_relation model.
Matt Amos [Mon, 13 Oct 2008 14:08:31 +0000 (14:08 +0000)]
Fixed node functional tests. A couple of changes to the old_node model and node controller for changesets.
Shaun McDonald [Mon, 13 Oct 2008 12:08:26 +0000 (12:08 +0000)]
fixing the data browser to be able to cope with the changeset change. changeset browsing still needs to be implemented. Also giving a nice error message for 404 not found instead of rendering nothing.
Shaun McDonald [Sun, 12 Oct 2008 22:32:51 +0000 (22:32 +0000)]
additional consistency checks. making the error message for the number of nodes use the configured number of nodes, rather than a hard coded number. minor improvements to the way controller functional tests. Not sure if they should be turned into integration tests.
Shaun McDonald [Fri, 10 Oct 2008 18:24:07 +0000 (18:24 +0000)]
fix indentation. Get teh api version from the constant, rather than hard coding it. Using right save method, so that exception is thrown. Some comment questions.
Shaun McDonald [Fri, 10 Oct 2008 13:27:21 +0000 (13:27 +0000)]
reverting the javascript change in changeset 10926, that needs to be specific to each rails setup (if run out of another dir), until we turn the file into an erb that can insert the rails root into the javascript file
Shaun McDonald [Fri, 10 Oct 2008 07:58:33 +0000 (07:58 +0000)]
Some comment about where to add code to get some more of the functional changesets working.
Shaun McDonald [Thu, 9 Oct 2008 16:22:05 +0000 (16:22 +0000)]
moving the conistency checks for updates and deletes to library, hopefully got the updates and deletes working now.
Matt Amos [Thu, 9 Oct 2008 10:19:16 +0000 (10:19 +0000)]
Small fixes to unit tests where user_id has become changeset_id.
Shaun McDonald [Wed, 8 Oct 2008 18:03:41 +0000 (18:03 +0000)]
adding the controller code to be able to get a specific version of a node, way or relation. Add some node checks on update. Some code indentation cleanup.
Shaun McDonald [Wed, 8 Oct 2008 15:42:42 +0000 (15:42 +0000)]
Fix the data config, so that the development database is not the same as the test database. Make a good stab at getting the creates and updates for relations working, adding some new error exceptions. Some code indentation cleanup.
Shaun McDonald [Tue, 7 Oct 2008 23:49:53 +0000 (23:49 +0000)]
some useful notes in code for ideas that require implementing.
Shaun McDonald [Tue, 7 Oct 2008 22:59:59 +0000 (22:59 +0000)]
Adding the classic_pagination to svn as the svn external is no longer working
Shaun McDonald [Tue, 7 Oct 2008 22:40:28 +0000 (22:40 +0000)]
Updating the fixtures for the new changesets
Shaun McDonald [Tue, 7 Oct 2008 22:11:05 +0000 (22:11 +0000)]
folder empty and components are dead and gone with rails 2 anyway, so deleting this folder.
Shaun McDonald [Fri, 3 Oct 2008 17:09:58 +0000 (17:09 +0000)]
Fixing a bug in my foreign keys. I can now upload and download nodes and ways using JOSM in the new API.
Shaun McDonald [Fri, 3 Oct 2008 13:57:20 +0000 (13:57 +0000)]
Changing if not to unless to make code more readable.
Shaun McDonald [Tue, 30 Sep 2008 18:21:56 +0000 (18:21 +0000)]
changing the belongs_to and has_many items in the models to reflect the new foriegn keys in the db and the fact that a (old)node/way/relation now belong to a changeset, which in turn has a user.
Shaun McDonald [Tue, 30 Sep 2008 15:52:54 +0000 (15:52 +0000)]
wrong foreign key command in the migration
Shaun McDonald [Tue, 30 Sep 2008 15:44:55 +0000 (15:44 +0000)]
wrong foreign key command in the migration
Shaun McDonald [Tue, 30 Sep 2008 15:24:25 +0000 (15:24 +0000)]
using the wrong field name in one of the migrations
Shaun McDonald [Tue, 30 Sep 2008 14:29:44 +0000 (14:29 +0000)]
changing the changesets migrations, so that the user id is now the changeset id for the nodes/ways/relations
Shaun McDonald [Mon, 29 Sep 2008 16:28:51 +0000 (16:28 +0000)]
adding some version reading for the nodes
Shaun McDonald [Fri, 26 Sep 2008 15:17:30 +0000 (15:17 +0000)]
fixing hard coded images/scripts, so that the site works better when deploy as a sub directory using passenger phusion.
Shaun McDonald [Thu, 25 Sep 2008 16:20:36 +0000 (16:20 +0000)]
fixing the test that was broken in the resync
Shaun McDonald [Thu, 25 Sep 2008 15:57:59 +0000 (15:57 +0000)]
Minor fix for the migration that was moved
Shaun McDonald [Thu, 25 Sep 2008 15:06:05 +0000 (15:06 +0000)]
Doing a resync from mainline 8633:10895. There was one simple to resolve conflict on app/models/node.rb. Also moving the migrations for API0.6 to new sequence numbers since there was some new migrations added to mainline, where the migration numbers would conflict if not moved.
Tom Hughes [Thu, 25 Sep 2008 03:58:18 +0000 (03:58 +0000)]
Get rails to do asset tagging for the SWF file.
Richard Fairhurst [Sat, 20 Sep 2008 12:07:48 +0000 (12:07 +0000)]
Potlatch 0.10c... part two
Richard Fairhurst [Thu, 18 Sep 2008 17:04:28 +0000 (17:04 +0000)]
Potlatch 0.10c
Tom Hughes [Tue, 9 Sep 2008 17:50:09 +0000 (17:50 +0000)]
Add the noname layer to the main map.
Tom Hughes [Sun, 7 Sep 2008 15:07:44 +0000 (15:07 +0000)]
Run web authorisation for all non-api requests. Closes #1152.
Tom Hughes [Thu, 28 Aug 2008 23:09:42 +0000 (23:09 +0000)]
Update for new cycle map location.
Tom Hughes [Sun, 24 Aug 2008 16:56:34 +0000 (16:56 +0000)]
Fix migration.
Tom Hughes [Sun, 24 Aug 2008 16:53:42 +0000 (16:53 +0000)]
Add basic support for logically deleting a user.
Tom Hughes [Sun, 24 Aug 2008 15:12:20 +0000 (15:12 +0000)]
Tidy up diary code a bit.
Richard Fairhurst [Thu, 21 Aug 2008 21:40:23 +0000 (21:40 +0000)]
edit diary entries
Shaun McDonald [Mon, 18 Aug 2008 13:55:21 +0000 (13:55 +0000)]
more testing of node tags
Tom Hughes [Mon, 18 Aug 2008 07:28:26 +0000 (07:28 +0000)]
Commit new route for email confirmation changes.
Tom Hughes [Wed, 13 Aug 2008 11:44:53 +0000 (11:44 +0000)]
Don't user flash[:notice] when we're not redirecting as it will
persist to the next request and cause confusion.
Tom Hughes [Wed, 13 Aug 2008 11:39:33 +0000 (11:39 +0000)]
Allow users to change their email address. Closes #546.
Tom Hughes [Wed, 13 Aug 2008 10:45:49 +0000 (10:45 +0000)]
Allow a user's email address to be marked invalid, and suppress most
notification mails for such users.
Tom Hughes [Wed, 13 Aug 2008 08:12:09 +0000 (08:12 +0000)]
Add an administrator flag to the user table.
Tom Hughes [Fri, 8 Aug 2008 15:49:29 +0000 (15:49 +0000)]
Make the cleanup script work a chunk at a time so we don't run out of
memory when there are lots of sessions.
Tom Hughes [Thu, 7 Aug 2008 17:59:27 +0000 (17:59 +0000)]
Import the output_compression plugin as the SVN external never works.
Tom Hughes [Thu, 7 Aug 2008 17:46:34 +0000 (17:46 +0000)]
Import the daemon generator as the SVN external never works.
Tom Hughes [Thu, 7 Aug 2008 11:31:42 +0000 (11:31 +0000)]
Make the location of the GPX traces configurable.
Tom Hughes [Sun, 3 Aug 2008 20:58:58 +0000 (20:58 +0000)]
Link to user pages.
Richard Fairhurst [Thu, 31 Jul 2008 22:48:12 +0000 (22:48 +0000)]
Potlatch 0.10b
Tom Hughes [Thu, 31 Jul 2008 08:06:09 +0000 (08:06 +0000)]
Ignore any files in an __MACOSX folder in a zip file, as these are
metadata files added by the MAC OS X zip tool.
Steve Chilton [Wed, 30 Jul 2008 14:37:55 +0000 (14:37 +0000)]
Correct versions of z12/13 keys
Steve Chilton [Wed, 30 Jul 2008 14:19:15 +0000 (14:19 +0000)]
new versions of map keys to z12 and z13
Frederik Ramm [Wed, 30 Jul 2008 13:20:33 +0000 (13:20 +0000)]
add "non-exclusively" to new user signup message
Tom Hughes [Wed, 30 Jul 2008 08:37:05 +0000 (08:37 +0000)]
Rework GPX import daemon to use libxml2 for speed.
Richard Fairhurst [Tue, 29 Jul 2008 00:33:33 +0000 (00:33 +0000)]
Potlatch 0.10a
Shaun McDonald [Fri, 25 Jul 2008 10:35:59 +0000 (10:35 +0000)]
Removing rspec from svn externals, as it isn't being used.
Shaun McDonald [Fri, 25 Jul 2008 10:22:52 +0000 (10:22 +0000)]
Removing rspec from svn, as it isn't being used.
Shaun McDonald [Thu, 24 Jul 2008 10:56:29 +0000 (10:56 +0000)]
Starting to test the output of the xml to make sure that it is what we expect to be returned by teh api for ways tests.
Shaun McDonald [Wed, 23 Jul 2008 14:33:45 +0000 (14:33 +0000)]
Show whether a trace is public or private in the trace list, so that a user can easily find traces that are private, when they really wanted them to be public. Only show 'in ...tags...', if there are some tags. Improve indentation.
Tom Hughes [Tue, 22 Jul 2008 14:16:07 +0000 (14:16 +0000)]
Render nothing on a successful delete.
Shaun McDonald [Tue, 22 Jul 2008 14:06:53 +0000 (14:06 +0000)]
Now just got one test to sort on the functional tests. All other tests are working and pass. Plenty more to write though.
Tom Hughes [Tue, 22 Jul 2008 08:53:34 +0000 (08:53 +0000)]
Enable JPEG export from Osmarender again.
Tom Hughes [Sun, 20 Jul 2008 17:08:27 +0000 (17:08 +0000)]
Try and improve libxml error handling.
Tom Hughes [Sat, 19 Jul 2008 23:02:04 +0000 (23:02 +0000)]
Fix thinko.
Tom Hughes [Sat, 19 Jul 2008 22:59:59 +0000 (22:59 +0000)]
Improve error handling.
Tom Hughes [Fri, 18 Jul 2008 22:23:26 +0000 (22:23 +0000)]
More warning fixes.
Tom Hughes [Fri, 18 Jul 2008 21:42:13 +0000 (21:42 +0000)]
Stop rails moaning.
Shaun McDonald [Fri, 18 Jul 2008 17:10:24 +0000 (17:10 +0000)]
First current node tag test
Shaun McDonald [Fri, 18 Jul 2008 16:44:14 +0000 (16:44 +0000)]
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.
Shaun McDonald [Fri, 18 Jul 2008 16:26:21 +0000 (16:26 +0000)]
Adding message tests. Adding some international UTF-8 chars for the display name and email address tests.
Tom Hughes [Fri, 18 Jul 2008 13:13:28 +0000 (13:13 +0000)]
Cope with being asked to find relations for any empty set of objects.
Richard Fairhurst [Fri, 18 Jul 2008 11:42:45 +0000 (11:42 +0000)]
move status message up a bit when Yahoo layer is displayed, so as not to obscure (c) notice
Tom Hughes [Fri, 18 Jul 2008 11:23:34 +0000 (11:23 +0000)]
Merge potlatch_010 properly.
Tom Hughes [Fri, 18 Jul 2008 11:20:04 +0000 (11:20 +0000)]
Revert broken attempt at potlatch_010 merge.
Tom Hughes [Fri, 18 Jul 2008 11:18:39 +0000 (11:18 +0000)]
Merged 8899:9136 and 9145 from trunk.
Richard Fairhurst [Fri, 18 Jul 2008 11:06:02 +0000 (11:06 +0000)]
make sure preset menu is removed on deselect
Tom Hughes [Fri, 18 Jul 2008 11:02:10 +0000 (11:02 +0000)]
Merge potlatch_010 branch to head.
Shaun McDonald [Thu, 17 Jul 2008 15:08:00 +0000 (15:08 +0000)]
some tweaking to the user fixtures so that there is 2 near each other. new users nearby and friends with tests.
Shaun McDonald [Thu, 17 Jul 2008 11:18:33 +0000 (11:18 +0000)]
new friends with test. Fix to the display name valid tests to make sure that they don't test the length
Shaun McDonald [Thu, 17 Jul 2008 10:44:06 +0000 (10:44 +0000)]
testing the display name
Tom Hughes [Wed, 16 Jul 2008 23:42:59 +0000 (23:42 +0000)]
Optimise finding of relations, partially reversing change #8443 but in
a more rails like way.
Tom Hughes [Wed, 16 Jul 2008 23:10:32 +0000 (23:10 +0000)]
Tidy up AMF controller and optimise a few rails things.
Tom Hughes [Wed, 16 Jul 2008 22:59:10 +0000 (22:59 +0000)]
Default to using rails.
Tom Hughes [Wed, 16 Jul 2008 15:27:25 +0000 (15:27 +0000)]
Remove SOTM advert.
Tom Hughes [Wed, 16 Jul 2008 13:21:16 +0000 (13:21 +0000)]
Disable JPEG exports from Osmarender as they are not currently
supported by the MapOf call in the new tiles@home server.
Tom Hughes [Wed, 16 Jul 2008 13:04:05 +0000 (13:04 +0000)]
Remove no longer needed PHP extension.
Tom Hughes [Tue, 15 Jul 2008 23:15:53 +0000 (23:15 +0000)]
Remote Potlatch projection routines as they are no longer needed.
Tom Hughes [Tue, 15 Jul 2008 18:23:00 +0000 (18:23 +0000)]
Minor tidyups.
Tom Hughes [Tue, 15 Jul 2008 18:18:37 +0000 (18:18 +0000)]
Rename unique_nodes to unshared_node_ids to make it's purpose a bit clearer
and rework it to be a bit tidier.
Tom Hughes [Tue, 15 Jul 2008 18:05:22 +0000 (18:05 +0000)]
Move Potlatch configuration to a separate initialiser file.