From 2eaf6441db4a27ae00a9e9551f78654847c1565a Mon Sep 17 00:00:00 2001 From: Dawid Potocki Date: Thu, 19 Sep 2019 11:27:36 +0000 Subject: [PATCH 1/3] Use bigger bottom margin in card.html and panel.html (#1323) Fixes #823 --- _includes/card.html | 2 +- _includes/panel.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_includes/card.html b/_includes/card.html index 17f4f1ce..178155e4 100644 --- a/_includes/card.html +++ b/_includes/card.html @@ -1,4 +1,4 @@ -
+
{% if include.color == "warning" %}
diff --git a/_includes/panel.html b/_includes/panel.html index f9e77415..ed21ee28 100644 --- a/_includes/panel.html +++ b/_includes/panel.html @@ -1,4 +1,4 @@ -
+
{% if include.color == "warning" %}
@@ -11,4 +11,4 @@ {{include.body}}
-
\ No newline at end of file +
-- 2.47.2 From 910c44fa85ca03ff5b39f5faeb9e7821a2cc07b6 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Thu, 19 Sep 2019 22:35:43 +0300 Subject: [PATCH 2/3] Delist Blokada, link to DNS clients & add anchor for them (#1325) * delist Blokada Resolves: #1123 * dns: add anchor "clients" --- _includes/sections/android-addons.html | 20 +++++++++----------- _includes/sections/dns.html | 2 +- assets/img/addons/Blokada.png | Bin 2855 -> 0 bytes 3 files changed, 10 insertions(+), 12 deletions(-) delete mode 100644 assets/img/addons/Blokada.png diff --git a/_includes/sections/android-addons.html b/_includes/sections/android-addons.html index 1779258a..c44a849a 100644 --- a/_includes/sections/android-addons.html +++ b/_includes/sections/android-addons.html @@ -6,16 +6,6 @@
-
-
- Blokada -
-
-

Block ads with Blokada

-

Blokada works across all of your apps, not only the browser. It doesn't require root, supports both wifi and mobile networks, and is perfectly safe and simple to use. Just turn it on, and it will do the job silently! -

-
-
NetGuard @@ -36,4 +26,12 @@
-
\ No newline at end of file +
+ +

See also

+ +
    +
  • + Our DNS page which also has information on encrypting DNS on Android. +
    • +
diff --git a/_includes/sections/dns.html b/_includes/sections/dns.html index ac8ab400..6acb5cf6 100644 --- a/_includes/sections/dns.html +++ b/_includes/sections/dns.html @@ -533,7 +533,7 @@
  • QNAME Minimization - Run dig +short txt qnamemintest.internet.nl from the command-line (taken from this NLnet Labs presentation). If you are on Windows 10, run Resolve-DnsName -Type TXT -Name qnamemintest.internet.nl from the PowerShell. You should see this display: "HOORAY - QNAME minimisation is enabled on your resolver :)!"
    • -

    Worth Mentioning and Additional Information

    +

    Worth Mentioning and Additional Information

    • Encrypted DNS clients for desktop: diff --git a/assets/img/addons/Blokada.png b/assets/img/addons/Blokada.png deleted file mode 100644 index 426466667ce530e0ccde270f8f943772a3561072..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2855 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 FV1nqbJA?oL -- 2.47.2 From 3aaba129c5e87397b3ac49cecb0bac73f204807d Mon Sep 17 00:00:00 2001 From: Dawid Potocki Date: Fri, 20 Sep 2019 19:40:04 +1200 Subject: [PATCH 3/3] Convert selfhosted-cloud.html to cardv2 --- _includes/sections/selfhosted-cloud.html | 69 ++++++++++++++---------- 1 file changed, 42 insertions(+), 27 deletions(-) diff --git a/_includes/sections/selfhosted-cloud.html b/_includes/sections/selfhosted-cloud.html index ca02b5d0..a9f408fa 100644 --- a/_includes/sections/selfhosted-cloud.html +++ b/_includes/sections/selfhosted-cloud.html @@ -4,35 +4,50 @@ If you are currently using a Cloud Storage Services like Dropbox, Google Drive, Microsoft OneDrive or Apple iCloud, you should think about hosting it on your own.
    -
    +{% include cardv2.html +title="Nextcloud" +image="/assets/img/provider/Nextcloud.png" +description="Similar functionally to the widely used Dropbox, with the difference being that Nextcloud is free and open-source, and thereby allowing anyone to install and operate it without charge on a private server, with no limits on storage space or the number of connected clients." +website="https://nextcloud.com/" +forum="https://forum.privacytools.io/t/discussion-nextcloud/287" +windows="https://nextcloud.com/install/#install-clients" +mac="https://nextcloud.com/install/#install-clients" +linux="https://nextcloud.com/install/#install-clients" +freebsd="https://www.freshports.org/www/nextcloud/" +openbsd="http://openports.se/www/nextcloud" +netbsd="http://pkgsrc.se/www/php-nextcloud" +fdroid="https://f-droid.org/packages/com.nextcloud.client/" +googleplay="https://play.google.com/store/apps/details?id=com.nextcloud.client" +ios="https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8" +github="https://github.com/nextcloud" +%} - {% include card.html color="success" - title="Pydio" - image="/assets/img/tools/Pydio.png" - url="https://pydio.com/" - footer="OS: Windows, macOS, Linux, iOS, Android." - description="Pydio is open source software that turns instantly any server (on-premise, NAS, cloud IaaS or PaaS) into a file sharing platform for your company. It is an alternative - to SaaS Boxes and Drives, with more control, safety and privacy, and favorable TCOs." - %} +{% include cardv2.html +title="Tahoe-LAFS" +image="/assets/img/tools/Tahoe-LAFS.png" +website="https://www.tahoe-lafs.org/" +forum="https://forum.privacytools.io/t/discussion-tahoe-lafs/1662" +description="Tahoe-LAFS is a Free and Open decentralized cloud storage system. It distributes your data across multiple servers. Even if some of the servers fail or are taken over by an attacker, the entire file store continues to function correctly, preserving your privacy and security." +windows="https://github.com/tahoe-lafs/tahoe-lafs#via-pip" +mac="https://github.com/tahoe-lafs/tahoe-lafs#via-pip" +linux="https://github.com/tahoe-lafs/tahoe-lafs#using-os-packages" +netbsd="http://pkgsrc.se/filesystems/tahoe-lafs" +git="https://www.tahoe-lafs.org/trac/tahoe-lafs/browser" +%} - {% include card.html color="primary" - title="Tahoe-LAFS" - image="/assets/img/tools/Tahoe-LAFS.png" - url="https://www.tahoe-lafs.org/" - footer="OS: Windows, macOS, Linux." - description="Tahoe-LAFS is a Free and Open decentralized cloud storage system. It distributes your data across multiple servers. Even if some of the servers fail or are - taken over by an attacker, the entire file store continues to function correctly, preserving your privacy and security." - %} - - {% include card.html color="warning" - title="Nextcloud" - image="/assets/img/provider/Nextcloud.png" - url="https://nextcloud.com/" - footer="Client OS: Windows, macOS, Linux, BSD, Unix, iOS, Android, Fire OS. Server: Linux." - description="Similar functionally to the widely used Dropbox, with the difference being that Nextcloud is free and open-source, and thereby allowing anyone to install and operate it without charge on a private server, with no limits on storage space or the number of connected clients." - %} - -
    +{% include cardv2.html +title="Pydio" +image="/assets/img/tools/Pydio.png" +website="https://pydio.com/" +forum="https://forum.privacytools.io/t/discussion-pydio/1663" +description="Pydio is open source software that turns instantly any server (on-premise, NAS, cloud IaaS or PaaS) into a file sharing platform for your company. It is an alternative to SaaS Boxes and Drives, with more control, safety and privacy, and favorable TCOs." +windows="https://pydio.com/en/get-pydio/downloads/pydiosync-desktop-app" +mac="https://pydio.com/en/get-pydio/downloads/pydiosync-desktop-app" +linux="https://pydio.com/en/docs/v8/install-pydio-community" +googleplay="https://play.google.com/store/apps/details?id=com.pydio.android.cells" +ios="https://itunes.apple.com/fr/app/pydio/id709275884" +github="https://github.com/pydio" +%}

    Worth Mentioning

      -- 2.47.2