diff options
author | Mario <mario@mariovavti.com> | 2020-11-05 08:46:42 +0000 |
---|---|---|
committer | Mario <mario@mariovavti.com> | 2020-11-05 08:46:42 +0000 |
commit | bafbf0416462c6f18c3fb6c8c06a063c8d6fdae6 (patch) | |
tree | 8929845be585b09d0f420621281c5531e1efad3e /include/features.php | |
parent | 6f93d9848c43019d43ea76c27d42d657ba031cd7 (diff) | |
parent | fdefa101d84dc2a9424eaedbdb003a4c30ec5d01 (diff) | |
download | volse-hubzilla-5.0.tar.gz volse-hubzilla-5.0.tar.bz2 volse-hubzilla-5.0.zip |
Merge branch '5.0RC'5.0
Diffstat (limited to 'include/features.php')
-rw-r--r-- | include/features.php | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/include/features.php b/include/features.php index 87df0c50d..e1457604b 100644 --- a/include/features.php +++ b/include/features.php @@ -144,7 +144,7 @@ function get_features($filtered = true, $level = (-1)) { 'conversation' => [ t('Conversation'), - + /* disable until we agree on how to implemnt this in zot6/activitypub [ 'commtag', t('Community Tagging'), @@ -152,7 +152,7 @@ function get_features($filtered = true, $level = (-1)) { false, get_config('feature_lock','commtag'), ], - + */ [ 'emojis', t('Emoji Reactions'), @@ -229,14 +229,6 @@ function get_features($filtered = true, $level = (-1)) { false, get_config('feature_lock','content_encrypt'), ], - - [ - 'consensus_tools', - t('Enable Voting Tools'), - t('Provide a class of post which others can vote on'), - false, - get_config('feature_lock','consensus_tools'), - ], [ 'disable_comments', @@ -299,6 +291,22 @@ function get_features($filtered = true, $level = (-1)) { t('Network'), [ + 'events_tab', + t('Events Filter'), + t('Ability to display only events'), + false, + get_config('feature_lock','events_tab') + ], + + [ + 'polls_tab', + t('Polls Filter'), + t('Ability to display only polls'), + false, + get_config('feature_lock','polls_tab') + ], + + [ 'savedsearch', t('Saved Searches'), t('Save search terms for re-use'), |