Skip to content
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.

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

Mid-September pull #1966

Merged
merged 17 commits into from
Sep 12, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

104 changes: 104 additions & 0 deletions services/Directory/data/FilterList.json
Original file line number Diff line number Diff line change
Expand Up @@ -16664,5 +16664,109 @@
"issuesUrl": "https://github.com/DandelionSprout/adfilt/issues",
"licenseId": 35,
"name": "Dummy List to Avoid 'No lists turned on' Warnings"
},
{
"description": "The Adblock Warning Removal List specifically removes obtrusive messages and warnings targeted to users who use an adblocker.",
"emailAddress": "[email protected]",
"forumUrl": "https://forums.lanik.us/",
"homeUrl": "https://easylist.to/",
"id": 2407,
"licenseId": 4,
"name": "Adblock Warning Removal List - English Only"
},
{
"description": "The Adblock Warning Removal List specifically removes obtrusive messages and warnings targeted to users who use an adblocker.",
"emailAddress": "[email protected]",
"forumUrl": "https://forums.lanik.us/",
"homeUrl": "https://easylist.to/",
"id": 2408,
"licenseId": 4,
"name": "Adblock Warning Removal List - International + French"
},
{
"description": "The Adblock Warning Removal List specifically removes obtrusive messages and warnings targeted to users who use an adblocker.",
"emailAddress": "[email protected]",
"forumUrl": "https://forums.lanik.us/",
"homeUrl": "https://easylist.to/",
"id": 2409,
"licenseId": 4,
"name": "Adblock Warning Removal List - Russian Only"
},
{
"description": "Christmas is a sad, sad time of the year, where everyone eat bleached fish, get drunk at company parties, wear ugly T-shirts, invite aggressive relatives, stuff the living room full of candles, listen to Whitney Houston, set up lame dollhouse exhibitions, and watch badly dubbed Eastern Bloc movies. And the snow that is everywhere on many websites during that time isn't helping on anyone's mood either. So here's a list to remove the snow from those websites.",
"donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations",
"emailAddress": "[email protected]",
"homeUrl": "https://github.com/DandelionSprout/adfilt",
"id": 2410,
"issuesUrl": "https://github.com/DandelionSprout/adfilt/issues",
"licenseId": 35,
"name": "Anti-'Snow marketing' List"
},
{
"emailAddress": "[email protected]",
"homeUrl": "https://github.com/pexcn/daily",
"id": 2411,
"issuesUrl": "https://github.com/pexcn/daily/issues",
"licenseId": 4,
"name": "pexcn Adlist"
},
{
"emailAddress": "[email protected]",
"homeUrl": "https://github.com/pexcn/daily",
"id": 2412,
"issuesUrl": "https://github.com/pexcn/daily/issues",
"licenseId": 4,
"name": "pexcn Adlist (dnsmasq)"
},
{
"emailAddress": "[email protected]",
"homeUrl": "https://github.com/pexcn/daily",
"id": 2413,
"issuesUrl": "https://github.com/pexcn/daily/issues",
"licenseId": 4,
"name": "pexcn GFWlist"
},
{
"emailAddress": "[email protected]",
"homeUrl": "https://github.com/pexcn/daily",
"id": 2414,
"issuesUrl": "https://github.com/pexcn/daily/issues",
"licenseId": 4,
"name": "pexcn China Whitelist"
},
{
"description": "A list of torrent trackers.",
"emailAddress": "[email protected]",
"homeUrl": "https://github.com/pexcn/daily",
"id": 2415,
"issuesUrl": "https://github.com/pexcn/daily/issues",
"licenseId": 4,
"name": "pexcn Trackerlist"
},
{
"emailAddress": "[email protected]",
"homeUrl": "https://github.com/pexcn/daily",
"id": 2416,
"issuesUrl": "https://github.com/pexcn/daily/issues",
"licenseId": 4,
"name": "pexcn uBlacklist"
},
{
"description": "Contains all known PR-Chinese IP address ranges.",
"emailAddress": "[email protected]",
"homeUrl": "https://github.com/pexcn/daily",
"id": 2417,
"issuesUrl": "https://github.com/pexcn/daily/issues",
"licenseId": 4,
"name": "Chinaroute (IPv4)"
},
{
"description": "Contains all known PR-Chinese IP address ranges.",
"emailAddress": "[email protected]",
"homeUrl": "https://github.com/pexcn/daily",
"id": 2418,
"issuesUrl": "https://github.com/pexcn/daily/issues",
"licenseId": 4,
"name": "Chinaroute (IPv6)"
}
]
20 changes: 20 additions & 0 deletions services/Directory/data/FilterListLanguage.json
Original file line number Diff line number Diff line change
Expand Up @@ -3634,5 +3634,25 @@
{
"filterListId": 2405,
"iso6391": "sv"
},
{
"filterListId": 2407,
"iso6391": "en"
},
{
"filterListId": 2408,
"iso6391": "fr"
},
{
"filterListId": 2409,
"iso6391": "ru"
},
{
"filterListId": 2413,
"iso6391": "zh"
},
{
"filterListId": 2414,
"iso6391": "zh"
}
]
32 changes: 32 additions & 0 deletions services/Directory/data/FilterListMaintainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5574,5 +5574,37 @@
{
"filterListId": 2402,
"maintainerId": 46
},
{
"filterListId": 2403,
"maintainerId": 22
},
{
"filterListId": 2404,
"maintainerId": 22
},
{
"filterListId": 2405,
"maintainerId": 22
},
{
"filterListId": 2406,
"maintainerId": 22
},
{
"filterListId": 2407,
"maintainerId": 6
},
{
"filterListId": 2408,
"maintainerId": 6
},
{
"filterListId": 2409,
"maintainerId": 6
},
{
"filterListId": 2410,
"maintainerId": 22
}
]
Loading