Merge branch 'dev' of codeberg.org:streams/streams into dev

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']);
             }
         }

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'),

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');

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

view/theme/redbasic/css/style.css

@@ -19,7 +19,7 @@ html {
 }
 
 .badge-pill {
-	background-color: #EEEEEE;
+	background-color: #888888;
 }
 .sys-apps-toggle {
 }