diff options
author | Mario Vavti <mario@mariovavti.com> | 2018-03-01 08:38:17 +0100 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2018-03-01 08:38:17 +0100 |
commit | 844bef5070b071aa5ddf823036d2fe2285b40a7b (patch) | |
tree | 129a67cbed69c4ed6f286e9a0bf3770b9c82ffc6 /include/features.php | |
parent | 97e329906e3cde0bacafcceb94780bedd44f1f32 (diff) | |
parent | 6210b7727f6c8542daaa62d1ed7f9ec1f74323f2 (diff) | |
download | volse-hubzilla-844bef5070b071aa5ddf823036d2fe2285b40a7b.tar.gz volse-hubzilla-844bef5070b071aa5ddf823036d2fe2285b40a7b.tar.bz2 volse-hubzilla-844bef5070b071aa5ddf823036d2fe2285b40a7b.zip |
Merge branch 'dev' into 3.2RC
Diffstat (limited to 'include/features.php')
-rw-r--r-- | include/features.php | 76 |
1 files changed, 52 insertions, 24 deletions
diff --git a/include/features.php b/include/features.php index 839faff67..993266977 100644 --- a/include/features.php +++ b/include/features.php @@ -54,14 +54,6 @@ function get_features($filtered = true) { t('General Features'), - [ - 'multi_profiles', - t('Multiple Profiles'), - t('Ability to create multiple profiles'), - false, - get_config('feature_lock','multi_profiles'), - feature_level('multi_profiles',3), - ], [ 'advanced_profiles', @@ -163,14 +155,6 @@ function get_features($filtered = true) { feature_level('ajaxchat',1), ], - [ - 'permcats', - t('Permission Groups'), - t('Provide alternate connection permission roles.'), - false, - get_config('feature_lock','permcats'), - feature_level('permcats',2), - ], [ 'smart_birthdays', @@ -219,6 +203,58 @@ function get_features($filtered = true) { ], ], + + 'access_control' => [ + t('Access Control and Permissions'), + + [ + 'groups', + t('Privacy Groups'), + t('Enable management and selection of privacy groups'), + true, + get_config('feature_lock','groups'), + feature_level('groups',0), + ], + + [ + 'multi_profiles', + t('Multiple Profiles'), + t('Ability to create multiple profiles'), + false, + get_config('feature_lock','multi_profiles'), + feature_level('multi_profiles',3), + ], + + + [ + 'permcats', + t('Permission Groups'), + t('Provide alternate connection permission roles.'), + false, + get_config('feature_lock','permcats'), + feature_level('permcats',2), + ], + + [ + 'oauth_clients', + t('OAuth Clients'), + t('Manage authenticatication tokens for mobile and remote apps.'), + false, + get_config('feature_lock','oauth_clients'), + feature_level('oauth_clients',1), + ], + + [ + 'access_tokens', + t('Access Tokens'), + t('Create access tokens so that non-members can access private content.'), + false, + get_config('feature_lock','access_tokens'), + feature_level('access_tokens',2), + ], + + ], + // Post composition 'composition' => [ @@ -312,14 +348,6 @@ function get_features($filtered = true) { feature_level('archives',1), ], - [ - 'groups', - t('Privacy Groups'), - t('Enable management and selection of privacy groups'), - true, - get_config('feature_lock','groups'), - feature_level('groups',0), - ], [ 'savedsearch', |