From df7e851e3a186537a1f695c5a926c502cc5f1804 Mon Sep 17 00:00:00 2001
From: nitrohorse <1514352+nitrohorse@users.noreply.github.com>
Date: Tue, 13 Aug 2019 20:07:58 -0700
Subject: [PATCH 1/3] Remove Flock
---
_includes/sections/calendar-contacts-sync.html | 4 ----
1 file changed, 4 deletions(-)
diff --git a/_includes/sections/calendar-contacts-sync.html b/_includes/sections/calendar-contacts-sync.html
index 6a4ff713..86523946 100644
--- a/_includes/sections/calendar-contacts-sync.html
+++ b/_includes/sections/calendar-contacts-sync.html
@@ -40,10 +40,6 @@
fruux - a unified contacts/calendaring system that works across platforms and devices.
-
- Flock - a discontinued calendar and contacts sync service by Open Whisper Systems. Despite being shut down the source code is still available on GitHub.
-
-
cloud backups - consider regularly exporting your calendar and or contacts and backing them up on a separate storage drive or uploading them to cloud storage (ideally after encrypting them).
From a011c0ae33a75aea474374d6463c3ea17280f32c Mon Sep 17 00:00:00 2001
From: Mikaela Suomalainen
Date: Wed, 14 Aug 2019 15:28:07 +0000
Subject: [PATCH 2/3] Delist Ricochet (#1135)
* Delist Ricochet
* source_code.md: remove Ricochet
* instant-messenger.html: remove another Ricochet mention
---
_includes/sections/instant-messenger.html | 36 -----------------------
source_code.md | 2 --
2 files changed, 38 deletions(-)
diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html
index 3da570dd..6169619b 100644
--- a/_includes/sections/instant-messenger.html
+++ b/_includes/sections/instant-messenger.html
@@ -59,49 +59,13 @@ web=""
Kontalk - A community-driven instant messaging network. Supports end-to-end encryption. Both client-to-server and server-to-server channels are fully encrypted.
Keybase - Warning End-to-end encrypted messaging with social verification.
Status - Experimental A free and open-source, peer-to-peer, encrypted instant messanger with support for DAPPs.
- Ricochet - Danger Experimental Ricochet uses the Tor network to reach your contacts without relying on messaging servers. It creates a hidden service, which is used to rendezvous with your contacts without revealing your location or IP address.
Related Information
-
- Updating the Tor binary included with Ricochet
-
-Currently there are no known vulnerabilities with Ricochet. The software is safe to use as long as you update the included Tor binary to the latest version.
-
-
- - Download the Tor Browser.
- - Run the Tor Browser installer or extract package for your platform. Windows (.exe), MacOSX (.dmg) and Linux (.tar.bz2).
- - Copy the Tor binary or create a symbolic link to it:
-
-
- - Windows: Copy the Tor binary included with the Tor Browser and overwrite the old one included with Ricochet.
-
- - Tor Browser binary:
%HOMEPATH%\Desktop\Tor Browser\Browser\TorBrowser\Tor\tor.exe
- - Ricochet's included binary:
%HOMEPATH%\Desktop\Ricochet\tor.exe
-
-
- - MacOSX: Assuming you copied the
Tor Browser.app
and Ricochet.app
from their respective .dmg install media to /Applications
:
- Create a symbolic link to the Tor binary in Terminal. Ricochet will continue to use the up to date version of the Tor binary when you update the Tor Browser Bundle.
-
- rm ~/Applications/Ricochet.app/Contents/MacOS/tor
- ln -s ~/Applications/Tor\ Browser.app/Contents/Resources/TorBrowser/Tor/tor \
- ~/Applications/Ricochet.app/Contents/MacOS/tor
-
-
-
- - Linux: Assuming you extracted the Tor Browser Bundle and Ricochet tarball to your home directory:
-
- rm ~/ricochet/tor
- ln -s ~/tor-browser_en-US/Browser/TorBrowser/Tor/tor ~/ricochet/tor
-
-
-
diff --git a/source_code.md b/source_code.md
index 3e18eb20..7de4daf3 100644
--- a/source_code.md
+++ b/source_code.md
@@ -134,8 +134,6 @@ Backend: closed-source
Status.im: https://github.com/status-im
- Ricochet: https://github.com/ricochet-im/ricochet
-
## Team chat
Rocket.chat: https://github.com/rocketchat/
From 06398cf07b59b9ab79a9cd654a538f937a9616e3 Mon Sep 17 00:00:00 2001
From: nitrohorse <1514352+nitrohorse@users.noreply.github.com>
Date: Wed, 14 Aug 2019 08:29:23 -0700
Subject: [PATCH 3/3] Update Email column sorting (#1143)
* Update Email column sorting
* Shift Tutanota
---
_includes/sections/email-providers.html | 278 ++++++++++++------------
1 file changed, 139 insertions(+), 139 deletions(-)
diff --git a/_includes/sections/email-providers.html b/_includes/sections/email-providers.html
index 74c17fe8..80d27d19 100644
--- a/_includes/sections/email-providers.html
+++ b/_includes/sections/email-providers.html
@@ -8,7 +8,7 @@
- Email Provider |
+ Email Provider |
Website |
Since |
Jurisdiction |
@@ -23,7 +23,104 @@
-
+ |
+
+ |
+
+
+ |
+ 2015 |
+ Netherlands |
+ 2 GB |
+ Free |
+ Accepted |
+ Built-in |
+ Yes |
+
+
+
+
+
+ |
+
+
+ |
+ 2010 |
+ Switzerland |
+ 2 GB |
+ $ 60 |
+ Accepted |
+ No |
+ Yes |
+
+
+
+
+
+
+ |
+
+
+ |
+ 2014 |
+ Germany |
+ 2 GB |
+ 12 € |
+ Accepted |
+ Built-in |
+ Yes |
+
+
+
+
+
+ |
+
+
+ |
+ 2013 |
+ Belgium |
+ 500 MB |
+ Free |
+ Accepted |
+ Built-in |
+ Yes |
+
+
+
+
+
+ |
+
+
+ |
+ 2003 |
+ Switzerland |
+ 1 GB |
+ $ 49.95 |
+ Accepted |
+ Built-in |
+ Yes |
+
+
+
+
+
+ |
+
+
+ |
+ 2009 |
+ Germany |
+ 2 GB |
+ 12 € |
+ No |
+ Built-in |
+ No |
+
+
+
+
|
@@ -40,23 +137,56 @@
|
-
-
+ |
+
+
|
-
+
+ |
+ 1999 |
+ Norway |
+ 1 GB |
+ $ 19.95 |
+ Accepted |
+ No |
+ Yes |
+
+
+
+
+
+ |
+
+
|
2015 |
Netherlands |
- 2 GB |
- Free |
- Accepted |
+ 25 GB |
+ 29 € |
+ No |
+ No |
+ Yes |
+
+
+
+
+
+ |
+
+
+ |
+ 2014 |
+ Netherlands |
+ 10 GB |
+ $ 59.95 |
+ Accepted |
Built-in |
Yes |
-
+ |
|
@@ -71,136 +201,6 @@
| Yes |
-
-
-
- |
-
-
- |
- 2013 |
- Belgium |
- 500 MB |
- Free |
- Accepted |
- Built-in |
- Yes |
-
-
-
-
-
-
- |
-
-
- |
- 2014 |
- Germany |
- 2 GB |
- 12 € |
- Accepted |
- Built-in |
- Yes |
-
-
-
-
-
- |
-
-
- |
- 2009 |
- Germany |
- 2 GB |
- 12 € |
- No |
- Built-in |
- No |
-
-
-
-
-
-
- |
-
-
- |
- 1999 |
- Norway |
- 1 GB |
- $ 19.95 |
- Accepted |
- No |
- Yes |
-
-
-
-
-
- |
-
-
- |
- 2003 |
- Switzerland |
- 1 GB |
- $ 49.95 |
- Accepted |
- Built-in |
- Yes |
-
-
-
-
-
- |
-
-
- |
- 2015 |
- Netherlands |
- 25 GB |
- 29 € |
- No |
- No |
- Yes |
-
-
-
-
-
- |
-
-
- |
- 2014 |
- Netherlands |
- 10 GB |
- $ 59.95 |
- Accepted |
- Built-in |
- Yes |
-
-
-
-
-
- |
-
-
- |
- 2010 |
- Switzerland |
- 2 GB |
- $ 60 |
- Accepted |
- No |
- Yes |
-
-