aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2017-01-02 07:56:23 -0500
committerAndrew Manning <tamanning@zoho.com>2017-01-02 07:56:23 -0500
commitbc0d4f28efe12601fde58d2f01f2d4834c1b7dc1 (patch)
tree9d8f0ab7b9af8f680547af6a997a9a71ab8ce3a3 /include
parent7b11e634aa570f4aca98c55abc802527d12d5be1 (diff)
parent369a29ac909a67813390b4ebbcda78d1a7033505 (diff)
downloadvolse-hubzilla-bc0d4f28efe12601fde58d2f01f2d4834c1b7dc1.tar.gz
volse-hubzilla-bc0d4f28efe12601fde58d2f01f2d4834c1b7dc1.tar.bz2
volse-hubzilla-bc0d4f28efe12601fde58d2f01f2d4834c1b7dc1.zip
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'include')
-rw-r--r--include/features.php9
1 files changed, 9 insertions, 0 deletions
diff --git a/include/features.php b/include/features.php
index 1ccdbf015..8ff0d2d21 100644
--- a/include/features.php
+++ b/include/features.php
@@ -157,6 +157,15 @@ function get_features($filtered = true) {
feature_level('smart_birthdays',2),
],
+ [
+ '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'),
+ feature_level('event_tz_select',2),
+ ],
+
[
'advanced_dirsearch',
t('Advanced Directory Search'),