diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-02-02 09:38:07 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-02-02 09:38:07 +0100 |
| commit | c3bada3c329cac9b712e0d4d0c5fb0bb73f24d45 (patch) | |
| tree | a13c2d56c1b14ba99a853fb7494a9214d075554d /Zotlabs/Access/Permissions.php | |
| parent | 2e0180ba55e5cbefcfc4066a82dbcaa5b59cacc2 (diff) | |
| parent | 23303391e070120851d505a2ec8f3b9b696329e2 (diff) | |
| download | volse-hubzilla-c3bada3c329cac9b712e0d4d0c5fb0bb73f24d45.tar.gz volse-hubzilla-c3bada3c329cac9b712e0d4d0c5fb0bb73f24d45.tar.bz2 volse-hubzilla-c3bada3c329cac9b712e0d4d0c5fb0bb73f24d45.zip | |
resolve merge conflict
Diffstat (limited to 'Zotlabs/Access/Permissions.php')
| -rw-r--r-- | Zotlabs/Access/Permissions.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Zotlabs/Access/Permissions.php b/Zotlabs/Access/Permissions.php index 5fded5f03..81408f122 100644 --- a/Zotlabs/Access/Permissions.php +++ b/Zotlabs/Access/Permissions.php @@ -36,7 +36,7 @@ class Permissions { static public function version() { // This must match the version in PermissionRoles.php before permission updates can run. - return 1; + return 2; } @@ -50,7 +50,9 @@ class Permissions { 'view_storage' => t('Can view my file storage and photos'), 'write_storage' => t('Can upload/modify my file storage and photos'), 'view_pages' => t('Can view my channel webpages'), + 'view_wiki' => t('Can view my wiki pages'), 'write_pages' => t('Can create/edit my channel webpages'), + 'write_wiki' => t('Can write to my wiki pages'), 'post_wall' => t('Can post on my channel (wall) page'), 'post_comments' => t('Can comment on or like my posts'), 'post_mail' => t('Can send me private mail messages'), |