Merge branch 'master' into next-gen

Add PrivacyTools recommendation

See merge request KevinRoebert/ClearUrls!60

.github/lockdown.yml

@@ -0,0 +1,39 @@
+# Configuration for Repo Lockdown - https://github.com/dessant/repo-lockdown
+
+# Skip issues and pull requests created before a given timestamp. Timestamp must
+# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
+#skipCreatedBefore: false
+
+# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
+#exemptLabels: []
+
+# Comment to post before closing or locking. Set to `false` to disable
+#comment: true
+
+# Label to add before closing or locking. Set to `false` to disable
+#label: true
+
+# Close issues and pull requests
+#close: true
+
+# Lock issues and pull requests
+#lock: true
+
+# Limit to only `issues` or `pulls`
+#only: pulls
+
+# Optionally, specify configuration settings just for `issues` or `pulls`
+issues:
+   comment: >
+     This repository is only a mirror of https://gitlab.com/KevinRoebert/ClearUrls. Issues are readed here, but not directly addressed. If possible, please use the GitLab repo or this support mail address: clearurls_1 (at) kevinroebert.de.
+   lock: false
+   close: true
+
+pulls:
+   comment: >
+     This repository is just a mirror of https://gitlab.com/KevinRoebert/ClearUrls. Only there pull requests accepted.   
+   lock: false
+   close: true
+
+# Repository to extend settings from
+# _extends: repo

.gitlab-ci.yml

@@ -3,7 +3,7 @@ image: debian:latest
 before_script:
   - export DEBIAN_FRONTEND= noninteractive
   - apt-get update -y
-  - apt-get install -y zip unzip jq nodejs
+  - apt-get install -y zip unzip nodejs
 
 stages:
   - build
@@ -23,30 +23,17 @@ hash rules:
   only:
     - master
 
-build firefox:
+bundle addon:
   stage: build
   script:
-    - zip ClearUrls_firefox -r -FS clearurls.js browser-polyfill.js manifest.json img/* external_js/* html/* core_js/* css/* fonts/* _locales/*
+    - zip ClearUrls -r -FS clearurls.js browser-polyfill.js manifest.json img/* external_js/* html/* core_js/* css/* fonts/* _locales/*
 
   only:
     - master
 
   artifacts:
     paths:
-      - ClearUrls_firefox.zip
+      - ClearUrls.zip
-
-build chrome:
-  stage: build
-  script:
-    - jq 'del(.applications)' manifest.json > manifest.json.tmp && mv manifest.json.tmp manifest.json
-    - zip ClearUrls_chrome -r -FS clearurls.js browser-polyfill.js manifest.json img/* external_js/* html/* core_js/* css/* fonts/* _locales/*
-
-  only:
-    - master
-
-  artifacts:
-    paths:
-      - ClearUrls_chrome.zip
 
 pages:
   stage: deploy

.gitlab/issue_templates/Bug.md

@@ -36,7 +36,7 @@ You do not have to reinstall Firefox or disable all addons. You can just create
 * **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: http://ip-api.com/json/?fields=country]
+* **Country**: [The country from which you called the page. You can found your country here: https://ipapi.co//country_capital]
 
 ### Log
 <!-- Please enable the log functionality of ClearURLs and attach the exported log to this bug report. -->

CHANGELOG.md

@@ -4,6 +4,34 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.17.0] - 2020-04-14
+
+### Compatibility note
+- Require Firefox >= 55
+- Require Chrome >= 22
+
+### Changed
+- Updated some strings of Spanish translation
+- Updated some strings of French translation
+- Updated some strings of Italian translation
+- Updated some strings of Russian translation
+- Updated some strings of Swedish translation
+- Updated some strings of Turkish translation
+- Updated some strings of Ukrainian translation
+- Updated some strings of Chinese Simple translation
+
+### Fixed
+- Fixed a typo in the path to the Datatables JavaScript file
+- Fixed [#445](https://gitlab.com/KevinRoebert/ClearUrls/issues/445)
+- Fixed [#462](https://gitlab.com/KevinRoebert/ClearUrls/issues/462)
+
+### Added
+- Added check for setBadgeTextColor function (only supported in Firefox)
+
+### Removed
+- Removed browser-polyfill content script import (seems no longer needed)
+- Removed old `applications` value
+
 ## [1.16.0] - 2020-03-20
 
 ### Compatibility note
@@ -15,7 +43,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Fixed spontaneous disappearance of the badged
-- Fixed wrong counting of blocked elements corrected (too little was  ;D)
+- Fixed wrong counting of blocked elements (too little was  ;D)
 
 ### Changed
 - Updated all translation

README.md

@@ -1,6 +1,6 @@
-<a href="https://www.buymeacoffee.com/KevinRoebert" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/default-orange.png" alt="Buy Me A Coffee" height="51" width="217"></a>
+<a href="https://www.buymeacoffee.com/KevinRoebert" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/default-orange.png" alt="Buy Me A Coffee" height="60"></a>
 
-[<img src="https://addons.cdn.mozilla.net/static/img/addons-buttons/AMO-button_1.png" alt="for Firefox">](https://addons.mozilla.org/en-US/firefox/addon/clearurls/) [<img src="https://gitlab.com/KevinRoebert/ClearUrls/-/raw/master/promotion/MEA-button.png" alt="for Edge">](https://microsoftedge.microsoft.com/addons/detail/mdkdmaickkfdekbjdoojfalpbkgaddei) [<img src="https://developer.chrome.com/webstore/images/ChromeWebStore_BadgeWBorder_v2_206x58.png"  alt="for Chrome">](https://chrome.google.com/webstore/detail/clearurls/lckanjgmijmafbedllaakclkaicjfmnk)
+[<img src="https://blog.mozilla.org/addons/files/2020/04/get-the-addon-fx-apr-2020.svg" alt="for Firefox" height="60px">](https://addons.mozilla.org/en-US/firefox/addon/clearurls/) [<img src="https://gitlab.com/KevinRoebert/ClearUrls/-/raw/master/promotion/MEA-button.png" alt="for Edge" height="60px">](https://microsoftedge.microsoft.com/addons/detail/mdkdmaickkfdekbjdoojfalpbkgaddei) [<img src="https://developer.chrome.com/webstore/images/ChromeWebStore_BadgeWBorder_v2_206x58.png" alt="for Chrome" height="60px">](https://chrome.google.com/webstore/detail/clearurls/lckanjgmijmafbedllaakclkaicjfmnk)
 
 # <sub><img src="https://gitlab.com/KevinRoebert/ClearUrls/raw/master/img/clearurls.svg" width="64px" height="64px"></sub> ClearURLs 
 
@@ -29,6 +29,7 @@ Indeed most of the above URL is tracking code. Once ClearURLs has cleaned the ad
 * Supports redirection to the destination, without tracking services as middleman
 * Adds an entry to the context menu so that links can be copied quickly and cleanly
 * Blocks hyperlink auditing, also known as *ping tracking* (see also [this article](https://html.spec.whatwg.org/multipage/links.html#hyperlink-auditing))
+* Prevents ETag tracking
 * Prevents tracking injection over history API (see also: [The replaceState() method](https://developer.mozilla.org/en-US/docs/Web/API/History_API#The_replaceState()_method))
 * Prevents Google from rewriting the search results (to include tracking elements)
 * Prevents Yandex from rewriting the search results (to include tracking elements)
@@ -42,12 +43,10 @@ Reasoning for needed permissions can be found under [here](https://gitlab.com/Ke
 ## CI/CD Artifacts Download (for Firefox- and Chrome-Dev only)
 Here you can download the packed files for the Firefox- and Chrome-Dev:
 
-[Firefox](https://gitlab.com/KevinRoebert/ClearUrls/-/jobs/artifacts/master/raw/ClearUrls_firefox.zip?job=build%20firefox)
+[<img src="promotion/download-128.png"/>](https://gitlab.com/KevinRoebert/ClearUrls/-/jobs/artifacts/master/raw/ClearUrls.zip?job=bundle%20addon)
-
-[Chrome](https://gitlab.com/KevinRoebert/ClearUrls/-/jobs/artifacts/master/raw/ClearUrls_chrome.zip?job=build%20chrome)
 
 ## Test
-If you want to test whether ClearURLs works correctly on your system, you can go to this test page: [https://clearurls.roebert.eu/](https://clearurls.roebert.eu/)
+If you want to test whether ClearURLs works correctly on your system, you can go to this test page: [https://kevinroebert.gitlab.io/ClearUrls/](https://kevinroebert.gitlab.io/ClearUrls/)
 
 ## Contribute
 If you have any suggestions or complaints, please [create an issue.](https://gitlab.com/KevinRoebert/ClearUrls/issues/new)
@@ -71,10 +70,12 @@ Please push your translation into the folder `_locales/{country code}/messages.j
 ## Projects that use parts of ClearURLs
 
 * [Uroute](https://github.com/walterl/uroute) used ClearURLs to filter/clean URL before launching browser
+* [Scrub](https://gitlab.com/CrunchBangDev/cbd-cogs/-/tree/master/Scrub) used ClearURLs to filter/clean URLs as cog for the Red Discord bot
 
 ## Recommended by...
 *  [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)
 *  ClearURLs is part of Mozilla's recommended extensions program
 
 ## Permissions

_locales/de/messages.json

@@ -1,8 +1,4 @@
 {
-    "extension_description": {
-        "message": "Entfernt Tracking-Elemente von URLs.",
-        "description": "Erweiterungsbeschreibung (max. 132 Zeichen)"
-    },
     "hash_status_code_1": {
         "message": "Aktuell",
         "description": "Dieser Statuscode besagt, dass kein Update für die ClearURLs-Regeln verfügbar ist und alles auf dem neuesten Stand ist."
@@ -335,6 +331,10 @@
         "message": "Blockiere Hyperlink Auditing Anfragen",
         "description": "Diese Zeichenkette wird als Titel für das Hyperlink Auditing-Blocking verwendet."
     },
+    "extension_description": {
+        "message": "Entfernt Tracking-Elemente von URLs.",
+        "description": "Erweiterungsbeschreibung (max. 132 Zeichen)"
+    },
     "eTag_filtering_log": {
         "message": "ETag-Header wurde aus dieser Anfrage entfernt",
         "description": "Diese Zeichenkette wird für das Filtern von ETag-Headern im ClearURL-Protokoll verwendet."

_locales/en/messages.json

@@ -1,8 +1,4 @@
 {
-    "extension_description": {
-        "message": "Remove tracking elements from URLs.",
-        "description": "Extension description (max. 132 characters)"
-    },
     "hash_status_code_1": {
         "message": "up to date",
         "description": "This status code says, that no update is available for the ClearURLs rules and everything is up to date."
@@ -335,6 +331,10 @@
         "message": "Block hyperlink auditing",
         "description": "This string is used as title for the hyperlink auditing blocking switch"
     },
+    "extension_description": {
+        "message": "Remove tracking elements from URLs.",
+        "description": "Extension description (max. 132 characters)"
+    },
     "eTag_filtering_log": {
         "message": "ETag header was removed from this request",
         "description": "This string is used on ETag header filtering in the ClearURLs log."

_locales/es/messages.json

@@ -301,6 +301,10 @@
         "message": "Permitir márketing de referidos",
         "description": "This string is used as title for the referral marketing switch"
     },
+    "watchdog": {
+        "message": "[ClearURLs]: El watchdog detectado un problema. ClearURLs será reiniciado.",
+        "description": "This string is used as text for the watchdog"
+    },
     "domain_blocking_enabled": {
         "message": "Permitir bloqueo de dominios (Puede provocar problemas con sitios que no permitan bloqueadores de anuncios)",
         "description": "This string is used as label for the domain blocking switch"

_locales/fr/messages.json

@@ -299,7 +299,17 @@
     },
     "referral_marketing_enabled_title": {
         "message": "Permettre certaines actions commerciales",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la signification de la fonction sur la switch"
+    },
+    "watchdog": {
+        "message": "[ClearURLs]: Watchdog, très petit programme qui surveille les attaques de la mémoire vive, a détecté $TIMES$ problème(s)",
+        "description": "Utilisé pour un texte explicatif du Watchdog",
+        "placeholders": {
+            "times": {
+                "content": "$1",
+                "example": "3"
+            }
+        }
     },
     "domain_blocking_enabled": {
         "message": "Bloquer les atteintes à la vie privée. Cependant, des sites décèlent la technique de protection et dysfonctionnent délibérément ou affichent des avertissements",
@@ -318,7 +328,23 @@
         "description": "Utilisé pour le bouton activer/désactiver l'audit (espionnages) des liens hypertextes"
     },
     "ping_blocking_enabled_title": {
-        "message": "Bloquer l’espionnage des clics souris sur les liens hypertextes",
+        "message": "Bloquer l’espionnage auditing",
-        "description": "Utilisé pour le bouton activer/désactiver de l'audit (espionnages) des liens hypertextes"
+        "description": "Utilisé comme titre pour le bouton, commutateur, de l’audit des liens hypertextes"
+    },
+    "extension_description": {
+        "message": "Retirer les espions dans les adresses Internet.",
+        "description": "Description des fonctions ; utilisez au maximum 132 caractères."
+    },
+    "eTag_filtering_log": {
+        "message": "L’identification ETag a été supprimée",
+        "description": "Utilisé pour le journal de ClearUrls et indiquer ce qui a été nettoyé"
+    },
+    "eTag_filtering_enabled": {
+        "message": "Filtrer ETag ; les sites mettent dans le cache du Navigateur, ou Système d’Exploitation, un identifiant pour vous pister",
+        "description": "Titre pour le bouton de filtrage ETag"
+    },
+    "eTag_filtering_enabled_title": {
+        "message": "Filtre les identifications ETag, mais pour la première utilisation, veuillez vider le cache",
+        "description": "Titre pour le bouton de filtrage ETag"
     }
 }

_locales/it/messages.json

@@ -301,6 +301,10 @@
         "message": "Permette l'utilizzo del referral marketing (esempio: Amazon)",
         "description": "This string is used as title for the referral marketing switch"
     },
+    "watchdog": {
+        "message": "[ClearURLs]: Il sistema di controllo ha identificato un problema. ClearURLs verrà riavviato.",
+        "description": "This string is used as text for the watchdog"
+    },
     "domain_blocking_enabled": {
         "message": "Permetti il blocco dei domini (può portare a problemi su pagine che non consentono AdBlocker)",
         "description": "This string is used as label for the domain blocking switch"

_locales/ru/messages.json

@@ -301,6 +301,16 @@
         "message": "Разрешить рефералы маркетинга",
         "description": "This string is used as title for the referral marketing switch"
     },
+    "watchdog": {
+        "message": "[ClearURLs]: сторожевой таймер обнаружил проблему. ClearURLs будет перезапущен.",
+        "description": "This string is used as text for the watchdog",
+        "placeholders": {
+            "times": {
+                "content": "$1",
+                "example": "3"
+            }
+        }
+    },
     "domain_blocking_enabled": {
         "message": "Разрешить блокировку домена (может вызвать проблемы на сайтах, которые запрещают AdBlocker)",
         "description": "This string is used as label for the domain blocking switch"
@@ -320,5 +330,21 @@
     "ping_blocking_enabled_title": {
         "message": "Блокировка аудита гиперссылок",
         "description": "This string is used as title for the hyperlink auditing blocking switch"
+    },
+    "extension_description": {
+        "message": "Удаление элементов слежения из URL-адресов.",
+        "description": "Описание расширения"
+    },
+    "eTag_filtering_log": {
+        "message": "Заголовок ETag был удален из этого запроса",
+        "description": "This string is used on ETag header filtering in the ClearURLs log."
+    },
+    "eTag_filtering_enabled": {
+        "message": "Фильтровать заголовки ETag из запросов (см. <a href='https://en.wikipedia.org/wiki/HTTP_ETag#Tracking_using_ETags' target='_blank'>эту статью</a>)",
+        "description": "This string is used as label for the ETag header filtering switch"
+    },
+    "eTag_filtering_enabled_title": {
+        "message": "Фильтрация заголовков ETag. Примечание: очистите кэш перед первым использованием.",
+        "description": "This string is used as title for the ETag header filtering switch"
     }
 }

_locales/sv_SE/messages.json

@@ -301,6 +301,10 @@
         "message": "Tillåt referral marketing",
         "description": "This string is used as title for the referral marketing switch"
     },
+    "watchdog": {
+        "message": "[ClearURLs]: Ett problem har upptäckts. ClearURLs startar om.",
+        "description": "This string is used as text for the watchdog"
+    },
     "domain_blocking_enabled": {
         "message": "Tillåt domänblockering (Kan leda till problem på sidor som inte tillåter AdBlockers)",
         "description": "This string is used as label for the domain blocking switch"

_locales/tr/messages.json

@@ -301,6 +301,16 @@
         "message": "Tavsiye pazarlamasına izin verir",
         "description": "Bu dize tavsiye pazarlama anahtarı için başlık olarak kullanılır"
     },
+    "watchdog": {
+        "message": "[ClearURL'ler]: Güvenlik Zamanlayıcısı bir sorun tespit etti. ClearURL'ler yeniden başlatıldı.",
+        "description": "Bu dize güvenlik zamanlayıcısı için metin olarak kullanılır.",
+        "placeholders": {
+            "times": {
+                "content": "$1",
+                "example": "3"
+            }
+        }
+    },
     "domain_blocking_enabled": {
         "message": "Alan adı engellemeye izin ver (Reklam Engelleyicilere izin vermeyen sayfalarda sorunlara neden olabilir)",
         "description": "Bu dize, alan adı engelleme anahtarı için etiket olarak kullanılır"
@@ -320,5 +330,21 @@
     "ping_blocking_enabled_title": {
         "message": "Köprü denetimini engelle",
         "description": "Bu dize köprü denetim engelleme anahtarının başlığı olarak kullanılır"
+    },
+    "extension_description": {
+        "message": "İzleme öğelerini URL'lerden kaldırın.",
+        "description": "Uzantı açıklaması."
+    },
+    "eTag_filtering_log": {
+        "message": "ETag başlığı bu istekten kaldırıldı",
+        "description": "Bu dize, ClearURLs günlüğünde ETag üstbilgisi filtrelemesinde kullanılır."
+    },
+    "eTag_filtering_enabled": {
+        "message": "ETag başlıklarını isteklerden filtreler (Ayrıca bkz. <a href='https://en.wikipedia.org/wiki/HTTP_ETag#Tracking_using_ETags' target='_blank'>Bu makaleye</a>)",
+        "description": "Bu dize, ETag başlık filtreleme anahtarı için etiket olarak kullanılır"
+    },
+    "eTag_filtering_enabled_title": {
+        "message": "ETag başlıklarını filtreler. İpucu: İlk kullanımdan önce önbellek temizlenmelidir.",
+        "description": "Bu dize, ETag başlık filtreleme anahtarının başlığı olarak kullanılır"
     }
 }

_locales/uk/messages.json

@@ -72,7 +72,7 @@
         "description": "This string is used as title for the filter switch button on the popup page."
     },
     "popup_html_configs_switch_log": {
-        "message": "Журнал",
+        "message": "Логування",
         "description": "This string is used as name for the logging switch button on the popup page."
     },
     "popup_html_configs_switch_log_title": {
@@ -198,5 +198,153 @@
     "donate_button": {
         "message": "Внесок для розробників ClearURLs.",
         "description": "This string is used to refer to a donation page."
+    },
+    "clipboard_copy_link": {
+        "message": "Скопіювати \"чисте\" посилання",
+        "description": "This string is used in the context menu to copy clean links."
+    },
+    "context_menu_enabled": {
+        "message": "Відобразити контекстне меню",
+        "description": "This string is used toggle the context menu entry to copy clean links."
+    },
+    "history_listener_enabled": {
+        "message": "Запобігти трекінг через API історії браузеру (див. також: <a href='https://developer.mozilla.org/en-US/docs/Web/API/History_API#The_replaceState()_method' target='_blank'>Метод replaceState()</a>)",
+        "description": "This string is used as name for the history API listener label."
+    },
+    "cleaning_tool_page_title": {
+        "message": "ClearURLs є утилітою очищення посилань",
+        "description": "This string is used as title on the cleaning tool page."
+    },
+    "cleaning_tool_description": {
+        "message": "За допомогою цієї утиліти ви можете вставити URL-адреси для ії \"очищення\" після натискання на зелену кнопку. Ви можете вставити відразу кілька URL-адрес, але кожна URL-адреса повинна бути на окремому рядку.",
+        "description": "This string is used as description of the cleaning tool."
+    },
+    "cleaning_tool_btn": {
+        "message": "\"Чисті\" посилання",
+        "description": "This string is used as name for the clean url button."
+    },
+    "cleaning_tool_dirty_urls_label": {
+        "message": "Тут ви можете вставити \"брудні\" посилання:",
+        "description": "This string is used as title on the cleaning tool page for the dirty URLs."
+    },
+    "cleaning_tool_clean_urls_label": {
+        "message": "Тут ви можете знайти \"чисті\" посилання:",
+        "description": "This string is used as title on the cleaning tool page for the clean URLs."
+    },
+    "local_hosts_skipping": {
+        "message": "Не фільтрувати посилання на локальних адресах (10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, 100.64.0.0/10, 169.254.0.0/16, 127.0.0.1, localhost)",
+        "description": "This string is used as label for the local host skipping switch"
+    },
+    "local_hosts_skipping_title": {
+        "message": "Не фільтрує посилання на локальних адресах",
+        "description": "This string is used as title for the local host skipping switch"
+    },
+    "log_html_export_button": {
+        "message": "Експорт",
+        "description": "This string is used for the export button on the log page."
+    },
+    "log_html_export_button_title": {
+        "message": "Експортувати глобальний лог",
+        "description": "This string is used as title for the export button on the log page."
+    },
+    "log_html_import_button": {
+        "message": "Імпорт",
+        "description": "This string is used for the import button on the log page."
+    },
+    "log_html_import_button_title": {
+        "message": "Імпортувати глобальний лог",
+        "description": "This string is used as title for the import button on the log page."
+    },
+    "setting_html_export_button": {
+        "message": "Експрот",
+        "description": "This string is used as name for the export button on the settings page."
+    },
+    "setting_html_export_button_title": {
+        "message": "Експортує все",
+        "description": "This string is used as title for the export button on the settings page."
+    },
+    "setting_html_import_button": {
+        "message": "Імпорт",
+        "description": "This string is used as name for the reset button on the settings page."
+    },
+    "setting_html_import_button_title": {
+        "message": "Імпортує все",
+        "description": "This string is used as title for the import button on the settings page."
+    },
+    "setting_log_limit_label": {
+        "message": "Обмежити логування $LIMIT$ записів.",
+        "description": "This string is used as name for the log limit label.",
+        "placeholders": {
+            "limit": {
+                "content": "$1",
+                "example": "100"
+            }
+        }
+    },
+    "blocked_html_title": {
+        "message": "Цей сайт було заблоковано додатком <b>ClearURLs</b>",
+        "description": "This string is used as title on the blocked site page."
+    },
+    "blocked_html_body": {
+        "message": "Цей сайт було заблоковано додатком <b>ClearURLs</b>, оскільки ми ідентифікували його як рекламний і/або трекінговий сервіс.\nДля того, щоб відвідати цей сайт, ви повинні тимчасово відключати додаток або виключати блокування доменів в налаштуваннях ClearURLs.\nПісля цього ви зможете натитснути кнопку нижче, щоб завантажити сторінку.",
+        "description": "This string is used as body on the blocked site page."
+    },
+    "blocked_html_button": {
+        "message": "Відвідати сторінку",
+        "description": "This string is used as button on the blocked site page."
+    },
+    "referral_marketing_enabled": {
+        "message": "Дозволити реферальний маркетинг",
+        "description": "This string is used as label for the referral marketing switch"
+    },
+    "referral_marketing_enabled_title": {
+        "message": "Дозволяє реферальний маркетинг",
+        "description": "This string is used as title for the referral marketing switch"
+    },
+    "watchdog": {
+        "message": "[ClearURLs]: \"Сторожовий пес\" помітив проблему та вилетів $TIMES$ разів.\n",
+        "description": "This string is used as text for the watchdog",
+        "placeholders": {
+            "times": {
+                "content": "$1",
+                "example": "3"
+            }
+        }
+    },
+    "domain_blocking_enabled": {
+        "message": "Дозволити блокування домену (Може привести до проблем на сайтах, які блокують AdBlocker'и)",
+        "description": "This string is used as label for the domain blocking switch"
+    },
+    "domain_blocking_enabled_title": {
+        "message": "Дозволити блокування домену (Може привести до проблем на сайтах, які блокують AdBlocker'и)",
+        "description": "This string is used as title for the domain blocking switch"
+    },
+    "log_ping_blocked": {
+        "message": "Цей аудит гіперпосилань було заблоковано",
+        "description": "This string is used on hyperlink auditing in the ClearURLs log."
+    },
+    "ping_blocking_enabled": {
+        "message": "Відключити аудит гіперпосилань (див. також <a href='https://html.spec.whatwg.org/multipage/links.html#hyperlink-auditing' target='_blank'>цю статтю</a>)",
+        "description": "This string is used as label for the hyperlink auditing blocking switch"
+    },
+    "ping_blocking_enabled_title": {
+        "message": "Блокувати аудит гіперпосилань",
+        "description": "This string is used as title for the hyperlink auditing blocking switch"
+    },
+    "extension_description": {
+        "message": "Видалити елементи трекінгу з посилань",
+        "description": "Опис додатку (максимум 132 символи)"
+    },
+    "eTag_filtering_log": {
+        "message": "ETag був видалений з цього запиту",
+        "description": "Ця стрічка використовується для фільтрації заголовків ETag у журналі ClearURL."
+    },
+    "eTag_filtering_enabled": {
+        "message": "Фільтрує ETag заголовки в запитах (див. також <a href='https://en.wikipedia.org/wiki/HTTP_ETag#Tracking_using_ETags' target='_blank'>цю статтю</a>)",
+        "description": "Цей рядок використовується, як мітка для перемикача фільтра заголовка ETag"
+    },
+    "eTag_filtering_enabled_title": {
+        "message": "Фільтри заголовків ETag. \nПідказка: Кеш повинен бути скинутим перед першим використанням.",
+        "description": "Цей рядок використовується, як заголовок для перемикача фільтра заголовка ETag"
     }
 }

_locales/zh_CN/messages.json

@@ -207,10 +207,6 @@
         "message": "显示右键选单条目",
         "description": "This string is used toggle the context menu entry to copy clean links."
     },
-    "history_listener_enabled": {
-        "message": "Prevent tracking injection over history API (详见: <a href='https://developer.mozilla.org/en-US/docs/Web/API/History_API#The_replaceState()_method' target='_blank'>The replaceState() method</a>)",
-        "description": "This string is used as name for the history API listener label."
-    },
     "cleaning_tool_page_title": {
         "message": "ClearURLs的网址清理工具",
         "description": "This string is used as title on the cleaning tool page."
@@ -230,5 +226,9 @@
     "cleaning_tool_clean_urls_label": {
         "message": "清理后的网址:",
         "description": "This string is used as title on the cleaning tool page for the clean URLs."
+    },
+    "local_hosts_skipping": {
+        "message": "跳过本地主机链接（10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, 100.64.0.0/10, 169.254.0.0/16, 127.0.0.1, localhost）",
+        "description": "This string is used as label for the local host skipping switch"
     }
 }

_locales/zh_TW/messages.json

@@ -207,10 +207,6 @@
         "message": "顯示右鍵選單項目",
         "description": "This string is used toggle the context menu entry to copy clean links."
     },
-    "history_listener_enabled": {
-        "message": "Prevent tracking injection over history API (詳見: <a href='https://developer.mozilla.org/en-US/docs/Web/API/History_API#The_replaceState()_method' target='_blank'>The replaceState() method</a>)",
-        "description": "This string is used as name for the history API listener label."
-    },
     "cleaning_tool_page_title": {
         "message": "ClearURLs的網址清理工具",
         "description": "This string is used as title on the cleaning tool page."

clearurls.js

@@ -32,10 +32,10 @@ var os;
  * for each provider given as parameter.
  *
  * @param  {Provider} provider      Provider-Object
- * @param pureUrl                   URL as String
+ * @param  {string}   pureUrl       URL as String
- * @param {boolean} quiet           if the action should be displayed in log and statistics
+ * @param  {boolean}  quiet         If the action should be displayed in log and statistics
- * @param {requestDetails} request  the request details
+ * @param {requestDetails} request  The request details
- * @return {Array}                  Array with changes and url fields
+ * @return {object}                 Object with changes and url fields
  */
 function removeFieldsFormURL(provider, pureUrl, quiet = false, request = null) {
     let url = pureUrl;
@@ -82,7 +82,7 @@ function removeFieldsFormURL(provider, pureUrl, quiet = false, request = null) {
 
     /*
     * Expand the url by provider redirections. So no tracking on
-    * url redirections form sites to sites.
+    * url redirections form site to site.
     */
     let re = provider.getRedirection(url);
     if (re !== null) {
@@ -92,8 +92,8 @@ function removeFieldsFormURL(provider, pureUrl, quiet = false, request = null) {
         if (!quiet) {
             pushToLog(pureUrl, url, translate('log_redirect'));
             increaseGlobalURLCounter(1);
-            increaseBadged(false, request)
+            increaseBadged(false, request);
-        };
+        }
 
         return {
             "redirect": true,

core_js/eTagFilter.js

@@ -22,7 +22,8 @@
  * Filters eTag headers from web requests.
  */
 function eTagFilter(requestDetails) {
-    if(!requestDetails.responseHeaders || !storage.eTagFiltering) return {};
+    if(!requestDetails.responseHeaders || !storage.eTagFiltering
+        || storage.localHostsSkipping && checkLocalURL(requestDetails.url)) return {};
     const responseHeaders = requestDetails.responseHeaders;
 
     const filteredHeaders = responseHeaders.filter(header => {

core_js/google_link_fix.js

@@ -30,7 +30,7 @@
 
         ele.type = 'text/javascript';
         ele.textContent = "Object.defineProperty(window, 'rwt', {" +
-        "    value: function() { return false; }," +
+        "    value: function() { return true; }," +
         "    writable: false," +
         "    configurable: false" +
         "});";

core_js/storage.js

@@ -199,7 +199,7 @@ function initSettings() {
     storage.historyListenerEnabled = true;
     storage.localHostsSkipping = true;
     storage.referralMarketing = false;
-    storage.logLimit = -1;
+    storage.logLimit = 100;
     storage.domainBlocking = true;
     storage.pingBlocking = true;
     storage.eTagFiltering = true;

core_js/tools.js

@@ -233,9 +233,13 @@ function setBadgedStatus() {
             browser.browserAction.setBadgeBackgroundColor({
                 'color': color
             }).catch(handleError);
-            browser.browserAction.setBadgeTextColor({
+
-                color: "#FFFFFF"
+            // Works only in Firefox: https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/browserAction/setBadgeTextColor#Browser_compatibility
-            }).catch(handleError);
+            if (getBrowser() === "Firefox") {
+                browser.browserAction.setBadgeTextColor({
+                    color: "#FFFFFF"
+                }).catch(handleError);
+            }
         }
     });
 }
@@ -283,7 +287,7 @@ Object.prototype.getOrDefault = function (key, defaultValue) {
 };
 
 function handleError(error) {
-    console.log(translate('core_error') + ":" + error);
+    console.log("[ClearURLs ERROR]:" + error);
 }
 
 /**

data/data.min.json

@@ -3,6 +3,62 @@
         "amazon": {
             "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(amazon)(\\.[a-zA-Z]{2,}).*",
             "completeProvider": false,
+            "rules": [
+                "pf_rd_[a-zA-Z]",
+                "qid",
+                "sr",
+                "srs",
+                "pd_rd_[a-zA-Z]*",
+                "__mk_[a-zA-Z]{1,3}_[a-zA-Z]{1,3}",
+                "spIA",
+                "ms3_c",
+                "[a-zA-Z%0-9]*ie",
+                "refRID",
+                "colid",
+                "coliid",
+                "[^a-zA-Z%0-9]adId",
+                "qualifier",
+                "_encoding",
+                "smid",
+                "field-lbr_brands_browse-bin",
+                "ref_?",
+                "th",
+                "sprefix",
+                "crid",
+                "keywords",
+                "cv_ct_[a-zA-Z]+",
+                "linkCode",
+                "creativeASIN",
+                "ascsubtag",
+                "aaxitk",
+                "hsa_cr_id",
+                "sb-ci-[a-zA-Z]+",
+                "rnid",
+                "dchild",
+                "camp",
+                "creative",
+                "s"
+            ],
+            "referralMarketing": [
+                "tag"
+            ],
+            "exceptions": [
+                ".*(amazon\\.).*(\\/gp).*\\/redirector.html\\/.*",
+                ".*(amazon\\.).*(\\/hz\\/reviews-render\\/ajax\\/).*",
+                ".*(amazon\\.).*(\\/gp).*\\/cart\\/ajax-update.html\\/.*",
+                ".*(amazon\\.).*\\/message-us\\?.*",
+                ".*(amazon\\.).*(\\/gp).*\\/video\\/api\\/.*",
+                ".*(amazon\\.).*\\/s\\?.*"
+            ],
+            "rawRules": [
+                "\\/ref=[^\\/\\?]*"
+            ],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "amazon search": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(amazon)(\\.[a-zA-Z]{2,}).*\\/s.*\\?.*",
+            "completeProvider": false,
             "rules": [
                 "pf_rd_[a-zA-Z]",
                 "qid",
@@ -41,15 +97,10 @@
             "referralMarketing": [
                 "tag"
             ],
-            "exceptions": [
-                ".*(amazon\\.).*(\\/gp).*\\/redirector.html\\/.*",
-                ".*(amazon\\.).*(\\/hz\\/reviews-render\\/ajax\\/).*",
-                ".*(amazon\\.).*(\\/gp).*\\/cart\\/ajax-update.html\\/.*",
-                ".*(amazon\\.).*\\/message-us\\?.*"
-            ],
             "rawRules": [
                 "\\/ref=[^\\/\\?]*"
             ],
+            "exceptions": [],
             "redirections": [],
             "forceRedirection": false
         },
@@ -100,7 +151,8 @@
                 "sourceid",
                 "sxsrf",
                 "rlz",
-                "i-would-rather-use-firefox"
+                "i-would-rather-use-firefox",
+                "stick"
             ],
             "referralMarketing": [
                 "referrer"
@@ -133,7 +185,8 @@
             "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(google)(\\.[a-zA-Z]{2,})\\/search\\?.*",
             "completeProvider": false,
             "rules": [
-                "client"
+                "client",
+                "sclient"
             ],
             "referralMarketing": [],
             "rawRules": [],
@@ -179,7 +232,7 @@
             "urlPattern": ".*",
             "completeProvider": false,
             "rules": [
-                "(%3F)?utm(_[a-zA-Z]*)?",
+                "(%3F)?utm(_[a-zA-Z_]*)?",
                 "(%3F)?ga_[a-zA-Z_]+",
                 "(%3F)?yclid",
                 "(%3F)?_openstat",
@@ -209,7 +262,8 @@
                 "(%3F)?dclid",
                 "Echobox",
                 "(%3F)?spm",
-                "(%3F)?vn(_[a-zA-Z]*)+"
+                "(%3F)?vn(_[a-zA-Z]*)+",
+                "(%3F)?cid"
             ],
             "referralMarketing": [],
             "rawRules": [],
@@ -249,7 +303,11 @@
                 ".*(\\.gog\\.com\\/click\\.html).*",
                 ".*(login\\.progressive\\.com).*",
                 ".*(sephora\\.com\\/api\\/).*",
-                ".*(contestgirl\\.com).*"
+                ".*(contestgirl\\.com).*",
+                ".*agenciatributaria.gob.es.*",
+                ".*login\\.ingbank\\.pl.*",
+                "wss?:\\/\\/.*zoom\\.us.*",
+                ".*api\\.bilibili\\.com.*"
             ],
             "redirections": [],
             "forceRedirection": false
@@ -400,7 +458,18 @@
         "reddit": {
             "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(reddit)(\\.[a-zA-Z]{2,}).*",
             "completeProvider": false,
-            "rules": [],
+            "rules": [
+                "%24deep_link",
+                "\\$deep_link",
+                "correlation_id",
+                "ref_campaign",
+                "ref_source",
+                "%243p",
+                "\\$3p",
+                "%24original_url",
+                "\\$original_url",
+                "_branch_match_id"
+            ],
             "referralMarketing": [],
             "rawRules": [],
             "exceptions": [],
@@ -1052,7 +1121,9 @@
             "referralMarketing": [],
             "rawRules": [],
             "exceptions": [],
-            "redirections": [],
+            "redirections": [
+                ".*u=([^&]*)"
+            ],
             "forceRedirection": false
         },
         "lazada.com.my": {
@@ -1476,6 +1547,406 @@
             "exceptions": [],
             "redirections": [],
             "forceRedirection": false
+        },
+        "srvtrck.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(srvtrck)(\\.com).*",
+            "completeProvider": false,
+            "rules": [],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [
+                ".*url=([^&]*)"
+            ],
+            "forceRedirection": false
+        },
+        "mysku.ru": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(mysku)(\\.ru).*",
+            "completeProvider": false,
+            "rules": [],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [
+                ".*r=([^&]*)"
+            ],
+            "forceRedirection": false
+        },
+        "admitad.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(admitad)(\\.com).*",
+            "completeProvider": false,
+            "rules": [],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [
+                ".*ulp=([^&]*)"
+            ],
+            "forceRedirection": false
+        },
+        "taobao.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(taobao)(\\.com).*",
+            "completeProvider": false,
+            "rules": [
+                "price",
+                "sourceType",
+                "suid",
+                "ut_sk",
+                "un",
+                "share_crt_v",
+                "sp_tk",
+                "cpp",
+                "shareurl",
+                "short_name",
+                "app",
+                "scm[_a-zA-Z\\-]*",
+                "pvid",
+                "algo_expid",
+                "algo_pvid",
+                "ns",
+                "abbucket",
+                "ali_refid",
+                "ali_trackid",
+                "acm",
+                "utparam",
+                "pos",
+                "abtest",
+                "trackInfo",
+                "user_number_id",
+                "utkn",
+                "scene",
+                "mytmenu",
+                "turing_bucket",
+                "lygClk",
+                "impid",
+                "bftTag",
+                "bftRwd"
+            ],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "tmall.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(tmall)(\\.com).*",
+            "completeProvider": false,
+            "rules": [
+                "price",
+                "sourceType",
+                "suid",
+                "ut_sk",
+                "un",
+                "share_crt_v",
+                "sp_tk",
+                "cpp",
+                "shareurl",
+                "short_name",
+                "app",
+                "scm[_a-zA-Z\\-]*",
+                "pvid",
+                "algo_expid",
+                "algo_pvid",
+                "ns",
+                "abbucket",
+                "ali_refid",
+                "ali_trackid",
+                "acm",
+                "utparam",
+                "pos",
+                "abtest",
+                "trackInfo",
+                "user_number_id",
+                "utkn",
+                "scene",
+                "mytmenu",
+                "turing_bucket",
+                "lygClk",
+                "impid",
+                "bftTag",
+                "bftRwd",
+                "activity_id"
+            ],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "tb.cn": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(tb)(\\.cn).*",
+            "completeProvider": false,
+            "rules": [
+                "sm"
+            ],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "bilibili.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(bilibili)(\\.com).*",
+            "completeProvider": false,
+            "rules": [
+                "callback",
+                "spm_id_from",
+                "from_source",
+                "from",
+                "seid"
+            ],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [
+                ".*(api\\.bilibili\\.com)\\/.*"
+            ],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "marketscreener.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(marketscreener)(\\.com).*",
+            "completeProvider": false,
+            "rules": [
+                "type_recherche",
+                "mots",
+                "noredirect",
+                "RewriteLast",
+                "lien",
+                "aComposeInputSearch",
+                "type_recherche_forum",
+                "add_mots"
+            ],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [
+                ".*\\/search\\/.*\\?.*"
+            ],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "marketscreener.com search": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(marketscreener)(\\.com).*\\/search\\/.*\\?.*",
+            "completeProvider": false,
+            "rules": [
+                "type_recherche",
+                "noredirect",
+                "RewriteLast",
+                "lien",
+                "aComposeInputSearch",
+                "type_recherche_forum"
+            ],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "bestbuy.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(bestbuy)(\\.com).*",
+            "completeProvider": false,
+            "rules": [
+                "irclickid",
+                "irgwc",
+                "loc",
+                "acampID",
+                "mpid",
+                "intl"
+            ],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "digidip.net": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(digidip)(\\.net).*",
+            "completeProvider": false,
+            "rules": [],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [
+                ".*url=([^&]*)"
+            ],
+            "forceRedirection": false
+        },
+        "tiktok.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(tiktok)(\\.com).*",
+            "completeProvider": false,
+            "rules": [
+                "u_code",
+                "preview_pb",
+                "language",
+                "_d",
+                "timestamp",
+                "user_id",
+                "share_app_name",
+                "share_iid",
+                "source"
+            ],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "autoplus.fr": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(autoplus)(\\.fr).*",
+            "completeProvider": false,
+            "rules": [
+                "idprob",
+                "hash",
+                "sending_id",
+                "site_id",
+                "dr_tracker"
+            ],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "bigfishgames.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(bigfishgames)(\\.com).*",
+            "completeProvider": false,
+            "rules": [
+                "pc",
+                "npc",
+                "npv[0-9]+",
+                "npi"
+            ],
+            "referralMarketing": [],
+            "rawRules": [
+                "\\?pc$"
+            ],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "dpbolvw.net": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(dpbolvw)(\\.net).*",
+            "completeProvider": false,
+            "rules": [],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [
+                ".*url=([^&]*)"
+            ],
+            "forceRedirection": false
+        },
+        "humblebundle.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(humblebundle)(\\.com).*",
+            "completeProvider": false,
+            "rules": [],
+            "referralMarketing": [
+                "partner"
+            ],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "cafepedagogique.net": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(cafepedagogique)(\\.net).*",
+            "completeProvider": false,
+            "rules": [
+                "actId",
+                "actCampaignType",
+                "actSource"
+            ],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "bloculus.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(bloculus)(\\.com).*",
+            "completeProvider": false,
+            "rules": [
+                "tl_[a-zA-Z_]+"
+            ],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "mailpanion.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(mailpanion)(\\.com).*",
+            "completeProvider": false,
+            "rules": [],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [
+                ".*destination=([^&]*)"
+            ],
+            "forceRedirection": false
+        },
+        "signtr.website": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(signtr)(\\.website).*",
+            "completeProvider": false,
+            "rules": [],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [
+                ".*redirect=([^&]*)"
+            ],
+            "forceRedirection": false
+        },
+        "mailtrack.io": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(mailtrack)(\\.io).*",
+            "completeProvider": false,
+            "rules": [],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [
+                ".*url=([^&]*)"
+            ],
+            "forceRedirection": false
+        },
+        "zillow.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(zillow)(\\.com).*",
+            "completeProvider": false,
+            "rules": [
+                "rtoken"
+            ],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "realtor.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(realtor)(\\.com).*",
+            "completeProvider": false,
+            "rules": [
+                "ex",
+                "identityID",
+                "MID",
+                "RID"
+            ],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "redfin.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(redfin)(\\.com).*",
+            "completeProvider": false,
+            "rules": [
+                "riftinfo"
+            ],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
         }
     }
 }

html/log.html

@@ -114,7 +114,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <script src="../browser-polyfill.js"></script>
     <script src="../external_js/jquery-3.4.1.min.js"></script>
     <script src="../external_js/bootstrap.min.js"></script>
-    <script src="../external_js/dataTables.min.js"></script>
+    <script src="../external_js/datatables.min.js"></script>
     <script src="../external_js/fontawesome/all.min.js"></script>
     <script src="../core_js/log.js"></script>
     <script src="../core_js/write_version.js"></script>

manifest.json

@@ -1,16 +1,11 @@
 {
     "manifest_version": 2,
     "name": "ClearURLs",
-    "version": "1.16.0",
+    "version": "1.17.0",
     "author": "Kevin Röbert",
     "description": "__MSG_extension_description__",
     "homepage_url": "https://gitlab.com/KevinRoebert/ClearUrls",
     "default_locale": "en",
-    "applications": {
-        "gecko": {
-            "id": "{74145f27-f039-47ce-a470-a662b129930a}"
-        }
-    },
     "icons": {
         "16": "img/clearurls_16x16.png",
         "19": "img/clearurls_19x19.png",
@@ -43,7 +38,6 @@
         "default_popup": "html/popup.html"
     },
     "permissions": [
-        "*://*/*",
         "<all_urls>",
         "webRequest",
         "webRequestBlocking",
@@ -74,14 +68,6 @@
         ]
     },
     "content_scripts": [
-        {
-            "matches": [
-                "<all_urls>"
-            ],
-            "js": [
-                "browser-polyfill.js"
-            ]
-        },
         {
             "all_frames": true,
             "matches": [