From 58ee2a49fa23bdc0de6c6cac59992d3a6a9c955e Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 27 Feb 2018 10:43:19 +0100
Subject: [PATCH 01/14] bump version

---
 boot.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot.php b/boot.php
index 0c3db1531..ae62b6f44 100755
--- a/boot.php
+++ b/boot.php
@@ -50,7 +50,7 @@ require_once('include/attach.php');
 require_once('include/bbcode.php');
 
 define ( 'PLATFORM_NAME',           'hubzilla' );
-define ( 'STD_VERSION',             '3.2RC' );
+define ( 'STD_VERSION',             '3.3' );
 define ( 'ZOT_REVISION',            '1.3' );
 
 define ( 'DB_UPDATE_VERSION',       1205 );

From f34e6d897766ab93a0c0dede9d89f5536c4f60e9 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 27 Feb 2018 19:15:12 -0800
Subject: [PATCH 02/14] move oauth_client management and guest access tokens to
 features rather than auto-enabling at various feature levels. This involves
 string changes and should *not* go into 3.2RC.

---
 Zotlabs/Widget/Settings_menu.php |  4 +--
 include/features.php             | 59 +++++++++++++++++++++++---------
 2 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/Zotlabs/Widget/Settings_menu.php b/Zotlabs/Widget/Settings_menu.php
index e15ed96a5..20241a22f 100644
--- a/Zotlabs/Widget/Settings_menu.php
+++ b/Zotlabs/Widget/Settings_menu.php
@@ -79,7 +79,7 @@ class Settings_menu {
 			'selected' => ''
 		);
 
-		if(get_account_techlevel() > 0) {
+		if(feature_enabled(local_channel(),'oauth_clients')) {
 			$tabs[] =	array(
 				'label' => t('Connected apps'),
 				'url' => z_root() . '/settings/oauth',
@@ -87,7 +87,7 @@ class Settings_menu {
 			);
 		}
 
-		if(get_account_techlevel() > 2) {
+		if(feature_enabled(local_channel(),'access_tokens')) {
 			$tabs[] =	array(
 				'label' => t('Guest Access Tokens'),
 				'url' => z_root() . '/settings/tokens',
diff --git a/include/features.php b/include/features.php
index 839faff67..be4017776 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,49 @@ function get_features($filtered = true) {
 			],
 		],
 
+
+		'access_control' => [
+			t('Access Control and Permissions'),
+
+			[
+				'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' => [
 

From 14183b8fb548b6525d6ce98b52ce5ec7f2580f2e Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 27 Feb 2018 19:18:53 -0800
Subject: [PATCH 03/14] move privacy groups to the newly created Access Control
 and Permissions tab. Not for 3.2 as it requires string changes from the prior
 checkin.

---
 include/features.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/include/features.php b/include/features.php
index be4017776..993266977 100644
--- a/include/features.php
+++ b/include/features.php
@@ -207,6 +207,15 @@ 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'),      
@@ -339,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',    

From be5187718c0f1791a692b7743aca51ea5f37649e Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 27 Feb 2018 19:34:51 -0800
Subject: [PATCH 04/14] provide usage hint on addon settings page to save each
 panel before opening another. [String change, not for 3.2]

---
 Zotlabs/Module/Settings/Featured.php | 1 +
 view/tpl/settings_addons.tpl         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Zotlabs/Module/Settings/Featured.php b/Zotlabs/Module/Settings/Featured.php
index 9c5a7b16c..3740eddfa 100644
--- a/Zotlabs/Module/Settings/Featured.php
+++ b/Zotlabs/Module/Settings/Featured.php
@@ -62,6 +62,7 @@ class Featured {
 		$o .= replace_macros($tpl, array(
 			'$form_security_token' => get_form_security_token("settings_featured"),
 			'$title'	=> t('Feature/Addon Settings'),
+			'$descrip'  => t('Please save/submit changes to any panel before opening another.'),
 			'$settings_addons' => $settings_addons
 		));
 		return $o;
diff --git a/view/tpl/settings_addons.tpl b/view/tpl/settings_addons.tpl
index 52f8d9d3f..2a925f1f7 100755
--- a/view/tpl/settings_addons.tpl
+++ b/view/tpl/settings_addons.tpl
@@ -1,5 +1,6 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
+		<div class="descriptive-text pull-right">{{$descrip}}</div>
 		<h2>{{$title}}</h2>
 	</div>
 	<form action="settings/featured" method="post" autocomplete="off">

From 6c60be9e8d57c26e92f704de0712def767ab8705 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 27 Feb 2018 19:51:29 -0800
Subject: [PATCH 05/14] rename Addon/Feature settings to addon settings [string
 change]

---
 Zotlabs/Module/Settings/Featured.php | 2 +-
 Zotlabs/Widget/Settings_menu.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Zotlabs/Module/Settings/Featured.php b/Zotlabs/Module/Settings/Featured.php
index 3740eddfa..1da139206 100644
--- a/Zotlabs/Module/Settings/Featured.php
+++ b/Zotlabs/Module/Settings/Featured.php
@@ -61,7 +61,7 @@ class Featured {
 		$tpl = get_markup_template("settings_addons.tpl");
 		$o .= replace_macros($tpl, array(
 			'$form_security_token' => get_form_security_token("settings_featured"),
-			'$title'	=> t('Feature/Addon Settings'),
+			'$title'	=> t('Addon Settings'),
 			'$descrip'  => t('Please save/submit changes to any panel before opening another.'),
 			'$settings_addons' => $settings_addons
 		));
diff --git a/Zotlabs/Widget/Settings_menu.php b/Zotlabs/Widget/Settings_menu.php
index 20241a22f..455fdcb9b 100644
--- a/Zotlabs/Widget/Settings_menu.php
+++ b/Zotlabs/Widget/Settings_menu.php
@@ -54,7 +54,7 @@ class Settings_menu {
 		}
 
 		$tabs[] =	array(
-			'label'	=> t('Feature/Addon settings'),
+			'label'	=> t('Addon settings'),
 			'url' 	=> z_root().'/settings/featured',
 			'selected'	=> ((argv(1) === 'featured') ? 'active' : ''),
 		);

From 924c8db71206dca0baa1e95c63719205404d5380 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 28 Feb 2018 08:38:56 +0100
Subject: [PATCH 06/14] missed some string for translation - update strings

---
 Zotlabs/Lib/Enotify.php |   6 +-
 util/hmessages.po       | 332 +++++++++++++++++++++-------------------
 2 files changed, 175 insertions(+), 163 deletions(-)

diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php
index 1461a2e18..61c98c881 100644
--- a/Zotlabs/Lib/Enotify.php
+++ b/Zotlabs/Lib/Enotify.php
@@ -138,7 +138,7 @@ class Enotify {
 
 		$itemlink = $params['link'];
 
-		$action = 'commented on';
+		$action = t('commented on');
 
 		if(array_key_exists('item',$params) && in_array($params['item']['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) {
 
@@ -149,10 +149,10 @@ class Enotify {
 			}
 
 			if(activity_match($params['verb'], ACTIVITY_LIKE))
-				$action = 'liked';
+				$action = t('liked');
 
 			if(activity_match($params['verb'], ACTIVITY_DISLIKE))
-				$action = 'disliked';
+				$action = t('disliked');
 
 		}
 
diff --git a/util/hmessages.po b/util/hmessages.po
index e0f9a3d9f..98091a368 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.2RC\n"
+"Project-Id-Version: 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-26 20:28+0100\n"
+"POT-Creation-Date: 2018-02-28 08:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -235,7 +235,7 @@ msgstr ""
 #: ../../include/attach.php:380 ../../include/attach.php:387
 #: ../../include/attach.php:469 ../../include/attach.php:1019
 #: ../../include/attach.php:1093 ../../include/attach.php:1258
-#: ../../include/items.php:3646 ../../include/photos.php:27
+#: ../../include/items.php:3656 ../../include/photos.php:27
 msgid "Permission denied."
 msgstr ""
 
@@ -244,7 +244,7 @@ msgstr ""
 msgid "Block Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2383
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2402
 msgid "Blocks"
 msgstr ""
 
@@ -407,7 +407,7 @@ msgstr ""
 #: ../../Zotlabs/Module/Admin/Logs.php:84
 #: ../../Zotlabs/Module/Admin/Channels.php:147
 #: ../../Zotlabs/Module/Admin/Themes.php:158
-#: ../../Zotlabs/Module/Admin/Site.php:288
+#: ../../Zotlabs/Module/Admin/Site.php:289
 #: ../../Zotlabs/Module/Admin/Profs.php:157
 #: ../../Zotlabs/Module/Admin/Account_edit.php:74
 #: ../../Zotlabs/Module/Admin/Security.php:104
@@ -1048,7 +1048,7 @@ msgstr ""
 #: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163
 #: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
 #: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
-#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:251
+#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:252
 #: ../../Zotlabs/Module/Settings/Channel.php:305
 #: ../../Zotlabs/Module/Settings/Display.php:100
 #: ../../Zotlabs/Module/Api.php:99 ../../Zotlabs/Module/Photos.php:697
@@ -1058,7 +1058,7 @@ msgstr ""
 #: ../../Zotlabs/Module/Defperms.php:180 ../../Zotlabs/Module/Profiles.php:681
 #: ../../Zotlabs/Module/Filestorage.php:155
 #: ../../Zotlabs/Module/Filestorage.php:163
-#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1589
+#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1587
 #: ../../view/theme/redbasic_c/php/config.php:100
 #: ../../view/theme/redbasic_c/php/config.php:115
 #: ../../view/theme/redbasic/php/config.php:98
@@ -1098,7 +1098,7 @@ msgstr ""
 #: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163
 #: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
 #: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
-#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:253
+#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:254
 #: ../../Zotlabs/Module/Settings/Channel.php:305
 #: ../../Zotlabs/Module/Settings/Display.php:100
 #: ../../Zotlabs/Module/Api.php:98 ../../Zotlabs/Module/Photos.php:697
@@ -1108,7 +1108,7 @@ msgstr ""
 #: ../../Zotlabs/Module/Profiles.php:681
 #: ../../Zotlabs/Module/Filestorage.php:155
 #: ../../Zotlabs/Module/Filestorage.php:163
-#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1589
+#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1587
 #: ../../view/theme/redbasic_c/php/config.php:100
 #: ../../view/theme/redbasic_c/php/config.php:115
 #: ../../view/theme/redbasic/php/config.php:98
@@ -2229,7 +2229,7 @@ msgstr ""
 #: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:89
 #: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:46
 #: ../../Zotlabs/Module/Display.php:409 ../../Zotlabs/Module/Filestorage.php:24
-#: ../../Zotlabs/Module/Admin.php:62 ../../include/items.php:3559
+#: ../../Zotlabs/Module/Admin.php:62 ../../include/items.php:3569
 msgid "Item not found."
 msgstr ""
 
@@ -2260,7 +2260,7 @@ msgstr ""
 #: ../../Zotlabs/Module/Admin/Channels.php:145
 #: ../../Zotlabs/Module/Admin/Themes.php:122
 #: ../../Zotlabs/Module/Admin/Themes.php:156
-#: ../../Zotlabs/Module/Admin/Site.php:286
+#: ../../Zotlabs/Module/Admin/Site.php:287
 #: ../../Zotlabs/Module/Admin/Security.php:86
 #: ../../Zotlabs/Module/Admin.php:136
 msgid "Administration"
@@ -2633,7 +2633,7 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Site.php:184
 #: ../../view/theme/redbasic_c/php/config.php:15
-#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3063
+#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3082
 msgid "Default"
 msgstr ""
 
@@ -2655,438 +2655,438 @@ msgstr ""
 msgid "unsupported"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:252
+#: ../../Zotlabs/Module/Admin/Site.php:253
 msgid "Yes - with approval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:258
+#: ../../Zotlabs/Module/Admin/Site.php:259
 msgid "My site is not a public server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:259
+#: ../../Zotlabs/Module/Admin/Site.php:260
 msgid "My site has paid access only"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:260
+#: ../../Zotlabs/Module/Admin/Site.php:261
 msgid "My site has free access only"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:261
+#: ../../Zotlabs/Module/Admin/Site.php:262
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:273
+#: ../../Zotlabs/Module/Admin/Site.php:274
 msgid "Beginner/Basic"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:274
+#: ../../Zotlabs/Module/Admin/Site.php:275
 msgid "Novice - not skilled but willing to learn"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:275
+#: ../../Zotlabs/Module/Admin/Site.php:276
 msgid "Intermediate - somewhat comfortable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:276
+#: ../../Zotlabs/Module/Admin/Site.php:277
 msgid "Advanced - very comfortable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:277
+#: ../../Zotlabs/Module/Admin/Site.php:278
 msgid "Expert - I can write computer code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:278
+#: ../../Zotlabs/Module/Admin/Site.php:279
 msgid "Wizard - I probably know more than you do"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:287 ../../Zotlabs/Widget/Admin.php:22
+#: ../../Zotlabs/Module/Admin/Site.php:288 ../../Zotlabs/Widget/Admin.php:22
 msgid "Site"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:289
+#: ../../Zotlabs/Module/Admin/Site.php:290
 #: ../../Zotlabs/Module/Register.php:271
 msgid "Registration"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:290
+#: ../../Zotlabs/Module/Admin/Site.php:291
 msgid "File upload"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:291
+#: ../../Zotlabs/Module/Admin/Site.php:292
 msgid "Policies"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:292 ../../include/contact_widgets.php:16
+#: ../../Zotlabs/Module/Admin/Site.php:293 ../../include/contact_widgets.php:16
 msgid "Advanced"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:296
+#: ../../Zotlabs/Module/Admin/Site.php:297
 #: ../../addon/statusnet/statusnet.php:891
 msgid "Site name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:298
+#: ../../Zotlabs/Module/Admin/Site.php:299
 msgid "Site default technical skill level"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:298
+#: ../../Zotlabs/Module/Admin/Site.php:299
 msgid "Used to provide a member experience matched to technical comfort level"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:300
+#: ../../Zotlabs/Module/Admin/Site.php:301
 msgid "Lock the technical skill level setting"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:300
+#: ../../Zotlabs/Module/Admin/Site.php:301
 msgid "Members can set their own technical comfort level by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:302
+#: ../../Zotlabs/Module/Admin/Site.php:303
 msgid "Banner/Logo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:302
+#: ../../Zotlabs/Module/Admin/Site.php:303
 msgid "Unfiltered HTML/CSS/JS is allowed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:303
+#: ../../Zotlabs/Module/Admin/Site.php:304
 msgid "Administrator Information"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:303
+#: ../../Zotlabs/Module/Admin/Site.php:304
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:304 ../../Zotlabs/Module/Siteinfo.php:21
+#: ../../Zotlabs/Module/Admin/Site.php:305 ../../Zotlabs/Module/Siteinfo.php:21
 msgid "Site Information"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:304
+#: ../../Zotlabs/Module/Admin/Site.php:305
 msgid ""
 "Publicly visible description of this site.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:305
+#: ../../Zotlabs/Module/Admin/Site.php:306
 msgid "System language"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:306
+#: ../../Zotlabs/Module/Admin/Site.php:307
 msgid "System theme"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:306
+#: ../../Zotlabs/Module/Admin/Site.php:307
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:307
+#: ../../Zotlabs/Module/Admin/Site.php:308
 msgid "Mobile system theme"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:307
+#: ../../Zotlabs/Module/Admin/Site.php:308
 msgid "Theme for mobile devices"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:309
+#: ../../Zotlabs/Module/Admin/Site.php:310
 msgid "Allow Feeds as Connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:309
+#: ../../Zotlabs/Module/Admin/Site.php:310
 msgid "(Heavy system resource usage)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:310
+#: ../../Zotlabs/Module/Admin/Site.php:311
 msgid "Maximum image size"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:310
+#: ../../Zotlabs/Module/Admin/Site.php:311
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:311
+#: ../../Zotlabs/Module/Admin/Site.php:312
 msgid "Does this site allow new member registration?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:312
+#: ../../Zotlabs/Module/Admin/Site.php:313
 msgid "Invitation only"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:312
+#: ../../Zotlabs/Module/Admin/Site.php:313
 msgid ""
 "Only allow new member registrations with an invitation code. Above register "
 "policy must be set to Yes."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:313
+#: ../../Zotlabs/Module/Admin/Site.php:314
 msgid "Minimum age"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:313
+#: ../../Zotlabs/Module/Admin/Site.php:314
 msgid "Minimum age (in years) for who may register on this site."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:314
+#: ../../Zotlabs/Module/Admin/Site.php:315
 msgid "Which best describes the types of account offered by this hub?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:315
+#: ../../Zotlabs/Module/Admin/Site.php:316
 msgid "Register text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:315
+#: ../../Zotlabs/Module/Admin/Site.php:316
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:316
+#: ../../Zotlabs/Module/Admin/Site.php:317
 msgid "Site homepage to show visitors (default: login box)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:316
+#: ../../Zotlabs/Module/Admin/Site.php:317
 msgid ""
 "example: 'public' to show public stream, 'page/sys/home' to show a system "
 "webpage called 'home' or 'include:home.html' to include a file."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:317
+#: ../../Zotlabs/Module/Admin/Site.php:318
 msgid "Preserve site homepage URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:317
+#: ../../Zotlabs/Module/Admin/Site.php:318
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:318
+#: ../../Zotlabs/Module/Admin/Site.php:319
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:318
+#: ../../Zotlabs/Module/Admin/Site.php:319
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:319
+#: ../../Zotlabs/Module/Admin/Site.php:320
 msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:319
+#: ../../Zotlabs/Module/Admin/Site.php:320
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:320
+#: ../../Zotlabs/Module/Admin/Site.php:321
 msgid "Verify Email Addresses"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:320
+#: ../../Zotlabs/Module/Admin/Site.php:321
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:321
+#: ../../Zotlabs/Module/Admin/Site.php:322
 msgid "Force publish"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:321
+#: ../../Zotlabs/Module/Admin/Site.php:322
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:322
+#: ../../Zotlabs/Module/Admin/Site.php:323
 msgid "Import Public Streams"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:322
+#: ../../Zotlabs/Module/Admin/Site.php:323
 msgid ""
 "Import and allow access to public content pulled from other sites. Warning: "
 "this content is unmoderated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:323
+#: ../../Zotlabs/Module/Admin/Site.php:324
 msgid "Site only Public Streams"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:323
+#: ../../Zotlabs/Module/Admin/Site.php:324
 msgid ""
 "Allow access to public content originating only from this site if Imported "
 "Public Streams are disabled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:324
+#: ../../Zotlabs/Module/Admin/Site.php:325
 msgid "Allow anybody on the internet to access the Public streams"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:324
+#: ../../Zotlabs/Module/Admin/Site.php:325
 msgid ""
 "Disable to require authentication before viewing. Warning: this content is "
 "unmoderated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:325
+#: ../../Zotlabs/Module/Admin/Site.php:326
 msgid "Login on Homepage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:325
+#: ../../Zotlabs/Module/Admin/Site.php:326
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:326
+#: ../../Zotlabs/Module/Admin/Site.php:327
 msgid "Enable context help"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:326
+#: ../../Zotlabs/Module/Admin/Site.php:327
 msgid ""
 "Display contextual help for the current page when the help button is pressed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:328
+#: ../../Zotlabs/Module/Admin/Site.php:329
 msgid "Reply-to email address for system generated email."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:329
+#: ../../Zotlabs/Module/Admin/Site.php:330
 msgid "Sender (From) email address for system generated email."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:330
+#: ../../Zotlabs/Module/Admin/Site.php:331
 msgid "Name of email sender for system generated email."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:332
+#: ../../Zotlabs/Module/Admin/Site.php:333
 msgid "Directory Server URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:332
+#: ../../Zotlabs/Module/Admin/Site.php:333
 msgid "Default directory server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:334
+#: ../../Zotlabs/Module/Admin/Site.php:335
 msgid "Proxy user"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:335
+#: ../../Zotlabs/Module/Admin/Site.php:336
 msgid "Proxy URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:336
+#: ../../Zotlabs/Module/Admin/Site.php:337
 msgid "Network timeout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:336
+#: ../../Zotlabs/Module/Admin/Site.php:337
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:337
+#: ../../Zotlabs/Module/Admin/Site.php:338
 msgid "Delivery interval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:337
+#: ../../Zotlabs/Module/Admin/Site.php:338
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:338
+#: ../../Zotlabs/Module/Admin/Site.php:339
 msgid "Deliveries per process"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:338
+#: ../../Zotlabs/Module/Admin/Site.php:339
 msgid ""
 "Number of deliveries to attempt in a single operating system process. Adjust "
 "if necessary to tune system performance. Recommend: 1-5."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:339
+#: ../../Zotlabs/Module/Admin/Site.php:340
 msgid "Queue Threshold"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:339
+#: ../../Zotlabs/Module/Admin/Site.php:340
 msgid ""
 "Always defer immediate delivery if queue contains more than this number of "
 "entries."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:340
+#: ../../Zotlabs/Module/Admin/Site.php:341
 msgid "Poll interval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:340
+#: ../../Zotlabs/Module/Admin/Site.php:341
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:341
+#: ../../Zotlabs/Module/Admin/Site.php:342
 msgid "Path to ImageMagick convert program"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:341
+#: ../../Zotlabs/Module/Admin/Site.php:342
 msgid ""
 "If set, use this program to generate photo thumbnails for huge images ( > "
 "4000 pixels in either dimension), otherwise memory exhaustion may occur. "
 "Example: /usr/bin/convert"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:342
+#: ../../Zotlabs/Module/Admin/Site.php:343
 msgid "Allow SVG thumbnails in file browser"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:342
+#: ../../Zotlabs/Module/Admin/Site.php:343
 msgid "WARNING: SVG images may contain malicious code."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:343
+#: ../../Zotlabs/Module/Admin/Site.php:344
 msgid "Maximum Load Average"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:343
+#: ../../Zotlabs/Module/Admin/Site.php:344
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:344
+#: ../../Zotlabs/Module/Admin/Site.php:345
 msgid "Expiration period in days for imported (grid/network) content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:344
+#: ../../Zotlabs/Module/Admin/Site.php:345
 msgid "0 for no expiration of imported content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:346
+#: ../../Zotlabs/Module/Admin/Site.php:347
 msgid ""
 "Public servers: Optional landing (marketing) webpage for new registrants"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:346
+#: ../../Zotlabs/Module/Admin/Site.php:347
 #, php-format
 msgid "Create this page first. Default is %s/register"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:347
+#: ../../Zotlabs/Module/Admin/Site.php:348
 msgid "Page to display after creating a new channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:347
+#: ../../Zotlabs/Module/Admin/Site.php:348
 msgid "Recommend: profiles, go, or settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:349
+#: ../../Zotlabs/Module/Admin/Site.php:350
 msgid "Optional: site location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:349
+#: ../../Zotlabs/Module/Admin/Site.php:350
 msgid "Region or country"
 msgstr ""
 
@@ -4331,7 +4331,7 @@ msgstr ""
 msgid "Authentication failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1585
+#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1583
 #: ../../include/channel.php:2307
 msgid "Remote Authentication"
 msgstr ""
@@ -4348,7 +4348,7 @@ msgstr ""
 msgid "Permissions denied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:344 ../../include/text.php:2407
+#: ../../Zotlabs/Module/Cal.php:344 ../../include/text.php:2426
 msgid "Import"
 msgstr ""
 
@@ -5541,7 +5541,7 @@ msgstr ""
 msgid "Connection Default Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:850 ../../include/items.php:4154
+#: ../../Zotlabs/Module/Connedit.php:850 ../../include/items.php:4164
 #, php-format
 msgid "Connection: %s"
 msgstr ""
@@ -5762,7 +5762,7 @@ msgstr ""
 msgid "Submit and proceed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2384
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2403
 msgid "Menus"
 msgstr ""
 
@@ -5814,7 +5814,7 @@ msgstr ""
 msgid "Allow bookmarks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2385
+#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2404
 msgid "Layouts"
 msgstr ""
 
@@ -5922,7 +5922,7 @@ msgid "Could not create privacy group."
 msgstr ""
 
 #: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:143
-#: ../../include/items.php:4121
+#: ../../include/items.php:4131
 msgid "Privacy group not found."
 msgstr ""
 
@@ -7169,7 +7169,7 @@ msgstr ""
 msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:288 ../../boot.php:1565
+#: ../../Zotlabs/Module/Register.php:288 ../../boot.php:1563
 #: ../../include/nav.php:164
 msgid "Register"
 msgstr ""
@@ -7185,25 +7185,25 @@ msgstr ""
 msgid "Cover Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4498
+#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4508
 msgid "female"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4499
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4509
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4500
+#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4510
 msgid "male"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4501
+#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4511
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4503
+#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4513
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr ""
@@ -7498,7 +7498,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1593
+#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1591
 msgid "Password Reset"
 msgstr ""
 
@@ -7600,7 +7600,7 @@ msgstr ""
 msgid "Suggest Channels"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:239 ../../boot.php:1584 ../../include/nav.php:126
+#: ../../Zotlabs/Lib/Apps.php:239 ../../boot.php:1582 ../../include/nav.php:126
 #: ../../include/nav.php:130
 msgid "Login"
 msgstr ""
@@ -7929,6 +7929,18 @@ msgstr ""
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr ""
 
+#: ../../Zotlabs/Lib/Enotify.php:141
+msgid "commented on"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:152
+msgid "liked"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:155
+msgid "disliked"
+msgstr ""
+
 #: ../../Zotlabs/Lib/Enotify.php:198
 #, php-format
 msgid "%1$s, %2$s %3$s [zrl=%4$s]a %5$s[/zrl]"
@@ -8361,7 +8373,7 @@ msgstr ""
 msgid "parent"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2802
+#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2821
 msgid "Collection"
 msgstr ""
 
@@ -8886,50 +8898,50 @@ msgstr ""
 msgid "Source channel not found."
 msgstr ""
 
-#: ../../boot.php:1564
+#: ../../boot.php:1562
 msgid "Create an account to access services and applications"
 msgstr ""
 
-#: ../../boot.php:1583 ../../include/nav.php:111 ../../include/nav.php:140
+#: ../../boot.php:1581 ../../include/nav.php:111 ../../include/nav.php:140
 #: ../../include/nav.php:159
 msgid "Logout"
 msgstr ""
 
-#: ../../boot.php:1587
+#: ../../boot.php:1585
 msgid "Login/Email"
 msgstr ""
 
-#: ../../boot.php:1588
+#: ../../boot.php:1586
 msgid "Password"
 msgstr ""
 
-#: ../../boot.php:1589
+#: ../../boot.php:1587
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1592
+#: ../../boot.php:1590
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:2344
+#: ../../boot.php:2347
 #, php-format
 msgid "[$Projectname] Website SSL error for %s"
 msgstr ""
 
-#: ../../boot.php:2349
+#: ../../boot.php:2352
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr ""
 
-#: ../../boot.php:2465
+#: ../../boot.php:2468
 #, php-format
 msgid "[$Projectname] Cron tasks not running on %s"
 msgstr ""
 
-#: ../../boot.php:2470
+#: ../../boot.php:2473
 msgid "Cron/Scheduled tasks not running."
 msgstr ""
 
-#: ../../boot.php:2471 ../../include/datetime.php:232
+#: ../../boot.php:2474 ../../include/datetime.php:232
 msgid "never"
 msgstr ""
 
@@ -12331,75 +12343,75 @@ msgstr ""
 msgid "activity"
 msgstr ""
 
-#: ../../include/text.php:2080
+#: ../../include/text.php:2099
 msgid "a-z, 0-9, -, and _ only"
 msgstr ""
 
-#: ../../include/text.php:2380
+#: ../../include/text.php:2399
 msgid "Design Tools"
 msgstr ""
 
-#: ../../include/text.php:2386
+#: ../../include/text.php:2405
 msgid "Pages"
 msgstr ""
 
-#: ../../include/text.php:2408
+#: ../../include/text.php:2427
 msgid "Import website..."
 msgstr ""
 
-#: ../../include/text.php:2409
+#: ../../include/text.php:2428
 msgid "Select folder to import"
 msgstr ""
 
-#: ../../include/text.php:2410
+#: ../../include/text.php:2429
 msgid "Import from a zipped folder:"
 msgstr ""
 
-#: ../../include/text.php:2411
+#: ../../include/text.php:2430
 msgid "Import from cloud files:"
 msgstr ""
 
-#: ../../include/text.php:2412
+#: ../../include/text.php:2431
 msgid "/cloud/channel/path/to/folder"
 msgstr ""
 
-#: ../../include/text.php:2413
+#: ../../include/text.php:2432
 msgid "Enter path to website files"
 msgstr ""
 
-#: ../../include/text.php:2414
+#: ../../include/text.php:2433
 msgid "Select folder"
 msgstr ""
 
-#: ../../include/text.php:2415
+#: ../../include/text.php:2434
 msgid "Export website..."
 msgstr ""
 
-#: ../../include/text.php:2416
+#: ../../include/text.php:2435
 msgid "Export to a zip file"
 msgstr ""
 
-#: ../../include/text.php:2417
+#: ../../include/text.php:2436
 msgid "website.zip"
 msgstr ""
 
-#: ../../include/text.php:2418
+#: ../../include/text.php:2437
 msgid "Enter a name for the zip file."
 msgstr ""
 
-#: ../../include/text.php:2419
+#: ../../include/text.php:2438
 msgid "Export to cloud files"
 msgstr ""
 
-#: ../../include/text.php:2420
+#: ../../include/text.php:2439
 msgid "/path/to/export/folder"
 msgstr ""
 
-#: ../../include/text.php:2421
+#: ../../include/text.php:2440
 msgid "Enter a path to a cloud files destination."
 msgstr ""
 
-#: ../../include/text.php:2422
+#: ../../include/text.php:2441
 msgid "Specify folder"
 msgstr ""
 
@@ -12875,34 +12887,34 @@ msgstr ""
 msgid "Visible to specific connections."
 msgstr ""
 
-#: ../../include/items.php:4137
+#: ../../include/items.php:4147
 msgid "Privacy group is empty."
 msgstr ""
 
-#: ../../include/items.php:4144
+#: ../../include/items.php:4154
 #, php-format
 msgid "Privacy group: %s"
 msgstr ""
 
-#: ../../include/items.php:4156
+#: ../../include/items.php:4166
 msgid "Connection not found."
 msgstr ""
 
-#: ../../include/items.php:4505
+#: ../../include/items.php:4515
 msgid "profile photo"
 msgstr ""
 
-#: ../../include/items.php:4696
+#: ../../include/items.php:4706
 #, php-format
 msgid "[Edited %s]"
 msgstr ""
 
-#: ../../include/items.php:4696
+#: ../../include/items.php:4706
 msgctxt "edit_activity"
 msgid "Post"
 msgstr ""
 
-#: ../../include/items.php:4696
+#: ../../include/items.php:4706
 msgctxt "edit_activity"
 msgid "Comment"
 msgstr ""

From 6593dff9f5b07c76037fa0afc7357089306195c4 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 28 Feb 2018 10:21:22 +0100
Subject: [PATCH 07/14] missed one index in the last update

---
 Zotlabs/Update/_1206.php | 24 ++++++++++++++++++++++++
 boot.php                 |  2 +-
 install/schema_mysql.sql |  1 +
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 Zotlabs/Update/_1206.php

diff --git a/Zotlabs/Update/_1206.php b/Zotlabs/Update/_1206.php
new file mode 100644
index 000000000..bb2000aad
--- /dev/null
+++ b/Zotlabs/Update/_1206.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Zotlabs\Update;
+
+class _1206 {
+
+	function run() {
+
+		if(ACTIVE_DBTYPE == DBTYPE_MYSQL) {
+			$r = q("ALTER TABLE item 
+				ADD INDEX uid_resource_type (uid, resource_type),
+			");
+
+			if($r)
+				return UPDATE_SUCCESS;
+			return UPDATE_FAILED;
+		}
+		else {
+			return UPDATE_SUCCESS;
+		}
+
+	}
+
+}
diff --git a/boot.php b/boot.php
index ae62b6f44..2c937cf57 100755
--- a/boot.php
+++ b/boot.php
@@ -53,7 +53,7 @@ define ( 'PLATFORM_NAME',           'hubzilla' );
 define ( 'STD_VERSION',             '3.3' );
 define ( 'ZOT_REVISION',            '1.3' );
 
-define ( 'DB_UPDATE_VERSION',       1205 );
+define ( 'DB_UPDATE_VERSION',       1206 );
 
 define ( 'PROJECT_BASE',   __DIR__ );
 
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index 76e6032fc..5cd04467d 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -658,6 +658,7 @@ CREATE TABLE IF NOT EXISTS `item` (
   KEY `uid_item_starred` (`uid`, `item_starred`),
   KEY `uid_item_retained` (`uid`, `item_retained`),
   KEY `uid_item_private` (`uid`, `item_private`),
+  KEY `uid_resource_type` (`uid`, `resource_type`),
   KEY `aid` (`aid`),
   KEY `owner_xchan` (`owner_xchan`),
   KEY `author_xchan` (`author_xchan`),

From c92bc60cec7d2a50f483879731a50b55a651c64c Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 28 Feb 2018 10:28:06 +0100
Subject: [PATCH 08/14] typo

---
 Zotlabs/Update/_1206.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Zotlabs/Update/_1206.php b/Zotlabs/Update/_1206.php
index bb2000aad..351d53ff6 100644
--- a/Zotlabs/Update/_1206.php
+++ b/Zotlabs/Update/_1206.php
@@ -8,7 +8,7 @@ class _1206 {
 
 		if(ACTIVE_DBTYPE == DBTYPE_MYSQL) {
 			$r = q("ALTER TABLE item 
-				ADD INDEX uid_resource_type (uid, resource_type),
+				ADD INDEX uid_resource_type (uid, resource_type)
 			");
 
 			if($r)

From 1c07880c0178bbda875bbe2cda5d19ae7fb5e1c4 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 28 Feb 2018 18:01:51 -0800
Subject: [PATCH 09/14] important bugfix: if logged in locally and mod_display
 returns nothing owned by your uid, retry with known public uids rather than
 issue 'permission denied'. Affects the ability to view search results for
 otherwise public posts 'in context'.

---
 Zotlabs/Module/Display.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php
index 11dd0d174..8e8a1ed24 100644
--- a/Zotlabs/Module/Display.php
+++ b/Zotlabs/Module/Display.php
@@ -215,6 +215,7 @@ class Display extends \Zotlabs\Web\Controller {
 			$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']),intval(\App::$pager['start']));
 
 			if($load || ($checkjs->disabled()) || ($module_format !== 'html')) {
+
 				$r = null;
 
 				require_once('include/channel.php');
@@ -235,7 +236,7 @@ class Display extends \Zotlabs\Web\Controller {
 					}
 				}
 
-				if($r === null) {
+				if(! $r) {
 
 					// in case somebody turned off public access to sys channel content using permissions
 					// make that content unsearchable by ensuring the owner uid can't match
@@ -281,7 +282,7 @@ class Display extends \Zotlabs\Web\Controller {
 				}
 			}
 
-			if($r === null) {
+			if(! $r) {
 				// in case somebody turned off public access to sys channel content using permissions
 				// make that content unsearchable by ensuring the owner_xchan can't match
 				if(! perm_is_allowed($sysid,$observer_hash,'view_stream'))

From 14e14c6c92dadf4c95900978135a161f5da696d9 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 28 Feb 2018 19:49:33 -0800
Subject: [PATCH 10/14] provide new member widget which sits beneath the
 notifications for the first 60 days after an account creation.

---
 Zotlabs/Module/Go.php            |  2 +-
 Zotlabs/Widget/Newmember.php     | 77 ++++++++++++++++++++++++++++++++
 view/pdl/mod_admin.pdl           |  1 +
 view/pdl/mod_appman.pdl          |  1 +
 view/pdl/mod_apps.pdl            |  1 +
 view/pdl/mod_articles.pdl        |  1 +
 view/pdl/mod_blocks.pdl          |  1 +
 view/pdl/mod_cal.pdl             |  1 +
 view/pdl/mod_cards.pdl           |  1 +
 view/pdl/mod_cdav.pdl            |  1 +
 view/pdl/mod_channel.pdl         |  1 +
 view/pdl/mod_chanview.pdl        |  1 +
 view/pdl/mod_chat.pdl            |  1 +
 view/pdl/mod_cloud.pdl           |  1 +
 view/pdl/mod_common.pdl          |  1 +
 view/pdl/mod_connect.pdl         |  1 +
 view/pdl/mod_connections.pdl     |  1 +
 view/pdl/mod_connedit.pdl        |  1 +
 view/pdl/mod_defperms.pdl        |  1 +
 view/pdl/mod_directory.pdl       |  1 +
 view/pdl/mod_display.pdl         |  1 +
 view/pdl/mod_editblock.pdl       |  1 +
 view/pdl/mod_editlayout.pdl      |  1 +
 view/pdl/mod_editwebpage.pdl     |  1 +
 view/pdl/mod_events.pdl          |  1 +
 view/pdl/mod_go.pdl              |  1 +
 view/pdl/mod_group.pdl           |  1 +
 view/pdl/mod_help.pdl            |  1 +
 view/pdl/mod_hq.pdl              |  1 +
 view/pdl/mod_id.pdl              |  1 +
 view/pdl/mod_layouts.pdl         |  1 +
 view/pdl/mod_locs.pdl            |  1 +
 view/pdl/mod_mail.pdl            |  1 +
 view/pdl/mod_menu.pdl            |  1 +
 view/pdl/mod_message.pdl         |  1 +
 view/pdl/mod_mitem.pdl           |  1 +
 view/pdl/mod_network.pdl         |  1 +
 view/pdl/mod_photos.pdl          |  1 +
 view/pdl/mod_profile.pdl         |  1 +
 view/pdl/mod_profile_photo.pdl   |  1 +
 view/pdl/mod_profiles.pdl        |  1 +
 view/pdl/mod_profperm.pdl        |  1 +
 view/pdl/mod_pubstream.pdl       |  1 +
 view/pdl/mod_rate.pdl            |  1 +
 view/pdl/mod_ratings.pdl         |  1 +
 view/pdl/mod_search.pdl          |  1 +
 view/pdl/mod_settings.pdl        |  1 +
 view/pdl/mod_sharedwithme.pdl    |  1 +
 view/pdl/mod_sources.pdl         |  1 +
 view/pdl/mod_suggest.pdl         |  1 +
 view/pdl/mod_uexport.pdl         |  1 +
 view/pdl/mod_viewconnections.pdl |  1 +
 view/pdl/mod_webpages.pdl        |  1 +
 view/pdl/mod_wiki.pdl            |  1 +
 view/tpl/new_member.tpl          | 17 +++++++
 55 files changed, 147 insertions(+), 1 deletion(-)
 create mode 100644 Zotlabs/Widget/Newmember.php
 create mode 100644 view/tpl/new_member.tpl

diff --git a/Zotlabs/Module/Go.php b/Zotlabs/Module/Go.php
index d23e940c3..d33136d9e 100644
--- a/Zotlabs/Module/Go.php
+++ b/Zotlabs/Module/Go.php
@@ -36,7 +36,7 @@ class Go extends \Zotlabs\Web\Controller {
 			'cover_photo'   => t('Upload a cover photo'),
 			'profiles'      => t('Edit your default profile'),
 			'suggest'       => t('View friend suggestions'),
-			'directory'     => t('View the directory to find other interesting channels'),
+			'directory'     => t('View the channel directory'),
 			'settings'      => t('View/edit your channel settings'),
 			'help'          => t('View the site or project documentation'),
 			'channel/' . $channel['channel_address']       => t('Visit your channel homepage'),
diff --git a/Zotlabs/Widget/Newmember.php b/Zotlabs/Widget/Newmember.php
new file mode 100644
index 000000000..a3f1126cc
--- /dev/null
+++ b/Zotlabs/Widget/Newmember.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Newmember {
+
+	function widget($arr) {
+
+		if(! local_channel())
+			return EMPTY_STR;
+
+		$c = \App::get_channel();
+		if(! $c)
+			return EMPTY_STR;
+
+
+		$a = \App::get_account();
+		if(! $a)
+			return EMPTY_STR;
+
+
+		if(datetime_convert('UTC','UTC',$a['account_created']) < datetime_convert('UTC','UTC', 'now - 60 days'))
+			return EMPTY_STR;
+
+
+		$options = [
+			t('Profile Creation'),
+			[ 
+				'profile_photo' => t('Upload profile photo'),
+				'cover_photo'   => t('Upload cover photo'),
+				'profiles'      => t('Edit your profile'),
+			],
+
+			t('Find and Connect with others'),
+			[
+				'directory'     => t('View the channel directory'),
+				'suggest'       => t('View friend suggestions'),
+				'connections'   => t('Manage your connections'),
+			],
+
+			t('Communicate'),
+			[
+				'channel/' . $channel['channel_address']       => t('View your channel homepage'),
+				'network'       => t('View your network stream'),
+			],
+
+			t('Miscellaneous'),
+			[
+				'settings'      => t('Settings'),
+				'help'    	    => t('Documentation'),
+			]
+		];
+
+		$site_firehose = ((intval(get_config('system','site_firehose',0))) ? true : false);
+		$net_firehose  = ((get_config('system','disable_discover_tab',1)) ? false : true);
+
+
+		// hack to put this in the correct spot of the array
+
+		if($site_firehose || $net_firehose) {
+			$options[5]['pubstream'] = t('View public stream. Warning: not moderated');
+		}
+
+		$o = replace_macros(get_markup_template('new_member.tpl'), [
+			'$title' => t('New Member Links'),
+			'$options' => $options
+
+		]);
+
+		return $o;
+
+	}
+
+}
+
+
+	
diff --git a/view/pdl/mod_admin.pdl b/view/pdl/mod_admin.pdl
index deee4551b..1cf49750d 100644
--- a/view/pdl/mod_admin.pdl
+++ b/view/pdl/mod_admin.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_appman.pdl b/view/pdl/mod_appman.pdl
index d2b1379a5..8bd407372 100644
--- a/view/pdl/mod_appman.pdl
+++ b/view/pdl/mod_appman.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_apps.pdl b/view/pdl/mod_apps.pdl
index d2b1379a5..8bd407372 100644
--- a/view/pdl/mod_apps.pdl
+++ b/view/pdl/mod_apps.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_articles.pdl b/view/pdl/mod_articles.pdl
index c7599a008..b823787f4 100644
--- a/view/pdl/mod_articles.pdl
+++ b/view/pdl/mod_articles.pdl
@@ -5,4 +5,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_blocks.pdl b/view/pdl/mod_blocks.pdl
index 6ef7993b5..4a90a4f36 100644
--- a/view/pdl/mod_blocks.pdl
+++ b/view/pdl/mod_blocks.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_cal.pdl b/view/pdl/mod_cal.pdl
index c34898dd5..7e15fc869 100644
--- a/view/pdl/mod_cal.pdl
+++ b/view/pdl/mod_cal.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_cards.pdl b/view/pdl/mod_cards.pdl
index f5606dcb8..f0403e380 100644
--- a/view/pdl/mod_cards.pdl
+++ b/view/pdl/mod_cards.pdl
@@ -5,4 +5,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_cdav.pdl b/view/pdl/mod_cdav.pdl
index d31308d90..c0f9a511f 100644
--- a/view/pdl/mod_cdav.pdl
+++ b/view/pdl/mod_cdav.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_channel.pdl b/view/pdl/mod_channel.pdl
index f7ac0b4ef..5857fca95 100644
--- a/view/pdl/mod_channel.pdl
+++ b/view/pdl/mod_channel.pdl
@@ -10,4 +10,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_chanview.pdl b/view/pdl/mod_chanview.pdl
index 5c8ca77d5..a5461df50 100644
--- a/view/pdl/mod_chanview.pdl
+++ b/view/pdl/mod_chanview.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_chat.pdl b/view/pdl/mod_chat.pdl
index 2f1f5c8d1..808ba3d5a 100644
--- a/view/pdl/mod_chat.pdl
+++ b/view/pdl/mod_chat.pdl
@@ -7,4 +7,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_cloud.pdl b/view/pdl/mod_cloud.pdl
index 5c8ca77d5..a5461df50 100644
--- a/view/pdl/mod_cloud.pdl
+++ b/view/pdl/mod_cloud.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_common.pdl b/view/pdl/mod_common.pdl
index c34898dd5..7e15fc869 100644
--- a/view/pdl/mod_common.pdl
+++ b/view/pdl/mod_common.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_connect.pdl b/view/pdl/mod_connect.pdl
index 23b8d9f71..d7e5d29f3 100644
--- a/view/pdl/mod_connect.pdl
+++ b/view/pdl/mod_connect.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_connections.pdl b/view/pdl/mod_connections.pdl
index 7cead4fe8..b777cada5 100644
--- a/view/pdl/mod_connections.pdl
+++ b/view/pdl/mod_connections.pdl
@@ -6,4 +6,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_connedit.pdl b/view/pdl/mod_connedit.pdl
index 3f57ed87b..4bdadb5e8 100644
--- a/view/pdl/mod_connedit.pdl
+++ b/view/pdl/mod_connedit.pdl
@@ -6,4 +6,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_defperms.pdl b/view/pdl/mod_defperms.pdl
index 53a3ac9e5..37c85c765 100644
--- a/view/pdl/mod_defperms.pdl
+++ b/view/pdl/mod_defperms.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_directory.pdl b/view/pdl/mod_directory.pdl
index 7b430738b..2e408c29f 100644
--- a/view/pdl/mod_directory.pdl
+++ b/view/pdl/mod_directory.pdl
@@ -6,4 +6,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_display.pdl b/view/pdl/mod_display.pdl
index e657fa88b..95f069031 100644
--- a/view/pdl/mod_display.pdl
+++ b/view/pdl/mod_display.pdl
@@ -1,3 +1,4 @@
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_editblock.pdl b/view/pdl/mod_editblock.pdl
index 6ef7993b5..4a90a4f36 100644
--- a/view/pdl/mod_editblock.pdl
+++ b/view/pdl/mod_editblock.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_editlayout.pdl b/view/pdl/mod_editlayout.pdl
index 6ef7993b5..4a90a4f36 100644
--- a/view/pdl/mod_editlayout.pdl
+++ b/view/pdl/mod_editlayout.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_editwebpage.pdl b/view/pdl/mod_editwebpage.pdl
index 6ef7993b5..4a90a4f36 100644
--- a/view/pdl/mod_editwebpage.pdl
+++ b/view/pdl/mod_editwebpage.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_events.pdl b/view/pdl/mod_events.pdl
index b26f3b0d0..e9a91e219 100644
--- a/view/pdl/mod_events.pdl
+++ b/view/pdl/mod_events.pdl
@@ -4,4 +4,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_go.pdl b/view/pdl/mod_go.pdl
index c34898dd5..7e15fc869 100644
--- a/view/pdl/mod_go.pdl
+++ b/view/pdl/mod_go.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_group.pdl b/view/pdl/mod_group.pdl
index 0a31e17d9..34eb7ddd1 100644
--- a/view/pdl/mod_group.pdl
+++ b/view/pdl/mod_group.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_help.pdl b/view/pdl/mod_help.pdl
index 2eab7aa63..4bb380cc9 100644
--- a/view/pdl/mod_help.pdl
+++ b/view/pdl/mod_help.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_hq.pdl b/view/pdl/mod_hq.pdl
index 450fcb9a7..1bcdb2c65 100644
--- a/view/pdl/mod_hq.pdl
+++ b/view/pdl/mod_hq.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_id.pdl b/view/pdl/mod_id.pdl
index c34898dd5..7e15fc869 100644
--- a/view/pdl/mod_id.pdl
+++ b/view/pdl/mod_id.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_layouts.pdl b/view/pdl/mod_layouts.pdl
index 6ef7993b5..4a90a4f36 100644
--- a/view/pdl/mod_layouts.pdl
+++ b/view/pdl/mod_layouts.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_locs.pdl b/view/pdl/mod_locs.pdl
index 53a3ac9e5..37c85c765 100644
--- a/view/pdl/mod_locs.pdl
+++ b/view/pdl/mod_locs.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_mail.pdl b/view/pdl/mod_mail.pdl
index 52f908919..d572b7244 100644
--- a/view/pdl/mod_mail.pdl
+++ b/view/pdl/mod_mail.pdl
@@ -4,4 +4,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_menu.pdl b/view/pdl/mod_menu.pdl
index 6ef7993b5..4a90a4f36 100644
--- a/view/pdl/mod_menu.pdl
+++ b/view/pdl/mod_menu.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_message.pdl b/view/pdl/mod_message.pdl
index f9dd8f623..3f1dd594f 100644
--- a/view/pdl/mod_message.pdl
+++ b/view/pdl/mod_message.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_mitem.pdl b/view/pdl/mod_mitem.pdl
index 4db06cb49..0cca7fd85 100644
--- a/view/pdl/mod_mitem.pdl
+++ b/view/pdl/mod_mitem.pdl
@@ -4,4 +4,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_network.pdl b/view/pdl/mod_network.pdl
index 44e29ffbd..09fdba573 100644
--- a/view/pdl/mod_network.pdl
+++ b/view/pdl/mod_network.pdl
@@ -14,4 +14,5 @@ $content
 
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_photos.pdl b/view/pdl/mod_photos.pdl
index 4d1a5b2ea..6a3d30b1c 100644
--- a/view/pdl/mod_photos.pdl
+++ b/view/pdl/mod_photos.pdl
@@ -4,4 +4,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_profile.pdl b/view/pdl/mod_profile.pdl
index c34898dd5..7e15fc869 100644
--- a/view/pdl/mod_profile.pdl
+++ b/view/pdl/mod_profile.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_profile_photo.pdl b/view/pdl/mod_profile_photo.pdl
index c34898dd5..7e15fc869 100644
--- a/view/pdl/mod_profile_photo.pdl
+++ b/view/pdl/mod_profile_photo.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_profiles.pdl b/view/pdl/mod_profiles.pdl
index c34898dd5..7e15fc869 100644
--- a/view/pdl/mod_profiles.pdl
+++ b/view/pdl/mod_profiles.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_profperm.pdl b/view/pdl/mod_profperm.pdl
index c34898dd5..7e15fc869 100644
--- a/view/pdl/mod_profperm.pdl
+++ b/view/pdl/mod_profperm.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_pubstream.pdl b/view/pdl/mod_pubstream.pdl
index e657fa88b..95f069031 100644
--- a/view/pdl/mod_pubstream.pdl
+++ b/view/pdl/mod_pubstream.pdl
@@ -1,3 +1,4 @@
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_rate.pdl b/view/pdl/mod_rate.pdl
index 5c8ca77d5..a5461df50 100644
--- a/view/pdl/mod_rate.pdl
+++ b/view/pdl/mod_rate.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_ratings.pdl b/view/pdl/mod_ratings.pdl
index cfa39e408..f6e87cb7c 100644
--- a/view/pdl/mod_ratings.pdl
+++ b/view/pdl/mod_ratings.pdl
@@ -7,4 +7,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_search.pdl b/view/pdl/mod_search.pdl
index e69657dac..ed1f77c5a 100644
--- a/view/pdl/mod_search.pdl
+++ b/view/pdl/mod_search.pdl
@@ -2,4 +2,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_settings.pdl b/view/pdl/mod_settings.pdl
index 53a3ac9e5..37c85c765 100644
--- a/view/pdl/mod_settings.pdl
+++ b/view/pdl/mod_settings.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_sharedwithme.pdl b/view/pdl/mod_sharedwithme.pdl
index e657fa88b..95f069031 100644
--- a/view/pdl/mod_sharedwithme.pdl
+++ b/view/pdl/mod_sharedwithme.pdl
@@ -1,3 +1,4 @@
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_sources.pdl b/view/pdl/mod_sources.pdl
index 53a3ac9e5..37c85c765 100644
--- a/view/pdl/mod_sources.pdl
+++ b/view/pdl/mod_sources.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_suggest.pdl b/view/pdl/mod_suggest.pdl
index 392a36dd6..b74391cba 100644
--- a/view/pdl/mod_suggest.pdl
+++ b/view/pdl/mod_suggest.pdl
@@ -4,4 +4,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_uexport.pdl b/view/pdl/mod_uexport.pdl
index 53a3ac9e5..37c85c765 100644
--- a/view/pdl/mod_uexport.pdl
+++ b/view/pdl/mod_uexport.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_viewconnections.pdl b/view/pdl/mod_viewconnections.pdl
index c34898dd5..7e15fc869 100644
--- a/view/pdl/mod_viewconnections.pdl
+++ b/view/pdl/mod_viewconnections.pdl
@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_webpages.pdl b/view/pdl/mod_webpages.pdl
index 4e60dc2a7..d13bf8862 100644
--- a/view/pdl/mod_webpages.pdl
+++ b/view/pdl/mod_webpages.pdl
@@ -4,4 +4,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/pdl/mod_wiki.pdl b/view/pdl/mod_wiki.pdl
index 1b98b6379..be86be7e3 100644
--- a/view/pdl/mod_wiki.pdl
+++ b/view/pdl/mod_wiki.pdl
@@ -4,4 +4,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]
diff --git a/view/tpl/new_member.tpl b/view/tpl/new_member.tpl
new file mode 100644
index 000000000..60e347ab3
--- /dev/null
+++ b/view/tpl/new_member.tpl
@@ -0,0 +1,17 @@
+<div class="widget">
+<h3>{{$title}}</h3>
+{{if $options}}
+<ul class="nav nav-pills flex-column">
+{{foreach $options as $x}}
+	{{if is_array($x) }}
+		{{foreach $x as $y => $z}}
+		<li class="nav-item"><a href="{{$y}}" class="nav-link">{{$z}}</a></li>
+		{{/foreach}}
+	{{else}}
+		<div><strong>{{$x}}</strong></div>
+	{{/if}}
+{{/foreach}}
+</ul>
+{{/if}}
+</div>
+

From 9672d35d8c614f174b313ef1b631dc189e5ce997 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 28 Feb 2018 20:02:08 -0800
Subject: [PATCH 11/14] hide newmember widget if a new account was used to
 create a clone of an old channel

---
 Zotlabs/Widget/Newmember.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Zotlabs/Widget/Newmember.php b/Zotlabs/Widget/Newmember.php
index a3f1126cc..898942ccc 100644
--- a/Zotlabs/Widget/Newmember.php
+++ b/Zotlabs/Widget/Newmember.php
@@ -22,6 +22,12 @@ class Newmember {
 		if(datetime_convert('UTC','UTC',$a['account_created']) < datetime_convert('UTC','UTC', 'now - 60 days'))
 			return EMPTY_STR;
 
+		// This could be a new account that was used to clone a very old channel
+
+		$ob = \App::get_observer();
+		if($ob && array_key_exists('xchan_name_date',$ob) && $ob['xchan_name_date'] < datetime_convert('UTC','UTC','now - 60 days'))
+			return EMPTY_STR;
+
 
 		$options = [
 			t('Profile Creation'),

From 2b910eb5aa204e1914c8c73afe369c443bd1ff49 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 28 Feb 2018 20:31:06 -0800
Subject: [PATCH 12/14] Create one and only one 'registration successful, check
 your email' popup.

---
 Zotlabs/Module/Register.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php
index c7fa1cee8..5356669e9 100644
--- a/Zotlabs/Module/Register.php
+++ b/Zotlabs/Module/Register.php
@@ -123,9 +123,6 @@ class Register extends \Zotlabs\Web\Controller {
 		if($policy == REGISTER_OPEN ) {
 			if($email_verify) {
 				$res = verify_email_address($result);
-				if($res) {
-					info( t('Registration successful. Please check your email for validation instructions.') . EOL ) ;
-				}
 			}
 			else {
 				$res = send_register_success_email($result['email'],$result['password']);
@@ -133,7 +130,8 @@ class Register extends \Zotlabs\Web\Controller {
 			if($res) {
 				if($invite_code) {
 					info( t('Registration successful. Continue to create your first channel...') . EOL ) ;
-				} else {
+				} 
+				else {
 					info( t('Registration successful. Please check your email for validation instructions.') . EOL ) ;
 				}
 			}

From 01015bc0d54343831189ce1b09a69b70a6371fd5 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 28 Feb 2018 21:15:26 -0800
Subject: [PATCH 13/14] several email validation issues

---
 Zotlabs/Module/Email_validation.php | 11 ++++++-----
 include/account.php                 |  2 +-
 view/tpl/email_validation.tpl       | 10 +++++-----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Zotlabs/Module/Email_validation.php b/Zotlabs/Module/Email_validation.php
index b8bb720cd..c1ba9a01a 100644
--- a/Zotlabs/Module/Email_validation.php
+++ b/Zotlabs/Module/Email_validation.php
@@ -7,12 +7,11 @@ class Email_validation extends \Zotlabs\Web\Controller {
 
 	function post() {
 
+		$success = false;
 		if($_POST['token']) {
 			// This will redirect internally on success unless the channel is auto_created
-			if(! account_approve(trim(basename($_POST['token'])))) {
-				notice('Token verification failed.');
-			}
-			else {
+			if(account_approve(trim(basename($_POST['token'])))) {
+				$success = true;
 				if(get_config('system','auto_channel_create')) {
 					$next_page = get_config('system', 'workflow_channel_next', 'profiles');		
 				}
@@ -21,7 +20,9 @@ class Email_validation extends \Zotlabs\Web\Controller {
 				}
 			}
 		}
-
+		if(! $success) {
+			notice( t('Token verification failed.') . EOL);
+		}
 	}
 
 
diff --git a/include/account.php b/include/account.php
index 3ac485974..40cf281c3 100644
--- a/include/account.php
+++ b/include/account.php
@@ -530,7 +530,7 @@ function account_deny($hash) {
 
 function account_approve($hash) {
 
-	$ret = array('success' => false);
+	$ret = false;
 
 	// Note: when the password in the register table is 'verify', the uid actually contains the account_id
 
diff --git a/view/tpl/email_validation.tpl b/view/tpl/email_validation.tpl
index f049a040f..9913e0971 100644
--- a/view/tpl/email_validation.tpl
+++ b/view/tpl/email_validation.tpl
@@ -2,15 +2,15 @@
 
 <div class="descriptive-paragraph" style="font-size: 1.2em;"><p>{{$desc}}</p></div>
 
-<form action="email_validation" method="post">
+<form action="email_validation/{{$email}}" method="post">
 {{include file="field_input.tpl" field=$token}}
 
-<div class="pull-right">
-	<a href="email_resend/{{$email}}" class="btn btn-warning">{{$resend}}</a>
-</div>
-<div class="submit-wrapper" >
+<div class="pull-right submit-wrapper">
 	<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
 </div>
+<div class="resend-email" >
+	<a href="email_resend/{{$email}}" class="btn btn-warning">{{$resend}}</a>
+</div>
 </form>
 <div class="clear"></div>
 

From 6210b7727f6c8542daaa62d1ed7f9ec1f74323f2 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 28 Feb 2018 21:39:52 -0800
Subject: [PATCH 14/14] profile edit: empty dob is set to the date of the first
 profile save unless you clear it first

---
 include/datetime.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/datetime.php b/include/datetime.php
index 1e9a1fa51..766c90d16 100644
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -125,7 +125,7 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d
  */
 function dob($dob) {
 
-	if ($dob === '0000-00-00')
+	if ($dob === '0000-00-00' || $dob === '')
 		$value = '';
 	else
 		$value = (($year) ? datetime_convert('UTC','UTC',$dob,'Y-m-d') : datetime_convert('UTC','UTC',$dob,'m-d'));