rename grid to network (for consistency) and activity to stream (as seen in osada) because it makes much more sense.

(cherry picked from commit 96277372d55a58349e318e694f4dab3a00fb2f13)

7 files changed, 36 insertions, 8 deletions

diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php
index 9e5de1bb0..b40cf70e5 100644
--- a/Zotlabs/Lib/Apps.php
+++ b/Zotlabs/Lib/Apps.php
@@ -59,7 +59,7 @@ class Apps {
 	static public function get_base_apps() {
 		return get_config('system','base_apps',[ 
 			'Connections',
-			'Grid',
+			'Network',
 			'Settings',
 			'Files',
 			'Channel Home',
@@ -310,7 +310,7 @@ class Apps {
 			'Suggest Channels' => t('Suggest Channels'),
 			'Login' => t('Login'),
 			'Channel Manager' => t('Channel Manager'), 
-			'Grid' => t('Activity'), 
+			'Network' => t('Stream'),
 			'Settings' => t('Settings'),
 			'Files' => t('Files'),
 			'Webpages' => t('Webpages'),
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index 015351cbf..792f92418 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -164,7 +164,7 @@ class Network extends \Zotlabs\Web\Controller {
 				));
 			}
 	
-			nav_set_selected('Grid');
+			nav_set_selected('Network');
 
 			$channel_acl = array(
 				'allow_cid' => $channel['channel_allow_cid'], 
diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php
index ebc444178..fc7c547ca 100644
--- a/Zotlabs/Module/Settings/Channel.php
+++ b/Zotlabs/Module/Settings/Channel.php
@@ -582,7 +582,7 @@ class Channel {
 	
 			'$lbl_vnot' 	=> t('Show visual notifications including:'),
 	
-			'$vnotify1'	=> array('vnotify1', t('Unseen grid activity'), ($vnotify & VNOTIFY_NETWORK), VNOTIFY_NETWORK, '', $yes_no),
+			'$vnotify1'	=> array('vnotify1', t('Unseen stream activity'), ($vnotify & VNOTIFY_NETWORK), VNOTIFY_NETWORK, '', $yes_no),
 			'$vnotify2'	=> array('vnotify2', t('Unseen channel activity'), ($vnotify & VNOTIFY_CHANNEL), VNOTIFY_CHANNEL, '', $yes_no),
 			'$vnotify3'	=> array('vnotify3', t('Unseen private messages'), ($vnotify & VNOTIFY_MAIL), VNOTIFY_MAIL, t('Recommended'), $yes_no),
 			'$vnotify4'	=> array('vnotify4', t('Upcoming events'), ($vnotify & VNOTIFY_EVENT), VNOTIFY_EVENT, '', $yes_no),
diff --git a/Zotlabs/Module/Settings/Network.php b/Zotlabs/Module/Settings/Network.php
index aaafe9255..ae02b06e9 100644
--- a/Zotlabs/Module/Settings/Network.php
+++ b/Zotlabs/Module/Settings/Network.php
@@ -55,7 +55,7 @@ class Network {
 			'$rpath' => $rpath,
 			'$action_url' => 'settings/' . $module,
 			'$form_security_token' => get_form_security_token('settings_' . $module),
-			'$title' => t('Activity Settings'),
+			'$title' => t('Stream Settings'),
 			'$features' => process_module_features_get(local_channel(), $features),
 			'$extra_settings_html' => $extra_settings_html,
 			'$submit' => t('Submit')
diff --git a/Zotlabs/Update/_1222.php b/Zotlabs/Update/_1222.php
new file mode 100644
index 000000000..579025457
--- /dev/null
+++ b/Zotlabs/Update/_1222.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Zotlabs\Update;
+
+use Zotlabs\Lib\Apps;
+
+class _1222 {
+
+	function run() {
+
+		q("START TRANSACTION");
+
+		$r1 = q("DELETE FROM app WHERE app_name = 'Grid' and app_system = 1");
+
+		if($r1) {
+			q("COMMIT");
+
+			Apps::import_system_apps();
+
+			return UPDATE_SUCCESS;
+		}
+
+		q("ROLLBACK");
+		return UPDATE_FAILED;
+
+	}
+
+}
diff --git a/app/grid.apd b/app/network.apd
index 8688f852c..1f6f9d46b 100644
--- a/app/grid.apd
+++ b/app/network.apd
@@ -1,6 +1,6 @@
-version: 1.2
+version: 1
 url: $baseurl/network, $baseurl/settings/network
 requires: local_channel
-name: Grid
+name: Network
 photo: icon:th
 categories: nav_featured_app, Networking
diff --git a/boot.php b/boot.php
index ef70dcba3..9d58f42aa 100755
--- a/boot.php
+++ b/boot.php
@@ -54,7 +54,7 @@ define ( 'STD_VERSION',             '3.8RC' );
 define ( 'ZOT_REVISION',            '6.0a' );
 
 
-define ( 'DB_UPDATE_VERSION',       1221 );
+define ( 'DB_UPDATE_VERSION',       1222 );
 
 define ( 'PROJECT_BASE',   __DIR__ );