Merge upstream commits into main

This commit is contained in:
Jonah Aragon 2021-01-15 04:28:31 -06:00
commit 05ad5939da
No known key found for this signature in database
GPG Key ID: 6A957C9A9A9429F7
14 changed files with 23 additions and 35 deletions

View File

@ -3,7 +3,7 @@
href="{{ include.link }}" class="badge badge-{{ include.color | default: "info" }}" href="{{ include.link }}" class="badge badge-{{ include.color | default: "info" }}"
{% if include.tooltip %} {% if include.tooltip %}
data-toggle="tooltip" data-toggle="tooltip"
title="{{ include.tooltip }}"><i class="{{ include.icon | default: "far fa-question-circle"}}"></i> {{ include.text }} data-original-title="{{ include.tooltip }}"><i class="{{ include.icon | default: "far fa-question-circle"}}"></i> {{ include.text }}
{% else %}><i class="{{ include.icon | default: "fas fa-external-link-alt"}}"></i> {{ include.text }}{% endif %} {% else %}><i class="{{ include.icon | default: "fas fa-external-link-alt"}}"></i> {{ include.text }}{% endif %}
</a> </a>
{% else %} {% else %}
@ -11,7 +11,7 @@
class="badge badge-{{ include.color | default: "info" }}" class="badge badge-{{ include.color | default: "info" }}"
{% if include.tooltip %} {% if include.tooltip %}
data-toggle="tooltip" data-toggle="tooltip"
title="{{ include.tooltip }}" data-original-title="{{ include.tooltip }}"
> <i class="{{ include.icon | default: "far fa-question-circle"}}"></i> {{include.text}} > <i class="{{ include.icon | default: "far fa-question-circle"}}"></i> {{include.text}}
{% else %} {% else %}
> {% if include.icon %}<i class="{{ include.icon }}"></i>{% endif %} {{include.text}} > {% if include.icon %}<i class="{{ include.icon }}"></i>{% endif %} {{include.text}}

View File

@ -17,7 +17,7 @@
{% assign text = label_data[1] %} {% assign text = label_data[1] %}
{% assign tooltip = label_data[2] | default: "" %} {% assign tooltip = label_data[2] | default: "" %}
{% assign help_icon = '<i class="far fa-question-circle"></i>' %} {% assign help_icon = '<i class="far fa-question-circle"></i>' %}
<span class="badge badge-{{color}}" {% if tooltip %} data-toggle="tooltip" title="{{ tooltip }}">{{text}} {{ help_icon <span class="badge badge-{{color}}" {% if tooltip %} data-toggle="tooltip" data-original-title="{{ tooltip }}">{{text}} {{ help_icon
}} }}
{% else %} {% else %}
>{{text}} >{{text}}

View File

@ -14,7 +14,7 @@
class="badge badge-{{color}}" class="badge badge-{{color}}"
{% if tooltip %} {% if tooltip %}
data-toggle="tooltip" data-toggle="tooltip"
title="{{ tooltip }}" data-original-title="{{ tooltip }}"
> {{text}} {{ help_icon }} > {{text}} {{ help_icon }}
{% else %} {% else %}
> {{text}} > {{text}}

View File

@ -138,7 +138,7 @@
<h3>Android</h3> <h3>Android</h3>
<div class="alert alert-warning" role="alert"> <div class="alert alert-warning" role="alert">
Unfortunately the Android version of Firefox <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1398097">doesn't support managing tabs as containers</a>. The recommended extensions below are a substitute, however as APIs do not exist for clearing <a href="https://en.wikipedia.org/wiki/Indexed_Database_API">IndexedDB</a>, <a href="https://en.wikipedia.org/wiki/Progressive_web_application#Service_workers">Service Workers</a> cache, <a href="https://en.wikipedia.org/wiki/Progressive_web_application#AppCache_(obsolete)">appCache</a>, or cache by host. As a result they are not as good as the above Temporary Container suggestions. Unfortunately the Android version of Firefox <a href="https://github.com/stoically/temporary-containers/issues/465">doesn't yet have Temporary Container support</a>. The recommended extensions below are a substitute, however as APIs do not exist for clearing <a href="https://en.wikipedia.org/wiki/Indexed_Database_API">IndexedDB</a>, <a href="https://en.wikipedia.org/wiki/Progressive_web_application#Service_workers">Service Workers</a> cache, <a href="https://en.wikipedia.org/wiki/Progressive_web_application#AppCache_(obsolete)">appCache</a>, or cache by host. As a result they are not as good as the above Temporary Container suggestions.
</div> </div>
{% include legacy/cardv2.html {% include legacy/cardv2.html

View File

@ -26,6 +26,6 @@
<h3>Worth Mentioning</h3> <h3>Worth Mentioning</h3>
<ul> <ul>
<li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration. {% include badge.html color="warning" tooltip="Cryptomator's mobile apps are not open-source." link="https://github.com/cryptomator/cryptomator-android/issues/1#issuecomment-257979375" icon="fas fa-exclamation-triangle" %}</li> <li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration.</li>
<li><a href="https://cryptpad.fr">CryptPad</a> - Free and end-to-end encrypted real time collaboration sharing folders, media, and documents.</li> <li><a href="https://cryptpad.fr">CryptPad</a> - Free and end-to-end encrypted real time collaboration sharing folders, media, and documents.</li>
</ul> </ul>

View File

@ -95,7 +95,7 @@ We also log how many times this or that tracker has been blocked. We need this i
<td> <td>
<div <div
class="btn-secondary btn-icon" class="btn-secondary btn-icon"
title="&quot;No logs.&quot;" data-original-title="&quot;No logs.&quot;"
data-toggle="tooltip" data-toggle="tooltip"
data-placement="bottom"> data-placement="bottom">
<span class="fas fa-globe"></span> <span class="fas fa-globe"></span>
@ -186,7 +186,7 @@ We also log how many times this or that tracker has been blocked. We need this i
<td> <td>
<div <div
class="btn-secondary btn-icon" class="btn-secondary btn-icon"
title="&quot;CZ.NIC resolvers neither collect any personal data nor gather information on pages where your computer sends personal data.&quot;" data-original-title="&quot;CZ.NIC resolvers neither collect any personal data nor gather information on pages where your computer sends personal data.&quot;"
data-toggle="tooltip" data-toggle="tooltip"
data-placement="bottom"> data-placement="bottom">
<span class="fas fa-globe"></span> <span class="fas fa-globe"></span>
@ -507,7 +507,7 @@ We also log how many times this or that tracker has been blocked. We need this i
<td> <td>
<div <div
class="btn-secondary btn-icon" class="btn-secondary btn-icon"
title="&quot;Absolutely nothing is being logged, neither about the users nor the usage of this service. I do keep graphs of the total number of queries, but no personally identifiable information is saved. The data that is saved will never be sold or used for anything except capacity planning of the service.&quot;" data-original-title="&quot;Absolutely nothing is being logged, neither about the users nor the usage of this service. I do keep graphs of the total number of queries, but no personally identifiable information is saved. The data that is saved will never be sold or used for anything except capacity planning of the service.&quot;"
data-toggle="tooltip" data-toggle="tooltip"
data-placement="bottom"> data-placement="bottom">
<span class="fas fa-globe"></span> <span class="fas fa-globe"></span>

View File

@ -55,16 +55,7 @@
<h3>Worth Mentioning</h3> <h3>Worth Mentioning</h3>
<ul> <ul>
<li> <li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration.</li>
<a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration.
{% include badge.html
color="warning"
text="Closed source"
icon="fas fa-exclamation-triangle"
link="https://github.com/cryptomator/cryptomator-android/issues/1#issuecomment-257979375"
tooltip="Cryptomator's mobile apps are not open-source."
%}
</li>
<li><a href="https://gitlab.com/cryptsetup/cryptsetup/">Linux Unified Key Setup (LUKS)</a> - A full disk encryption system for Linux using dm-crypt as the disk encryption backend. Included by default in Ubuntu. Available for Windows and Linux.</li> <li><a href="https://gitlab.com/cryptsetup/cryptsetup/">Linux Unified Key Setup (LUKS)</a> - A full disk encryption system for Linux using dm-crypt as the disk encryption backend. Included by default in Ubuntu. Available for Windows and Linux.</li>
<li><a href="https://www.dyne.org/software/tomb/">Tomb</a> - A simple zsh script for making LUKS containers on the commandline.</li> <li><a href="https://www.dyne.org/software/tomb/">Tomb</a> - A simple zsh script for making LUKS containers on the commandline.</li>
<li><a href="https://hat.sh/">Hat.sh</a> - A cross-platform, serverless JavaScript web application that provides secure file encryption using the AES-256-GCM algorithm in your browser. It can also be downloaded and run offline.</li> <li><a href="https://hat.sh/">Hat.sh</a> - A cross-platform, serverless JavaScript web application that provides secure file encryption using the AES-256-GCM algorithm in your browser. It can also be downloaded and run offline.</li>

View File

@ -8,7 +8,8 @@
title="Invidious" title="Invidious"
image="/assets/img/legacy_svg/3rd-party/invidious.svg" image="/assets/img/legacy_svg/3rd-party/invidious.svg"
description='Invidious is an alternative front-end to YouTube. It is free software, with no advertising or Javascript dependency to play videos, with lots of other features that allow you to have a complete YouTube experience, sans Google.' description='Invidious is an alternative front-end to YouTube. It is free software, with no advertising or Javascript dependency to play videos, with lots of other features that allow you to have a complete YouTube experience, sans Google.'
labels="color==warning::icon==fas fa-exclamation-triangle::link==https://github.com/iv-org/documentation/blob/master/Always-use-%22local%22-to-proxy-video-through-the-server-without-creating-an-account.md::text==Warning::tooltip==By default, Invidious will not proxy videos through the instance's proxy."
website="https://invidio.us" website="https://invidio.us"
github="https://github.com/omarroth/invidious" github="https://github.com/iv-org/invidious"
web="https://instances.invidio.us" web="https://instances.invidio.us"
%} %}

View File

@ -86,7 +86,7 @@
{% include badge.html color="info" text="Standard USD $60/y" %} {% include badge.html color="info" text="Standard USD $60/y" %}
{% include badge.html color="secondary" text="Pro USD $100/y" %} {% include badge.html color="secondary" text="Pro USD $100/y" %}
</h2> </h2>
<p><strong><a href="https://www.ivpn.net">IVPN.net</a></strong> is another premium VPN provider, and they have been in operation since <strong>2009</strong>. IVPN is based in <span class="flag-icon flag-icon-gi"></span> Gibraltar and offers a 3 day free trial.</p> <p><strong><a href="https://www.ivpn.net">IVPN.net</a></strong> is another premium VPN provider, and they have been in operation since <strong>2009</strong>. IVPN is based in <span class="flag-icon flag-icon-gi"></span> Gibraltar.</p>
<h5>{% include badge.html color="success" text="32 Countries" %}</h5> <h5>{% include badge.html color="success" text="32 Countries" %}</h5>
<p>IVPN has <a href="https://www.ivpn.net/server-locations">servers in 32 countries</a> at the time of writing this page. Picking a VPN provider with a server nearest to you will reduce latency of the network traffic you send. This is because of a shorter route (less hops) to the destination.</p> <p>IVPN has <a href="https://www.ivpn.net/server-locations">servers in 32 countries</a> at the time of writing this page. Picking a VPN provider with a server nearest to you will reduce latency of the network traffic you send. This is because of a shorter route (less hops) to the destination.</p>
<p>We also think it's better for the security of the VPN provider's private keys if they use <a href="https://en.wikipedia.org/wiki/Dedicated_hosting_service">dedicated servers</a>, instead of cheaper shared solutions (with other customers) such as <a href="https://en.wikipedia.org/wiki/Virtual_private_server">virtual private servers</a>.</p> <p>We also think it's better for the security of the VPN provider's private keys if they use <a href="https://en.wikipedia.org/wiki/Dedicated_hosting_service">dedicated servers</a>, instead of cheaper shared solutions (with other customers) such as <a href="https://en.wikipedia.org/wiki/Virtual_private_server">virtual private servers</a>.</p>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,3 @@
$(function() {
$("[data-toggle='tooltip']").tooltip();
});
document.querySelectorAll(".onclick-select").forEach(element => { document.querySelectorAll(".onclick-select").forEach(element => {
element.addEventListener("click", element.select); element.addEventListener("click", element.select);
}); });

File diff suppressed because one or more lines are too long

View File

@ -285,7 +285,7 @@ breadcrumb: "VPN"
<div class="row"> <div class="row">
<div class="col-lg-6 col-12"> <div class="col-lg-6 col-12">
<h3>Related Videos</h3> <h3>Related Videos</h3>
<a href="https://invidiou.site/watch?v=WVDQEoe6ZWY" target="_blank"> <a href="https://invidious.site/watch?v=WVDQEoe6ZWY" target="_blank">
<img <img
src="/assets/img/legacy_png/layout/this-video-is-sponsored-by-vpn.png" src="/assets/img/legacy_png/layout/this-video-is-sponsored-by-vpn.png"
class="img-fluid float-left mr-3" class="img-fluid float-left mr-3"