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

16 years agoBlock bots from /trace/, so they don't attempt to eat all the GPX data.
Grant Slater [Thu, 9 Oct 2008 18:31:36 +0000 (18:31 +0000)]
Block bots from /trace/, so they don't attempt to eat all the GPX data.

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

16 years agoBackporting the change that I made to the api06 branch to bring the classic_paginatio...
Shaun McDonald [Thu, 9 Oct 2008 13:40:08 +0000 (13:40 +0000)]
Backporting the change that I made to the api06 branch to bring the classic_pagination into our svn. This will make it easier for people to setup a rails version of the server.

16 years agoSet the displayProjection on the map.
Tom Hughes [Thu, 9 Oct 2008 11:51:51 +0000 (11:51 +0000)]
Set the displayProjection on the map.

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

16 years agoMake data browser work with OpenLayers 2.7.
Tom Hughes [Wed, 8 Oct 2008 23:38:45 +0000 (23:38 +0000)]
Make data browser work with OpenLayers 2.7.

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

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

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

16 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

16 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

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

16 years agoMore changes from the live server.
Tom Hughes [Mon, 6 Oct 2008 23:31:41 +0000 (23:31 +0000)]
More changes from the live server.

16 years agoCommit updated dispatch rules from live server.
Tom Hughes [Mon, 6 Oct 2008 23:27:36 +0000 (23:27 +0000)]
Commit updated dispatch rules from live server.

16 years agoUpdate cross domain policy to only allow API access.
Tom Hughes [Mon, 6 Oct 2008 23:21:57 +0000 (23:21 +0000)]
Update cross domain policy to only allow API access.

16 years agoadd railway=platform
Richard Fairhurst [Sun, 5 Oct 2008 22:20:04 +0000 (22:20 +0000)]
add railway=platform

16 years agoslight fix to prevent empty tag values
Richard Fairhurst [Sun, 5 Oct 2008 14:51:43 +0000 (14:51 +0000)]
slight fix to prevent empty tag values

16 years agoPotlatch 0.10d
Richard Fairhurst [Sun, 5 Oct 2008 00:21:35 +0000 (00:21 +0000)]
Potlatch 0.10d

16 years agoUpdate to OpenLayers 2.7.
Tom Hughes [Sat, 4 Oct 2008 23:45:08 +0000 (23:45 +0000)]
Update to OpenLayers 2.7.

16 years agoMake sure the zoom level is valid when positioning the map. Closes #1158.
Tom Hughes [Sat, 4 Oct 2008 23:44:41 +0000 (23:44 +0000)]
Make sure the zoom level is valid when positioning the map. Closes #1158.

16 years agoFix test for errors from geocoder.ca to work properly. Closes #1213.
Tom Hughes [Sat, 4 Oct 2008 23:20:58 +0000 (23:20 +0000)]
Fix test for errors from geocoder.ca to work properly. Closes #1213.

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

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

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

16 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

16 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

16 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

16 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

16 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

16 years agoAdd Flash crossdomain.xml policy file
Grant Slater [Sat, 27 Sep 2008 17:55:54 +0000 (17:55 +0000)]
Add Flash crossdomain.xml policy file

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

16 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

16 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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

16 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

16 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

16 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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

16 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

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

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

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

16 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

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

16 years agosome tweaking to the user fixtures so that there is 2 near each other. new users...
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.

16 years agonew friends with test. Fix to the display name valid tests to make sure that they...
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

16 years agotesting the display name
Shaun McDonald [Thu, 17 Jul 2008 10:44:06 +0000 (10:44 +0000)]
testing the display name

16 years agoOptimise finding of relations, partially reversing change #8443 but in
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.

16 years agoTidy up AMF controller and optimise a few rails things.
Tom Hughes [Wed, 16 Jul 2008 23:10:32 +0000 (23:10 +0000)]
Tidy up AMF controller and optimise a few rails things.

16 years agoDefault to using rails.
Tom Hughes [Wed, 16 Jul 2008 22:59:10 +0000 (22:59 +0000)]
Default to using rails.

16 years agoRemove SOTM advert.
Tom Hughes [Wed, 16 Jul 2008 15:27:25 +0000 (15:27 +0000)]
Remove SOTM advert.

16 years agoDisable JPEG exports from Osmarender as they are not currently
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.

16 years agoRemove no longer needed PHP extension.
Tom Hughes [Wed, 16 Jul 2008 13:04:05 +0000 (13:04 +0000)]
Remove no longer needed PHP extension.

16 years agoRemote Potlatch projection routines as they are no longer needed.
Tom Hughes [Tue, 15 Jul 2008 23:15:53 +0000 (23:15 +0000)]
Remote Potlatch projection routines as they are no longer needed.

16 years agoMinor tidyups.
Tom Hughes [Tue, 15 Jul 2008 18:23:00 +0000 (18:23 +0000)]
Minor tidyups.

16 years agoRename unique_nodes to unshared_node_ids to make it's purpose a bit clearer
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.

16 years agoMove Potlatch configuration to a separate initialiser file.
Tom Hughes [Tue, 15 Jul 2008 18:05:22 +0000 (18:05 +0000)]
Move Potlatch configuration to a separate initialiser file.

16 years agofixing the new display name test
Shaun McDonald [Tue, 15 Jul 2008 18:04:35 +0000 (18:04 +0000)]
fixing the new display name test

16 years agoCheck to see if the e-mail test works
Shaun McDonald [Tue, 15 Jul 2008 17:51:26 +0000 (17:51 +0000)]
Check to see if the e-mail test works