From d1d324fc81825d4b4dca752f5d7771e29583bca0 Mon Sep 17 00:00:00 2001 From: basedgentoo <128768654+basedgentoo@users.noreply.github.com> Date: Tue, 25 Apr 2023 00:36:28 -0400 Subject: [PATCH] README update & delete unapplied patches directory. (#566) * We merged this. No need for this anymore. * Update README No more unapplied patches, we also are doing releases now. --- README.md | 12 ++----- ...f3bab70de7f983fd56aa18817ede38d1d4f3.patch | 33 ------------------- 2 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 static/unapplied patches/5d31f3bab70de7f983fd56aa18817ede38d1d4f3.patch diff --git a/README.md b/README.md index 5de6bf10..584254b8 100644 --- a/README.md +++ b/README.md @@ -9,21 +9,13 @@ vichan - A lightweight and full featured PHP imageboard. As of 29 August 2022 it supports PHP8.1. -##### Unapplied patches - -Some patches remain unapplied due to their uncertain maintenance burden. You may wish to apply them: - - - -They will be collected in `static/unapplied patches` upon rejection. - About ------------ vichan is a free light-weight, fast, highly configurable and user-friendly imageboard software package. It is written in PHP and has few dependencies. +**For best results, you should use a stable release from the releases page. The master branch is used for development work and testing. You may experience bugs if you use master.** + For support, feel free to join our [IRC channel](https://chat.kolyma.net/#/connect?channels=vichan) at irc.kolyma.net. Some documentation may be found on our [wiki](https://github.com/vichan-devel/vichan/wiki). (feel free to contribute) diff --git a/static/unapplied patches/5d31f3bab70de7f983fd56aa18817ede38d1d4f3.patch b/static/unapplied patches/5d31f3bab70de7f983fd56aa18817ede38d1d4f3.patch deleted file mode 100644 index be474e69..00000000 --- a/static/unapplied patches/5d31f3bab70de7f983fd56aa18817ede38d1d4f3.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5d31f3bab70de7f983fd56aa18817ede38d1d4f3 Mon Sep 17 00:00:00 2001 -From: discomrade <83621080+discomrade@users.noreply.github.com> -Date: Thu, 12 Jan 2023 10:16:15 +0000 -Subject: [PATCH] Add open parentheses to cite regex - -Allows cite regex to match a post number after an opening parenthesis. "I like the comfy threads (>>1 and >>2) because they're comfy" -From https://github.com/fallenPineapple/NPFchan/commit/d78254b41db7902b9463b8d5ccfecd30265bacf9 ---- - inc/functions.php | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/inc/functions.php b/inc/functions.php -index 7cf9c5dc3..9d3fcc57e 100755 ---- a/inc/functions.php -+++ b/inc/functions.php -@@ -2086,7 +2086,7 @@ function markup(&$body, $track_cites = false, $op = false) { - $tracked_cites = array(); - - // Cites -- if (isset($board) && preg_match_all('/(^|\s)>>(\d+?)((?=[\s,.)?!])|$)/m', $body, $cites, PREG_SET_ORDER | PREG_OFFSET_CAPTURE)) { -+ if (isset($board) && preg_match_all('/(^|[\s(])>>(\d+?)((?=[\s,.)?!])|$)/m', $body, $cites, PREG_SET_ORDER | PREG_OFFSET_CAPTURE)) { - if (count($cites[0]) > $config['max_cites']) { - error($config['error']['toomanycites']); - } -@@ -2133,7 +2133,7 @@ function markup(&$body, $track_cites = false, $op = false) { - } - - // Cross-board linking -- if (preg_match_all('/(^|\s)>>>\/(' . $config['board_regex'] . 'f?)\/(\d+)?((?=[\s,.)?!])|$)/um', $body, $cites, PREG_SET_ORDER | PREG_OFFSET_CAPTURE)) { -+ if (preg_match_all('/(^|[\s(])>>>\/(' . $config['board_regex'] . 'f?)\/(\d+)?((?=[\s,.)?!])|$)/um', $body, $cites, PREG_SET_ORDER | PREG_OFFSET_CAPTURE)) { - if (count($cites[0]) > $config['max_cites']) { - error($config['error']['toomanycross']); - }