diff options
author | Thomas Willingham <founder@kakste.com> | 2013-12-18 18:21:47 +0000 |
---|---|---|
committer | Thomas Willingham <founder@kakste.com> | 2013-12-18 18:21:47 +0000 |
commit | 7ac00d02d110ec2f2d33779d8316e17c13cda149 (patch) | |
tree | 03b41e86e0790895fe56488beea2b5f554fbaeae /include/features.php | |
parent | 733cb37ef14eb4dd5408e1a8c453f13cd41952eb (diff) | |
parent | df34aaba4733b1c38ac2b8b9c19c5a945d5a841b (diff) | |
download | volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.tar.gz volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.tar.bz2 volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.zip |
Merge remote-tracking branch 'upstream/master'
Conflicts:
mod/page.php
Diffstat (limited to 'include/features.php')
-rw-r--r-- | include/features.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/features.php b/include/features.php index c5ab95a34..978d7af8a 100644 --- a/include/features.php +++ b/include/features.php @@ -23,6 +23,7 @@ function get_features() { array('content_expire', t('Content Expiration'), t('Remove posts/comments and/or private messages at a future time')), array('multi_profiles', t('Multiple Profiles'), t('Ability to create multiple profiles')), array('webpages', t('Web Pages'), t('Provide managed web pages on your channel')), + array('private_notes', t('Private Notes'), t('Enables a tool to store notes and reminders')), array('prettyphoto', t('Enhanced Photo Albums'), t('Enable photo album with enhanced features')), //FIXME - needs a description, but how the hell do we explain this to normals? array('sendzid', t('Extended Identity Sharing'), t(' ')), @@ -48,6 +49,7 @@ function get_features() { array('personal_tab', t('Network Personal Tab'), t('Enable tab to display only Network posts that you\'ve interacted on')), array('new_tab', t('Network New Tab'), t('Enable tab to display all new Network activity')), array('affinity', t('Affinity Tool'), t('Filter stream activity by depth of relationships')), + array('suggest', t('Suggest Channels'), t('Show channel suggestions')), ), // Item tools |