From 3f73887e47818e03231f44b84953e4f10f4d3f4c Mon Sep 17 00:00:00 2001 From: uncw Date: Tue, 12 Aug 2025 23:46:22 +0800 Subject: [PATCH 1/6] Add Safari toolbar icon --- platform/mv3/extension/img/icon_safari.svg | 4 ++++ platform/mv3/safari/manifest.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 platform/mv3/extension/img/icon_safari.svg diff --git a/platform/mv3/extension/img/icon_safari.svg b/platform/mv3/extension/img/icon_safari.svg new file mode 100644 index 000000000..1e59ae0e2 --- /dev/null +++ b/platform/mv3/extension/img/icon_safari.svg @@ -0,0 +1,4 @@ + + + + diff --git a/platform/mv3/safari/manifest.json b/platform/mv3/safari/manifest.json index 951417859..9baf448b6 100644 --- a/platform/mv3/safari/manifest.json +++ b/platform/mv3/safari/manifest.json @@ -1,6 +1,6 @@ { "action": { - "default_icon": "/img/icon_64.png", + "default_icon": "/img/icon_safari.svg", "default_popup": "popup.html" }, "author": "Raymond Hill", From e6a8c87e0ec3cef69a11bdfc8cbd48ada8c00851 Mon Sep 17 00:00:00 2001 From: uncw Date: Wed, 13 Aug 2025 12:06:45 +0800 Subject: [PATCH 2/6] Change Safari toolbar icon to an outlined version --- platform/mv3/extension/img/icon_safari.svg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/mv3/extension/img/icon_safari.svg b/platform/mv3/extension/img/icon_safari.svg index 1e59ae0e2..3be31dd35 100644 --- a/platform/mv3/extension/img/icon_safari.svg +++ b/platform/mv3/extension/img/icon_safari.svg @@ -1,4 +1,4 @@ - - - + + + From 972ed1e520c2a45aaccda7a4731d860142d1d037 Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Wed, 13 Aug 2025 10:48:17 -0400 Subject: [PATCH 3/6] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4b15f579..88cc86588 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +- [JSONPath: Add ability to select root node for appending/modifying](https://github.com/gorhill/uBlock/commit/faff035203) +- [Allow usage of `csp=`/`permissions=` with resource type object](https://github.com/gorhill/uBlock/commit/07e9f805bb) - [JSONPath: Add ability to substitute a pattern within a string value](https://github.com/gorhill/uBlock/commit/38ca6d41ff) - [Remove "CERT.PL's Warning List" from stock lists](https://github.com/gorhill/uBlock/commit/e713e133eb) - [Fix incorrect CNAME-related test in advanced settings](https://github.com/gorhill/uBlock/commit/171ddd3e06) From 17a363c2ff6e0e27342edcf582671765da070f41 Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Wed, 13 Aug 2025 10:53:12 -0400 Subject: [PATCH 4/6] GitHub Actions-related changes --- RELEASE.HEAD.md => .github/workflows/RELEASE.HEAD.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) rename RELEASE.HEAD.md => .github/workflows/RELEASE.HEAD.md (86%) diff --git a/RELEASE.HEAD.md b/.github/workflows/RELEASE.HEAD.md similarity index 86% rename from RELEASE.HEAD.md rename to .github/workflows/RELEASE.HEAD.md index 328d4e75f..96985c2fd 100644 --- a/RELEASE.HEAD.md +++ b/.github/workflows/RELEASE.HEAD.md @@ -3,10 +3,7 @@ #### How to Install the Developer Build: - **Firefox**: Download the build from [uBlock0_%version%.firefox.signed.xpi](https://github.com/gorhill/uBlock/releases/download/%version%/uBlock0_%version%.firefox.signed.xpi). - - uBO works best on Gecko-based browsers, check out [why](https://github.com/gorhill/uBlock/wiki/uBlock-Origin-works-best-on-Firefox). - + uBO works best on Gecko-based browsers, check out [why](https://github.com/gorhill/uBlock/wiki/uBlock-Origin-works-best-on-Firefox). - **Chromium**: Install directly from the [Chrome Web Store](https://chromewebstore.google.com/detail/ublock-origin-development/cgbcahbpdhpcegmbfconppldiemgcoii). - - **Thunderbird**: Download [uBlock0_%version%.thunderbird.xpi](https://github.com/gorhill/uBlock/releases/download/%version%/uBlock0_%version%.thunderbird.xpi) and drag it into Thunderbird's _Add-ons Manager_ (requires Thunderbird 91+). - - **Node.js**: You can import from [npm](https://www.npmjs.com/package/@gorhill/ubo-core) or download and unzip [uBlock0_%version%.npm.tgz](https://github.com/gorhill/uBlock/releases/download/%version%/uBlock0_%version%.npm.tgz). From 9be4661294b9e0a4f5b35b0ab66f15128c8828e9 Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Wed, 13 Aug 2025 10:54:20 -0400 Subject: [PATCH 5/6] New revision for dev build --- dist/version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/version b/dist/version index 139eb67fc..adad65785 100644 --- a/dist/version +++ b/dist/version @@ -1 +1 @@ -1.65.1.3 \ No newline at end of file +1.65.1.4 \ No newline at end of file From a6c9a9e9a444cd92fae7c111ee137d5c5e01b31b Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Wed, 13 Aug 2025 10:57:32 -0400 Subject: [PATCH 6/6] GitHub Actions-related changes --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 90ebc5e55..23e5b3629 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,7 +34,7 @@ jobs: run: | > release.body.txt grep -m1 -B10000 -- "----------" CHANGELOG.md >> release.body.txt - sed -e 's/%version%/${{ env.VERSION }}/g' RELEASE.HEAD.md >> release.body.txt + sed -e 's/%version%/${{ env.VERSION }}/g' .github/workflows/RELEASE.HEAD.md >> release.body.txt - name: Create GitHub release id: create_release uses: softprops/action-gh-release@v2