diff --git a/.docker/app/Dockerfile b/.docker/app/Dockerfile index d5d5c32a7..6b64fe7f6 100644 --- a/.docker/app/Dockerfile +++ b/.docker/app/Dockerfile @@ -59,7 +59,7 @@ ADD .docker/app/config.docker.php ${SCRIPT_ROOT} COPY . ${SRC_DIR} -ARG ORIGIN_REPO_XACCEL=https://git.tt-rss.org/fox/ttrss-nginx-xaccel.git +ARG ORIGIN_REPO_XACCEL=https://github.com/supahgreg/tt-rss-plugin-nginx-xaccel.git RUN git clone --depth=1 ${ORIGIN_REPO_XACCEL} ${SRC_DIR}/plugins.local/nginx_xaccel diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a0dd4d70b..a0990367e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,39 +1 @@ -## Contributing code the right way - -TLDR: it works *almost* like Github. - -Due to spam, new Gitlab users are set to [external](https://docs.gitlab.com/ee/user/admin_area/external_users.html). In order to do anything, you'll need to ask for your account to be promoted. Sorry for the inconvenience. - -1. Register on the [Gitlab](https://gitlab.tt-rss.org); -2. Post on the forums asking for your account to be promoted; -3. Fork the repository you're interested in; -4. Do the needful; -6. File a PR against master branch and verify that CI pipeline (especially, PHPStan) passes; - -If you have any other questions, see this [forum thread](https://discourse.tt-rss.org/t/how-to-contribute-code-via-pull-requests-on-git-tt-rss-org/1850). - -Please don't inline patches in forum posts, attach files instead (``.patch`` or ``.diff`` file extensions should work). - -### FAQ - -#### How do I push or pull without SSH? - -You can't use SSH directly because tt-rss Gitlab is behind Cloudflare. You can use HTTPS with personal access tokens instead. - -Create a personal access token in [Gitlab preferences](https://gitlab.tt-rss.org/-/user_settings/personal_access_tokens); - -Optionally, configure Git to transparently work with tt-rss Gitlab repositories using HTTPS: - -``` -git config --global \ - --add url."https://gitlab-token:your-personal-access-token@gitlab.tt-rss.org/".insteadOf \ - "git@gitlab.tt-rss.org:" -``` - -Alternatively, checkout over HTTPS while adding the token manually: - -``` -git clone https://gitlab-token:your-personal-access-token@gitlab.tt-rss.org/tt-rss/tt-rss.git tt-rss -``` - -That's it. +TBD diff --git a/README.md b/README.md index 71b11cc8b..5b168d086 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,19 @@ -Tiny Tiny RSS -============= +Tiny Tiny RSS (tt-rss) +====================== -Web-based news feed aggregator, designed to allow you to read news from +Web-based news feed aggregator, designed to allow you to read news from any location, while feeling as close to a real desktop application as possible. -http://tt-rss.org +## Some notes + +* The original tt-rss project, hosted at https://tt-rss.org/ and its various subdomains, [will be gone after 2025-11-01](https://community.tt-rss.org/t/the-end-of-tt-rss-org/7164). + * Massive thanks to fox for maintaining tt-rss (and absolutely everything else that went along with it) for so many years. +* https://github.com/supahgreg/tt-rss is a fork of tt-rss as of 2025-10-03, created by one of its long-time contributors (`wn` on `tt-rss.org`, `supahgreg` on GitHub). + * For now, just treat this as a slightly-tweaked mirror of the original project (initially just removing `tt-rss.org` references and integrations). +* Plugins that were under https://gitlab.tt-rss.org/tt-rss/plugins have been mirrored to `https://github.com/supahgreg/tt-rss-plugin-*` (NOTE: names have changed) +* The repository that held the content for https://tt-rss.org has been mirrored to https://github.com/supahgreg/tt-rss-web-static. + +## License This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/classes/Config.php b/classes/Config.php index 49715a576..61aab85ca 100644 --- a/classes/Config.php +++ b/classes/Config.php @@ -272,7 +272,7 @@ class Config { Config::CHECK_FOR_PLUGIN_UPDATES => [ "true", Config::T_BOOL ], Config::ENABLE_PLUGIN_INSTALLER => [ "true", Config::T_BOOL ], Config::AUTH_MIN_INTERVAL => [ 5, Config::T_INT ], - Config::HTTP_USER_AGENT => [ 'Tiny Tiny RSS/%s (https://tt-rss.org/)', + Config::HTTP_USER_AGENT => [ 'Tiny Tiny RSS/%s (https://github.com/supahgreg/tt-rss)', Config::T_STRING ], Config::HTTP_429_THROTTLE_INTERVAL => [ 3600, Config::T_INT ], Config::DISABLE_LOGIN_FORM => [ "", Config::T_BOOL ], @@ -632,8 +632,8 @@ class Config { -

You might want to check the tt-rss wiki or - forums for more information. Please search the forums before creating a new topic +

You might want to check the tt-rss wiki or + discussions for more information. Please search before creating a new topic for your question.

diff --git a/classes/Pref_Prefs.php b/classes/Pref_Prefs.php index 6942e711c..97a6940b5 100644 --- a/classes/Pref_Prefs.php +++ b/classes/Pref_Prefs.php @@ -647,7 +647,7 @@ class Pref_Prefs extends Handler_Protected { "Helpers.Prefs.customizeCSS()"]) ?> "alt-info", "onclick" => "window.open(\"https://tt-rss.org/Themes/\")"]) ?> + ["class" => "alt-info", "onclick" => "window.open(\"https://github.com/supahgreg/tt-rss-web-static/blob/main/docs/Themes.md\")"]) ?> "alt-info", - "onclick" => "window.open('https://tt-rss.org/wiki/SSL%20Certificate%20Authentication')"]); + "onclick" => "window.open('https://github.com/supahgreg/tt-rss-web-static/blob/main/docs/wiki/SSL%20Certificate%20Authentication.md')"]); } else if ($pref_name == Prefs::DIGEST_PREFERRED_TIME) { print "%s" , implode(", ", array_map(fn($plugin) => get_class($plugin), $feed_handlers)) - ) . " (".__("More info...").")" + ) . " (".__("More info...").")" ); } ?> --> @@ -890,7 +890,7 @@ class Pref_Prefs extends Handler_Protected {
- @@ -1274,8 +1274,10 @@ class Pref_Prefs extends Handler_Protected { * @return array, 'html_url': string, 'clone_url': string, 'last_update': string}> */ private function _get_available_plugins(): array { + // TODO: Get this working again. https://tt-rss.org/plugins.json won't exist after 2025-11-01 (probably). if ($_SESSION["access_level"] >= UserHelper::ACCESS_LEVEL_ADMIN && Config::get(Config::ENABLE_PLUGIN_INSTALLER)) { - $content = json_decode(UrlHelper::fetch(['url' => 'https://tt-rss.org/plugins.json']), true); + // $content = json_decode(UrlHelper::fetch(['url' => 'https://tt-rss.org/plugins.json']), true); + $content = false; if ($content) { return $content; diff --git a/classes/RPC.php b/classes/RPC.php index 8ecec41f5..d5588cc57 100644 --- a/classes/RPC.php +++ b/classes/RPC.php @@ -324,8 +324,10 @@ class RPC extends Handler_Protected { $git_timestamp = $version["timestamp"] ?? false; $git_commit = $version["commit"] ?? false; + // TODO: Get this working again. https://tt-rss.org/version.json won't exist after 2025-11-01 (probably). if (Config::get(Config::CHECK_FOR_UPDATES) && $_SESSION["access_level"] >= UserHelper::ACCESS_LEVEL_ADMIN && $git_timestamp) { - $content = @UrlHelper::fetch(["url" => "https://tt-rss.org/version.json"]); + // $content = @UrlHelper::fetch(["url" => "https://tt-rss.org/version.json"]); + $content = false; if ($content) { $content = json_decode($content, true); diff --git a/classes/RSSUtils.php b/classes/RSSUtils.php index 540069b6a..c4a6af548 100644 --- a/classes/RSSUtils.php +++ b/classes/RSSUtils.php @@ -1989,8 +1989,6 @@ class RSSUtils { } /** - * @see https://community.tt-rss.org/t/problem-with-img-srcset/3519 - * * @return array> An array of srcset subitem arrays with keys "url" and "size" */ static function decode_srcset(string $srcset): array { diff --git a/composer.json b/composer.json index 018b53220..784280ea9 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ { "name": "j4mie/idiorm", "type": "vcs", - "url": "https://git.tt-rss.org/fox/idiorm.git" + "url": "https://github.com/supahgreg/tt-rss-idiorm.git" } ], "autoload": { diff --git a/composer.lock b/composer.lock index 10feb0256..7587c2cdb 100644 --- a/composer.lock +++ b/composer.lock @@ -560,7 +560,7 @@ "version": "dev-master", "source": { "type": "git", - "url": "https://dev.tt-rss.org/fox/idiorm.git", + "url": "https://github.com/supahgreg/tt-rss-idiorm.git", "reference": "efc8ea06698f53e2c479c7696f2b154c47c3a3cb" }, "require": { diff --git a/config.php-dist b/config.php-dist index 27006377d..eed4a7572 100644 --- a/config.php-dist +++ b/config.php-dist @@ -13,6 +13,6 @@ etc. - See this page for more information: https://tt-rss.org/wiki/GlobalConfig + See this page for more information: https://github.com/supahgreg/tt-rss-web-static/blob/main/docs/wiki/GlobalConfig.md */ diff --git a/include/functions.php b/include/functions.php index 24b5c8538..190c840f2 100644 --- a/include/functions.php +++ b/include/functions.php @@ -329,7 +329,7 @@ } /** Convert values accepted by tt-rss as true/false to PHP booleans - * @see https://tt-rss.org/ApiReference/#boolean-values + * @see https://github.com/supahgreg/tt-rss-web-static/blob/main/docs/ApiReference.md#boolean-values * @param null|string $s null values are considered false */ function sql_bool_to_bool(?string $s): bool { diff --git a/include/login_form.php b/include/login_form.php index e601ca619..2f3b5dbdb 100755 --- a/include/login_form.php +++ b/include/login_form.php @@ -211,8 +211,7 @@
- Tiny Tiny RSS - © 2005– Andrew Dolgov + Tiny Tiny RSS
diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js index 781b0dcc5..6f8767c09 100644 --- a/js/CommonDialogs.js +++ b/js/CommonDialogs.js @@ -690,7 +690,7 @@ const CommonDialogs = {