diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml new file mode 100644 index 0000000000..5f5fb7ba36 --- /dev/null +++ b/.github/workflows/lock.yml @@ -0,0 +1,20 @@ +name: 'Lock Old Threads' + +on: + schedule: + - cron: '0 */6 * * *' + +jobs: + lock: + runs-on: ubuntu-latest + timeout-minutes: 120 + 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: '' 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 diff --git a/docs/index.html b/docs/index.html index 8b3584eae4..fbdfa1786f 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

@@ -31,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 under my control


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

@@ -58,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.

@@ -65,9 +75,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.


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/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/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. 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", ]; // ----------------------------------------------------------------------------------------------------------------- // diff --git a/uBlockProtectorList.txt b/uBlockProtectorList.txt index 18dd2ad7d5..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 @@ -1311,8 +1310,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