diff options
| author | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2019-05-19 13:25:00 +0200 |
|---|---|---|
| committer | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2019-05-19 13:25:00 +0200 |
| commit | 429140df97a2c273fba6974147ac2e48e7688263 (patch) | |
| tree | 2e337542da1b0f4c9c383dfeb8a7d9eb63990a72 /include/features.php | |
| parent | f92d2e3f7c6573bd7bab04223c7e28662605c6d8 (diff) | |
| parent | af2b263bc74b16601ec7c123a58f0549613aed27 (diff) | |
| download | volse-hubzilla-429140df97a2c273fba6974147ac2e48e7688263.tar.gz volse-hubzilla-429140df97a2c273fba6974147ac2e48e7688263.tar.bz2 volse-hubzilla-429140df97a2c273fba6974147ac2e48e7688263.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'include/features.php')
| -rw-r--r-- | include/features.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/features.php b/include/features.php index 35a4c0dd4..d8607f447 100644 --- a/include/features.php +++ b/include/features.php @@ -79,7 +79,7 @@ function get_features($filtered = true, $level = (-1)) { 'calendar' => [ - t('CalDAV'), + t('Calendar'), [ 'cal_first_day', @@ -167,6 +167,14 @@ function get_features($filtered = true, $level = (-1)) { t('Ability to mark special posts with a star indicator'), false, get_config('feature_lock','star_posts'), + ], + + [ + 'reply_to', + t('Reply on comment'), + t('Ability to reply on selected comment'), + false, + get_config('feature_lock','reply_to'), ] ], @@ -361,14 +369,6 @@ function get_features($filtered = true, $level = (-1)) { ], [ - 'suggest', - t('Suggest Channels'), - t('Show friend and connection suggestions'), - false, - get_config('feature_lock','suggest') - ], - - [ 'network_list_mode', t('Use blog/list mode'), t('Comments will be displayed separately'), |