From d6a8aa9278035fcb14633939d9248c8c314bb87f Mon Sep 17 00:00:00 2001 From: Hugo Xu Date: Thu, 20 Aug 2020 19:17:37 -0600 Subject: [PATCH 01/13] Create lock.yml --- .github/workflows/lock.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/lock.yml diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml new file mode 100644 index 0000000000..f8b9cb4089 --- /dev/null +++ b/.github/workflows/lock.yml @@ -0,0 +1,19 @@ +name: 'Lock Old Threads' + +on: + schedule: + - cron: '0 */6 * * *' + +jobs: + lock: + runs-on: ubuntu-latest + steps: + - uses: dessant/lock-threads@v2 + with: + github-token: ${{ github.token }} + issue-lock-inactive-days: '14' + issue-lock-labels: 'archived' + issue-lock-reason: '' + pr-lock-inactive-days: '28' + pr-lock-labels: 'archived' + pr-lock-reason: '' From 7fadeb6103ce40eefeb7eabe79b6d767b8ead18a Mon Sep 17 00:00:00 2001 From: Hugo Xu Date: Thu, 20 Aug 2020 19:18:54 -0600 Subject: [PATCH 02/13] Update lock.yml --- .github/workflows/lock.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml index f8b9cb4089..a9554f5569 100644 --- a/.github/workflows/lock.yml +++ b/.github/workflows/lock.yml @@ -15,5 +15,5 @@ jobs: issue-lock-labels: 'archived' issue-lock-reason: '' pr-lock-inactive-days: '28' - pr-lock-labels: 'archived' + pr-lock-labels: 'Archived' pr-lock-reason: '' From a7780b4a73efed51c409c412a56f2390be2bb310 Mon Sep 17 00:00:00 2001 From: Hugo Xu Date: Thu, 20 Aug 2020 19:19:40 -0600 Subject: [PATCH 03/13] Update lock.yml --- .github/workflows/lock.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml index a9554f5569..9832e7db77 100644 --- a/.github/workflows/lock.yml +++ b/.github/workflows/lock.yml @@ -12,7 +12,7 @@ jobs: with: github-token: ${{ github.token }} issue-lock-inactive-days: '14' - issue-lock-labels: 'archived' + issue-lock-labels: 'Archived' issue-lock-reason: '' pr-lock-inactive-days: '28' pr-lock-labels: 'Archived' From 367e032330abf378ccfa927a2152a6e503f752a4 Mon Sep 17 00:00:00 2001 From: jspenguin2017 Date: Sun, 23 Aug 2020 09:09:17 -0600 Subject: [PATCH 04/13] https://github.com/NanoMeow/QuickReports/issues/4560 --- list/6-other.txt | 2 -- uBlockProtectorList.txt | 2 -- 2 files changed, 4 deletions(-) diff --git a/list/6-other.txt b/list/6-other.txt index bfcd4040d7..d24739bf02 100644 --- a/list/6-other.txt +++ b/list/6-other.txt @@ -847,8 +847,6 @@ cnx-software.com##img[src="/pic/support_cnx-software.png"] daciaclub.cz#@#.reklama @@||pagead2.googlesyndication.com/pagead/show_ads.js$script,domain=windows7themes.net @@||pagead2.googlesyndication.com/pagead/js/r*/r*/show_ads_impl.js$script,domain=windows7themes.net -beforeitsnews.com###fancybox-overlay -beforeitsnews.com###fancybox-wrap ||cloudfront.net^$script,domain=croydonguardian.co.uk tobys.dk#@#.adsbygoogle @@||pagead2.googlesyndication.com/pagead/js/adsbygoogle.js$script,domain=tobys.dk diff --git a/uBlockProtectorList.txt b/uBlockProtectorList.txt index 18dd2ad7d5..5c9a849cdf 100644 --- a/uBlockProtectorList.txt +++ b/uBlockProtectorList.txt @@ -1311,8 +1311,6 @@ cnx-software.com##img[src="/pic/support_cnx-software.png"] daciaclub.cz#@#.reklama @@||pagead2.googlesyndication.com/pagead/show_ads.js$script,domain=windows7themes.net @@||pagead2.googlesyndication.com/pagead/js/r*/r*/show_ads_impl.js$script,domain=windows7themes.net -beforeitsnews.com###fancybox-overlay -beforeitsnews.com###fancybox-wrap ||cloudfront.net^$script,domain=croydonguardian.co.uk tobys.dk#@#.adsbygoogle @@||pagead2.googlesyndication.com/pagead/js/adsbygoogle.js$script,domain=tobys.dk From 98ea54cb240ca5b8dd6d0f36a971660289f5c084 Mon Sep 17 00:00:00 2001 From: Hugo Xu Date: Sun, 23 Aug 2020 09:38:42 -0600 Subject: [PATCH 05/13] Update lock.yml --- .github/workflows/lock.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml index 9832e7db77..5f5fb7ba36 100644 --- a/.github/workflows/lock.yml +++ b/.github/workflows/lock.yml @@ -7,6 +7,7 @@ on: jobs: lock: runs-on: ubuntu-latest + timeout-minutes: 120 steps: - uses: dessant/lock-threads@v2 with: From a4c070fa59f2c21da1c8c3f7a289db0ec1e89054 Mon Sep 17 00:00:00 2001 From: jspenguin2017 Date: Mon, 24 Aug 2020 20:52:07 -0600 Subject: [PATCH 06/13] No commit message --- list/3-rules.txt | 2 -- uBlockProtectorList.txt | 1 - 2 files changed, 3 deletions(-) diff --git a/list/3-rules.txt b/list/3-rules.txt index 52e83ba16c..ae30719667 100644 --- a/list/3-rules.txt +++ b/list/3-rules.txt @@ -154,8 +154,6 @@ animmex.*###M148617ScriptRootC75329 animmex.*##a[href^="https://forum.animmex.com/viewtopic.php"] ! === gry.pl ||flakyfeast.com^$domain=gry.pl -! === pixiv.net -pixiv.net##.popular-introduction-overlay ! === youtube.com youtube.com###companion ! === pogdesign.co.uk diff --git a/uBlockProtectorList.txt b/uBlockProtectorList.txt index 5c9a849cdf..90f0ff0860 100644 --- a/uBlockProtectorList.txt +++ b/uBlockProtectorList.txt @@ -93,7 +93,6 @@ finalservers.net##+js(abort-on-property-read.js, _gunggo) animmex.*###M148617ScriptRootC75329 animmex.*##a[href^="https://forum.animmex.com/viewtopic.php"] ||flakyfeast.com^$domain=gry.pl -pixiv.net##.popular-introduction-overlay youtube.com###companion pogdesign.co.uk##.replace ||p207208.clksite.com^$subdocument,redirect=noopframe,domain=ally.sh|al.ly From 1577472db15fece1781de322eea0487ed84e254e Mon Sep 17 00:00:00 2001 From: jspenguin2017 Date: Fri, 18 Sep 2020 08:54:38 -0600 Subject: [PATCH 07/13] update reporter --- src/reporter/index.js | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/reporter/index.js b/src/reporter/index.js index 50e8111dd3..e4475689ef 100644 --- a/src/reporter/index.js +++ b/src/reporter/index.js @@ -33,18 +33,13 @@ const knownGood = [ "hugoxu.com", "github.com", "jspenguin2017.github.io", + "local.ntp", "www.microsoft.com", // Do not remove "www" // Bad installation "blockadblock.com", "detectadblock.com", - // Broken by non-default ABP X Files - "hdblog.it", - - // Broken by Firefox Tracking Protection - "bild.de", - // Other known good "youtube.com", ]; @@ -52,12 +47,6 @@ const knownGood = [ const knownBad = [ // https://github.com/NanoMeow/QuickReports/issues/903 "browserleaks.com", - - // https://github.com/NanoMeow/QuickReports/issues/1711 - "o2.pl", - - // https://github.com/NanoMeow/QuickReports/issues/1760 - "wp.pl", ]; // ----------------------------------------------------------------------------------------------------------------- // From 7745f6f0d1d35ea54f9a284636eafc6608a8abf8 Mon Sep 17 00:00:00 2001 From: Hugo Xu Date: Mon, 5 Oct 2020 21:29:44 -0600 Subject: [PATCH 08/13] Update README.MD --- README.MD | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.MD b/README.MD index 413943b66f..fa960e8845 100644 --- a/README.MD +++ b/README.MD @@ -1,3 +1,7 @@ +# Important Announcements Regarding Recent Changes + +Please read important announcements here: https://github.com/NanoAdblocker/NanoCore/issues/362 + # Nano Defender [![Build Status](https://travis-ci.org/jspenguin2017/uBlockProtector.svg?branch=master)](https://travis-ci.org/jspenguin2017/uBlockProtector) An anti-adblock defuser for Nano Adblocker and uBlock Origin From 74d92cf8b8ff3467fad3a1eaabadb2ef88b230c9 Mon Sep 17 00:00:00 2001 From: jspenguin2017 Date: Mon, 5 Oct 2020 21:35:40 -0600 Subject: [PATCH 09/13] add announcement --- docs/index.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/index.html b/docs/index.html index 8b3584eae4..8f57710042 100644 --- a/docs/index.html +++ b/docs/index.html @@ -24,6 +24,13 @@

Nano Defender

Warning: Do not install from unofficial sources! Any websites that are not linked below are considered to be unofficial.

+
+

Important Announcements Regarding Recent Changes

+ +

Please read important announcements here: https://github.com/NanoAdblocker/NanoCore/issues/362

+
+
+

Installation

From 6c2bb680534fb2fdda89b19f40ea9b74fd91de8b Mon Sep 17 00:00:00 2001 From: Hugo Xu Date: Wed, 7 Oct 2020 19:12:07 -0600 Subject: [PATCH 10/13] Update issue-reporter.md --- notes/issue-reporter.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/notes/issue-reporter.md b/notes/issue-reporter.md index 4268ddad7e..6ddfb86215 100644 --- a/notes/issue-reporter.md +++ b/notes/issue-reporter.md @@ -1,10 +1,8 @@ # Privacy Policy for Quick Issue Reporter -This Privacy Policy (the "Policy") applies to the Quick Issue Reporter -(the "Tool") published and distributed by @jspenguin2017 (the "Author"). -The Author has little control over forks of the Tool so the Policy may -not apply to them. Furthermore, the Policy only applies to latest unmodified -production builds of the Tool. +This Privacy Policy (the "Policy") only applies to the latest unmodified +production build of the Quick Issue Reporter (the "Tool") published and +distributed by `@jspenguin2017` (the "Author"). The Tool allows you to quickly report issues related to Nano Adblocker and Nano Defender (the "Projects") you encounter when browsing the Internet. From 0e67e231b23c7dbc8b53b1a29333457810c8df2e Mon Sep 17 00:00:00 2001 From: jspenguin2017 Date: Wed, 14 Oct 2020 17:44:29 -0600 Subject: [PATCH 11/13] update doc --- docs/index.html | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/docs/index.html b/docs/index.html index 8f57710042..04acd8ed96 100644 --- a/docs/index.html +++ b/docs/index.html @@ -38,7 +38,7 @@

Installation


Get Nano Defender Pro for Edge

-

Get Nano Defender for Chrome or Chromium

+

Get Nano Defender for Chrome or Chromium This listing is no longer controlled by me


If you are using uBlock Origin, there are a few extra installation steps to follow.

@@ -72,9 +72,6 @@

January 8, 2020

Google recently changed their policies and some rules (about 15% by file size) can no longer be published to WebStore. Edge users are currently not affected.

Going forward, Nano Defender will have a Standard version and a Pro version, where the Pro version has all of the rules. Do not install both versions at the same time.

The Pro version can be downloaded from the Edge Addons store or GitHub Releases.

- -

September 19, 2017

-

Nano Defender is 100% free, and I do not accept donations for Nano Defender, now and in the future. My GitHub username is jspenguin2017, my GitLab username is xuhaiyang1234, and my domain is hugoxu.com. Be careful to not get scammed by someone who is pretending to be a developer of Nano Defender.


From 6698877b01f2ea03664057d4f3ad8dfced7c1bdd Mon Sep 17 00:00:00 2001 From: jspenguin2017 Date: Wed, 14 Oct 2020 17:45:39 -0600 Subject: [PATCH 12/13] update doc --- docs/index.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/index.html b/docs/index.html index 04acd8ed96..5e3840d107 100644 --- a/docs/index.html +++ b/docs/index.html @@ -65,6 +65,9 @@

Official Ports

Announcements

+

October 3, 2020

+

Please read important announcements here: https://github.com/NanoAdblocker/NanoCore/issues/362

+

January 21, 2020

Since major browsers will be removing Flash player completely by the end of 2020, websites that have anti-adblock after requesting Flash support will no longer be fixed.

From 0552c9ba7535678aea73b82a9f0639f992d29143 Mon Sep 17 00:00:00 2001 From: jspenguin2017 Date: Wed, 14 Oct 2020 19:07:19 -0600 Subject: [PATCH 13/13] No commit message --- docs/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.html b/docs/index.html index 5e3840d107..fbdfa1786f 100644 --- a/docs/index.html +++ b/docs/index.html @@ -38,7 +38,7 @@

Installation


Get Nano Defender Pro for Edge

-

Get Nano Defender for Chrome or Chromium This listing is no longer controlled by me

+

Get Nano Defender for Chrome or Chromium This listing is no longer under my control


If you are using uBlock Origin, there are a few extra installation steps to follow.