]> git.openstreetmap.org Git - rails.git/log
rails.git
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 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 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 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 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 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 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 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 agoRevert Potlatch 0.10 from the trunk - we will keep it on the potlatch_010
Tom Hughes [Wed, 9 Jul 2008 23:31:00 +0000 (23:31 +0000)]
Revert Potlatch 0.10 from the trunk - we will keep it on the potlatch_010
branch for now until it has been reviewed.

16 years agoBranch the rails code for Potlatch 0.10 support.
Tom Hughes [Wed, 9 Jul 2008 23:27:33 +0000 (23:27 +0000)]
Branch the rails code for Potlatch 0.10 support.

16 years agoPotlatch 0.10
Richard Fairhurst [Wed, 9 Jul 2008 22:19:48 +0000 (22:19 +0000)]
Potlatch 0.10

16 years agoSorts out a problem with the description field and adding users.
Shaun McDonald [Tue, 8 Jul 2008 13:43:56 +0000 (13:43 +0000)]
Sorts out a problem with the description field and adding users.

16 years agoAdd bounds to map responses. Closes #1011.
Tom Hughes [Tue, 8 Jul 2008 09:52:08 +0000 (09:52 +0000)]
Add bounds to map responses. Closes #1011.

16 years agoAllow users to remove their image. Closes #1010.
Tom Hughes [Mon, 7 Jul 2008 23:26:41 +0000 (23:26 +0000)]
Allow users to remove their image. Closes #1010.

16 years agoSanitize user descriptions properly.
Tom Hughes [Mon, 7 Jul 2008 08:06:56 +0000 (08:06 +0000)]
Sanitize user descriptions properly.

16 years agoCapitalise German message correctly.
Tom Hughes [Sat, 5 Jul 2008 23:45:15 +0000 (23:45 +0000)]
Capitalise German message correctly.

16 years agoQuote default when used as a key in a hash as it is a keyword...
Tom Hughes [Sat, 28 Jun 2008 09:59:47 +0000 (09:59 +0000)]
Quote default when used as a key in a hash as it is a keyword...

16 years agoMerge data browser branch to trunk.
Tom Hughes [Fri, 27 Jun 2008 23:09:05 +0000 (23:09 +0000)]
Merge data browser branch to trunk.

16 years agoRefactor to remove some code duplication.
Tom Hughes [Thu, 26 Jun 2008 23:01:55 +0000 (23:01 +0000)]
Refactor to remove some code duplication.

16 years agoDisable the data browswer when the database is not available.
Tom Hughes [Thu, 26 Jun 2008 17:36:21 +0000 (17:36 +0000)]
Disable the data browswer when the database is not available.

16 years agoMinor correction to German translation.
Tom Hughes [Wed, 25 Jun 2008 16:46:25 +0000 (16:46 +0000)]
Minor correction to German translation.

16 years agoHandle international idiots in a reasonable selection of languages.
Tom Hughes [Wed, 25 Jun 2008 15:18:07 +0000 (15:18 +0000)]
Handle international idiots in a reasonable selection of languages.

16 years agoTry and make message and comment notifications more idiot proof.
Tom Hughes [Wed, 25 Jun 2008 14:41:37 +0000 (14:41 +0000)]
Try and make message and comment notifications more idiot proof.

16 years agoRailsify relation selection (aka ripping out the f***in SQL).
Tom Hughes [Tue, 24 Jun 2008 23:42:39 +0000 (23:42 +0000)]
Railsify relation selection (aka ripping out the f***in SQL).

16 years agoImprove the layout of the object browser views.
Tom Hughes [Tue, 24 Jun 2008 16:44:45 +0000 (16:44 +0000)]
Improve the layout of the object browser views.

16 years agoMerge 8381:8390 from trunk.
Tom Hughes [Sun, 22 Jun 2008 15:24:12 +0000 (15:24 +0000)]
Merge 8381:8390 from trunk.

16 years agoMake GeoRecord inject class methods correctly when included.
Tom Hughes [Sun, 22 Jun 2008 15:22:13 +0000 (15:22 +0000)]
Make GeoRecord inject class methods correctly when included.

16 years agoMerge 8377:8381 from trunk.
Tom Hughes [Sun, 22 Jun 2008 14:46:46 +0000 (14:46 +0000)]
Merge 8377:8381 from trunk.

16 years agoMake the polymorphic relation association work properly.
Tom Hughes [Sun, 22 Jun 2008 14:44:34 +0000 (14:44 +0000)]
Make the polymorphic relation association work properly.

16 years agoMerge 7922:8377 from trunk.
Tom Hughes [Sun, 22 Jun 2008 12:23:43 +0000 (12:23 +0000)]
Merge 7922:8377 from trunk.

16 years agoAdd support for putting the site in an offline mode where it operates
Tom Hughes [Sun, 22 Jun 2008 12:10:32 +0000 (12:10 +0000)]
Add support for putting the site in an offline mode where it operates
without a database but with most features disabled.

16 years agoUse a polymorphic association to model relation members and add
Tom Hughes [Sat, 21 Jun 2008 17:38:17 +0000 (17:38 +0000)]
Use a polymorphic association to model relation members and add
associations for upward links from objects to relations that they
are a part of.

16 years agoRemoved bogus belongs_to user declaration.
Tom Hughes [Sat, 21 Jun 2008 16:19:36 +0000 (16:19 +0000)]
Removed bogus belongs_to user declaration.

16 years agotrap for #971 until I can work out why it's doing it
Richard Fairhurst [Wed, 11 Jun 2008 14:45:36 +0000 (14:45 +0000)]
trap for #971 until I can work out why it's doing it

16 years agoReplacing the non existant image with a pending text on the trace page
Shaun McDonald [Tue, 10 Jun 2008 17:17:32 +0000 (17:17 +0000)]
Replacing the non existant image with a pending text on the trace page

16 years agoWork around the fact that exists? no longer works for models with
Tom Hughes [Sat, 7 Jun 2008 22:40:39 +0000 (22:40 +0000)]
Work around the fact that exists? no longer works for models with
no primary key.

16 years agoLet's have one last try...
Tom Hughes [Sat, 7 Jun 2008 00:03:27 +0000 (00:03 +0000)]
Let's have one last try...

16 years agoMagic foo to make composite_primary_keys work.
Tom Hughes [Fri, 6 Jun 2008 23:53:20 +0000 (23:53 +0000)]
Magic foo to make composite_primary_keys work.

16 years agoGo back to rails 2.0.2 for now as 2.1.0 doesn't quite work...
Tom Hughes [Fri, 6 Jun 2008 23:32:21 +0000 (23:32 +0000)]
Go back to rails 2.0.2 for now as 2.1.0 doesn't quite work...

16 years agoSwitch to rails 2.1.0 release.
Tom Hughes [Fri, 6 Jun 2008 23:17:56 +0000 (23:17 +0000)]
Switch to rails 2.1.0 release.

16 years agoDon't use comma to separate values in the location cookie, as rails 2.0.2 will
Tom Hughes [Thu, 5 Jun 2008 23:27:52 +0000 (23:27 +0000)]
Don't use comma to separate values in the location cookie, as rails 2.0.2 will
treat comma (as well as semicolon) as a cookie separate. Also change the name
of the location cookie to avoid problems parsing old ones.

16 years agoSwitch to rails 2.0.2 as Debian/Ubuntu is able to handle it now.
Tom Hughes [Thu, 5 Jun 2008 23:06:29 +0000 (23:06 +0000)]
Switch to rails 2.0.2 as Debian/Ubuntu is able to handle it now.

16 years agoMake sure the diary tab always links to the global diary rather than
Tom Hughes [Thu, 5 Jun 2008 21:20:30 +0000 (21:20 +0000)]
Make sure the diary tab always links to the global diary rather than
a specific user's diary. Closes #956.

16 years agoCope with not having a layer configuration at all.
Tom Hughes [Tue, 3 Jun 2008 15:12:46 +0000 (15:12 +0000)]
Cope with not having a layer configuration at all.

16 years agoDon't try and parse an empty string as a layer config, and cope a bit
Tom Hughes [Mon, 2 Jun 2008 12:45:24 +0000 (12:45 +0000)]
Don't try and parse an empty string as a layer config, and cope a bit
better if we do hit the end of the string. Closes #942.

16 years agoRequire a form post to finally confirm an account to stop
Tom Hughes [Thu, 29 May 2008 20:43:58 +0000 (20:43 +0000)]
Require a form post to finally confirm an account to stop
accidental confirmations.

16 years agofix node relations bug (thanks Dave!)
Richard Fairhurst [Thu, 29 May 2008 19:58:05 +0000 (19:58 +0000)]
fix node relations bug (thanks Dave!)