Converted vote_popup.js to jQuery.  (Was no longer working in prototype.)
Converted image_vote ajax to jQuery.  (Was no longer working in prototype.)
Converted api key manager's ajaxy edit/activate capabilities to jquery.
Converted a bunch more javascript to jQuery.
There was a minor problem with edit_translations, too -- wasn't reading template correctly resulting in all strings being classified as "unlisted".
All tests are passing, and javascript seems to work fine on firefox, but it's hard to test js thoroughly.
Still left to do: autocompleter, name_lister, pivotal
Major revision of javascript.  Everything is now converted to jQuery.
Only thing I haven't tested pretty thoroughly (on firefox at least) is name_lister, which is still having some problems.
I've removed all the cruft from public/javascripts.
All unit tests are passing, not that that tells us anything useful about javascript functionality...
Fixed name_lister javascript.
Separated out url/config part of app/models/image.rb into app/models/image/url.rb.
Oops.
Fixed pivotal page.
Finally got all the pivotal-related tests working.
Forgot to re-enable pivotal test that actually posts stuff.
Added style to class "textile" divs which limits width to 50em, helps break up insanely wide comments.
Added the ability to run advanced searches from external URL.
Added (presently undocumented) parameter to observation advanced search
to have it include location notes in what it searches for when you give
it a location name.
name_lister requires successful user, and tested fixed. (from master jul 6)
Made some tweaks to parsing of lat/longs (from Jul 27 and Aug 16 on master).
Code is now sort of rebased with respect to master as of August 18.
(Which is to say I applied the Apr 23, May 4, Jul 6, Jul 27 and Aug 16 patches
from master to the end of this branch.  Actual rebasing looked too difficult.)
Some bugs found on the ror31 branch which apply equally here. (from jul 27)
Merged in small change from ror31 branch: set_inheritance_column is about to be deprecated in favor of self.inheritance_column=
Tweak to production configuration (LOCAL_IMAGE_FILES is not defined before consts-site.rb is read).
Fixed bash code that gets the list of image servers to ignore commented-out servers.
Need process_image not to mark images as transferred if there are no image servers to transfer them to!
Nginx cannot rewrite urls to file://..., so fell back to soft-linking local_images to images instead.
Two typos in observer_controller.rb.