diff options
| author | marijus <mario@localhost.localdomain> | 2014-02-05 14:48:42 +0100 |
|---|---|---|
| committer | marijus <mario@localhost.localdomain> | 2014-02-05 14:48:42 +0100 |
| commit | 419e3b5024efec40c98e48c3bf213c4e60d39fae (patch) | |
| tree | d3754aa1d251308eb6178fe4ab138463ceaaf135 /include/permissions.php | |
| parent | d7d2fff24b05bcb3ff3acc215e99f8f7d33d058d (diff) | |
| parent | 0844110f7b154a0fb5102362fe732c2b091222d7 (diff) | |
| download | volse-hubzilla-419e3b5024efec40c98e48c3bf213c4e60d39fae.tar.gz volse-hubzilla-419e3b5024efec40c98e48c3bf213c4e60d39fae.tar.bz2 volse-hubzilla-419e3b5024efec40c98e48c3bf213c4e60d39fae.zip | |
Merge branch 'master' of https://github.com/friendica/red into upstream
Diffstat (limited to 'include/permissions.php')
| -rw-r--r-- | include/permissions.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/permissions.php b/include/permissions.php index 45ea7c3eb..420591c54 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -24,11 +24,12 @@ function get_perms() { 'post_mail' => array('channel_w_mail', intval(PERMS_W_MAIL), false, t('Can send me private mail messages'), ''), 'post_photos' => array('channel_w_photos', intval(PERMS_W_PHOTOS), false, t('Can post photos to my photo albums'), ''), 'tag_deliver' => array('channel_w_tagwall', intval(PERMS_W_TAGWALL), false, t('Can forward to all my channel contacts via post @mentions'), t('Advanced - useful for creating group forum channels')), - 'chat' => array('channel_w_chat', intval(PERMS_W_CHAT), false, t('Can chat with me (when available)'), t('Requires compatible chat plugin')), + 'chat' => array('channel_w_chat', intval(PERMS_W_CHAT), false, t('Can chat with me (when available)'), t('')), 'write_storage' => array('channel_w_storage', intval(PERMS_W_STORAGE), false, t('Can write to my "public" file storage'), ''), 'write_pages' => array('channel_w_pages', intval(PERMS_W_PAGES), false, t('Can edit my "public" pages'), ''), 'republish' => array('channel_a_republish', intval(PERMS_A_REPUBLISH), false, t('Can source my "public" posts in derived channels'), t('Somewhat advanced - very useful in open communities')), + 'bookmark' => array('channel_a_bookmark', intval(PERMS_A_BOOKMARK), false, t('Can send me bookmarks'), 'Bookmarks from this person will automatically be saved'), 'delegate' => array('channel_a_delegate', intval(PERMS_A_DELEGATE), false, t('Can administer my channel resources'), t('Extremely advanced. Leave this alone unless you know what you are doing')), ); $ret = array('global_permissions' => $global_perms); |