Commit Graph

16 Commits

Author SHA1 Message Date
Zach Copley
9dc888894b Merge branch 'master' into 0.9.x
* master: (67 commits)
  Ticket 2038: fix bad bug tracker link
  Fix regression in group posting: bug introduced in commit 1319002e15. Need to use actual profile object rather than an id on a variable that doesn't exist when checking blocks :D
  Log database errors when saving notice_inbox entries
  Drop the username from the log id for now; seems to trigger an error loop in some circumstances
  request id on logs... pid + random id per web request + username + method + url
  Add OpenID ini info back into statusnet.ini as a stopgap until we can
  Some changes to the OpenID DataObjects to make them emit the exact same
  OpenID plugin should set 'user_openid.display' as unique key
  Remove relationship: user_openid.user_id -> user.id. I don't think this
  Have OpenID plugin DataObjects emit their own .ini info
  Revert "Allow plugin DB_DataObject classes to not have to use the .ini file by overriding keys(), table(), and sequenceKey() for them"
  Catch and report exceptions from notice_to_omb_notice() instead of letting the OMB queue handler die.
  Fix regression in remote subscription; added hasRole() shadow method on Remote_profile.
  Fix fatal error on OMB subscription for first-timers
  Remove annoying log msg
  Drop error message on setlocale() failure; this is harmless, since we actually have a working locale set up.
  Catch uncaught exception
  Fixed bug where reply-sync bit wasn't getting saved
  Forgot to render the nav menu when on FB Connect login tab
  Facebook plugin no longer takes over Login and Connect settings nav menus
  ...

Conflicts:
	db/08to09_pg.sql
	db/statusnet_pg.sql
	locale/pt_BR/LC_MESSAGES/statusnet.mo
	plugins/Mapstraction/MapstractionPlugin.php
2009-11-30 10:28:58 -08:00
Craig Andrews
83ba93e945 Change the format of the lat/lon output on a notice in HTML 2009-11-20 17:40:38 -05:00
Brion Vibber
afe5e71c4e Quick fix for Safari XHTML error... the map doesn't currently work with Safari, but this gets the whole page parsing again! 2009-11-20 12:04:27 -08:00
Brion Vibber
e7663ce38f fix notice bug 2009-11-20 13:57:35 -05:00
Brion Vibber
1ca022464a Fix double-escaped HTML in mapstraction notice popups 2009-11-20 10:17:14 -08:00
Brion Vibber
46c5a52810 fix notice bug 2009-11-20 10:08:13 -08:00
Craig Andrews
09d67d6f80 Fix js error on non-map containing pages 2009-11-20 11:16:39 -05:00
Craig Andrews
dc90e90fd2 Load notice data using javascript from the html on the page instead of writing json representations of the notices on each page
Clicking on a geo link pops up a map
2009-11-19 19:13:55 -05:00
Evan Prodromou
507c7e1e6b take out void setLabel() call in Mapstraction 2009-11-19 13:24:03 -05:00
Evan Prodromou
2723bee69f add username and timestamp to map popup 2009-11-19 13:20:55 -05:00
Evan Prodromou
2daa31f142 show maps on inbox and personal page 2009-11-19 12:34:56 -05:00
Evan Prodromou
ae710f20d8 add markers for each notice and show the bounding box correctly 2009-11-19 11:51:15 -05:00
Evan Prodromou
844a28aa9d put out provider JS correctly 2009-11-19 11:21:51 -05:00
Evan Prodromou
ecc1bd6130 first steps towards usermaps 2009-11-19 10:51:46 -05:00
Evan Prodromou
1cc10aaef6 set provider global JS variable from Mapstraction 2009-11-18 08:33:48 -05:00
Evan Prodromou
fc08a5c880 first pass at Mapstraction plugin 2009-11-17 23:23:13 -05:00