diff options
| author | Evan Prodromou <evan@status.net> | 2010-11-15 11:57:19 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-11-15 11:57:19 -0500 |
| commit | c1cee3b27ffa1529009195604c5495bef4f83bc2 (patch) | |
| tree | 42ae51f86b085978c9f1a28820ec4a69af1589b9 /EVENTS.txt | |
| parent | fdf3a23da7769586a818ca2219ec6bc1b46587de (diff) | |
| parent | cb371d65c18771f8fcdcbeb450c063b844c000df (diff) | |
Merge branch 'atompub' into 0.9.x
Conflicts:
actions/apistatusesshow.php
actions/apitimelineuser.php
Diffstat (limited to 'EVENTS.txt')
| -rw-r--r-- | EVENTS.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/EVENTS.txt b/EVENTS.txt index fed489705..a3b0804e8 100644 --- a/EVENTS.txt +++ b/EVENTS.txt @@ -1172,3 +1172,11 @@ StartRevokeRole: when a role is being revoked EndRevokeRole: when a role has been revoked - $profile: profile that lost the role - $role: string name of the role + +StartAtomPubNewActivity: When a new activity comes in through Atom Pub API +- &$activity: received activity + +EndAtomPubNewActivity: When a new activity comes in through Atom Pub API +- $activity: received activity +- $notice: notice that was created + |