diff options
author | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2019-08-11 10:39:03 +0200 |
---|---|---|
committer | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2019-08-11 10:39:03 +0200 |
commit | b89d2d7580e40cd417defaffd2514b5eed38577d (patch) | |
tree | 78ba9004d87b994dd9a531b475fd51b940bf3dd8 /include/features.php | |
parent | 350e636e3d0a44323c69185555e89cc01a213aa2 (diff) | |
parent | 047dd31724f8da12c153b4a6f27dc5462f7b97e5 (diff) | |
download | volse-hubzilla-b89d2d7580e40cd417defaffd2514b5eed38577d.tar.gz volse-hubzilla-b89d2d7580e40cd417defaffd2514b5eed38577d.tar.bz2 volse-hubzilla-b89d2d7580e40cd417defaffd2514b5eed38577d.zip |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'include/features.php')
-rw-r--r-- | include/features.php | 38 |
1 files changed, 8 insertions, 30 deletions
diff --git a/include/features.php b/include/features.php index d8607f447..87df0c50d 100644 --- a/include/features.php +++ b/include/features.php @@ -87,6 +87,14 @@ function get_features($filtered = true, $level = (-1)) { t('Default is Sunday'), false, get_config('feature_lock','cal_first_day') + ], + + [ + 'event_tz_select', + t('Event Timezone Selection'), + t('Allow event creation in timezones other than your own.'), + false, + get_config('feature_lock','event_tz_select'), ] ], @@ -272,36 +280,6 @@ function get_features($filtered = true, $level = (-1)) { ], - 'events' => [ - - t('Events'), - - [ - 'events_cal_first_day', - t('Start calendar week on Monday'), - t('Default is Sunday'), - false, - get_config('feature_lock','events_cal_first_day') - ], - - [ - 'smart_birthdays', - t('Smart Birthdays'), - t('Make birthday events timezone aware in case your friends are scattered across the planet.'), - true, - get_config('feature_lock','smart_birthdays'), - ], - - [ - 'event_tz_select', - t('Event Timezone Selection'), - t('Allow event creation in timezones other than your own.'), - false, - get_config('feature_lock','event_tz_select'), - ] - - ], - 'manage' => [ t('Manage'), |