GitLab

Include <author> with actor ID and name in Activity::asString(); fixes Salmon signature on OStatus unsub pings

the input field.

- Add test for Portable Contacts stuff

* 'testing' of gitorious.org:statusnet/mainline:
  OStatus: fix group delivery, send reply/group Salmon pings from background.

OStatus: consolidate the low-level notice save code between Salmon and PuSH input paths. Validation etc remains at higher levels.

Add class and (if present) id to DB_DataObject error exceptions; often they're VERRRRRY vague, and it helps to know what type of item is failing!

the shorthand that I've proposed at
http://microformats.org/wiki/geo-brainstorming#latitude_longitude_shorthand_and_geo_link

If anyone wants to pick up on where the discussion was left off or
get more implementation support by other sites and software, and be
recognized by parsers, I'd be happy to go back to the shorthand.
Because you know, it actually makes a lot of sense.

Conflicts:
	plugins/OStatus/OStatusPlugin.php

OStatus: do PuSH subscription setup from subscribe/join event hooks, so resubscribing directly from a profile/group list works correctly if there aren't active subscriptions at the moment.

OStatus subscription UI tweak: if we're already subscribed/joined, say so and don't offer a 'subscribe'/'join' button on the profile preview page.

I removed the check for local users in the subscribe button. I replaced
it with a more specific check for OMB 0.1 remote profiles, which you
can't use with this action.

I also took the opportunity to split the handle() method into
prepare() and handle(), and added PHPCS clean documentation.