Skip to content

[pull] master from jspenguin2017:master #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pull wants to merge 13 commits into
base: master
Choose a base branch
from
Open

[pull] master from jspenguin2017:master #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d6a8aa9
Create lock.yml
jspenguin2017 Aug 21, 2020
7fadeb6
Update lock.yml
jspenguin2017 Aug 21, 2020
a7780b4
Update lock.yml
jspenguin2017 Aug 21, 2020
367e032
https://github.com/NanoMeow/QuickReports/issues/4560
jspenguin2017 Aug 23, 2020
98ea54c
Update lock.yml
jspenguin2017 Aug 23, 2020
a4c070f
No commit message
jspenguin2017 Aug 25, 2020
1577472
update reporter
jspenguin2017 Sep 18, 2020
7745f6f
Update README.MD
jspenguin2017 Oct 6, 2020
74d92cf
add announcement
jspenguin2017 Oct 6, 2020
6c2bb68
Update issue-reporter.md
jspenguin2017 Oct 8, 2020
0e67e23
update doc
jspenguin2017 Oct 14, 2020
6698877
update doc
jspenguin2017 Oct 14, 2020
0552c9b
No commit message
jspenguin2017 Oct 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .github/workflows/lock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: ''
4 changes: 4 additions & 0 deletions README.MD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
15 changes: 11 additions & 4 deletions docs/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,21 @@ <h1>Nano Defender</h1>
<p class="red">Warning: Do not install from unofficial sources! Any websites that are not linked below are considered to be unofficial.</p>
</div>

<div class="container">
<h2>Important Announcements Regarding Recent Changes</h2>

<p>Please read important announcements here: <a href="https://github.com/NanoAdblocker/NanoCore/issues/362" target="_blank" rel="noopener">https://github.com/NanoAdblocker/NanoCore/issues/362</a></p>
<br />
</div>

<div class="container" id="installation">
<h2>Installation</h2>

<p>Nano Defender can only protect <strong>either</strong> <a href="https://github.com/NanoAdblocker/NanoCore#nano-adblocker-core" target="_blank" rel="noopener">Nano Adblocker</a> or uBlock Origin, and will prioritize Nano Adblocker.</p>
<br />

<p><a href="https://microsoftedge.microsoft.com/addons/detail/ijfkmnlofajajikjhfiigelipempcklj" target="_blank" rel="noopener">Get Nano Defender Pro for <strong>Edge</strong></a></p>
<p><a href="https://chrome.google.com/webstore/detail/nano-defender/ggolfgbegefeeoocgjbmkembbncoadlb" target="_blank" rel="noopener">Get Nano Defender for <strong>Chrome</strong> or <strong>Chromium</strong></a></p>
<p><s><a href="https://chrome.google.com/webstore/detail/nano-defender/ggolfgbegefeeoocgjbmkembbncoadlb" target="_blank" rel="noopener">Get Nano Defender for <strong>Chrome</strong> or <strong>Chromium</strong></a></s> <i>This listing is no longer under my control</i></p>
<br />

<p>If you are using uBlock Origin, there are a few <a href="#extra-installation-steps-for-ublock-origin">extra installation steps</a> to follow.</p>
Expand All @@ -58,16 +65,16 @@ <h2>Official Ports</h2>
<div class="container" id="announcements">
<h2>Announcements</h2>

<h4>October 3, 2020</h4>
<p>Please read important announcements here: <a href="https://github.com/NanoAdblocker/NanoCore/issues/362" target="_blank" rel="noopener">https://github.com/NanoAdblocker/NanoCore/issues/362</a></p>

<h4>January 21, 2020</h4>
<p>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.</p>

<h4>January 8, 2020</h4>
<p>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.</p>
<p>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.</p>
<p>The Pro version can be downloaded from the Edge Addons store or GitHub Releases.</p>

<h4>September 19, 2017</h4>
<p>Nano Defender is 100% free, and I do not accept donations for Nano Defender, now and in the future. My GitHub username is <code>jspenguin2017</code>, my GitLab username is <code>xuhaiyang1234</code>, and my domain is <code>hugoxu.com</code>. Be careful to not get scammed by someone who is pretending to be a developer of Nano Defender.</p>
<br />
</div>

Expand Down
2 changes: 0 additions & 2 deletions list/3-rules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions list/6-other.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 3 additions & 5 deletions notes/issue-reporter.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
13 changes: 1 addition & 12 deletions src/reporter/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,31 +33,20 @@ 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",
];

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",
];

// ----------------------------------------------------------------------------------------------------------------- //
Expand Down
3 changes: 0 additions & 3 deletions uBlockProtectorList.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down