diff --git a/.gitignore b/.gitignore index a6ce8bd9..2d2eb810 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ _site/ -Gemfile.lock .sass-cache/ .DS_Store diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 00000000..1f032e3c --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,70 @@ +GEM + remote: https://rubygems.org/ + specs: + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + colorator (1.1.0) + concurrent-ruby (1.1.5) + em-websocket (0.5.1) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0.6.0) + eventmachine (1.2.7) + ffi (1.11.1) + forwardable-extended (2.6.0) + http_parser.rb (0.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + jekyll (3.8.5) + addressable (~> 2.4) + colorator (~> 1.0) + em-websocket (~> 0.5) + i18n (~> 0.7) + jekyll-sass-converter (~> 1.0) + jekyll-watch (~> 2.0) + kramdown (~> 1.14) + liquid (~> 4.0) + mercenary (~> 0.3.3) + pathutil (~> 0.9) + rouge (>= 1.7, < 4) + safe_yaml (~> 1.0) + jekyll-multiple-languages-plugin (1.6.0) + jekyll (>= 2.0, < 4.0) + jekyll-sass-converter (1.5.2) + sass (~> 3.4) + jekyll-sitemap (1.2.0) + jekyll (~> 3.3) + jekyll-watch (2.2.1) + listen (~> 3.0) + kramdown (1.17.0) + liquid (4.0.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + mercenary (0.3.6) + pathutil (0.16.2) + forwardable-extended (~> 2.6) + public_suffix (3.1.1) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + rouge (2.2.1) + ruby_dep (1.5.0) + safe_yaml (1.0.5) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + +PLATFORMS + ruby + +DEPENDENCIES + jekyll + jekyll-multiple-languages-plugin + jekyll-sitemap + tzinfo-data + +BUNDLED WITH + 2.0.1 diff --git a/_i18n/en.yml b/_i18n/en.yml index 19b58cfe..bdbec683 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -157,6 +157,7 @@ footer: socially_motivated: "privacytools.io is a socially motivated website that provides information for protecting your data security and privacy. Never trust any company with your privacy, always encrypt." privacy_policy: "View our privacy policy" learn_more: "Learn More" + javascript: "JavaScript Licenses" resources: tools: "Privacy Tools" classic: "Prefer the classic site? View a single-page layout." diff --git a/_includes/footer.html b/_includes/footer.html index 255b1a82..5398fc5e 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -71,8 +71,19 @@
-

{% t footer.no_ads %} {% t footer.socially_motivated %} {% t footer.privacy_policy %}.

-

Tor v3: privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion ({% t footer.learn_more %})

-
+ + + {% t footer.javascript %} + +

+ {% t footer.no_ads %} + {% t footer.socially_motivated %} + {% t footer.privacy_policy %}. +

+

+ Tor v3: privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion + ({% t footer.learn_more %}) +

+ diff --git a/_includes/scripts.html b/_includes/scripts.html index 08fffe2a..d55f2c76 100644 --- a/_includes/scripts.html +++ b/_includes/scripts.html @@ -11,17 +11,4 @@ - User privacy protection --> - diff --git a/_includes/sections/browser-tweaks.html b/_includes/sections/browser-tweaks.html index 277bbd57..62b2ec4e 100644 --- a/_includes/sections/browser-tweaks.html +++ b/_includes/sections/browser-tweaks.html @@ -52,9 +52,6 @@
dom.event.clipboardevents.enabled = false
Disable that websites can get notifications if you copy, paste, or cut something from a web page, and it lets them know which part of the page had been selected.
-
geo.enabled = false
-
Disables geolocation.
-
media.eme.enabled = false

Disables playback of DRM-controlled HTML5 content, which, if enabled, automatically downloads the Widevine Content Decryption Module provided by Google Inc. Details

@@ -118,23 +115,8 @@
-
network.trr.mode = 2
-
- Use Trusted Recursive Resolver (DNS-over-HTTPS) first and if it fails, use the system resolver Source - -
- -
network.trr.uri = CHANGEME
-
The address of your DNS-over-HTTPS provider, if you don't have one, check our encrypted DNS recommendations. It can also be changed in Settings, Network Settings, Enable DNS over HTTPS, Use Provider, Custom.
- -
network.security.esni.enabled = true
-
Hide the address which you are requesting SSL certificate for if the server supports it. This requires DoH/TRR to be enabled even on Android 9+ when Private DNS is enabled.
+
Looking for TRR, DoH or ESNI?
+
They have moved to our DNS page.
webgl.disabled = true
WebGL is a potential security risk. Source
diff --git a/_includes/sections/dns.html b/_includes/sections/dns.html index 219f170c..19c3e777 100644 --- a/_includes/sections/dns.html +++ b/_includes/sections/dns.html @@ -307,6 +307,10 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
  • Encrypted DNS clients for desktop:
  • Encrypted DNS clients for mobile: @@ -330,6 +334,13 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
  • Further reading: diff --git a/about/javascript/index.html b/about/javascript/index.html new file mode 100644 index 00000000..1b77e49a --- /dev/null +++ b/about/javascript/index.html @@ -0,0 +1,27 @@ +

    JavaScript Licenses

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    main.jsCC0-1.0-only
    redirects.jsCC0-1.0-only
    bootstrap.min.jsExpat
    jquery-3.3.1.min.jsExpat
    popper.min.jsExpat
    sortable.min.jsExpat
    diff --git a/assets/js/main.js b/assets/js/main.js index 6d68c8bc..f2925aad 100644 --- a/assets/js/main.js +++ b/assets/js/main.js @@ -1,13 +1,8 @@ -// Tooltips -$(function () { - $("[data-toggle='tooltip']").tooltip(); +$(function() { + $("[data-toggle='tooltip']").tooltip(); }); - -// // Navbar dropdowns -// - const navSections = document.querySelectorAll(".nav-details"); navSections.forEach(navSection => { @@ -31,3 +26,22 @@ function navSectionsClose(event) { navSection.open = !open; }); } + +// Matomo +var _paq = window._paq || []; +/* tracker methods like "setCustomDimension" should be called before "trackPageView" */ +_paq.push(["trackPageView"]); +_paq.push(["enableLinkTracking"]); +(function() { + var u = "https://stats.privacytools.io/"; + _paq.push(["setTrackerUrl", u + "matomo.php"]); + _paq.push(["setSiteId", "1"]); + var d = document, + g = d.createElement("script"), + s = d.getElementsByTagName("script")[0]; + g.type = "text/javascript"; + g.async = true; + g.defer = true; + g.src = u + "matomo.js"; + s.parentNode.insertBefore(g, s); +})();