]> git.openstreetmap.org Git - rails.git/log
rails.git
15 years agofixing some of the relation tests. Some adjustments to the fixtures.
Shaun McDonald [Wed, 22 Apr 2009 00:42:23 +0000 (00:42 +0000)]
fixing some of the relation tests. Some adjustments to the fixtures.

15 years agoibid
Richard Fairhurst [Tue, 21 Apr 2009 23:59:27 +0000 (23:59 +0000)]
ibid

15 years agothere is not HTML attribute named "padding". either use "cellpadding" (this patch...
Frederik Ramm [Tue, 21 Apr 2009 23:55:02 +0000 (23:55 +0000)]
there is not HTML attribute named "padding". either use "cellpadding" (this patch), or use the CSS attribute (i.e. style="padding: 0px").

15 years agoQuick and dirty fix for relation tags issue.
Matt Amos [Tue, 21 Apr 2009 23:40:27 +0000 (23:40 +0000)]
Quick and dirty fix for relation tags issue.

15 years agomodified "user" link in "recent changes" list to point directly to user's list of...
Frederik Ramm [Tue, 21 Apr 2009 23:38:43 +0000 (23:38 +0000)]
modified "user" link in "recent changes" list to point directly to user's list of changes which is what you expect in this context, rather than going to that user's user page and having to click "edits" there.

15 years agofix id/relid inconsistency
Richard Fairhurst [Tue, 21 Apr 2009 23:36:53 +0000 (23:36 +0000)]
fix id/relid inconsistency

15 years agoFixed search controller to have some chance of working.
Tom Hughes [Tue, 21 Apr 2009 23:35:19 +0000 (23:35 +0000)]
Fixed search controller to have some chance of working.

15 years agoForce selection to fail when no traces match the tag.
Tom Hughes [Tue, 21 Apr 2009 21:54:44 +0000 (21:54 +0000)]
Force selection to fail when no traces match the tag.

15 years agoDon't generate an IN condition with an empty list.
Tom Hughes [Tue, 21 Apr 2009 21:51:02 +0000 (21:51 +0000)]
Don't generate an IN condition with an empty list.

15 years agoUse correct names for member types.
Tom Hughes [Tue, 21 Apr 2009 21:37:27 +0000 (21:37 +0000)]
Use correct names for member types.

15 years agoFix bbox display again, how do we keep mixing our lons and lats?
Thomas Wood [Tue, 21 Apr 2009 21:30:37 +0000 (21:30 +0000)]
Fix bbox display again, how do we keep mixing our lons and lats?

15 years agoAdding more tests for updating relation tags.
Matt Amos [Tue, 21 Apr 2009 20:33:16 +0000 (20:33 +0000)]
Adding more tests for updating relation tags.

15 years agoExtra test for updating relation tags.
Matt Amos [Tue, 21 Apr 2009 19:53:14 +0000 (19:53 +0000)]
Extra test for updating relation tags.

15 years agoMore test fixes after fixture changes.
Matt Amos [Tue, 21 Apr 2009 19:51:43 +0000 (19:51 +0000)]
More test fixes after fixture changes.

15 years agoFixed formatting and stuff in fixtures.
Matt Amos [Tue, 21 Apr 2009 18:37:24 +0000 (18:37 +0000)]
Fixed formatting and stuff in fixtures.

15 years agoSlight performance improvement (a reported 2s) by skipping db query if no bbox is...
Thomas Wood [Tue, 21 Apr 2009 18:04:43 +0000 (18:04 +0000)]
Slight performance improvement (a reported 2s) by skipping db query if no bbox is passed in on /history
Thanks apmon for the report.

15 years agoAdd new fixtures for testing multiple tags on a relation.
Shaun McDonald [Tue, 21 Apr 2009 17:54:59 +0000 (17:54 +0000)]
Add new fixtures for testing multiple tags on a relation.

15 years agoPedantic change to descriptive text - "Recently closed" to "Recently edited"
Thomas Wood [Tue, 21 Apr 2009 17:35:54 +0000 (17:35 +0000)]
Pedantic change to descriptive text - "Recently closed" to "Recently edited"

15 years agoAdd an expiry header to trace images.
Tom Hughes [Tue, 21 Apr 2009 17:10:35 +0000 (17:10 +0000)]
Add an expiry header to trace images.

15 years agoHopefully fix the old_node_controller tests.
Shaun McDonald [Tue, 21 Apr 2009 17:07:14 +0000 (17:07 +0000)]
Hopefully fix the old_node_controller tests.

15 years agoAdd a geocoder backend.
Tom Hughes [Tue, 21 Apr 2009 15:08:36 +0000 (15:08 +0000)]
Add a geocoder backend.

15 years agoArrays have a length method, not a count method.
Tom Hughes [Tue, 21 Apr 2009 11:36:41 +0000 (11:36 +0000)]
Arrays have a length method, not a count method.

15 years agoMake error messages more helpful
Richard Fairhurst [Tue, 21 Apr 2009 11:27:03 +0000 (11:27 +0000)]
Make error messages more helpful

15 years agoSplit out subscript to see which one is erroring
Richard Fairhurst [Tue, 21 Apr 2009 10:14:28 +0000 (10:14 +0000)]
Split out subscript to see which one is erroring

15 years agoConnect up the versioned capabilities call again.
Tom Hughes [Tue, 21 Apr 2009 09:32:19 +0000 (09:32 +0000)]
Connect up the versioned capabilities call again.

15 years agoFix MySQL dependency
Richard Fairhurst [Tue, 21 Apr 2009 09:24:07 +0000 (09:24 +0000)]
Fix MySQL dependency

15 years agoAdd missing image.
Tom Hughes [Tue, 21 Apr 2009 08:51:23 +0000 (08:51 +0000)]
Add missing image.

15 years agoRemove reference to non-existent images.
Tom Hughes [Tue, 21 Apr 2009 08:08:02 +0000 (08:08 +0000)]
Remove reference to non-existent images.

15 years agoSwitch database config to postgresql.
Tom Hughes [Tue, 21 Apr 2009 07:56:52 +0000 (07:56 +0000)]
Switch database config to postgresql.

15 years agoUpdate lighttpd config for 0.6 api.
Tom Hughes [Tue, 21 Apr 2009 07:54:00 +0000 (07:54 +0000)]
Update lighttpd config for 0.6 api.

15 years agoRemove explicit load of mysql and rails automatically loads the
Tom Hughes [Tue, 21 Apr 2009 07:52:47 +0000 (07:52 +0000)]
Remove explicit load of mysql and rails automatically loads the
right database driver already.

15 years agoImprove comments.
Tom Hughes [Tue, 21 Apr 2009 07:51:26 +0000 (07:51 +0000)]
Improve comments.

15 years agonginx fix expiry to actually work on images/javascripts/etc
Grant Slater [Tue, 21 Apr 2009 02:42:29 +0000 (02:42 +0000)]
nginx fix expiry to actually work on images/javascripts/etc

15 years agoPull in block rules from the lighttpd config.
Tom Hughes [Mon, 20 Apr 2009 21:14:39 +0000 (21:14 +0000)]
Pull in block rules from the lighttpd config.

15 years agoEnsure :not_found status is returned, catching RecordNotFound doesn't work as isnt...
Thomas Wood [Mon, 20 Apr 2009 20:58:42 +0000 (20:58 +0000)]
Ensure :not_found status is returned, catching RecordNotFound doesn't work as isnt raised when finding :first.

15 years agoGive munin access to some statistics.
Tom Hughes [Mon, 20 Apr 2009 20:14:05 +0000 (20:14 +0000)]
Give munin access to some statistics.

15 years agoExpose relation version to api and fix remaining server status typo in old_relation...
Thomas Wood [Mon, 20 Apr 2009 19:44:58 +0000 (19:44 +0000)]
Expose relation version to api and fix remaining server status typo in old_relation controller.

15 years agoIncrease fastcgi timeout to 300s for bulk api requests.
Tom Hughes [Mon, 20 Apr 2009 19:30:23 +0000 (19:30 +0000)]
Increase fastcgi timeout to 300s for bulk api requests.

15 years agoRemove trailing whitespace.
Tom Hughes [Mon, 20 Apr 2009 19:25:10 +0000 (19:25 +0000)]
Remove trailing whitespace.

15 years agoStrip asset tags from user images.
Tom Hughes [Mon, 20 Apr 2009 19:22:38 +0000 (19:22 +0000)]
Strip asset tags from user images.

15 years agoFix bug introduced in r14610 (.downcase in wrong place)
Thomas Wood [Mon, 20 Apr 2009 19:13:52 +0000 (19:13 +0000)]
Fix bug introduced in r14610 (.downcase in wrong place)
No need to sanitise type of relation member, since will only be a Node, Way, or Relation and not user-provided.

15 years agoDetabify.
Tom Hughes [Mon, 20 Apr 2009 18:57:05 +0000 (18:57 +0000)]
Detabify.

15 years agonginx fixes, including http://api.openstreetmap/0.6/... support
Grant Slater [Mon, 20 Apr 2009 18:45:20 +0000 (18:45 +0000)]
nginx fixes, including http://api.openstreetmap/0.6/... support

15 years agoRemove location block from abuse placeholder so it applies server wide.
Tom Hughes [Mon, 20 Apr 2009 17:32:33 +0000 (17:32 +0000)]
Remove location block from abuse placeholder so it applies server wide.

15 years agofix bug in the case of the action in the data browser when linking to relation members
Shaun McDonald [Mon, 20 Apr 2009 17:28:01 +0000 (17:28 +0000)]
fix bug in the case of the action in the data browser when linking to relation members

15 years agoRestrict 7 day expiry on /export to just the embed.html page.
Tom Hughes [Mon, 20 Apr 2009 17:27:12 +0000 (17:27 +0000)]
Restrict 7 day expiry on /export to just the embed.html page.

15 years agoReturn 404 for unknown API versions instead of 403.
Tom Hughes [Mon, 20 Apr 2009 17:17:00 +0000 (17:17 +0000)]
Return 404 for unknown API versions instead of 403.

15 years agoApply patch by Lars from osm dev list with the typo
Shaun McDonald [Mon, 20 Apr 2009 17:15:28 +0000 (17:15 +0000)]
Apply patch by Lars from osm dev list with the typo

15 years agoStrip asset tags from public files.
Tom Hughes [Mon, 20 Apr 2009 17:09:26 +0000 (17:09 +0000)]
Strip asset tags from public files.

15 years agoMove access_log configuration.
Tom Hughes [Mon, 20 Apr 2009 17:00:52 +0000 (17:00 +0000)]
Move access_log configuration.

15 years agoTidy things up and fix a few errors.
Tom Hughes [Mon, 20 Apr 2009 16:59:12 +0000 (16:59 +0000)]
Tidy things up and fix a few errors.

15 years agoRemove tabs.
Tom Hughes [Mon, 20 Apr 2009 16:39:24 +0000 (16:39 +0000)]
Remove tabs.

15 years agoAdd missing semicolon.
Tom Hughes [Mon, 20 Apr 2009 16:37:48 +0000 (16:37 +0000)]
Add missing semicolon.

15 years agoRemove private data.
Tom Hughes [Mon, 20 Apr 2009 16:37:36 +0000 (16:37 +0000)]
Remove private data.

15 years agoConvert to unix newlines.
Tom Hughes [Mon, 20 Apr 2009 16:37:12 +0000 (16:37 +0000)]
Convert to unix newlines.

15 years agonginx syntax tweaks
Grant Slater [Mon, 20 Apr 2009 15:38:48 +0000 (15:38 +0000)]
nginx syntax tweaks

15 years agoRewrite /0.n/... as /api/0.n/... for the api virtual host.
Tom Hughes [Mon, 20 Apr 2009 15:16:38 +0000 (15:16 +0000)]
Rewrite /0.n/... as /api/0.n/... for the api virtual host.

15 years agoAdd some extra indexes to the changesets table.
Tom Hughes [Mon, 20 Apr 2009 14:54:05 +0000 (14:54 +0000)]
Add some extra indexes to the changesets table.

15 years agocorrect nginx syntax
Grant Slater [Mon, 20 Apr 2009 14:37:46 +0000 (14:37 +0000)]
correct nginx syntax

15 years agoinitial untest nginx config. API 0.6 tweaking still required.
Grant Slater [Mon, 20 Apr 2009 14:20:33 +0000 (14:20 +0000)]
initial untest nginx config. API 0.6 tweaking still required.

15 years agoAdd missing files from api06 merge.
Tom Hughes [Mon, 20 Apr 2009 14:09:35 +0000 (14:09 +0000)]
Add missing files from api06 merge.

15 years agoAdd changeset indexes to nodes, ways and relations.
Tom Hughes [Mon, 20 Apr 2009 13:39:20 +0000 (13:39 +0000)]
Add changeset indexes to nodes, ways and relations.

15 years agoAdd a user index to the changeset table.
Tom Hughes [Mon, 20 Apr 2009 13:31:57 +0000 (13:31 +0000)]
Add a user index to the changeset table.

15 years agoadd mongrel_cluster config for potential usage later
Grant Slater [Mon, 20 Apr 2009 13:25:28 +0000 (13:25 +0000)]
add mongrel_cluster config for potential usage later

15 years agoMerge vendor tree from api06 branch.
Tom Hughes [Mon, 20 Apr 2009 09:17:10 +0000 (09:17 +0000)]
Merge vendor tree from api06 branch.

15 years agoRemove plugin externals.
Tom Hughes [Mon, 20 Apr 2009 09:13:21 +0000 (09:13 +0000)]
Remove plugin externals.

15 years agoMerge api06 branch to trunk.
Tom Hughes [Mon, 20 Apr 2009 09:12:03 +0000 (09:12 +0000)]
Merge api06 branch to trunk.

15 years agoAdd condition for user not found in trace controller.
Thomas Wood [Sun, 19 Apr 2009 21:22:34 +0000 (21:22 +0000)]
Add condition for user not found in trace controller.
Closes #1710

15 years agoFix map in IE by deferring Vector layer addition to page load (note that deferred...
Thomas Wood [Sun, 19 Apr 2009 21:03:41 +0000 (21:03 +0000)]
Fix map in IE by deferring Vector layer addition to page load (note that deferred script running is _not_ the same as onload), also only add the Vector layer as required, so to save some overhead.
I've trimmed down the unrequired options on the layer, they're defaulted from the map.
Thanks firefishy for the report.

15 years agoReverse order of marker and vector layers to stop the vector layer
Tom Hughes [Sun, 19 Apr 2009 11:12:28 +0000 (11:12 +0000)]
Reverse order of marker and vector layers to stop the vector layer
grabbing all the mouse clicks. Closes #1718.

15 years agoDon't register a setHome handler unless we have the flag checkbox
Tom Hughes [Sun, 19 Apr 2009 11:00:37 +0000 (11:00 +0000)]
Don't register a setHome handler unless we have the flag checkbox
prsent on the page.

15 years agoSend replies to the right user. Closes #1720.
Tom Hughes [Sun, 19 Apr 2009 10:36:04 +0000 (10:36 +0000)]
Send replies to the right user. Closes #1720.

15 years agoFixing some of the tests, adding the new tests to make sure that you can't edit when...
Shaun McDonald [Sat, 18 Apr 2009 17:17:22 +0000 (17:17 +0000)]
Fixing some of the tests, adding the new tests to make sure that you can't edit when your not a public user

15 years agoRemove trailing comma to make IE happy.
Tom Hughes [Sat, 18 Apr 2009 16:45:45 +0000 (16:45 +0000)]
Remove trailing comma to make IE happy.

15 years agoReject uploads unless the user has made their edits pubic.
Tom Hughes [Thu, 16 Apr 2009 21:50:20 +0000 (21:50 +0000)]
Reject uploads unless the user has made their edits pubic.

15 years agoFixed to work with merged changes to api availability checks.
Tom Hughes [Thu, 16 Apr 2009 21:38:29 +0000 (21:38 +0000)]
Fixed to work with merged changes to api availability checks.

15 years agoHandle MySQL/Postgres boolean differences.
Tom Hughes [Thu, 16 Apr 2009 21:16:09 +0000 (21:16 +0000)]
Handle MySQL/Postgres boolean differences.

15 years agoMerge 14394:14533 from trunk.
Tom Hughes [Thu, 16 Apr 2009 21:11:12 +0000 (21:11 +0000)]
Merge 14394:14533 from trunk.

15 years agoHandle differences in interval constant formatting.
Tom Hughes [Thu, 16 Apr 2009 20:47:18 +0000 (20:47 +0000)]
Handle differences in interval constant formatting.

15 years agoCope with MySQL and Postgres.
Tom Hughes [Thu, 16 Apr 2009 20:40:32 +0000 (20:40 +0000)]
Cope with MySQL and Postgres.

15 years agoWork out which session store class to use automatically.
Tom Hughes [Thu, 16 Apr 2009 20:29:18 +0000 (20:29 +0000)]
Work out which session store class to use automatically.

15 years agoFix statistics script to work with 0.6 database schema.
Tom Hughes [Thu, 16 Apr 2009 11:38:02 +0000 (11:38 +0000)]
Fix statistics script to work with 0.6 database schema.

15 years agoRailsify the relation member model, type attribute, by putting it into class case...
Shaun McDonald [Wed, 15 Apr 2009 14:49:21 +0000 (14:49 +0000)]
Railsify the relation member model, type attribute, by putting it into class case, rather than lower case. Requires reload of postgres databases or manual change to the enum. Fixes the databrowser on postgres, however affects the rest of the codebase.

15 years agoFix database check in browse controller.
Tom Hughes [Wed, 15 Apr 2009 09:05:29 +0000 (09:05 +0000)]
Fix database check in browse controller.

15 years agoFix spelling mistake.
Tom Hughes [Wed, 15 Apr 2009 08:03:26 +0000 (08:03 +0000)]
Fix spelling mistake.

15 years agoAdd a "database readonly" state that allows all writes to the database
Tom Hughes [Tue, 14 Apr 2009 14:27:30 +0000 (14:27 +0000)]
Add a "database readonly" state that allows all writes to the database
to be suppressed.

15 years agoShould have a .new when raising error
Shaun McDonald [Tue, 14 Apr 2009 12:00:26 +0000 (12:00 +0000)]
Should have a .new when raising error

15 years agoRemove function that is in the test help from functional test
Shaun McDonald [Tue, 14 Apr 2009 11:52:56 +0000 (11:52 +0000)]
Remove function that is in the test help from functional test

15 years agoRemove function that is in the test help from functional test
Shaun McDonald [Tue, 14 Apr 2009 11:39:46 +0000 (11:39 +0000)]
Remove function that is in the test help from functional test

15 years agoremove the dup methods from the test helper. Add tests for no content and checking...
Shaun McDonald [Mon, 13 Apr 2009 00:13:51 +0000 (00:13 +0000)]
remove the dup methods from the test helper. Add tests for no content and checking that a record has been created.

15 years agoreverting last change, which included posgres config specific things
Shaun McDonald [Mon, 13 Apr 2009 00:10:37 +0000 (00:10 +0000)]
reverting last change, which included posgres config specific things

15 years agoRemove duplication that is in the test helper. Adding tests for the passing of no...
Shaun McDonald [Mon, 13 Apr 2009 00:04:24 +0000 (00:04 +0000)]
Remove duplication that is in the test helper. Adding tests for the passing of no content, and the wrong method used. Also ensuring that there has been a changeset added to the db when it is created.

15 years agoMore tests, found a bug in the data browser, no fix yet. Fix db readme. Don't show...
Shaun McDonald [Sun, 12 Apr 2009 23:20:31 +0000 (23:20 +0000)]
More tests, found a bug in the data browser, no fix yet. Fix db readme. Don't show the signup page to logged in users, by redirecting them to the home page. Remove unnessesary begin blocks in the browse controller.

15 years agoUse the right keyword this time...
Thomas Wood [Thu, 9 Apr 2009 23:18:21 +0000 (23:18 +0000)]
Use the right keyword this time...

15 years agoAdd exceptions for remaing cases where XML::Parser.string is used, to catch for empty...
Thomas Wood [Thu, 9 Apr 2009 22:37:43 +0000 (22:37 +0000)]
Add exceptions for remaing cases where XML::Parser.string is used, to catch for empty strings.
See also r14241

15 years agoExplicitly set the default for home_lat and home_lon to null.
Tom Hughes [Thu, 9 Apr 2009 17:11:04 +0000 (17:11 +0000)]
Explicitly set the default for home_lat and home_lon to null.

15 years agoReturn "Make my edits" button to functioning state, positioning is unfortunate, but...
Thomas Wood [Thu, 9 Apr 2009 17:06:53 +0000 (17:06 +0000)]
Return "Make my edits" button to functioning state, positioning is unfortunate, but it cannot be inside the page's form. I've made a compromise of the two states.

15 years agoUse the inet type for IP addresses in postgres.
Tom Hughes [Thu, 9 Apr 2009 15:17:12 +0000 (15:17 +0000)]
Use the inet type for IP addresses in postgres.

15 years agoFix primary key creation for ACL table.
Tom Hughes [Thu, 9 Apr 2009 15:09:38 +0000 (15:09 +0000)]
Fix primary key creation for ACL table.

15 years agoUse pg_config to find postgres.
Tom Hughes [Thu, 9 Apr 2009 14:47:41 +0000 (14:47 +0000)]
Use pg_config to find postgres.