diff options
| author | Greg <supahgreg@users.noreply.github.com> | 2025-10-06 14:33:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-06 14:33:29 -0500 |
| commit | 2cfb58cf8cf872c164d12d1a4ecec55388f4b502 (patch) | |
| tree | 9eb481e4402cb70de41b037c7e0b0c2a869c46bc | |
| parent | 14ac789ddce61acbdecc92a71bad030892079d22 (diff) | |
| parent | a7d5566aa9a88e5206928d3a0a68065ad65776d0 (diff) | |
Merge pull request #8 from tt-rss/feature/switch-to-github-org
Switch links to the 'tt-rss' GitHub organization
| -rw-r--r-- | .docker/app/Dockerfile | 2 | ||||
| -rw-r--r-- | README.md | 16 | ||||
| -rw-r--r-- | classes/Config.php | 6 | ||||
| -rw-r--r-- | classes/Pref_Prefs.php | 8 | ||||
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | composer.lock | 2 | ||||
| -rw-r--r-- | config.php-dist | 2 | ||||
| -rw-r--r-- | include/functions.php | 2 | ||||
| -rwxr-xr-x | include/login_form.php | 2 | ||||
| -rw-r--r-- | js/CommonDialogs.js | 2 | ||||
| -rw-r--r-- | js/CommonFilters.js | 2 | ||||
| -rw-r--r-- | js/Feeds.js | 2 | ||||
| -rw-r--r-- | plugins/bookmarklets/init.php | 4 | ||||
| -rw-r--r-- | prefs.php | 2 | ||||
| -rw-r--r-- | templates/generated_feed.txt | 2 |
15 files changed, 28 insertions, 28 deletions
diff --git a/.docker/app/Dockerfile b/.docker/app/Dockerfile index 6b64fe7f6..09535eeee 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://github.com/supahgreg/tt-rss-plugin-nginx-xaccel.git +ARG ORIGIN_REPO_XACCEL=https://github.com/tt-rss/tt-rss-plugin-nginx-xaccel.git RUN git clone --depth=1 ${ORIGIN_REPO_XACCEL} ${SRC_DIR}/plugins.local/nginx_xaccel @@ -5,29 +5,29 @@ Tiny Tiny RSS (tt-rss) is a free, flexible, open-source, web-based news feed (RS ## Getting started -Please refer to [the wiki](https://github.com/supahgreg/tt-rss/wiki). +Please refer to [the wiki](https://github.com/tt-rss/tt-rss/wiki). ## Some notes about this project * 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 creating tt-rss, and maintaining it (and absolutely everything else that went along with it) for so many years. -* This project (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_`/`wn_name` on `tt-rss.org`, `supahgreg` on `github.com`). +* This project (https://github.com/tt-rss/tt-rss) is a fork of tt-rss as of 2025-10-03, created by one of its long-time contributors (`wn_`/`wn_name` on `tt-rss.org`, `supahgreg` on `github.com`). * The goal is to continue tt-rss development, with an initial focus on replacing `tt-rss.org` references and integrations + getting things working. * Developer note: Due to use of `invalid@email.com` on `supahgreg`'s pre-2025-10-03 commits (which were done on `tt-rss.org`) GitHub incorrectly shows `ivanivanov884` (the GitHub user associated with that e-mail address) as the author instead of `wn_`/`supahgreg`. Apologies for any confusion. `¯\_(ツ)_/¯` -* Plugins that were under https://gitlab.tt-rss.org/tt-rss/plugins have been mirrored to `https://github.com/supahgreg/tt-rss-plugin-*`. +* Plugins that were under https://gitlab.tt-rss.org/tt-rss/plugins have been mirrored to `https://github.com/tt-rss/tt-rss-plugin-*`. * Plugin repository names have changed to get a consistent `tt-rss-plugin-*` prefix. -* Documentation from https://tt-rss.org has been recreated in https://github.com/supahgreg/tt-rss/wiki . - * The repository that held the content for https://tt-rss.org was mirrored to https://github.com/supahgreg/tt-rss-web-static . +* Documentation from https://tt-rss.org has been recreated in https://github.com/tt-rss/tt-rss/wiki . + * The repository that held the content for https://tt-rss.org was mirrored to https://github.com/tt-rss/tt-rss-web-static . Some content tweaks were made after mirroring (prior to the wiki being set up), and the repository is now archived. -* Docker images are being built and published to Docker Hub [via GitHub Actions](https://github.com/supahgreg/tt-rss/actions/workflows/publish.yml). +* Docker images are being built and published to Docker Hub [via GitHub Actions](https://github.com/tt-rss/tt-rss/actions/workflows/publish.yml). * See https://hub.docker.com/r/supahgreg/tt-rss/ and https://hub.docker.com/r/supahgreg/tt-rss-web-nginx/ , and - [the installation guide](https://github.com/supahgreg/tt-rss/wiki/Installation-Guide) for how they can be used. + [the installation guide](https://github.com/tt-rss/tt-rss/wiki/Installation-Guide) for how they can be used. ## Development and contributing * Contributions (code, translations, reporting issues, etc.) are welcome. -* Development and issue tracking primarily happens in https://github.com/supahgreg/tt-rss . +* Development and issue tracking primarily happens in https://github.com/tt-rss/tt-rss . * (not quite ready for this yet) ~~Help translate tt-rss into your own language using [Weblate](https://hosted.weblate.org/engage/tt-rss/)~~ ## License diff --git a/classes/Config.php b/classes/Config.php index fdb673bba..0a741fd73 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://github.com/supahgreg/tt-rss)', + Config::HTTP_USER_AGENT => [ 'Tiny Tiny RSS/%s (https://github.com/tt-rss/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 { <?php foreach ($errors as $error) { echo self::format_error($error); } ?> - <p>You might want to check the tt-rss <a target="_blank" href="https://github.com/supahgreg/tt-rss/wiki">wiki</a> or - <a target="_blank" href="https://github.com/supahgreg/tt-rss/discussions">discussions</a> for more information. + <p>You might want to check the tt-rss <a target="_blank" href="https://github.com/tt-rss/tt-rss/wiki">wiki</a> or + <a target="_blank" href="https://github.com/tt-rss/tt-rss/discussions">discussions</a> for more information. Please search before creating a new topic for your question.</p> </div> </body> diff --git a/classes/Pref_Prefs.php b/classes/Pref_Prefs.php index 4d80ac9b7..0abbe6174 100644 --- a/classes/Pref_Prefs.php +++ b/classes/Pref_Prefs.php @@ -647,7 +647,7 @@ class Pref_Prefs extends Handler_Protected { <?= \Controls\button_tag(\Controls\icon("palette") . " " . __("Customize"), "", ["onclick" => "Helpers.Prefs.customizeCSS()"]) ?> <?= \Controls\button_tag(\Controls\icon("open_in_new") . " " . __("More themes..."), "", - ["class" => "alt-info", "onclick" => "window.open(\"https://github.com/supahgreg/tt-rss/wiki/Themes\")"]) ?> + ["class" => "alt-info", "onclick" => "window.open(\"https://github.com/tt-rss/tt-rss/wiki/Themes\")"]) ?> <?php @@ -713,7 +713,7 @@ class Pref_Prefs extends Handler_Protected { print \Controls\button_tag(\Controls\icon("help") . " " . __("More info..."), "", [ "class" => "alt-info", - "onclick" => "window.open('https://github.com/supahgreg/tt-rss/wiki/SSL-Certificate-Authentication')"]); + "onclick" => "window.open('https://github.com/tt-rss/tt-rss/wiki/SSL-Certificate-Authentication')"]); } else if ($pref_name == Prefs::DIGEST_PREFERRED_TIME) { print "<input dojoType=\"dijit.form.ValidationTextBox\" @@ -878,7 +878,7 @@ class Pref_Prefs extends Handler_Protected { print_error( T_sprintf("The following plugins use per-feed content hooks. This may cause excessive data usage and origin server load resulting in a ban of your instance: <b>%s</b>" , implode(", ", array_map(fn($plugin) => get_class($plugin), $feed_handlers)) - ) . " (<a href='https://github.com/supahgreg/tt-rss/wiki/Feed-Handler-Plugins' target='_blank'>".__("More info...")."</a>)" + ) . " (<a href='https://github.com/tt-rss/tt-rss/wiki/Feed-Handler-Plugins' target='_blank'>".__("More info...")."</a>)" ); } ?> --> @@ -890,7 +890,7 @@ class Pref_Prefs extends Handler_Protected { </div> <div dojoType="dijit.layout.ContentPane" region="bottom"> - <button dojoType='dijit.form.Button' class="alt-info pull-right" onclick='window.open("https://github.com/supahgreg/tt-rss/wiki/Plugins")'> + <button dojoType='dijit.form.Button' class="alt-info pull-right" onclick='window.open("https://github.com/tt-rss/tt-rss/wiki/Plugins")'> <i class='material-icons'>help</i> <?= __("More info") ?> </button> diff --git a/composer.json b/composer.json index 24c2a34d6..41a7c6ba0 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ { "name": "j4mie/idiorm", "type": "vcs", - "url": "https://github.com/supahgreg/tt-rss-idiorm.git" + "url": "https://github.com/tt-rss/tt-rss-idiorm.git" } ], "autoload": { diff --git a/composer.lock b/composer.lock index daafbe811..fae232ac7 100644 --- a/composer.lock +++ b/composer.lock @@ -560,7 +560,7 @@ "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/supahgreg/tt-rss-idiorm.git", + "url": "https://github.com/tt-rss/tt-rss-idiorm.git", "reference": "efc8ea06698f53e2c479c7696f2b154c47c3a3cb" }, "dist": { diff --git a/config.php-dist b/config.php-dist index 6e193c1f5..24501438f 100644 --- a/config.php-dist +++ b/config.php-dist @@ -13,6 +13,6 @@ etc. - See this page for more information: https://github.com/supahgreg/tt-rss/wiki/Global-Config + See this page for more information: https://github.com/tt-rss/tt-rss/wiki/Global-Config */ diff --git a/include/functions.php b/include/functions.php index 4178151e0..62ec22f8c 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://github.com/supahgreg/tt-rss/wiki/API-Reference#boolean-values + * @see https://github.com/tt-rss/tt-rss/wiki/API-Reference#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 2f3b5dbdb..741a0a6c4 100755 --- a/include/login_form.php +++ b/include/login_form.php @@ -211,7 +211,7 @@ </div> <div class="footer"> - <a href="https://github.com/supahgreg/tt-rss">Tiny Tiny RSS</a> + <a href="https://github.com/tt-rss/tt-rss">Tiny Tiny RSS</a> </div> </div> diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js index 1b62cb99e..f1be94c7c 100644 --- a/js/CommonDialogs.js +++ b/js/CommonDialogs.js @@ -690,7 +690,7 @@ const CommonDialogs = { </section> <footer> <button dojoType='dijit.form.Button' style='float : left' class='alt-info' - onclick='window.open("https://github.com/supahgreg/tt-rss/wiki/Generated-Feeds")'> + onclick='window.open("https://github.com/tt-rss/tt-rss/wiki/Generated-Feeds")'> <i class='material-icons'>help</i> ${__("More info...")}</button> <button dojoType='dijit.form.Button' onclick="return App.dialogOf(this).regenFeedKey('${feed}', '${is_cat}')"> ${App.FormFields.icon("refresh")} diff --git a/js/CommonFilters.js b/js/CommonFilters.js index e94eb9314..f6cc5a4e7 100644 --- a/js/CommonFilters.js +++ b/js/CommonFilters.js @@ -226,7 +226,7 @@ const Filters = { <footer> ${App.FormFields.button_tag(App.FormFields.icon("help") + " " + __("More info"), "", {class: 'pull-left alt-info', - onclick: "window.open('https://github.com/supahgreg/tt-rss/wiki/Content-Filters')"})} + onclick: "window.open('https://github.com/tt-rss/tt-rss/wiki/Content-Filters')"})} ${App.FormFields.submit_tag(App.FormFields.icon("save") + " " + __("Save"), {onclick: "App.dialogOf(this).execute()"})} ${App.FormFields.cancel_dialog_tag(__("Cancel"))} </footer> diff --git a/js/Feeds.js b/js/Feeds.js index 49de183b5..71d9c29d4 100644 --- a/js/Feeds.js +++ b/js/Feeds.js @@ -658,7 +658,7 @@ const Feeds = { <footer> ${reply.show_syntax_help ? `${App.FormFields.button_tag(App.FormFields.icon("help") + " " + __("Search syntax"), "", - {class: 'alt-info pull-left', onclick: "window.open('https://github.com/supahgreg/tt-rss/wiki/Search-Syntax')"})} + {class: 'alt-info pull-left', onclick: "window.open('https://github.com/tt-rss/tt-rss/wiki/Search-Syntax')"})} ` : ''} ${App.FormFields.submit_tag(App.FormFields.icon("search") + " " + __('Search'), {onclick: "App.dialogOf(this).execute()"})} diff --git a/plugins/bookmarklets/init.php b/plugins/bookmarklets/init.php index fbf13e653..50784e118 100644 --- a/plugins/bookmarklets/init.php +++ b/plugins/bookmarklets/init.php @@ -9,7 +9,7 @@ class Bookmarklets extends Plugin { "Easy feed subscription and web page sharing using bookmarklets", "fox", false, - "https://github.com/supahgreg/tt-rss/wiki/Share-Anything"); + "https://github.com/tt-rss/tt-rss/wiki/Share-Anything"); } function init($host) { @@ -371,7 +371,7 @@ class Bookmarklets extends Plugin { </label> <?= \Controls\button_tag(\Controls\icon("help") . " " . __("More info..."), "", - ["class" => 'alt-info', "onclick" => "window.open('https://github.com/supahgreg/tt-rss/wiki/Share-Anything')"]) ?> + ["class" => 'alt-info', "onclick" => "window.open('https://github.com/tt-rss/tt-rss/wiki/Share-Anything')"]) ?> </div> @@ -161,7 +161,7 @@ ?> </div> <div id="footer" dojoType="dijit.layout.ContentPane" region="bottom"> - <a class="text-muted" target="_blank" href="https://github.com/supahgreg/tt-rss">Tiny Tiny RSS</a> + <a class="text-muted" target="_blank" href="https://github.com/tt-rss/tt-rss">Tiny Tiny RSS</a> <span>v<?= Config::get_version_html() ?></span> </div> </div> diff --git a/templates/generated_feed.txt b/templates/generated_feed.txt index 72fddc5d9..3e4cd31b2 100644 --- a/templates/generated_feed.txt +++ b/templates/generated_feed.txt @@ -2,7 +2,7 @@ <!-- $BeginBlock feed --> <feed xmlns="http://www.w3.org/2005/Atom"> <title>${FEED_TITLE}</title> -<generator uri="https://github.com/supahgreg/tt-rss">Tiny Tiny RSS/${VERSION}</generator> +<generator uri="https://github.com/tt-rss/tt-rss">Tiny Tiny RSS/${VERSION}</generator> <updated>${FEED_UPDATED}</updated> <id>${FEED_URL}</id> <link href="${FEED_URL}" rel="self"/> |