Compare commits

..

No commits in common. "a4f3943073617d556a172c91cbeca1355c4b0fc4" and "6a9798c61bd76ca193e6eec71ac7be50f9f2c7b2" have entirely different histories.

5 changed files with 48 additions and 84 deletions

View File

@ -3,47 +3,6 @@
"3rdparty": { "3rdparty": {
"Extensions": { "Extensions": {
"adnauseam@rednoise.org": { "adnauseam@rednoise.org": {
"toAdd": {
"trustedSiteDirectives": [
""
]
},
"toOverwrite": {
"filterLists": [
"easylist",
"adnauseam-filters",
"eff-dnt-whitelist"
]
}
},
"jid1-MnnxcxisBPnSXQ@jetpack": {
"checkForDNTPolicy": true,
"disabledSites": [
"app.element.io",
"staging.element.io",
"develop.element.io",
"chat.pikaviestin.fi",
"webchat.disroot.org",
"learn.microsoft.com",
"teams.microsoft.com",
"bittimittari.fi",
"pp-attester-turnstile.research.cloudflare.com",
"keyoxide.org",
"one.one.one.one",
"www.ecosia.org",
"ac.ecosia.org"
],
"learnInIncognito": true,
"learnLocally": true,
"sendDNTSignal": true,
"showCounter": true,
"showIntroPage": false,
"socialWidgetReplacementEnabled": true
},
"jid1-ZAdIEUB7XOzOJw@jetpack": {
"hasSeenPostInstall": true
},
"uBlock0@raymondhill.net": {
"toAdd": { "toAdd": {
"trustedSiteDirectives": [ "trustedSiteDirectives": [
"app.element.io", "app.element.io",
@ -73,16 +32,44 @@
"easyprivacy", "easyprivacy",
"urlhaus-1", "urlhaus-1",
"plowe-0", "plowe-0",
"https://www.eff.org/files/effdntlist.txt",
"https://gitea.blesmrt.net/mikaela/gist/raw/branch/master/DNS/blocklist.txt", "https://gitea.blesmrt.net/mikaela/gist/raw/branch/master/DNS/blocklist.txt",
"adnauseam-filters",
"eff-dnt-whitelist",
"ublock-quick-fixes", "ublock-quick-fixes",
"FIN-0", "FIN-0",
"RUS-0",
"https://big.oisd.nl", "https://big.oisd.nl",
"ublock-annoyances", "ublock-annoyances",
"adguard-mobile-app-banners" "adguard-mobile-app-banners",
"curben-phishing"
] ]
} }
},
"jid1-MnnxcxisBPnSXQ@jetpack": {
"checkForDNTPolicy": true,
"disabledSites": [
"app.element.io",
"staging.element.io",
"develop.element.io",
"chat.pikaviestin.fi",
"webchat.disroot.org",
"learn.microsoft.com",
"teams.microsoft.com",
"bittimittari.fi",
"pp-attester-turnstile.research.cloudflare.com",
"keyoxide.org",
"one.one.one.one",
"www.ecosia.org",
"ac.ecosia.org"
],
"learnInIncognito": true,
"learnLocally": true,
"sendDNTSignal": true,
"showCounter": true,
"showIntroPage": false,
"socialWidgetReplacementEnabled": true
},
"jid1-ZAdIEUB7XOzOJw@jetpack": {
"hasSeenPostInstall": true
} }
} }
}, },
@ -155,7 +142,7 @@
}, },
"adnauseam@rednoise.org": { "adnauseam@rednoise.org": {
"install_url": "https://addons.mozilla.org/firefox/downloads/latest/adnauseam/latest.xpi", "install_url": "https://addons.mozilla.org/firefox/downloads/latest/adnauseam/latest.xpi",
"installation_mode": "blocked" "installation_mode": "force_installed"
}, },
"ipvfoobar@napr.eu": { "ipvfoobar@napr.eu": {
"install_url": "https://addons.mozilla.org/firefox/downloads/latest/ipvfoobar/latest.xpi", "install_url": "https://addons.mozilla.org/firefox/downloads/latest/ipvfoobar/latest.xpi",
@ -179,11 +166,10 @@
}, },
"uBlock0@raymondhill.net": { "uBlock0@raymondhill.net": {
"blocked_install_message": "uBlock Origin on integroitu AdNauseamiin, joka on forkki siitä.", "blocked_install_message": "uBlock Origin on integroitu AdNauseamiin, joka on forkki siitä.",
"install_url": "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi", "installation_mode": "blocked"
"installation_mode": "force_installed"
}, },
"uMatrix@raymondhill.net": { "uMatrix@raymondhill.net": {
"blocked_install_message": "uMatrixin kehitys on päättynyt ja samat ominaisuudet löytyvät uBlock Originista (ja AdNauseamista).", "blocked_install_message": "uMatrixin kehitys on päättynyt ja samat ominaisuudet löytyvät AdNauseamista (ja uBlock Originista).",
"installation_mode": "blocked" "installation_mode": "blocked"
}, },
"wayback_machine@mozilla.org": { "wayback_machine@mozilla.org": {
@ -356,9 +342,9 @@
"Value": "once" "Value": "once"
}, },
"intl.accept_languages": { "intl.accept_languages": {
"Status": "locked", "Status": "default",
"Type": "string", "Type": "string",
"Value": "fi, en, ru" "Value": "fi, en"
}, },
"javascript.use_us_english_locale": { "javascript.use_us_english_locale": {
"Comment": "Preference not allowed for stability reasons. :(", "Comment": "Preference not allowed for stability reasons. :(",

View File

@ -205,7 +205,8 @@ that I can see.
## `disable-floc.json` ## `disable-floc.json`
Disables floc or ad topics that are against privacy. Disables floc or ad topics that are against privacy. Additionally allows
Manifest v2 extensions (as v3 is kind of floc too).
- https://start.duckduckgo.com/?q=google+floc+privacy+topics - https://start.duckduckgo.com/?q=google+floc+privacy+topics

View File

@ -7,7 +7,7 @@
"caoacbimdbbljakfhgikoodekdnlcgpk": { "caoacbimdbbljakfhgikoodekdnlcgpk": {
"hasSeenPostInstall": true "hasSeenPostInstall": true
}, },
"cjpalhdlnbpafiamejdnhcphjbkeiagm": { "mlojlfildnehdpnlmpkeiiglhhkofhpb": {
"toAdd": { "toAdd": {
"trustedSiteDirectives": [ "trustedSiteDirectives": [
"app.element.io", "app.element.io",
@ -37,28 +37,15 @@
"easyprivacy", "easyprivacy",
"urlhaus-1", "urlhaus-1",
"plowe-0", "plowe-0",
"https://www.eff.org/files/effdntlist.txt",
"https://gitea.blesmrt.net/mikaela/gist/raw/branch/master/DNS/blocklist.txt", "https://gitea.blesmrt.net/mikaela/gist/raw/branch/master/DNS/blocklist.txt",
"adnauseam-filters",
"eff-dnt-whitelist",
"ublock-quick-fixes", "ublock-quick-fixes",
"FIN-0", "FIN-0",
"RUS-0",
"https://big.oisd.nl", "https://big.oisd.nl",
"ublock-annoyances", "ublock-annoyances",
"adguard-mobile-app-banners" "adguard-mobile-app-banners",
] "curben-phishing"
}
},
"mlojlfildnehdpnlmpkeiiglhhkofhpb": {
"toAdd": {
"trustedSiteDirectives": [
""
]
},
"toOverwrite": {
"filterLists": [
"easylist",
"adnauseam-filters",
"eff-dnt-whitelist"
] ]
} }
}, },
@ -88,7 +75,6 @@
} }
} }
}, },
"ExtensionManifestV2Availability": 2,
"ExtensionSettings": { "ExtensionSettings": {
"ajhmfdgkijocedmfjonnpjfojldioehi": { "ajhmfdgkijocedmfjonnpjfojldioehi": {
"installation_mode": "force_installed", "installation_mode": "force_installed",
@ -103,10 +89,8 @@
"update_url": "https://clients2.google.com/service/update2/crx" "update_url": "https://clients2.google.com/service/update2/crx"
}, },
"cjpalhdlnbpafiamejdnhcphjbkeiagm": { "cjpalhdlnbpafiamejdnhcphjbkeiagm": {
"installation_mode": "force_installed", "blocked_install_message": "uBlock Origin on integroitu AdNauseamiin, joka on forkki siitä.",
"override_update_url": true, "installation_mode": "blocked"
"toolbar_pin": "force_pinned",
"update_url": "https://clients2.google.com/service/update2/crx"
}, },
"donbcfbmhbcapadipfkeojnmajbakjdc": { "donbcfbmhbcapadipfkeojnmajbakjdc": {
"installation_mode": "normal_installed", "installation_mode": "normal_installed",
@ -133,8 +117,7 @@
"update_url": "https://clients2.google.com/service/update2/crx" "update_url": "https://clients2.google.com/service/update2/crx"
}, },
"mlojlfildnehdpnlmpkeiiglhhkofhpb": { "mlojlfildnehdpnlmpkeiiglhhkofhpb": {
"blocked_install_message": "AdNauseam on protestityökalu, kun taas Aminda yrittää olla sysadmin.", "installation_mode": "force_installed",
"installation_mode": "blocked",
"override_update_url": true, "override_update_url": true,
"toolbar_pin": "force_pinned", "toolbar_pin": "force_pinned",
"update_url": "https://edge.microsoft.com/extensionwebstorebase/v1/crx" "update_url": "https://edge.microsoft.com/extensionwebstorebase/v1/crx"
@ -146,7 +129,7 @@
"update_url": "https://clients2.google.com/service/update2/crx" "update_url": "https://clients2.google.com/service/update2/crx"
}, },
"odfafepnkmbhccpbejgmiehpchacaeak": { "odfafepnkmbhccpbejgmiehpchacaeak": {
"blocked_install_message": "uBlock Origin pitäisi olla jo asennettu Chrome-kaupasta.", "blocked_install_message": "uBlock Origin on integroitu AdNauseamiin, joka on forkki siitä.",
"installation_mode": "blocked" "installation_mode": "blocked"
}, },
"pkehgijcmpdhfbdbbnkijodmdjhbjlgp": { "pkehgijcmpdhfbdbbnkijodmdjhbjlgp": {

View File

@ -1,4 +1,5 @@
{ {
"ExtensionManifestV2Availability": 2,
"PrivacySandboxAdMeasurementEnabled": false, "PrivacySandboxAdMeasurementEnabled": false,
"PrivacySandboxAdTopicsEnabled": false, "PrivacySandboxAdTopicsEnabled": false,
"PrivacySandboxPromptEnabled": false, "PrivacySandboxPromptEnabled": false,

View File

@ -1,7 +0,0 @@
{
"ForcedLanguages": [
"fi",
"en",
"ru"
]
}