From 60e3c259acbc0f58d20a13c47eea848f2d461416 Mon Sep 17 00:00:00 2001
From: Mike Macgirvin <mike.macgirvin@agentbox.com.au>
Date: Mon, 25 Sep 2023 16:25:48 +1000
Subject: [PATCH 1/3] Don't include discovered locations from act->object in
 response activities

---
 Code/Lib/Activity.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Code/Lib/Activity.php b/Code/Lib/Activity.php
index 19d5f1ee3..6d7cede1b 100644
--- a/Code/Lib/Activity.php
+++ b/Code/Lib/Activity.php
@@ -3267,7 +3267,7 @@ class Activity
             if ($act->obj['type'] === 'Place') {
                 $location = new Place($act->obj);
             }
-            elseif (is_array($act->obj['location'])) {
+            elseif (is_array($act->obj['location']) && !$response_activity) {
                 $location = new Place($act->obj['location']);
             }
         }

From d49f58ea82f0b64f55d64bd12e15f0548ae5179f Mon Sep 17 00:00:00 2001
From: Mike Macgirvin <mike@macgirvin.com>
Date: Mon, 25 Sep 2023 18:35:24 +1000
Subject: [PATCH 2/3] badge-pills again. Now to figure why the foreground is
 changing

---
 Code/Lib/Connect.php              | 1 -
 view/theme/redbasic/css/style.css | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Code/Lib/Connect.php b/Code/Lib/Connect.php
index c5cd5c8ec..7e910369e 100644
--- a/Code/Lib/Connect.php
+++ b/Code/Lib/Connect.php
@@ -180,7 +180,6 @@ class Connect
             return $result;
         }
 
-
         if ($r['xchan_network'] === 'activitypub') {
             if (!$ap_allowed) {
                 $result['message'] = t('Protocol not supported');
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index e735283b9..c34dee4ef 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -19,7 +19,7 @@ html {
 }
 
 .badge-pill {
-	background-color: #EEEEEE;
+	background-color: #888888;
 }
 .sys-apps-toggle {
 }

From 5a26aeda03d15c3bc8231babfe7fe783547df0ca Mon Sep 17 00:00:00 2001
From: Mike Macgirvin <mike@macgirvin.com>
Date: Mon, 25 Sep 2023 19:51:02 +1000
Subject: [PATCH 3/3] preparatory work for app order ticket. Make English
 translations of app names consistent.

---
 Code/Lib/Apps.php | 2 +-
 app/admin.apd     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Code/Lib/Apps.php b/Code/Lib/Apps.php
index dd0d29d22..e11bf7dc5 100644
--- a/Code/Lib/Apps.php
+++ b/Code/Lib/Apps.php
@@ -340,7 +340,6 @@ class Apps
     {
         $apps = [
             'Access Lists' => t('Access Lists'),
-            'Admin' => t('Site Admin'),
             'Apps' => t('Apps'),
             'Articles' => t('Articles'),
             'CalDAV' => t('CalDAV'),
@@ -406,6 +405,7 @@ class Apps
             'Search' => t('Search'),
             'Secrets' => t('Secrets'),
             'Settings' => t('Settings'),
+            'Site Admin' => t('Site Admin'),
             'Sites' => t('Sites'),
             'Stream' => t('Stream'),
             'Stream Order' => t('Stream Order'),
diff --git a/app/admin.apd b/app/admin.apd
index 68c07568e..d38cfac42 100644
--- a/app/admin.apd
+++ b/app/admin.apd
@@ -1,6 +1,6 @@
 version: 1
 url: $baseurl/admin
 requires: admin 
-name: Admin
+name: Site Admin
 photo: icon:wrench
 categories: nav_featured_app