From b59b74f689df8591b59a9970239fc1e61adddee9 Mon Sep 17 00:00:00 2001 From: Flux Belly Date: Fri, 27 Nov 2020 22:41:35 +0000 Subject: [PATCH 1/9] Grammar --- .gitlab/issue_templates/Bug.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md index 6d3e67f..43dabe9 100644 --- a/.gitlab/issue_templates/Bug.md +++ b/.gitlab/issue_templates/Bug.md @@ -14,9 +14,9 @@ possible. Thank you! -* [ ] Can you reproduce the problem in a **fresh** firefox profile with **only** ClearURLs? +* [ ] Can you reproduce the problem in a **fresh** Firefox profile with **only** ClearURLs? * [ ] Are you running the latest version of ClearURLs? -* [ ] Are you have changed settings under `about:config`? +* [ ] Have you changed settings under `about:config`? ### Description @@ -33,10 +33,10 @@ You do not have to reinstall Firefox or disable all addons. You can just create **Actual behavior:** [What actually happened] ### System -* **Version**: [compulsory. you must provide your version] +* **Version**: [compulsory. You must provide your version] * **Platform**: [either `uname -a` output, or if Windows, version and 32-bit or 64-bit] -* **Country**: [The country from which you called the page. You can found your country here: https://ipapi.co//country_capital] +* **Country**: [The country from which you called the page. You can find your country here: https://ipapi.co//country_capital] ### Log From 5fff4f726e9ff8ca8b78344d5f4f85940419487f Mon Sep 17 00:00:00 2001 From: Kevin R Date: Fri, 25 Dec 2020 20:24:01 +0100 Subject: [PATCH 2/9] Update data --- data | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data b/data index d7915c2..7a180c3 160000 --- a/data +++ b/data @@ -1 +1 @@ -Subproject commit d7915c2b8a5b72275301aeb6f541229c94698593 +Subproject commit 7a180c3dbd2a48aeeb1271919f6a9218b4d45354 From 3ec1e5906606c97a6a2f481bf324889a04b82962 Mon Sep 17 00:00:00 2001 From: Teknoist Date: Tue, 29 Dec 2020 21:49:05 +0000 Subject: [PATCH 3/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8eae587..f2a136c 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Buy Me A Coffee Buy Me A Coffee -[for Firefox](https://addons.mozilla.org/firefox/addon/clearurls/) [for Edge](https://microsoftedge.microsoft.com/addons/detail/mdkdmaickkfdekbjdoojfalpbkgaddei) [for Chrome](https://chrome.google.com/webstore/detail/clearurls/lckanjgmijmafbedllaakclkaicjfmnk) +[for Firefox](https://addons.mozilla.org/firefox/addon/clearurls/) [for Edge](https://microsoftedge.microsoft.com/addons/detail/mdkdmaickkfdekbjdoojfalpbkgaddei) [for Chrome](https://chrome.google.com/webstore/detail/clearurls/lckanjgmijmafbedllaakclkaicjfmnk) # ClearURLs [![Gitter](https://badges.gitter.im/ClearURLs/ClearURLs.svg)](https://gitter.im/ClearURLs/ClearURLs) From b8b197fdaa76da5ecfdd0f9187ace8763eaf6cf6 Mon Sep 17 00:00:00 2001 From: Kevin R Date: Thu, 7 Jan 2021 22:02:22 +0000 Subject: [PATCH 4/9] Update PRIVACY.md --- PRIVACY.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PRIVACY.md b/PRIVACY.md index b34ff33..23394d4 100644 --- a/PRIVACY.md +++ b/PRIVACY.md @@ -1,6 +1,6 @@ ClearURLs protects and respects your privacy. -We do not collect any of your usage data. Furthermore ClearURLs has no home server nor embed any kind of analytic hooks in its code. +We do not collect any of your usage data. Furthermore, ClearURLs has no home server nor embed any kind of analytic hooks in its code. -The only time ClearURLs connects to a remote server (gitlab.io) is to update the rules file and the associated hash file. You can replace the default update address with your own address at any time in the settings. +The only time ClearURLs connects to a remote server (gitlab.io or github.io) is to update the rules file and the associated hash file. You can replace the default update address (_rules1.clearurls.xyz_/_rules2.clearurls.xyz_) with your address at any time in the settings. -The project and the rule file is currently hosted on gitlab.com, which is owned by GitLab Inc. and thus is unrelated to ClearURLs. \ No newline at end of file +The project and the rule file are currently hosted on gitlab.com and github.com, which is owned by GitLab Inc. and GitHub Inc. Thus they are unrelated to ClearURLs. The _rules1.clearurls.xyz_ and _rules2.clearurls.xyz_ addresses are just CNAME records and thus we got no information about the request. From 9ba19a9eb3120b8277e168f53228d25ccb810483 Mon Sep 17 00:00:00 2001 From: Kevin R Date: Thu, 7 Jan 2021 22:03:44 +0000 Subject: [PATCH 5/9] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f2a136c..f739e6c 100644 --- a/README.md +++ b/README.md @@ -82,6 +82,7 @@ Please push your translation into the folder `_locales/{country code}/messages.j * [ghacks-user.js](https://github.com/ghacksuserjs/ghacks-user.js/wiki/4.1-Extensions) * [Awesome Humane Tech List](https://github.com/humanetech-community/awesome-humane-tech#tracking) * [PrivacyTools](https://www.privacytools.io/browsers/#addons) +* [New York Times Wirecutter](https://www.nytimes.com/wirecutter/reviews/our-favorite-ad-blockers-and-browser-extensions-to-protect-privacy/#cleaner-links-clearurls) * ClearURLs is part of Mozilla's recommended extensions program ## Permissions From ebad8e401817a1e86890e1ec1b294880ba5194e7 Mon Sep 17 00:00:00 2001 From: Oymate <5662314-Oymate@users.noreply.gitlab.com> Date: Mon, 11 Jan 2021 07:50:51 +0000 Subject: [PATCH 6/9] Changed country to language code --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f739e6c..5935d16 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ It is not necessary to translate the description field; in the most cases it is #### Merge request If you want to create a merge request, you must open the path [`_locales/en/messages.json`](https://github.com/KevinRoebert/ClearUrls/blob/master/_locales/en/messages.json) in the ClearURLs repo and translate the english terms into terms of your language. Once you have translated all the terms, you make a pull request of your translation. -Please push your translation into the folder `_locales/{country code}/messages.json`. +Please push your translation into the folder `_locales/{language code}/messages.json`. #### POEditor [https://poeditor.com/join/project/vKTpQWWvk2](https://poeditor.com/join/project/vKTpQWWvk2) From 4f6241842fe60fb47c29dda41b101451626d277d Mon Sep 17 00:00:00 2001 From: Kevin R Date: Wed, 13 Jan 2021 16:32:57 +0100 Subject: [PATCH 7/9] Updated referralMarketing pattern to match rule pattern --- clearurls.js | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/clearurls.js b/clearurls.js index 4feb91c..e0ed7bd 100644 --- a/clearurls.js +++ b/clearurls.js @@ -1,20 +1,20 @@ /* -* ClearURLs -* Copyright (c) 2017-2020 Kevin Röbert -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License -* along with this program. If not, see . -*/ + * ClearURLs + * Copyright (c) 2017-2021 Kevin Röbert + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ /*jshint esversion: 6 */ /* @@ -52,7 +52,7 @@ function removeFieldsFormURL(provider, pureUrl, quiet = false, request = null) { "changes": false, "url": url, "cancel": false - }; + } } /* @@ -93,12 +93,12 @@ function removeFieldsFormURL(provider, pureUrl, quiet = false, request = null) { pushToLog(pureUrl, url, translate('log_redirect')); increaseGlobalURLCounter(1); increaseBadged(false, request) - }; + } return { "redirect": true, "url": url - }; + } } if (existsFields(url)) { @@ -157,7 +157,7 @@ function removeFieldsFormURL(provider, pureUrl, quiet = false, request = null) { "changes": changes, "url": url, "cancel": cancel - }; + } } function start() { @@ -255,7 +255,7 @@ function start() { return { hash: (await response.text()).trim(), status: response.status - }; + } }); response.then(result => { @@ -290,7 +290,7 @@ function start() { data: (await response.clone().text()).trim(), hash: await sha256((await response.text()).trim()), status: response.status - }; + } }) response.then(result => { @@ -468,7 +468,7 @@ function start() { * @param {boolean} isActive Is this rule active? */ this.addReferralMarketing = function (rule, isActive = true) { - rule = "([\\/\\?#]|(&|&))+(" + rule + "=[^\\/\\?&]*)"; + rule = "([\\/\\?#]|(&|&))+(" + rule + "=[^&]*)"; this.applyRule(enabled_referralMarketing, disabled_referralMarketing, rule, isActive); }; @@ -478,7 +478,7 @@ function start() { * and replace old with new exception. * * @param {String} exception RegExp as string - * @param {Boolean} isActive Is this exception acitve? + * @param {Boolean} isActive Is this exception active? */ this.addException = function (exception, isActive = true) { if (isActive) { From d87ae26c7522351e03e66081d60aa8d0962e3b56 Mon Sep 17 00:00:00 2001 From: Kevin R Date: Wed, 24 Mar 2021 11:59:13 +0100 Subject: [PATCH 8/9] Updated to correct new sub-repo F ixed GitHub issue #103 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5935d16..3692954 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ **ClearURLs** is an add-on based on the new WebExtensions technology and is optimized for *Firefox* and *Chrome* based browsers. This extension will automatically remove tracking elements from URLs to help protect your privacy when browse through the Internet, -which is regularly updated by us and can be found [here](https://gitlab.com/KevinRoebert/ClearUrls/raw/master/data/data.min.json). +which is regularly updated by us and can be found [here](https://gitlab.com/anti-tracking/ClearURLs/rules/-/raw/master/data.min.json). ## Application Many websites use tracking elements in the URL (e.g. `https://example.com?utm_source=newsletter1&utm_medium=email&utm_campaign=sale`) to mark your online activity. From 4c648b45558eae49599d36cef2c9cd41ca830631 Mon Sep 17 00:00:00 2001 From: Kevin R Date: Wed, 24 Mar 2021 12:17:00 +0100 Subject: [PATCH 9/9] Removed clipboardWrite permission --- manifest.json | 1 - 1 file changed, 1 deletion(-) diff --git a/manifest.json b/manifest.json index f5abcd0..d7f407e 100644 --- a/manifest.json +++ b/manifest.json @@ -44,7 +44,6 @@ "storage", "unlimitedStorage", "contextMenus", - "clipboardWrite", "webNavigation", "tabs", "downloads"