diff --git a/.github/lockdown.yml b/.github/lockdown.yml index d109544..29f62a0 100644 --- a/.github/lockdown.yml +++ b/.github/lockdown.yml @@ -2,34 +2,38 @@ # 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 +#skipCreatedBefore: false # Issues and pull requests with these labels will be ignored. Set to `[]` to disable -exemptLabels: [] +#exemptLabels: [] # Comment to post before closing or locking. Set to `false` to disable -comment: true +#comment: true # Label to add before closing or locking. Set to `false` to disable -label: true +#label: true # Close issues and pull requests -close: true +#close: true # Lock issues and pull requests -lock: true +#lock: true # Limit to only `issues` or `pulls` -only: pulls +#only: pulls # Optionally, specify configuration settings just for `issues` or `pulls` -# issues: -# label: wontfix +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 are pull requests accepted. + 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 diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md index d7fa4e2..6d3e67f 100644 --- a/.gitlab/issue_templates/Bug.md +++ b/.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 diff --git a/core_js/storage.js b/core_js/storage.js index 65f73ec..49c128f 100644 --- a/core_js/storage.js +++ b/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; diff --git a/data/data.min.json b/data/data.min.json index 365da98..ad05201 100644 --- a/data/data.min.json +++ b/data/data.min.json @@ -135,7 +135,8 @@ "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(google)(\\.[a-zA-Z]{2,})\\/search\\?.*", "completeProvider": false, "rules": [ - "client" + "client", + "sclient" ], "referralMarketing": [], "rawRules": [], @@ -251,7 +252,8 @@ ".*(\\.gog\\.com\\/click\\.html).*", ".*(login\\.progressive\\.com).*", ".*(sephora\\.com\\/api\\/).*", - ".*(contestgirl\\.com).*" + ".*(contestgirl\\.com).*", + ".*agenciatributaria.gob.es.*" ], "redirections": [], "forceRedirection": false @@ -402,7 +404,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": [], @@ -1666,6 +1679,35 @@ "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 } } -} +} \ No newline at end of file diff --git a/manifest.json b/manifest.json index efc8d5a..b6dcbe7 100644 --- a/manifest.json +++ b/manifest.json @@ -38,7 +38,6 @@ "default_popup": "html/popup.html" }, "permissions": [ - "*://*/*", "", "webRequest", "webRequestBlocking",