From a18424935c3d35c4a81798ab4ab72ae126e4e3c6 Mon Sep 17 00:00:00 2001
From: Daniel Supernault
Date: Mon, 22 Jul 2019 22:29:02 -0600
Subject: [PATCH 1/3] Update footer
---
resources/views/layouts/partial/footer.blade.php | 2 --
1 file changed, 2 deletions(-)
diff --git a/resources/views/layouts/partial/footer.blade.php b/resources/views/layouts/partial/footer.blade.php
index 2dd360ca7..c24ae90d0 100644
--- a/resources/views/layouts/partial/footer.blade.php
+++ b/resources/views/layouts/partial/footer.blade.php
@@ -6,10 +6,8 @@
{{__('site.contact-us')}}
@endif
{{__('site.help')}}
- {{__('site.opensource')}}
{{__('site.terms')}}
{{__('site.privacy')}}
- API
{{__('site.language')}}
Powered by Pixelfed
From 1f2a57132f99a3cf4e952d6d9cda2558b52de409 Mon Sep 17 00:00:00 2001
From: Daniel Supernault
Date: Mon, 22 Jul 2019 22:29:27 -0600
Subject: [PATCH 2/3] Add drive view
---
resources/views/settings/drive/index.blade.php | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 resources/views/settings/drive/index.blade.php
diff --git a/resources/views/settings/drive/index.blade.php b/resources/views/settings/drive/index.blade.php
new file mode 100644
index 000000000..b14887eb7
--- /dev/null
+++ b/resources/views/settings/drive/index.blade.php
@@ -0,0 +1,10 @@
+@extends('settings.template')
+
+@section('section')
+
+
+
Drive
+
+
+
+@endsection
\ No newline at end of file
From 654b8801192c97c1b0a2308db73f3ec232bb4630 Mon Sep 17 00:00:00 2001
From: Daniel Supernault
Date: Mon, 22 Jul 2019 22:39:36 -0600
Subject: [PATCH 3/3] Update RestrictedNames
---
app/Util/Lexer/RestrictedNames.php | 43 ++++++++++++++++++++++++++----
1 file changed, 38 insertions(+), 5 deletions(-)
diff --git a/app/Util/Lexer/RestrictedNames.php b/app/Util/Lexer/RestrictedNames.php
index 92eec60fb..d17bb139d 100644
--- a/app/Util/Lexer/RestrictedNames.php
+++ b/app/Util/Lexer/RestrictedNames.php
@@ -5,10 +5,6 @@ namespace App\Util\Lexer;
class RestrictedNames
{
public static $blacklist = [
- 'about',
- 'abuse',
- 'administrator',
- 'app',
'autoconfig',
'blog',
'broadcasthost',
@@ -97,7 +93,11 @@ class RestrictedNames
// Reserved routes
'a',
+ 'app',
+ 'about',
+ 'abuse',
'account',
+ 'admins',
'api',
'audio',
'auth',
@@ -124,6 +124,7 @@ class RestrictedNames
'css',
'd',
'dashboard',
+ 'dmca',
'db',
'deck',
'dev',
@@ -136,15 +137,27 @@ class RestrictedNames
'docs',
'docs',
'drive',
+ 'drives',
'driver',
+ 'e',
'error',
'explore',
+ 'export',
+ 'exports',
+ 'f',
'feed',
'font',
'fonts',
+ 'follow',
+ 'follows',
+ 'followme',
+ 'follow-me',
+ 'follow_me',
'g',
'gdpr',
'graph',
+ 'ghost',
+ 'ghosts',
'group',
'groups',
'h',
@@ -164,7 +177,12 @@ class RestrictedNames
'images',
'invite',
'invites',
+ 'import',
+ 'imports',
+ 'j',
'js',
+ 'k',
+ 'key',
'l',
'lab',
'labs',
@@ -186,6 +204,7 @@ class RestrictedNames
'news',
'news',
'newsfeed',
+ 'o',
'oauth',
'official',
'p',
@@ -197,13 +216,21 @@ class RestrictedNames
'photos',
'password',
'privacy',
+ 'private',
+ 'q',
+ 'quote',
+ 'query',
+ 'r',
+ 'review',
'reset',
'report',
'results',
'reports',
'robot',
'robots',
+ 's',
'search',
+ 'sell',
'send',
'settings',
'status',
@@ -217,20 +244,24 @@ class RestrictedNames
'support',
'svg',
'svgs',
+ 't',
'terms',
'telescope',
'timeline',
'timelines',
'tour',
'tv',
+ 'u',
'user',
'users',
'username',
'usernames',
'v',
+ 'valet',
'video',
'videos',
'vendor',
+ 'w',
'waiter',
'wall',
'whats-new',
@@ -240,7 +271,9 @@ class RestrictedNames
'ws',
'wss',
'www',
- 'valet',
+ 'x',
+ 'y',
+ 'z',
'400',
'401',
'403',