mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-19 23:55:19 +00:00
Merge branch 'dev' of codeberg.org:streams/streams into dev
This commit is contained in:
commit
2946f4a148
5 changed files with 4 additions and 5 deletions
|
@ -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']);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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'),
|
||||
|
|
|
@ -180,7 +180,6 @@ class Connect
|
|||
return $result;
|
||||
}
|
||||
|
||||
|
||||
if ($r['xchan_network'] === 'activitypub') {
|
||||
if (!$ap_allowed) {
|
||||
$result['message'] = t('Protocol not supported');
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
version: 1
|
||||
url: $baseurl/admin
|
||||
requires: admin
|
||||
name: Admin
|
||||
name: Site Admin
|
||||
photo: icon:wrench
|
||||
categories: nav_featured_app
|
||||
|
|
|
@ -19,7 +19,7 @@ html {
|
|||
}
|
||||
|
||||
.badge-pill {
|
||||
background-color: #EEEEEE;
|
||||
background-color: #888888;
|
||||
}
|
||||
.sys-apps-toggle {
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue