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

15 years agoFix readme instructions for module compilation
Thomas Wood [Thu, 9 Apr 2009 14:16:13 +0000 (14:16 +0000)]
Fix readme instructions for module compilation

15 years agoAdd has_valid_bbox? method to Changeset model to tidy checking for bbox, and fix...
Thomas Wood [Thu, 9 Apr 2009 11:18:31 +0000 (11:18 +0000)]
Add has_valid_bbox? method to Changeset model to tidy checking for bbox, and fix edge case where no bbox would cause changeset browsing to die.

15 years agoMake the box outline the same colour as the ways and points drawn
Tom Hughes [Wed, 8 Apr 2009 23:52:39 +0000 (23:52 +0000)]
Make the box outline the same colour as the ways and points drawn
in the data browser maps.

15 years agoAdd a mini map to the changeset view in the data browser.
Tom Hughes [Wed, 8 Apr 2009 23:44:43 +0000 (23:44 +0000)]
Add a mini map to the changeset view in the data browser.

15 years agoEliminate duplication of tag printing logic.
Tom Hughes [Wed, 8 Apr 2009 23:19:41 +0000 (23:19 +0000)]
Eliminate duplication of tag printing logic.

15 years agoTidy up new box code.
Tom Hughes [Wed, 8 Apr 2009 23:14:50 +0000 (23:14 +0000)]
Tidy up new box code.

15 years agonew support for box=yes param on the homepage, and then link to this from various...
Harry Wood [Wed, 8 Apr 2009 16:55:22 +0000 (16:55 +0000)]
new support for box=yes param on the homepage, and then link to this from various changeset display

15 years agoMerge 14059:14394 from trunk.
Tom Hughes [Wed, 8 Apr 2009 13:53:09 +0000 (13:53 +0000)]
Merge 14059:14394 from trunk.

15 years agoFix formatting of changeset details.
Tom Hughes [Wed, 8 Apr 2009 13:35:35 +0000 (13:35 +0000)]
Fix formatting of changeset details.

15 years agoAdding a versionless capabilities to head, so that editors can use it now, prior...
Shaun McDonald [Fri, 3 Apr 2009 11:12:11 +0000 (11:12 +0000)]
Adding a versionless capabilities to head, so that editors can use it now, prior to the 0.6 changeover.

15 years agotweak lat lon decision logic for the edit tab. made it more similar to logic in index...
Harry Wood [Thu, 2 Apr 2009 18:08:46 +0000 (18:08 +0000)]
tweak lat lon decision logic for the edit tab. made it more similar to logic in index, including using cookie

15 years agolose the unnecessary <% embed syntax %>
Harry Wood [Thu, 2 Apr 2009 17:19:33 +0000 (17:19 +0000)]
lose the unnecessary <% embed syntax %>

15 years agoUse correct key for z15 and greater.
Tom Hughes [Sun, 29 Mar 2009 16:23:07 +0000 (16:23 +0000)]
Use correct key for z15 and greater.

15 years agoFixed a problem where rails was setting the ID column to null, which violates the...
Matt Amos [Sun, 29 Mar 2009 02:14:40 +0000 (02:14 +0000)]
Fixed a problem where rails was setting the ID column to null, which violates the not-null constraint. Also fixed possible typo in AMF controller.

15 years agoMoved a bunch of time functions into UTC. Fixes bugs which we only see for 4 hours...
Matt Amos [Sun, 29 Mar 2009 01:31:04 +0000 (01:31 +0000)]
Moved a bunch of time functions into UTC. Fixes bugs which we only see for 4 hours a year.

15 years agoFix for correct boolean handling in query.
Matt Amos [Sun, 29 Mar 2009 00:56:08 +0000 (00:56 +0000)]
Fix for correct boolean handling in query.

15 years agoFixed unit tests and fixture loading for postgres. The foreign keys were playing...
Matt Amos [Sat, 28 Mar 2009 20:18:26 +0000 (20:18 +0000)]
Fixed unit tests and fixture loading for postgres. The foreign keys were playing havoc with the tests when only some fixtures were loaded.

15 years agoFixed a couple of bugs with changeset bounding box calculation when modifying or...
Matt Amos [Fri, 27 Mar 2009 12:22:23 +0000 (12:22 +0000)]
Fixed a couple of bugs with changeset bounding box calculation when modifying or deleting.

15 years agofix 'edits' link. action was renamed 'list_user'
Harry Wood [Thu, 26 Mar 2009 23:43:34 +0000 (23:43 +0000)]
fix 'edits' link. action was renamed 'list_user'

15 years agofix user:pass auth for Potlatch
Richard Fairhurst [Thu, 26 Mar 2009 09:38:11 +0000 (09:38 +0000)]
fix user:pass auth for Potlatch

15 years agoFixing failing potlatch tests. Someone who knows what the potlatch API is actually...
Matt Amos [Wed, 25 Mar 2009 17:54:21 +0000 (17:54 +0000)]
Fixing failing potlatch tests. Someone who knows what the potlatch API is actually supposed to be doing should check these...

15 years agoAdd SOTM advert.
Tom Hughes [Wed, 25 Mar 2009 16:49:33 +0000 (16:49 +0000)]
Add SOTM advert.

15 years agoshow a 'no bbox specified' message for the moment at least. Due to inconsistent locat...
Harry Wood [Tue, 24 Mar 2009 11:23:56 +0000 (11:23 +0000)]
show a 'no bbox specified' message for the moment at least. Due to inconsistent location detecting across tabs, the history tab often gets nil bbox (Need to fix for all tabs) + other history tab tweaks

15 years agoShut up libxml's "Must specify a string with one or more characters" error on relatio...
Thomas Wood [Mon, 23 Mar 2009 21:52:32 +0000 (21:52 +0000)]
Shut up libxml's "Must specify a string with one or more characters" error on relation and way models.

15 years ago<td> tags must be closed, move browse index test over to changeset, lazy fix for...
Thomas Wood [Mon, 23 Mar 2009 21:35:06 +0000 (21:35 +0000)]
<td> tags must be closed, move browse index test over to changeset, lazy fix for new format

15 years agoRather than referring how to view a bbox history, just redirect to the global history.
Thomas Wood [Mon, 23 Mar 2009 19:56:01 +0000 (19:56 +0000)]
Rather than referring how to view a bbox history, just redirect to the global history.

15 years agoMore fixes to the changeset viewer, including logged-in-ness on per-user edit lists...
Thomas Wood [Mon, 23 Mar 2009 19:40:33 +0000 (19:40 +0000)]
More fixes to the changeset viewer, including logged-in-ness on per-user edit lists, fix XSS potential on usernames here, and general tidyups.

15 years agoFix various auth bugs with the changeset listing stuff, catch exception (but not...
Thomas Wood [Mon, 23 Mar 2009 18:23:37 +0000 (18:23 +0000)]
Fix various auth bugs with the changeset listing stuff, catch exception (but not yet handled well) for when edits not public.

15 years agoForce the map div to fill the page.
Tom Hughes [Mon, 23 Mar 2009 17:37:50 +0000 (17:37 +0000)]
Force the map div to fill the page.

15 years agojs changes for 'history' tab
Harry Wood [Mon, 23 Mar 2009 16:41:18 +0000 (16:41 +0000)]
js changes for 'history' tab

15 years agoAdd 'history' tab + Move 'recent changes' changeset list to re-use the same _changese...
Harry Wood [Mon, 23 Mar 2009 16:39:59 +0000 (16:39 +0000)]
Add 'history' tab + Move 'recent changes' changeset list to re-use the same _changeset.rhtml partial

15 years agoServe HTML files with a UTF-8 charset declaration.
Tom Hughes [Mon, 23 Mar 2009 11:21:05 +0000 (11:21 +0000)]
Serve HTML files with a UTF-8 charset declaration.

15 years agoFixed for XHTML compliance. Based on patch from Alexander Delius.
Tom Hughes [Mon, 23 Mar 2009 11:19:34 +0000 (11:19 +0000)]
Fixed for XHTML compliance. Based on patch from Alexander Delius.

15 years agoRevised keys 6,7,8,9,12,13, new 15
Steve Chilton [Sat, 21 Mar 2009 21:11:11 +0000 (21:11 +0000)]
Revised keys 6,7,8,9,12,13, new 15

15 years agolose the unneeded <% syntax %>
Harry Wood [Fri, 20 Mar 2009 12:05:00 +0000 (12:05 +0000)]
lose the unneeded <% syntax %>

15 years agoRefactor the GPX upload to try and avoid the import daemon loading traces
Tom Hughes [Fri, 20 Mar 2009 00:08:53 +0000 (00:08 +0000)]
Refactor the GPX upload to try and avoid the import daemon loading traces
which do not exist yet.

15 years agobackport to 0.5
Richard Fairhurst [Fri, 13 Mar 2009 00:11:39 +0000 (00:11 +0000)]
backport to 0.5

15 years agoremove ways from memory immediately on delete; redo background layer storage
Richard Fairhurst [Thu, 12 Mar 2009 23:58:54 +0000 (23:58 +0000)]
remove ways from memory immediately on delete; redo background layer storage

15 years agoMerged 14009:14059 from trunk.
Tom Hughes [Thu, 12 Mar 2009 00:13:27 +0000 (00:13 +0000)]
Merged 14009:14059 from trunk.

15 years agoRequire libxml 1.1.1 to fix seg faults.
Tom Hughes [Thu, 12 Mar 2009 00:10:47 +0000 (00:10 +0000)]
Require libxml 1.1.1 to fix seg faults.

15 years agoCommit ACL related files from earlier merges as svn merge seems to
Tom Hughes [Sun, 8 Mar 2009 16:13:00 +0000 (16:13 +0000)]
Commit ACL related files from earlier merges as svn merge seems to
neglected to add them...

15 years agoAdd tabindex values to make sure links are not in the tab order when
Tom Hughes [Sun, 8 Mar 2009 16:12:07 +0000 (16:12 +0000)]
Add tabindex values to make sure links are not in the tab order when
navigating forms.

15 years agoMerge 12304:14009 from trunk.
Tom Hughes [Sun, 8 Mar 2009 13:02:37 +0000 (13:02 +0000)]
Merge 12304:14009 from trunk.

15 years agoFix for libxml 1.0.0 changes.
Tom Hughes [Sun, 8 Mar 2009 12:44:45 +0000 (12:44 +0000)]
Fix for libxml 1.0.0 changes.

15 years agoUpdate to use libxml 1.0.0 gem.
Tom Hughes [Sun, 8 Mar 2009 11:34:46 +0000 (11:34 +0000)]
Update to use libxml 1.0.0 gem.

15 years agoFix thinko.
Tom Hughes [Fri, 6 Mar 2009 14:30:01 +0000 (14:30 +0000)]
Fix thinko.

15 years agoPut auto discovery links in the document head.
Tom Hughes [Fri, 6 Mar 2009 14:27:40 +0000 (14:27 +0000)]
Put auto discovery links in the document head.

15 years agoDeclare XML namespace.
Tom Hughes [Fri, 6 Mar 2009 14:19:54 +0000 (14:19 +0000)]
Declare XML namespace.

15 years agosetting lon2 correctly. Was displaying one of the bbox numbers wrong
Harry Wood [Sun, 1 Mar 2009 22:24:07 +0000 (22:24 +0000)]
setting lon2 correctly. Was displaying one of the bbox numbers wrong

15 years agofix backspacing through way to delete it
Richard Fairhurst [Thu, 26 Feb 2009 00:26:23 +0000 (00:26 +0000)]
fix backspacing through way to delete it

15 years agohistory stuff should be working now (haha)
Richard Fairhurst [Wed, 25 Feb 2009 22:04:22 +0000 (22:04 +0000)]
history stuff should be working now (haha)

15 years agofurther work on 0.6 history (not quite complete yet)
Richard Fairhurst [Wed, 25 Feb 2009 01:14:19 +0000 (01:14 +0000)]
further work on 0.6 history (not quite complete yet)

15 years agoAdd an ACL system to allow key/value pairs to be attached to blocks
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.