rails.git
11 years agoAltered a functional test on way_tags.
Matt Amos [Fri, 17 Oct 2008 11:21:40 +0000 (11:21 +0000)]
Altered a functional test on way_tags.

11 years agoMore functional tests, this time for way_tags.
Matt Amos [Fri, 17 Oct 2008 11:06:58 +0000 (11:06 +0000)]
More functional tests, this time for way_tags.

11 years agoFixed fixtures and added new tests for ways and way_nodes.
Matt Amos [Thu, 16 Oct 2008 13:02:09 +0000 (13:02 +0000)]
Fixed fixtures and added new tests for ways and way_nodes.

11 years agoadding the Last-Modified response header to the version action
Shaun McDonald [Thu, 16 Oct 2008 07:11:28 +0000 (07:11 +0000)]
adding the Last-Modified response header to the version action

11 years agoset the db encoding to utf-8, otherwise data is stored incorrectly in db. Can be...
Andy Allan [Wed, 15 Oct 2008 16:56:56 +0000 (16:56 +0000)]
set the db encoding to utf-8, otherwise data is stored incorrectly in db. Can be seen by roundtrip truncating at 255 bytes instead of 255 chars. Connection setting (here) is independant of mysql setup

11 years agoAdding a lower and upper length on various web site varchar fields. Fixes one test.
Shaun McDonald [Wed, 15 Oct 2008 16:20:43 +0000 (16:20 +0000)]
Adding a lower and upper length on various web site varchar fields. Fixes one test.

11 years agoChecking foreign key constraints on message recipients and senders
Andy Allan [Wed, 15 Oct 2008 15:23:56 +0000 (15:23 +0000)]
Checking foreign key constraints on message recipients and senders

11 years agoutf-8 wide-char testing of message title - this will come in useful for other things...
Andy Allan [Wed, 15 Oct 2008 13:17:10 +0000 (13:17 +0000)]
utf-8 wide-char testing of message title - this will come in useful for other things e.g. k/v pairs

11 years agoAdded more fixtures and tests for node versioning calls.
Matt Amos [Wed, 15 Oct 2008 11:12:26 +0000 (11:12 +0000)]
Added more fixtures and tests for node versioning calls.

11 years agomore work on the data browser to show the changesets. Also showing the version number...
Shaun McDonald [Tue, 14 Oct 2008 18:33:03 +0000 (18:33 +0000)]
more work on the data browser to show the changesets. Also showing the version number. Would be good to have an additional route for showing a specific version of the node/way/relation from the changeset.

11 years agoCleaned up some unreachable code. Added first test on the 'old' node controller.
Matt Amos [Tue, 14 Oct 2008 16:40:17 +0000 (16:40 +0000)]
Cleaned up some unreachable code. Added first test on the 'old' node controller.

11 years agoAdded some more functional tests for way and relation delete methods.
Matt Amos [Tue, 14 Oct 2008 14:34:17 +0000 (14:34 +0000)]
Added some more functional tests for way and relation delete methods.

11 years agoFixed up delete methods on nodes, ways and relations to return the new version number...
Matt Amos [Tue, 14 Oct 2008 14:27:12 +0000 (14:27 +0000)]
Fixed up delete methods on nodes, ways and relations to return the new version number and added some more tests.

11 years agoadding changeset stuff for the data browser
Shaun McDonald [Mon, 13 Oct 2008 20:48:58 +0000 (20:48 +0000)]
adding changeset stuff for the data browser

11 years agoAdded a bunch more tests on the API 0.6. Fixed node/way/relation from_xml code to...
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.

11 years agonow you will actually save the changeset on updating ways. Showing the changeset...
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.

11 years agofix so that changeset will be closed without an exception due to double validation
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

11 years agoAll API 0.6 functional tests now pass.
Matt Amos [Mon, 13 Oct 2008 15:46:22 +0000 (15:46 +0000)]
All API 0.6 functional tests now pass.

11 years agoFixed up way controller tests for API 0.6.
Matt Amos [Mon, 13 Oct 2008 15:40:32 +0000 (15:40 +0000)]
Fixed up way controller tests for API 0.6.

11 years agoCreating consistency check for creation of nodes, way and relations. Moving some...
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.

11 years agoFixed problems with the relations functional tests.
Matt Amos [Mon, 13 Oct 2008 15:23:48 +0000 (15:23 +0000)]
Fixed problems with the relations functional tests.

11 years agoFixed xml method of old way model.
Matt Amos [Mon, 13 Oct 2008 14:38:32 +0000 (14:38 +0000)]
Fixed xml method of old way model.

11 years agomoving the check consistency to it's own file so that checks will be able to be loade...
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.

11 years agoFix to_xml method of old_relation model.
Matt Amos [Mon, 13 Oct 2008 14:29:30 +0000 (14:29 +0000)]
Fix to_xml method of old_relation model.

11 years agoFixed node functional tests. A couple of changes to the old_node model and node contr...
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.

11 years agofixing the data browser to be able to cope with the changeset change. changeset brows...
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.

11 years agoadditional consistency checks. making the error message for the number of nodes use...
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.

11 years agofix indentation. Get teh api version from the constant, rather than hard coding it...
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.

11 years agoreverting the javascript change in changeset 10926, that needs to be specific to...
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

11 years agoSome comment about where to add code to get some more of the functional changesets...
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.

11 years agomoving the conistency checks for updates and deletes to library, hopefully got the...
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.

11 years agoSmall fixes to unit tests where user_id has become changeset_id.
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.

11 years agoadding the controller code to be able to get a specific version of a node, way or...
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.

11 years agoFix the data config, so that the development database is not the same as the test...
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.

11 years agosome useful notes in code for ideas that require implementing.
Shaun McDonald [Tue, 7 Oct 2008 23:49:53 +0000 (23:49 +0000)]
some useful notes in code for ideas that require implementing.

11 years agoAdding the classic_pagination to svn as the svn external is no longer working
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

11 years agoUpdating the fixtures for the new changesets
Shaun McDonald [Tue, 7 Oct 2008 22:40:28 +0000 (22:40 +0000)]
Updating the fixtures for the new changesets

11 years agofolder empty and components are dead and gone with rails 2 anyway, so deleting this...
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.

11 years agoFixing a bug in my foreign keys. I can now upload and download nodes and ways using...
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.

11 years agoChanging if not to unless to make code more readable.
Shaun McDonald [Fri, 3 Oct 2008 13:57:20 +0000 (13:57 +0000)]
Changing if not to unless to make code more readable.

11 years agochanging the belongs_to and has_many items in the models to reflect the new foriegn...
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.

11 years agowrong foreign key command in the migration
Shaun McDonald [Tue, 30 Sep 2008 15:52:54 +0000 (15:52 +0000)]
wrong foreign key command in the migration

11 years agowrong 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

11 years agousing the wrong field name in one of the migrations
Shaun McDonald [Tue, 30 Sep 2008 15:24:25 +0000 (15:24 +0000)]
using the wrong field name in one of the migrations

11 years agochanging the changesets migrations, so that the user id is now the changeset id for...
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

11 years agoadding some version reading for the nodes
Shaun McDonald [Mon, 29 Sep 2008 16:28:51 +0000 (16:28 +0000)]
adding some version reading for the nodes

11 years agofixing hard coded images/scripts, so that the site works better when deploy as a...
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.

11 years agofixing the test that was broken in the resync
Shaun McDonald [Thu, 25 Sep 2008 16:20:36 +0000 (16:20 +0000)]
fixing the test that was broken in the resync

11 years agoMinor fix for the migration that was moved
Shaun McDonald [Thu, 25 Sep 2008 15:57:59 +0000 (15:57 +0000)]
Minor fix for the migration that was moved

11 years agoDoing a resync from mainline 8633:10895. There was one simple to resolve conflict...
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.

11 years agoGet rails to do asset tagging for the SWF file.
Tom Hughes [Thu, 25 Sep 2008 03:58:18 +0000 (03:58 +0000)]
Get rails to do asset tagging for the SWF file.

11 years agoPotlatch 0.10c... part two
Richard Fairhurst [Sat, 20 Sep 2008 12:07:48 +0000 (12:07 +0000)]
Potlatch 0.10c... part two

11 years agoPotlatch 0.10c
Richard Fairhurst [Thu, 18 Sep 2008 17:04:28 +0000 (17:04 +0000)]
Potlatch 0.10c

11 years agoAdd the noname layer to the main map.
Tom Hughes [Tue, 9 Sep 2008 17:50:09 +0000 (17:50 +0000)]
Add the noname layer to the main map.

11 years agoRun web authorisation for all non-api requests. Closes #1152.
Tom Hughes [Sun, 7 Sep 2008 15:07:44 +0000 (15:07 +0000)]
Run web authorisation for all non-api requests. Closes #1152.

11 years agoUpdate for new cycle map location.
Tom Hughes [Thu, 28 Aug 2008 23:09:42 +0000 (23:09 +0000)]
Update for new cycle map location.

11 years agoFix migration.
Tom Hughes [Sun, 24 Aug 2008 16:56:34 +0000 (16:56 +0000)]
Fix migration.

11 years agoAdd basic support for logically deleting a user.
Tom Hughes [Sun, 24 Aug 2008 16:53:42 +0000 (16:53 +0000)]
Add basic support for logically deleting a user.

11 years agoTidy up diary code a bit.
Tom Hughes [Sun, 24 Aug 2008 15:12:20 +0000 (15:12 +0000)]
Tidy up diary code a bit.

11 years agoedit diary entries
Richard Fairhurst [Thu, 21 Aug 2008 21:40:23 +0000 (21:40 +0000)]
edit diary entries

11 years agomore testing of node tags
Shaun McDonald [Mon, 18 Aug 2008 13:55:21 +0000 (13:55 +0000)]
more testing of node tags

11 years agoCommit new route for email confirmation changes.
Tom Hughes [Mon, 18 Aug 2008 07:28:26 +0000 (07:28 +0000)]
Commit new route for email confirmation changes.

11 years agoDon't user flash[:notice] when we're not redirecting as it will
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.

11 years agoAllow users to change their email address. Closes #546.
Tom Hughes [Wed, 13 Aug 2008 11:39:33 +0000 (11:39 +0000)]
Allow users to change their email address. Closes #546.

11 years agoAllow a user's email address to be marked invalid, and suppress most
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.

11 years agoAdd an administrator flag to the user table.
Tom Hughes [Wed, 13 Aug 2008 08:12:09 +0000 (08:12 +0000)]
Add an administrator flag to the user table.

11 years agoMake the cleanup script work a chunk at a time so we don't run out of
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.

11 years agoImport the output_compression plugin as the SVN external never works.
Tom Hughes [Thu, 7 Aug 2008 17:59:27 +0000 (17:59 +0000)]
Import the output_compression plugin as the SVN external never works.

11 years agoImport the daemon generator 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.

11 years agoMake the location of the GPX traces configurable.
Tom Hughes [Thu, 7 Aug 2008 11:31:42 +0000 (11:31 +0000)]
Make the location of the GPX traces configurable.

11 years agoLink to user pages.
Tom Hughes [Sun, 3 Aug 2008 20:58:58 +0000 (20:58 +0000)]
Link to user pages.

11 years agoPotlatch 0.10b
Richard Fairhurst [Thu, 31 Jul 2008 22:48:12 +0000 (22:48 +0000)]
Potlatch 0.10b

11 years agoIgnore any files in an __MACOSX folder in a zip file, as these are
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.

11 years agoCorrect versions of z12/13 keys
Steve Chilton [Wed, 30 Jul 2008 14:37:55 +0000 (14:37 +0000)]
Correct versions of z12/13 keys

11 years agonew versions of map keys to z12 and z13
Steve Chilton [Wed, 30 Jul 2008 14:19:15 +0000 (14:19 +0000)]
new versions of map keys to z12 and z13

11 years agoadd "non-exclusively" to new user signup message
Frederik Ramm [Wed, 30 Jul 2008 13:20:33 +0000 (13:20 +0000)]
add "non-exclusively" to new user signup message

11 years agoRework GPX import daemon to use libxml2 for speed.
Tom Hughes [Wed, 30 Jul 2008 08:37:05 +0000 (08:37 +0000)]
Rework GPX import daemon to use libxml2 for speed.

11 years agoPotlatch 0.10a
Richard Fairhurst [Tue, 29 Jul 2008 00:33:33 +0000 (00:33 +0000)]
Potlatch 0.10a

11 years agoRemoving rspec from svn externals, as it isn't being used.
Shaun McDonald [Fri, 25 Jul 2008 10:35:59 +0000 (10:35 +0000)]
Removing rspec from svn externals, as it isn't being used.

11 years agoRemoving rspec from svn, 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.

11 years agoStarting to test the output of the xml to make sure that it is what we expect to...
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.

11 years agoShow whether a trace is public or private in the trace list, so that a user can easil...
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.

11 years agoRender nothing on a successful delete.
Tom Hughes [Tue, 22 Jul 2008 14:16:07 +0000 (14:16 +0000)]
Render nothing on a successful delete.

11 years agoNow just got one test to sort on the functional tests. All other tests are working...
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.

11 years agoEnable JPEG export from Osmarender again.
Tom Hughes [Tue, 22 Jul 2008 08:53:34 +0000 (08:53 +0000)]
Enable JPEG export from Osmarender again.

11 years agoTry and improve libxml error handling.
Tom Hughes [Sun, 20 Jul 2008 17:08:27 +0000 (17:08 +0000)]
Try and improve libxml error handling.

11 years agoFix thinko.
Tom Hughes [Sat, 19 Jul 2008 23:02:04 +0000 (23:02 +0000)]
Fix thinko.

11 years agoImprove error handling.
Tom Hughes [Sat, 19 Jul 2008 22:59:59 +0000 (22:59 +0000)]
Improve error handling.

11 years agoMore warning fixes.
Tom Hughes [Fri, 18 Jul 2008 22:23:26 +0000 (22:23 +0000)]
More warning fixes.

11 years agoStop rails moaning.
Tom Hughes [Fri, 18 Jul 2008 21:42:13 +0000 (21:42 +0000)]
Stop rails moaning.

11 years agoFirst current node tag test
Shaun McDonald [Fri, 18 Jul 2008 17:10:24 +0000 (17:10 +0000)]
First current node tag test

11 years agoMake sure that there is a sender and a recipient of a message. New test to make sure...
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.

11 years agoAdding message tests. Adding some international UTF-8 chars for the display name...
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.

11 years agoCope with being asked to find relations for any empty set of objects.
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.

11 years agomove status message up a bit when Yahoo layer is displayed, so as not to obscure...
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

11 years agoMerge potlatch_010 properly.
Tom Hughes [Fri, 18 Jul 2008 11:23:34 +0000 (11:23 +0000)]
Merge potlatch_010 properly.

11 years agoRevert broken attempt at potlatch_010 merge.
Tom Hughes [Fri, 18 Jul 2008 11:20:04 +0000 (11:20 +0000)]
Revert broken attempt at potlatch_010 merge.

11 years agoMerged 8899:9136 and 9145 from trunk.
Tom Hughes [Fri, 18 Jul 2008 11:18:39 +0000 (11:18 +0000)]
Merged 8899:9136 and 9145 from trunk.

11 years agomake sure preset menu is removed on deselect
Richard Fairhurst [Fri, 18 Jul 2008 11:06:02 +0000 (11:06 +0000)]
make sure preset menu is removed on deselect

11 years agoMerge potlatch_010 branch to head.
Tom Hughes [Fri, 18 Jul 2008 11:02:10 +0000 (11:02 +0000)]
Merge potlatch_010 branch to head.