Merge branch 'master' of https://gitlab.com/KevinRoebert/ClearUrls

Load the icon settings at boot

.gitlab/issue_templates/Bug.md

@@ -36,6 +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]
 
 ### Log
 <!-- Please enable the log functionality of ClearURLs and copy your log into this table. -->

_locales/de/messages.json

@@ -242,5 +242,10 @@
     "error_report_url": {
         "message": "Es schaut so aus, als ob diese URL schon gemeldet wurde.",
         "description": ""
+    },
+
+    "donate_button": {
+        "message": "Eine Spende (Schenkung) für den ClearURLs Urheber.",
+        "description": ""
     }
 }

_locales/en/messages.json

@@ -242,5 +242,10 @@
     "error_report_url": {
         "message": "It seems like this URL has already been reported.",
         "description": ""
+    },
+
+    "donate_button": {
+        "message": "A donation for the ClearURLs creator.",
+        "description": ""
     }
 }

clearurls.js

@@ -20,6 +20,7 @@ getDataFromDisk();
 function start(items)
 {
     initStorage(items);
+    changeIcon();
 
     /**
     * Save OS Version

core_js/popup_new.js

@@ -208,6 +208,7 @@ function setText()
     injectText('configs_head','popup_html_configs_head');
     injectText('configs_switch_statistics','configs_switch_statistics');
     injectText('reportButton', 'popup_html_report_button', true);
+    $('#donate').prop('title', translate('donate_button'));
 }
 
 /**

css/core.css

@@ -14,3 +14,13 @@ body {
 .col-sm-1 {
     margin-top: -10px;
 }
+
+#donate {
+    transition: 0.3s;
+    opacity: 0.8;
+    color: red;
+}
+
+#donate:hover {
+    opacity: 1;
+}

data/data.json

@@ -63,20 +63,20 @@
                 "sa=[^\\/|\\?|&]*(\\/|&(amp;)?)?",
                 "dpr=[^\\/|\\?|&]*(\\/|&(amp;)?)?",
                 "hl=[^\\/|\\?|&]*(\\/|&(amp;)?)?",
-                "btnG=[^\\/|\\?|&]*(\\/|&(amp;)?)?"
+                "btn[a-zA-Z]*=[^\\/|\\?|&]*(\\/|&(amp;)?)?"
             ],
             "exceptions": [
-                ".*(mail\\.google\\.).*(\\/mail\\/u\\/0)\\/.*",
+                ".*(mail\\.google\\.).*(\\/mail\\/u\\/0).*",
-                ".*(mail\\.google\\.).*(\\/mail\\/u\\/0)\\/.*",
                 ".*(google\\.).*(\\/upload)?(\\/drive)\\/.*",
                 ".*(docs\\.google\\.).*\\/.*",
                 ".*(accounts\\.google\\.).*",
                 ".*(google\\.).*\\/searchbyimage\\?image_url=[^\\/|\\?|&]*(\\/|&(amp;)?)?",
                 ".*(hangouts\\.google\\.).*\\/webchat.*zx=[^\\/|\\?|&]*(\\/|&(amp;)?)?",
                 ".*(client-channel\\.google\\.).*\\/client-channel.*zx=[^\\/|\\?|&]*(\\/|&(amp;)?)?",
-                ".*(google\\.).*\\/complete\\/search\\?client=youtube.*gs_gbg=[^\\/|\\?|&]*(\\/|&(amp;)?)?",
+                ".*(google\\.).*\\/complete\\/search\\?.*gs_[a-zA-Z]*=[^\\/|\\?|&]*(\\/|&(amp;)?)?",
                 ".*(google\\.).*\\/s\\?tbm=map.*gs_[a-zA-Z]*=[^\\/|\\?|&]*(\\/|&(amp;)?)?",
-                ".*(news\\.google\\.).*\\?hl=.*"
+                ".*(news\\.google\\.).*\\?hl=.*",
+                ".*(google\\.).*\\/setprefs\\?.*hl=[^\\/|\\?|&]*(\\/|&(amp;)?)?"
             ],
             "redirections": [
                 ".*google\\..*\\/.*url\\?.*url=([^&]*)"
@@ -186,7 +186,7 @@
             "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-]*\\.)?(facebook)(\\.[a-zA-Z]{2,})(.*\\?.*)",
             "completeProvider": false,
             "rules": [
-                "hc_location=[^\\/|\\?|&]*(\\/|&(amp;)?)?",
+                "hc_[a-zA-Z]*=[^\\/|\\?|&]*(\\/|&(amp;)?)?",
                 "ref=[^\\/|\\?|&]*(\\/|&(amp;)?)?"
             ],
             "exceptions": [

data/rules.hash

@@ -1 +1 @@
-ebf585f37a97c528de8465c017db1280283db472c5e66dcf0181821c57434143
+a95e87aada0aa139767457391cfbfb7480638dd29b5872f97030844a9eb69db6

html/popup.html

@@ -28,12 +28,14 @@
                                 </span><br />
                                 <span class="label label-warning pull-left small-version"
                                 id="version"></span>
+                                <a id="donate" target="_blank" href="https://www.paypal.me/KevinRoebert">
+                                    <span class="pull-right glyphicon glyphicon-heart"></span>
+                                </a>
                             </span>
                         </div>
                     </div>
                 </nav>
             </div>
-
             <div class="row" id="incognito" style="display:none;">
                 <div class="col-sm-1">
                     <b class="text-justify word-wrap" style="color: #FF7800;">

manifest.json

@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "ClearURLs",
-    "version": "1.3.3.16",
+    "version": "1.3.3.18",
     "author": "Kevin R.",
     "description": "Remove tracking elements form URLs.",
     "homepage_url": "https://gitlab.com/KevinRoebert/ClearUrls",