diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-04-30 08:40:06 +0200 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-04-30 08:40:06 +0200 |
| commit | 36522c43418a1ba4905fc688eb1c84c09c1a9fe1 (patch) | |
| tree | 764b75c817713e41da50da29509ad9cac3183bbe | |
| parent | f08dc392df3eddef7294e6388cb99a63825b7755 (diff) | |
| parent | 0639f645d2333d775ef671806c319f9566afbe7b (diff) | |
| download | volse-hubzilla-36522c43418a1ba4905fc688eb1c84c09c1a9fe1.tar.gz volse-hubzilla-36522c43418a1ba4905fc688eb1c84c09c1a9fe1.tar.bz2 volse-hubzilla-36522c43418a1ba4905fc688eb1c84c09c1a9fe1.zip | |
Merge branch 'master' of https://github.com/friendica/friendica
| -rw-r--r-- | boot.php | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -201,6 +201,8 @@ define ( 'ACTIVITY_REQ_FRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'request-friend' ); define ( 'ACTIVITY_UNFRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'remove-friend' ); define ( 'ACTIVITY_FOLLOW', NAMESPACE_ACTIVITY_SCHEMA . 'follow' ); define ( 'ACTIVITY_UNFOLLOW', NAMESPACE_ACTIVITY_SCHEMA . 'stop-following' ); +define ( 'ACTIVITY_JOIN', NAMESPACE_ACTIVITY_SCHEMA . 'join' ); + define ( 'ACTIVITY_POST', NAMESPACE_ACTIVITY_SCHEMA . 'post' ); define ( 'ACTIVITY_UPDATE', NAMESPACE_ACTIVITY_SCHEMA . 'update' ); define ( 'ACTIVITY_TAG', NAMESPACE_ACTIVITY_SCHEMA . 'tag' ); @@ -213,6 +215,7 @@ define ( 'ACTIVITY_OBJ_PHOTO', NAMESPACE_ACTIVITY_SCHEMA . 'photo' ); define ( 'ACTIVITY_OBJ_P_PHOTO', NAMESPACE_ACTIVITY_SCHEMA . 'profile-photo' ); define ( 'ACTIVITY_OBJ_ALBUM', NAMESPACE_ACTIVITY_SCHEMA . 'photo-album' ); define ( 'ACTIVITY_OBJ_EVENT', NAMESPACE_ACTIVITY_SCHEMA . 'event' ); +define ( 'ACTIVITY_OBJ_GROUP', NAMESPACE_ACTIVITY_SCHEMA . 'group' ); define ( 'ACTIVITY_OBJ_TAGTERM', NAMESPACE_DFRN . '/tagterm' ); define ( 'ACTIVITY_OBJ_PROFILE', NAMESPACE_DFRN . '/profile' ); |