]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Thu, 26 Jun 2008 23:01:55 +0000 (23:01 +0000)]
Refactor to remove some code duplication.
Tom Hughes [Thu, 26 Jun 2008 17:36:21 +0000 (17:36 +0000)]
Disable the data browswer when the database is not available.
Tom Hughes [Wed, 25 Jun 2008 16:46:25 +0000 (16:46 +0000)]
Minor correction to German translation.
Tom Hughes [Wed, 25 Jun 2008 15:18:07 +0000 (15:18 +0000)]
Handle international idiots in a reasonable selection of languages.
Tom Hughes [Wed, 25 Jun 2008 14:41:37 +0000 (14:41 +0000)]
Try and make message and comment notifications more idiot proof.
Tom Hughes [Tue, 24 Jun 2008 23:42:39 +0000 (23:42 +0000)]
Railsify relation selection (aka ripping out the f***in SQL).
Tom Hughes [Tue, 24 Jun 2008 16:44:45 +0000 (16:44 +0000)]
Improve the layout of the object browser views.
Tom Hughes [Sun, 22 Jun 2008 15:24:12 +0000 (15:24 +0000)]
Merge 8381:8390 from trunk.
Tom Hughes [Sun, 22 Jun 2008 15:22:13 +0000 (15:22 +0000)]
Make GeoRecord inject class methods correctly when included.
Tom Hughes [Sun, 22 Jun 2008 14:46:46 +0000 (14:46 +0000)]
Merge 8377:8381 from trunk.
Tom Hughes [Sun, 22 Jun 2008 14:44:34 +0000 (14:44 +0000)]
Make the polymorphic relation association work properly.
Tom Hughes [Sun, 22 Jun 2008 12:23:43 +0000 (12:23 +0000)]
Merge 7922:8377 from trunk.
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.
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.
Tom Hughes [Sat, 21 Jun 2008 16:19:36 +0000 (16:19 +0000)]
Removed bogus belongs_to user declaration.
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
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
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.
Tom Hughes [Sat, 7 Jun 2008 00:03:27 +0000 (00:03 +0000)]
Let's have one last try...
Tom Hughes [Fri, 6 Jun 2008 23:53:20 +0000 (23:53 +0000)]
Magic foo to make composite_primary_keys 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...
Tom Hughes [Fri, 6 Jun 2008 23:17:56 +0000 (23:17 +0000)]
Switch to rails 2.1.0 release.
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.
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.
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.
Shaun McDonald [Wed, 4 Jun 2008 16:35:00 +0000 (16:35 +0000)]
Removing id's so that the ids are generated, and it makes it easier to deal with referential tests. Now have messages and users with basic tests. Using http://api.rubyonrails.com/classes/Fixtures.html.
Shaun McDonald [Wed, 4 Jun 2008 06:48:49 +0000 (06:48 +0000)]
improved messages fixtures. Additional user fixture (for sending messages between the users). Checking that an empty message fails.
Tom Hughes [Tue, 3 Jun 2008 15:12:46 +0000 (15:12 +0000)]
Cope with not having a layer configuration at all.
Shaun McDonald [Mon, 2 Jun 2008 17:27:32 +0000 (17:27 +0000)]
Adding some additional node fixtures to test edge cases. Having a bit of an issue as the too far north and south tests aren't working as expected, even so the too far east and west ones are.
Shaun McDonald [Mon, 2 Jun 2008 15:28:03 +0000 (15:28 +0000)]
You can now test nodes. This test needs looked at again, as it currently doesn't test the node tags
Shaun McDonald [Mon, 2 Jun 2008 15:22:17 +0000 (15:22 +0000)]
Fixing indentation
Shaun McDonald [Mon, 2 Jun 2008 15:13:29 +0000 (15:13 +0000)]
Fixing indentation
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.
Shaun McDonald [Mon, 2 Jun 2008 11:00:09 +0000 (11:00 +0000)]
sort the default test database user and password.
Adding new test for the user
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.
Richard Fairhurst [Thu, 29 May 2008 19:58:05 +0000 (19:58 +0000)]
fix node relations bug (thanks Dave!)
Richard Fairhurst [Thu, 29 May 2008 01:18:38 +0000 (01:18 +0000)]
Potlatch 0.9c
Tom Hughes [Wed, 28 May 2008 23:46:55 +0000 (23:46 +0000)]
Improve the layout of the browse sidebar a bit.
Tom Hughes [Wed, 28 May 2008 16:37:31 +0000 (16:37 +0000)]
Merge 7744:7922 from trunk.
Richard Fairhurst [Sun, 25 May 2008 08:17:16 +0000 (08:17 +0000)]
Potlatch 0.9b
Richard Fairhurst [Wed, 21 May 2008 15:20:55 +0000 (15:20 +0000)]
temporarily disable OAM (SWF)
Richard Fairhurst [Wed, 21 May 2008 12:01:56 +0000 (12:01 +0000)]
don't set _alpha so often when ways dimmed (SWF)
Tom Hughes [Tue, 20 May 2008 23:37:06 +0000 (23:37 +0000)]
Make the layer attribute a bit less fragile - base layers and overlays are
now treated separately so that adding a new base laser doesn't break things.
Shaun McDonald [Tue, 20 May 2008 15:25:18 +0000 (15:25 +0000)]
Add a check to make sure that a node/way/relation doesn't already exist in the relation as part of the preconditions. closes #718
Tom Hughes [Mon, 19 May 2008 10:00:52 +0000 (10:00 +0000)]
Make the "larger map" link on an HTML export point at the right layer.
Tom Hughes [Mon, 19 May 2008 09:57:58 +0000 (09:57 +0000)]
Add the cycle map to the main site.
Tom Hughes [Fri, 16 May 2008 10:42:51 +0000 (10:42 +0000)]
Yet another at fixing the layout of the search box. Seems to work now
on FF2, IE7, Operand and Safari though we are giving space away on FF.
Richard Fairhurst [Fri, 16 May 2008 10:32:53 +0000 (10:32 +0000)]
fix revert to cope with moved nodes properly (OH NOES I updated some SQL)
Tom Hughes [Fri, 16 May 2008 10:09:55 +0000 (10:09 +0000)]
Reword the noscript section a bit.
Tom Hughes [Fri, 16 May 2008 10:06:57 +0000 (10:06 +0000)]
Try and make browsers display the search box sanely.
Shaun McDonald [Fri, 16 May 2008 09:44:50 +0000 (09:44 +0000)]
Showing a nice message for browsers with javascript disabled. closes #36
Tom Hughes [Thu, 15 May 2008 16:57:34 +0000 (16:57 +0000)]
Tidy up map browse code and qualify various global names to avoid
any risk of conflicts.
Tom Hughes [Thu, 15 May 2008 09:34:45 +0000 (09:34 +0000)]
Remove bogus action attribute from the submit button - it should have
no effect as there is no such attribute defined, but Opera seems to
decide that it should post the form to that URL instead of the one
give on the form element.
Gabriel Ebner [Tue, 13 May 2008 13:42:03 +0000 (13:42 +0000)]
api06: remove debugging output.
Gabriel Ebner [Tue, 13 May 2008 13:24:31 +0000 (13:24 +0000)]
api06: simplify diff uploading.
Gabriel Ebner [Tue, 13 May 2008 12:53:59 +0000 (12:53 +0000)]
api06: diff upload: don't read the whole request into memory.
Note: libxml-ruby-0.5.4 will segfault on this:
https://rubyforge.org/tracker/index.php?func=detail&aid=20117&group_id=494&atid=1971
Gabriel Ebner [Tue, 13 May 2008 12:32:43 +0000 (12:32 +0000)]
api06: Fix OSM::APIVersionMismatchError.render_opts
Gabriel Ebner [Tue, 13 May 2008 12:27:38 +0000 (12:27 +0000)]
api06: fix syntax errors.
Gabriel Ebner [Tue, 13 May 2008 12:15:06 +0000 (12:15 +0000)]
api06: simplify exception handling and add exception handling to the diff
upload.
Christopher Schmidt [Mon, 12 May 2008 21:12:30 +0000 (21:12 +0000)]
The ordering of these shouldn't have mattered, but it did, because I didn't put a regex filter on my :id, so "upload" was being treated as an ID (which clearly wouldn't work); This fix obviates the need for r7789, sorry about that.
Gabriel Ebner [Mon, 12 May 2008 21:11:51 +0000 (21:11 +0000)]
api06: Fix typo.
Gabriel Ebner [Mon, 12 May 2008 21:10:38 +0000 (21:10 +0000)]
api06: s/delete_with_relations_and_history/delete_with_history/g
Gabriel Ebner [Mon, 12 May 2008 21:05:11 +0000 (21:05 +0000)]
api06: Move version-checking into the models, raising an exception on mismatch
(still not implemented for delete requests though.)
Gabriel Ebner [Mon, 12 May 2008 20:43:35 +0000 (20:43 +0000)]
api06: Make diff uploading work again.
Richard Fairhurst [Mon, 12 May 2008 10:18:57 +0000 (10:18 +0000)]
splash screen
Christopher Schmidt [Mon, 12 May 2008 01:22:04 +0000 (01:22 +0000)]
node.tags is now (apparently) the same as tags_as_hash.
Christopher Schmidt [Sun, 11 May 2008 23:12:54 +0000 (23:12 +0000)]
make error_message spit out the message text to the user as well as
putting it in the header.
Christopher Schmidt [Sun, 11 May 2008 23:02:06 +0000 (23:02 +0000)]
undo composite keys change on old_ndoe
Christopher Schmidt [Sun, 11 May 2008 22:27:40 +0000 (22:27 +0000)]
from_xml sets a version on nodes
Christopher Schmidt [Sun, 11 May 2008 22:26:46 +0000 (22:26 +0000)]
add to_xml method for oldnode
Christopher Schmidt [Sun, 11 May 2008 22:26:11 +0000 (22:26 +0000)]
spit out whether the changeset is open in the xml
Christopher Schmidt [Sun, 11 May 2008 21:49:33 +0000 (21:49 +0000)]
prevent update of any object without providing the correct/current
version as part of the XML. This affects update-only at this time:
DELETE doesn't work the same way because we don't provide the data as
part of a DELETE
Christopher Schmidt [Sun, 11 May 2008 21:23:38 +0000 (21:23 +0000)]
Make capabilities report the current version for from/to version
identifier
Christopher Schmidt [Sun, 11 May 2008 21:21:30 +0000 (21:21 +0000)]
change 'no nodes' response to use API_VERSION in output
Christopher Schmidt [Sun, 11 May 2008 21:18:42 +0000 (21:18 +0000)]
add support for closing changesets
Richard Fairhurst [Sun, 11 May 2008 20:25:11 +0000 (20:25 +0000)]
hmmm, probably best not to gratuitously send the same request every second
Richard Fairhurst [Sun, 11 May 2008 20:16:09 +0000 (20:16 +0000)]
Potlatch 0.9a
Christopher Schmidt [Sun, 11 May 2008 20:07:47 +0000 (20:07 +0000)]
add FIXME FIXME FIXME for serializing changes in a changeset
Christopher Schmidt [Sun, 11 May 2008 20:03:17 +0000 (20:03 +0000)]
Add support for accessing changesets as XML through the API via the
changeset controller "read" method
Christopher Schmidt [Sun, 11 May 2008 19:47:19 +0000 (19:47 +0000)]
Make edits return version numbers as plain text strings
Tom Hughes [Sun, 11 May 2008 16:15:35 +0000 (16:15 +0000)]
Add maximiseMap() and minimiseMap() functions to the edit page to allow the
size of the editing area to be toggled.
Tom Hughes [Sun, 11 May 2008 14:42:44 +0000 (14:42 +0000)]
Fix what looks like an accidental change to the stylesheeet.
Tom Hughes [Sun, 11 May 2008 14:41:11 +0000 (14:41 +0000)]
Only add the data layer to the main map, and use the visibility changed
event to handle turning the data layer on and off.
Tom Hughes [Fri, 9 May 2008 23:22:26 +0000 (23:22 +0000)]
Merge 7452:7744 from trunk.
Tom Hughes [Fri, 9 May 2008 14:10:10 +0000 (14:10 +0000)]
Add the marker to the map correctly.
Richard Fairhurst [Thu, 8 May 2008 10:24:17 +0000 (10:24 +0000)]
Potlatch 0.9
Tom Hughes [Wed, 7 May 2008 11:05:17 +0000 (11:05 +0000)]
Remove bogus apostrophe.
Tom Hughes [Tue, 6 May 2008 16:57:40 +0000 (16:57 +0000)]
Tidy up handling of unknown traces.
Tom Hughes [Tue, 6 May 2008 16:35:24 +0000 (16:35 +0000)]
Backout message deletion functionality as it has unfortunate side effects
as it also removes the message from the sender's outbox.
Tom Hughes [Mon, 5 May 2008 23:01:05 +0000 (23:01 +0000)]
Fix replying to diary comments, and tidy a few things up.
Tom Hughes [Mon, 5 May 2008 22:52:19 +0000 (22:52 +0000)]
Quote reply messages properly.
Tom Hughes [Mon, 5 May 2008 22:46:56 +0000 (22:46 +0000)]
Reinstate stripping of Re: prefixes that Steve dropped...
Gabriel Ebner [Mon, 5 May 2008 22:41:32 +0000 (22:41 +0000)]
api06: Fix normal way and relation uploading (i.e. not as part of a diff).
(I'm sorry that I couldn't commit it earlier, but I didn't have access to an
internet connection until now.)
Tom Hughes [Mon, 5 May 2008 16:39:33 +0000 (16:39 +0000)]
Rework the new Go button on the search form so that it actually stands
some chance of rendering as intended.
It's still not really ideal to steal space from the seach box of course...
Closes #589.
Gabriel Ebner [Sun, 4 May 2008 15:56:10 +0000 (15:56 +0000)]
api06: Diff upload works now (but no integration with changesets whatsoever as
of now)
Gabriel Ebner [Sun, 4 May 2008 15:16:58 +0000 (15:16 +0000)]
api06: Fix diff uploading (still doesn't give a useful response):
Modification and deletion works fine now. Rollback also works apparently.
Just auto increment doesn't get reset.
Tom Hughes [Sun, 4 May 2008 14:50:53 +0000 (14:50 +0000)]
The current_way_nodes table is already an InnoDB table.
Gabriel Ebner [Sun, 4 May 2008 14:37:12 +0000 (14:37 +0000)]
api06: Fix diff uploading (creation works fine now)
Gabriel Ebner [Sun, 4 May 2008 13:52:43 +0000 (13:52 +0000)]
api06: Preliminary support for diff uploading. This will not return anything
useful and the code will need some heavy refactoring.
Gabriel Ebner [Sun, 4 May 2008 13:51:45 +0000 (13:51 +0000)]
api06: Fix tag parsing in the node-tags-normalization helper, as suggested by
Jon Burgess.