Merge remote-tracking branch 'origin/master' into add-dns-table

This commit is contained in:
nitrohorse
2019-08-06 18:22:43 -07:00
7 changed files with 75 additions and 32 deletions

View File

@ -7,41 +7,45 @@
<img src="{{include.image}}" height="120" width="120" class="panel-pic" alt="{{include.title}}">
{{include.description}}
</p>
<a href="{{include.website}}" class="btn btn-primary"><i class="fas fa-external-link-alt fa-fw"></i> Website</a>
{% if include.forum %}
<a href="{{include.forum}}" class="btn btn-success"><i class="fab fa-discourse fa-fw"></i> Forum</a>
{% endif %}
{% if include.tor %}
<a class="mb-1" data-toggle="tooltip" data-placement="bottom" data-original-title="Requires specific software to access: torproject.org" href="{{include.tor}}"><img alt="Tor" src="/assets/img/layout/tor.png" width="35" height="35"></a>
{% endif %}
<div class="d-flex justify-content-between flex-column flex-md-row align-items-start align-items-md-center">
<div class="flex-shrink-0 mr-2">
<a href="{{include.website}}" class="btn btn-primary mt-1"><i class="fas fa-external-link-alt fa-fw"></i> Website</a>
{% if include.forum %}
<a href="{{include.forum}}" class="btn btn-success mt-1"><i class="fab fa-discourse fa-fw"></i> Forum</a>
{% endif %}
{% if include.tor %}
<a data-toggle="tooltip" data-placement="bottom" data-original-title="Requires specific software to access: torproject.org" href="{{include.tor}}"><img class="mt-2" alt="Tor" src="/assets/img/layout/tor.png" width="35" height="35"></a>
{% endif %}
</div>
<div class="float-right">
{% if include.windows %}<i class="fab fa-windows fa-2x fa-fw"></i>{% endif %}
{% if include.mac %}<i class="fab fa-apple fa-2x fa-fw"></i>{% endif %}
{% if include.linux %}<i class="fab fa-linux fa-2x fa-fw"></i>{% endif %}
{% if include.bsd %}<i class="fab fa-freebsd fa-2x fa-fw"></i>{% endif %}
<div class="mt-2">
{% if include.windows %}<i class="fab fa-windows fa-2x fa-fw d-inline pr-1"></i>{% endif %}
{% if include.mac %}<i class="fab fa-apple fa-2x fa-fw d-inline pr-1"></i>{% endif %}
{% if include.linux %}<i class="fab fa-linux fa-2x fa-fw d-inline pr-1"></i>{% endif %}
{% if include.bsd %}<i class="fab fa-freebsd fa-2x fa-fw d-inline pr-1"></i>{% endif %}
{% if include.firefox %}<i class="fab fa-firefox fa-2x fa-fw"></i>{% endif %}
{% if include.chrome %}<i class="fab fa-chrome fa-2x fa-fw"></i>{% endif %}
{% if include.safari %}<i class="fab fa-safari fa-2x fa-fw"></i>{% endif %}
{% if include.opera %}<i class="fab fa-opera fa-2x fa-fw"></i>{% endif %}
{% if include.edge %}<i class="fab fa-edge fa-2x fa-fw"></i>{% endif %}
{% if include.firefox %}<i class="fab fa-firefox fa-2x fa-fw d-inline pr-1"></i>{% endif %}
{% if include.chrome %}<i class="fab fa-chrome fa-2x fa-fw d-inline pr-1"></i>{% endif %}
{% if include.safari %}<i class="fab fa-safari fa-2x fa-fw d-inline pr-1"></i>{% endif %}
{% if include.opera %}<i class="fab fa-opera fa-2x fa-fw d-inline pr-1"></i>{% endif %}
{% if include.edge %}<i class="fab fa-edge fa-2x fa-fw d-inline pr-1"></i>{% endif %}
{% if include.android %}<i class="fab fa-android fa-2x fa-fw"></i>{% endif %}
{% if include.ios %}<i class="fab fa-app-store-ios fa-2x fa-fw"></i>{% endif %}
{% if include.fire %}<i class="fas fa-fire fa-2x fa-fw"></i>{% endif %}
{% if include.android %}<i class="fab fa-android fa-2x fa-fw d-inline pr-1"></i>{% endif %}
{% if include.ios %}<i class="fab fa-app-store-ios fa-2x fa-fw d-inline pr-1"></i>{% endif %}
{% if include.fire %}<i class="fas fa-fire fa-2x fa-fw d-inline pr-1"></i>{% endif %}
{% if include.web %}<i class="fas fa-desktop fa-2x fa-fw"></i>{% endif %}
{% if include.web %}<i class="fas fa-desktop fa-2x fa-fw d-inline pr-1"></i>{% endif %}
{{include.icon1}}
{{include.icon2}}
{{include.icon3}}
{{include.icon1}}
{{include.icon2}}
{{include.icon3}}
{% if include.github %}<a href="{{include.github}}"><i class="fab fa-github fa-2x fa-fw"></i></a>{% endif %}
{% if include.gitlab %}<a href="{{include.gitlab}}"><i class="fab fa-gitlab fa-2x fa-fw"></i></a>{% endif %}
{% if include.git %}<a href="{{include.git}}"><i class="fab fa-git-square fa-2x fa-fw"></i></a>{% endif %}
{% if include.source %}<a href="{{include.source}}"><i class="fas fa-code-branch fa-2x fa-fw"></i></a>{% endif %}
{% if include.github %}<a href="{{include.github}}"><i class="fab fa-github fa-2x fa-fw d-inline"></i></a>{% endif %}
{% if include.gitlab %}<a href="{{include.gitlab}}"><i class="fab fa-gitlab fa-2x fa-fw d-inline"></i></a>{% endif %}
{% if include.git %}<a href="{{include.git}}"><i class="fab fa-git-square fa-2x fa-fw d-inline"></i></a>{% endif %}
{% if include.source %}<a href="{{include.source}}"><i class="fas fa-code-branch fa-2x fa-fw d-inline"></i></a>{% endif %}
</div>
</div>
</div>

View File

@ -72,7 +72,7 @@
<div class="copyright-text">
<p><strong>No Ads, No Google Analytics, No Affiliates, No Cross-Site Requests.</strong> <em>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.</em> <a href="/privacy-policy/">View our privacy policy</a>.</p>
<p>Tor v3: <strong>privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion</strong> (<a href="https://write.privacytools.io/jonah/tor-on-privacytools-io">Learn More</a>)</p>
<p class="text-left">Tor v3: <strong>privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion</strong> (<a href="https://write.privacytools.io/jonah/tor-on-privacytools-io">Learn More</a>)</p>
</div>
</footer>

View File

@ -19,6 +19,7 @@
<a class="dropdown-item" href="/providers/dns/"><i class="fa fa-tasks fa-fw"></i> DNS</a>
<a class="dropdown-item" href="/providers/email/"><i class="fas fa-mail-bulk fa-fw"></i> Email</a>
<a class="dropdown-item" href="/providers/hosting/"><i class="fas fa-database fa-fw"></i> Hosting</a>
<a class="dropdown-item" href="/providers/paste/"><i class="fas fa-paste fa-fw"></i> Pastebins</a>
<a class="dropdown-item" href="/providers/search-engines/"><i class="fab fa-searchengin fa-fw"></i> Search Engines</a>
<a class="dropdown-item" href="/providers/social-networks/"><i class="fas fa-expand-arrows-alt fa-fw"></i> Social Networks</a>
<a class="dropdown-item" href="/providers/vpn/"><i class="far fa-eye-slash fa-fw"></i> VPN</a>
@ -41,6 +42,7 @@
Software
</a>
<div class="dropdown-menu" aria-labelledby="softwareDropdown">
<a class="dropdown-item" href="/software/calendar-contacts/"><i class="fas fa-calendar fa-fw"></i> Calendar/Contacts Sync Tools</a>
<a class="dropdown-item" href="/software/notebooks/"><i class="far fa-sticky-note fa-fw"></i> Digital Notebook</a>
<a class="dropdown-item" href="/software/email/#messaging"><i class="fas fa-random fa-fw"></i> Email Alternatives</a>
<a class="dropdown-item" href="/software/email/"><i class="fas fa-envelope fa-fw"></i> Email Clients</a>
@ -80,6 +82,7 @@
<div class="dropdown-menu" aria-labelledby="servicesDropdown">
<a href="https://privacytools.twngo.xyz/" class="dropdown-item">繁體中文</a>
<a href="https://victorhck.gitlab.io/privacytools-es/" class="dropdown-item">Español</a>
<a href="https://pl.privacytools.io/" class="dropdown-item">Polski</a>
<a href="https://www.privacidade.digital/" class="dropdown-item">Português</a>
<a href="https://privacytools.it-sec.rocks/" class="dropdown-item">Deutsch</a>
<a href="https://privacytools-it.github.io/" class="dropdown-item">Italiano</a>

View File

@ -11,7 +11,7 @@
image="/assets/img/tools/Joplin.png"
url="https://joplinapp.org/"
footer="OS: Windows, macOS, Linux, iOS, Android, Firefox/Chrome (Web Clipper)."
description="Joplin is a free, open source, fully featured note taking and to-do application, which can handle a large number of markdown notes organized into notebooks and tags. It offers E2EE encryption and can sync through Nextcloud, Dropbox and more. It also offers easy import from Evernote and plain text notes."
description="Joplin is a free, open source, fully featured note taking and to-do application, which can handle a large number of markdown notes organized into notebooks and tags. It offers E2E encryption and can sync through Nextcloud, Dropbox and more. It also offers easy import from Evernote and plain text notes."
%}
{% include card.html color="primary"