port_patches
Some checks failed
dockers/pixelfed/pipeline/head There was a failure building this commit
Some checks failed
dockers/pixelfed/pipeline/head There was a failure building this commit
This commit is contained in:
parent
cbf6012eda
commit
e512e0d6cd
6 changed files with 44 additions and 1063 deletions
File diff suppressed because it is too large
Load diff
|
@ -1,6 +1,6 @@
|
||||||
From 5e45b11e0f84ffc83ad55b3bc4969cd7aa9bd805 Mon Sep 17 00:00:00 2001
|
From 796abe4146b83b50633e3881cdfa0ddfa2f83202 Mon Sep 17 00:00:00 2001
|
||||||
From: chris <cg@zknt.org>
|
From: chris <cg@zknt.org>
|
||||||
Date: Mon, 1 Jul 2024 12:03:28 +0200
|
Date: Sun, 14 Jul 2024 11:08:37 +0200
|
||||||
Subject: [PATCH 2/6] hardcode discovery settings
|
Subject: [PATCH 2/6] hardcode discovery settings
|
||||||
|
|
||||||
force enable discovery (as dynamic settings are not saved properly)
|
force enable discovery (as dynamic settings are not saved properly)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
From 1f4eb893dc805eeaefdb80c673daea4916ff9857 Mon Sep 17 00:00:00 2001
|
From 90df0d4ccc81b1ad2e0d1a14ba9edd85237feeb4 Mon Sep 17 00:00:00 2001
|
||||||
From: chris <cg@zknt.org>
|
From: chris <cg@zknt.org>
|
||||||
Date: Mon, 1 Jul 2024 12:03:45 +0200
|
Date: Sun, 14 Jul 2024 11:09:11 +0200
|
||||||
Subject: [PATCH 3/6] point to modified sourcecode
|
Subject: [PATCH 3/6] point to modified sourcecode
|
||||||
|
|
||||||
as per AGPL license of original source, modifications must be disclosed.
|
as per AGPL license of original source, modifications must be disclosed.
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
From 9c339532d73d5cbd45cb711396d2c42725620f45 Mon Sep 17 00:00:00 2001
|
From ebf5c9052746eba97ee6c9abefb2e355b54c2bf7 Mon Sep 17 00:00:00 2001
|
||||||
From: chris <cg@zknt.org>
|
From: chris <cg@zknt.org>
|
||||||
Date: Mon, 1 Jul 2024 12:06:16 +0200
|
Date: Sun, 14 Jul 2024 11:09:42 +0200
|
||||||
Subject: [PATCH 4/6] disable beagle service
|
Subject: [PATCH 4/6] disable beagle service
|
||||||
|
|
||||||
beagle is a remote API service provided by dansup and used for centralised lookups.
|
beagle is a remote API service provided by dansup and used for centralised lookups.
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
From 147ba26fdc854392c32e81778470c9038c288c6d Mon Sep 17 00:00:00 2001
|
From 6cf238c78b05243d8ddcdfa7ed7d08ba2292efd5 Mon Sep 17 00:00:00 2001
|
||||||
From: chris <cg@zknt.org>
|
From: chris <cg@zknt.org>
|
||||||
Date: Mon, 1 Jul 2024 12:06:48 +0200
|
Date: Sun, 14 Jul 2024 11:10:36 +0200
|
||||||
Subject: [PATCH 5/6] allow 30 char usernames
|
Subject: [PATCH 5/6] allow 30 char usernames
|
||||||
|
|
||||||
raise maximum username length, because why not?
|
raise maximum username length, because why not?
|
||||||
|
@ -9,18 +9,18 @@ raise maximum username length, because why not?
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
|
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
|
||||||
index 72c8b741..2c8a26b4 100644
|
index 1d0e415c..3150ddba 100644
|
||||||
--- a/app/Http/Controllers/Auth/RegisterController.php
|
--- a/app/Http/Controllers/Auth/RegisterController.php
|
||||||
+++ b/app/Http/Controllers/Auth/RegisterController.php
|
+++ b/app/Http/Controllers/Auth/RegisterController.php
|
||||||
@@ -70,7 +70,7 @@ class RegisterController extends Controller
|
@@ -69,7 +69,7 @@ class RegisterController extends Controller
|
||||||
$usernameRules = [
|
$usernameRules = [
|
||||||
'required',
|
'required',
|
||||||
'min:2',
|
'min:2',
|
||||||
- 'max:15',
|
- 'max:15',
|
||||||
+ 'max:30',
|
+ 'max:30',
|
||||||
'unique:users',
|
'unique:users',
|
||||||
function ($attribute, $value, $fail) {
|
function ($attribute, $value, $fail) {
|
||||||
$dash = substr_count($value, '-');
|
$dash = substr_count($value, '-');
|
||||||
--
|
--
|
||||||
2.45.2
|
2.45.2
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
From 5e9c2e82672839b3712bc6e372848ad38571b361 Mon Sep 17 00:00:00 2001
|
From 7246b1144c638a7ec000b21cf3f1ddf277dc00b5 Mon Sep 17 00:00:00 2001
|
||||||
From: chris <cg@zknt.org>
|
From: chris <cg@zknt.org>
|
||||||
Date: Mon, 1 Jul 2024 12:07:04 +0200
|
Date: Sun, 14 Jul 2024 11:11:14 +0200
|
||||||
Subject: [PATCH 6/6] Link legal notice
|
Subject: [PATCH 6/6] Link legal notice
|
||||||
|
|
||||||
local jurisdiction requires a prominent link to a legal notice at the frontpage
|
local jurisdiction requires a prominent link to a legal notice at the frontpage
|
||||||
|
|
Loading…
Reference in a new issue