diff --git a/app/Util/Lexer/RestrictedNames.php b/app/Util/Lexer/RestrictedNames.php index 1e09a11c..dace884e 100644 --- a/app/Util/Lexer/RestrictedNames.php +++ b/app/Util/Lexer/RestrictedNames.php @@ -174,6 +174,7 @@ class RestrictedNames 'privacy', 'reset', 'report', + 'results', 'reports', 'robot', 'robots', diff --git a/config/pixelfed.php b/config/pixelfed.php index 98400f51..618e2cb4 100644 --- a/config/pixelfed.php +++ b/config/pixelfed.php @@ -238,6 +238,25 @@ return [ */ 'optimize_video' => env('PF_OPTIMIZE_VIDEOS', true), + /* + |-------------------------------------------------------------------------- + | User invites + |-------------------------------------------------------------------------- + | + | Allow users to invite others via email. + | Will respect max user limit and prevent invites after the + | limit is reached. Default: off + | + */ + 'user_invites' => [ + 'enabled' => env('PF_USER_INVITES', false), + 'limit' => [ + 'total' => (int) env('PF_USER_INVITES_TOTAL_LIMIT', 0), + 'daily' => (int) env('PF_USER_INVITES_DAILY_LIMIT', 0), + 'monthly' => (int) env('PF_USER_INVITES_MONTHLY_LIMIT', 0), + ] + ], + 'media_types' => env('MEDIA_TYPES', 'image/jpeg,image/png,image/gif'), 'enforce_account_limit' => env('LIMIT_ACCOUNT_SIZE', true), diff --git a/resources/views/settings/accessibility.blade.php b/resources/views/settings/accessibility.blade.php new file mode 100644 index 00000000..6c63b68a --- /dev/null +++ b/resources/views/settings/accessibility.blade.php @@ -0,0 +1,61 @@ +@extends('settings.template') + +@section('section') + +
A list of reports you have made.
+ID | +Type | +Reported | +Status | +Created | + + + + @foreach($reports as $report) +|
---|---|---|---|---|---|
{{$report->id}} | +{{$report->type}} | +{{str_limit($report->reported()->url(), 30)}} | + @if(!$report->admin_seen) +Unresolved | + @else +Resolved | + @endif +{{$report->created_at->diffForHumans(null, true, true)}} | +