1
0
Fork 1
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-24 16:53:17 +00:00

Merge branch 'staging' into patch-8

This commit is contained in:
daniel 2022-05-15 21:46:10 -06:00 committed by GitHub
commit 7b164ef300
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 16 additions and 13 deletions

View file

@ -9,6 +9,9 @@
- Hardcode UTC application timezone to prevent timezone issues ([b0d2c5e1](https://github.com/pixelfed/pixelfed/commit/b0d2c5e1))
- Remove arbitrary metro url redirect timeout ([84209c24](https://github.com/pixelfed/pixelfed/commit/84209c24))
- Fix json-ld attributes, fixes #3423 ([95f902b1](https://github.com/pixelfed/pixelfed/commit/95f902b1))
- Add trusted proxies flag to admin dashboard diagnostics ([#3450](https://github.com/pixelfed/pixelfed/pull/3450))
- Fix json-ld attributes, fixes #3423 ([95f902b1](https://github.com/pixelfed/pixelfed/commit/95f902b1))
- Update exp config, enforce mastoapi compatibility by default ([a160b233](https://github.com/pixelfed/pixelfed/commit/a160b233))
## [v0.11.3 (2022-05-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.2...v0.11.3)

View file

@ -97,7 +97,6 @@ class Installer extends Command
if(extension_loaded($ext) == false) {
$this->error("- {$ext} extension not found, aborting installation");
exit;
} else {
}
}
$this->info("- Required PHP extensions found!");

View file

@ -120,7 +120,7 @@ class AdminController extends Controller
public function appsHome(Request $request)
{
$filter = $request->input('filter');
if(in_array($filter, ['revoked'])) {
if($filter == 'revoked') {
$apps = OauthClient::with('user')
->whereNotNull('user_id')
->whereRevoked(true)

View file

@ -38,7 +38,6 @@ class StatusTransformer extends Fractal\TransformerAbstract
'website' => null
],
'mentions' => [],
'tags' => [],
'emojis' => [],
'card' => null,
'poll' => null,

View file

@ -667,6 +667,7 @@ class Inbox
if($story) {
StoryExpire::dispatch($story)->onQueue('story');
}
break;
default:
return;

View file

@ -32,6 +32,5 @@ return [
'spa' => true,
// Enforce Mastoapi Compatibility (alpha)
// Note: this may break 3rd party apps who use non-mastodon compliant fields
'emc' => env('EXP_EMC', false),
'emc' => env('EXP_EMC', true),
];

View file

@ -23,5 +23,5 @@ return [
* how many proxies that client's request has
* subsequently passed through.
*/
'proxies' => env('TRUST_PROXIES', ''),
'proxies' => env('TRUST_PROXIES', '*'),
];

View file

@ -735,7 +735,6 @@ export default {
layout: this.profileLayout,
showProfileMorePosts: false,
profileMorePosts: [],
replySending: false,
reactionBarLoading: true,
tributeSettings: {
collection: [

View file

@ -160,7 +160,7 @@
});
break;
case 'suspend':
msg = 'Are you sure you want to suspend the account of ' + username + ' ?';
let msg = 'Are you sure you want to suspend the account of ' + username + ' ?';
swal({
title: 'Confirm',
text: msg,

View file

@ -614,7 +614,6 @@ export default {
layout: this.profileLayout,
showProfileMorePosts: false,
profileMorePosts: [],
replySending: false,
reactionBarLoading: true,
profileUrl: null,
currentLayout: 'status'

View file

@ -4,6 +4,5 @@ return [
'emptyTimeline' => 'Tällä käyttäjällä ei ole vielä päivityksiä!',
'emptyFollowers' => 'Tällä käyttäjällä ei ole vielä seuraajia!',
'emptyFollowing' => 'Tämä käyttäjä ei vielä seuraa ketään!',
'savedWarning' => 'Only you can see what you\'ve saved',
'savedWarning' => 'Vain sinä voit nähdä, mitä olet tallentanut',
];

View file

@ -184,6 +184,11 @@
<strong><span class="badge badge-primary">Storage</span> Filesystems default (local/s3/spaces): </strong>
<span>{{ config_cache('filesystems.default')}}</span>
</li>
<li>
<strong><span class="badge badge-primary">Network</span> TrustedProxy: </strong>
<span>{{ config('trustedproxy.proxies') }}</span>
</li>
</ul>
</div>
<div class="pb-3 border-bottom">

View file

@ -9,7 +9,7 @@
@if ($errors->any())
<div class="alert alert-danger px-3 h6 text-center">
@foreach($errors->all() as $error)
<p class="font-weight-bold mb-1">{{ $error }}</li>
<p class="font-weight-bold mb-1">{{ $error }}</p>
@endforeach
</div>
@endif

View file

@ -9,7 +9,7 @@
@if ($errors->any())
<div class="alert alert-danger px-3 h6 text-center">
@foreach($errors->all() as $error)
<p class="font-weight-bold mb-1">{{ $error }}</li>
<p class="font-weight-bold mb-1">{{ $error }}</p>
@endforeach
</div>
@endif

View file

@ -9,7 +9,7 @@
@if ($errors->any())
<div class="alert alert-danger px-3 h6 text-center">
@foreach($errors->all() as $error)
<p class="font-weight-bold mb-1">{{ $error }}</li>
<p class="font-weight-bold mb-1">{{ $error }}</p>
@endforeach
</div>
@endif