UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-22 14:31:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4961 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2024-02-28 21:07:16 -07:00 committed by GitHub
commit e4f33e823d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 1763 additions and 1579 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1921
app/Http/Controllers/Admin/AdminReportController.php
View file

File diff suppressed because it is too large Load diff

1403
resources/assets/components/admin/AdminReports.vue
View file

File diff suppressed because it is too large Load diff

16
resources/views/site/help/email-confirmation-issues.blade.php Normal file
View file

@ -0,0 +1,16 @@
@extends('site.help.partial.template', ['breadcrumb'=>'Email Confirmation Issues'])
@section('section')
<div class="title">
<h3 class="font-weight-bold">Email Confirmation Issues</h3>
</div>
<hr>
<p>If you have been redirected to this page, it may be due to one of the following reasons:</p>
<ul>
<li>The email confirmation link has already been used.</li>
<li>The email confirmation link may have expired, they are only valid for 24 hours.</li>
<li>You cannot confirm an email for another account while logged in to a different account. Try logging out, or use a different browser to open the email confirmation link.</li>
<li>The account the associated email belongs to may have been deleted, or the account may have changed the email address.</li>
</ul>
@endsection

2
routes/web.php
View file

@ -307,7 +307,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
Route::view('instance-max-users-limit', 'site.help.instance-max-users')->name('help.instance-max-users-limit'); Route::view('instance-max-users-limit', 'site.help.instance-max-users')->name('help.instance-max-users-limit');
Route::view('import', 'site.help.import')->name('help.import'); Route::view('import', 'site.help.import')->name('help.import');
Route::view('parental-controls', 'site.help.parental-controls'); Route::view('parental-controls', 'site.help.parental-controls');
// Route::view('email-confirmation-issues', 'site.help.email-confirmation-issues')->name('help.email-confirmation-issues'); Route::view('email-confirmation-issues', 'site.help.email-confirmation-issues')->name('help.email-confirmation-issues');
Route::view('curated-onboarding', 'site.help.curated-onboarding')->name('help.curated-onboarding'); Route::view('curated-onboarding', 'site.help.curated-onboarding')->name('help.curated-onboarding');
}); });
Route::get('newsroom/{year}/{month}/{slug}', 'NewsroomController@show'); Route::get('newsroom/{year}/{month}/{slug}', 'NewsroomController@show');