From ec03ced6684c0b52c122c477356a42d828fb513c Mon Sep 17 00:00:00 2001 From: Tommy Date: Wed, 8 Jun 2022 03:26:29 +0000 Subject: [PATCH] Update Calendar and Contact Sync page (#1408) Signed-off-by: Daniel Gray Signed-off-by: lexi --- docs/assets/img/calendar-contacts/decsync.svg | 1 - .../img/calendar-contacts/nextcloud.svg | 2 - docs/calendar-contacts.en.md | 92 +++++-------------- docs/tools.en.md | 6 +- includes/abbreviations.en.md | 1 + 5 files changed, 26 insertions(+), 76 deletions(-) delete mode 100644 docs/assets/img/calendar-contacts/decsync.svg delete mode 100644 docs/assets/img/calendar-contacts/nextcloud.svg diff --git a/docs/assets/img/calendar-contacts/decsync.svg b/docs/assets/img/calendar-contacts/decsync.svg deleted file mode 100644 index 2cb2e6b5..00000000 --- a/docs/assets/img/calendar-contacts/decsync.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/docs/assets/img/calendar-contacts/nextcloud.svg b/docs/assets/img/calendar-contacts/nextcloud.svg deleted file mode 100644 index 823cb960..00000000 --- a/docs/assets/img/calendar-contacts/nextcloud.svg +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/docs/calendar-contacts.en.md b/docs/calendar-contacts.en.md index dc0ccbb1..60dc6e9a 100644 --- a/docs/calendar-contacts.en.md +++ b/docs/calendar-contacts.en.md @@ -2,38 +2,18 @@ title: "Calendar and Contact Sync" icon: material/calendar --- -Calendaring and contacts are some of the most sensitive data possess. Use only products that use E2EE at rest. This prevents a provider from reading your data. +Calendaring and contacts are some of the most sensitive data possess. Use products that implement E2EE at rest to prevent a provider from reading your data. -## Cloud/SaaS Providers - -These products are included with an subscription with their respective [email providers](email.md). - -### Proton Calendar - -!!! recommendation - - ![Proton Calendar logo](assets/img/calendar-contacts/proton-calendar.svg){ align=right } - - **Proton Calendar** is an encrypted calendar service available to Proton Mail members. Features include: automatic E2EE of all data, sharing features, import/export functionality, and [more](https://proton.me/support/proton-calendar-guide). Those on the free tier get access to a single calendar, whereas paid subscribers can create up to 20 calendars. Extended sharing functionality is also limited to paid subscribers. Proton Calendar is currently only available for the web and Android. - - [:octicons-home-16: Homepage](https://proton.me/calendar){ .md-button .md-button--primary } - [:octicons-eye-16:](https://proton.me/legal/privacy){ .card-link title="Privacy Policy" } - [:octicons-info-16:](https://proton.me/support/proton-calendar-guide){ .card-link title=Documentation} - [:octicons-code-16:](https://github.com/ProtonMail/WebClients){ .card-link title="Source Code" } - - ??? downloads - - - [:octicons-browser-16: Web](https://calendar.proton.me) - - [:fontawesome-brands-google-play: Google Play](https://play.google.com/store/apps/details?id=me.proton.android.calendar) - -### Tutanota +## Tutanota !!! recommendation ![Tutanota logo](assets/img/calendar-contacts/tutanota.svg#only-light){ align=right } ![Tutanota logo](assets/img/calendar-contacts/tutanota-dark.svg#only-dark){ align=right } - **Tutanota** offers a free and encrypted calendar across their supported platforms. Features include: automatic E2EE of all data, sharing features, import/export functionality, and [more](https://tutanota.com/calendar-app-comparison/). Multiple calendars and extended sharing functionality is limited to paid subscribers. + **Tutanota** offers a free and encrypted calendar across their supported platforms. Features include: automatic E2EE of all data, sharing features, import/export functionality, multi-factor authentication, and [more](https://tutanota.com/calendar-app-comparison/). + + Multiple calendars and extended sharing functionality is limited to paid subscribers. [:octicons-home-16: Homepage](https://tutanota.com/calendar){ .md-button .md-button--primary } [:octicons-eye-16:](https://tutanota.com/privacy){ .card-link title="Privacy Policy" } @@ -52,39 +32,15 @@ These products are included with an subscription with their respective [email pr - [:pg-f-droid: F-Droid](https://f-droid.org/en/packages/de.tutao.tutanota) - [:fontawesome-brands-app-store-ios: App Store](https://apps.apple.com/us/app/tutanota/id922429609) -## Self-hostable - -Some of these options are self-hostable, but could be offered by third party SaaS providers for a fee: - -### DecSync CC - -!!! recommendation - - ![DecSync logo](assets/img/calendar-contacts/decsync.svg){ align=right } - - **DecSync CC** synchronizes contacts, calendars and tasks using DecSync. It stores this data in a shared directory, using [Syncthing](file-sharing.md#syncthing), or any other file synchronization service. - - There are [plugins](https://github.com/39aldo39/DecSync#rss) to sync other types of data such as [RSS](news-aggregators.md). - - [:octicons-repo-16: Repository](https://github.com/39aldo39/DecSync){ .md-button .md-button--primary } - [:octicons-info-16:](https://github.com/39aldo39/DecSync/blob/master/design.md){ .card-link title=Documentation} - [:octicons-code-16:](https://github.com/39aldo39/DecSync){ .card-link title="Source Code" } - [:octicons-heart-16:](https://github.com/39aldo39/DecSync#donations){ .card-link title=Contribute } - - ??? downloads - - - [:fontawesome-brands-google-play: Google Play](https://play.google.com/store/apps/details?id=org.decsync.cc) - - [:pg-f-droid: F-Droid](https://f-droid.org/packages/org.decsync.cc) - -### EteSync +## EteSync !!! recommendation ![EteSync logo](assets/img/calendar-contacts/etesync.svg){ align=right } - **EteSync** is a secure, end-to-end encrypted, and privacy-respecting cloud backup and synchronization software for your personal information (e.g. contacts and calendars). There are native clients for Android, iOS, and the web, and an adapter layer for most desktop clients. + **EteSync** is a secure, end-to-end encrypted, and privacy-respecting cloud backup and synchronization software for your personal information, including contacts and calendars. There are native clients for Android, iOS, with a web client and an adapter layer for most desktop clients available too. Etesync does [not](https://www.etesync.com/faq/#2fa) currently support multi-factor authentication. - EteSync also offers optional software as a service for [$24 per year](https://dashboard.etebase.com/user/partner/pricing/) to use, or you can host the server yourself for free. + EteSync offers a SaaS for [$24/year](https://dashboard.etebase.com/user/partner/pricing/), or you can host the server yourself for free. [:octicons-home-16: Homepage](https://www.etesync.com){ .md-button .md-button--primary } [:octicons-eye-16:](https://www.etesync.com/tos/#privacy){ .card-link title="Privacy Policy" } @@ -95,34 +51,32 @@ Some of these options are self-hostable, but could be offered by third party Saa ??? downloads - [:octicons-device-desktop-16: Client Setup](https://github.com/etesync/etesync-dav/blob/master/README.md#specific-client-notes-and-instructions) - - [:fontawesome-brands-google-play: Google PLay](https://play.google.com/store/apps/details?id=com.etesync.syncadapter) + - [:fontawesome-brands-google-play: Google Play](https://play.google.com/store/apps/details?id=com.etesync.syncadapter) - [:pg-f-droid: F-Droid](https://f-droid.org/app/com.etesync.syncadapter) - [:fontawesome-brands-app-store-ios: App Store](https://apps.apple.com/us/app/apple-store/id1489574285) + - [:fontawesome-brands-docker: Docker Hub](https://hub.docker.com/r/victorrds/etesync) -### Nextcloud +## Proton Calendar !!! recommendation - ![Nextcloud logo](assets/img/calendar-contacts/nextcloud.svg){ align=right } + ![Proton](assets/img/calendar-contacts/proton-calendar.svg){ align=right } - **Nextcloud** is a suite of client-server software for creating and using file hosting services. This includes calendar sync via CalDAV and contacts sync via CardDAV. Nextcloud is free and open-source, thereby allowing anyone to install and operate it without charge on a private server. + **Proton Calendar** is an encrypted calendar service available to Proton members via web or mobile clients. Features include: automatic E2EE of all data, sharing features, import/export functionality, and [more](https://proton.me/support/proton-calendar-guide). Those on the free tier get access to a single calendar, whereas paid subscribers can create up to 20 calendars. Extended sharing functionality is also limited to paid subscribers. - You can self-host Nextcloud or pay for service from a [provider](https://nextcloud.com/signup/). + **Proton Mail** can be used to synchronize contacts. Likewise, the service is currently only available via web and mobile clients. - [:octicons-home-16: Homepage](https://nextcloud.com/){ .md-button .md-button--primary } - [:octicons-eye-16:](https://nextcloud.com/privacy/){ .card-link title="Privacy Policy" } - [:octicons-info-16:](https://nextcloud.com/support/){ .card-link title=Documentation} - [:octicons-code-16:](https://github.com/nextcloud){ .card-link title="Source Code" } - [:octicons-heart-16:](https://nextcloud.com/contribute/){ .card-link title=Contribute } + [:octicons-home-16: Homepage](https://proton.me/calendar){ .md-button .md-button--primary } + [:octicons-eye-16:](https://proton.me/legal/privacy){ .card-link title="Privacy Policy" } + [:octicons-info-16:](https://proton.me/support/proton-calendar-guide){ .card-link title=Documentation} + [:octicons-code-16:](https://github.com/ProtonMail/WebClients){ .card-link title="Source Code" } ??? downloads - - [:fontawesome-brands-windows: Windows](https://nextcloud.com/install/#install-clients) - - [:fontawesome-brands-apple: macOS](https://nextcloud.com/install/#install-clients) - - [:fontawesome-brands-linux: Linux](https://nextcloud.com/install/#install-clients) - - [:pg-flathub: Flatpak](https://flathub.org/apps/details/com.nextcloud.desktopclient.nextcloud) - - [:fontawesome-brands-google-play: Google Play](https://play.google.com/store/apps/details?id=com.nextcloud.client) - - [:pg-f-droid: F-Droid](https://f-droid.org/packages/com.nextcloud.client) - - [:fontawesome-brands-app-store-ios: App Store](https://apps.apple.com/us/app/nextcloud/id1125420102) + - [:octicons-browser-16: Web](https://calendar.proton.me) + - [:fontawesome-brands-google-play: Google Play](https://play.google.com/store/apps/details?id=me.proton.android.calendar) + +!!! warning + Proton [does not](https://proton.me/support/proton-contacts#verify) use E2EE for your contact names and email addresses. --8<-- "includes/abbreviations.en.md" diff --git a/docs/tools.en.md b/docs/tools.en.md index 9a868562..2541dc01 100644 --- a/docs/tools.en.md +++ b/docs/tools.en.md @@ -223,11 +223,9 @@ We [recommend](dns.md#recommended-providers) a number of encrypted DNS servers b
-- ![DecSync CC logo](assets/img/calendar-contacts/decsync.svg){ .twemoji } [DecSync CC](calendar-contacts.md#decsync-cc) +- ![Tutanota logo](assets/img/calendar-contacts/tutanota.svg){ .twemoji } [Tutanota](calendar-contacts.md#tutanota) - ![EteSync logo](assets/img/calendar-contacts/etesync.svg){ .twemoji } [EteSync](calendar-contacts.md#etesync) -- ![Nextcloud logo](assets/img/calendar-contacts/nextcloud.svg){ .twemoji } [Nextcloud](calendar-contacts.md#nextcloud) -- ![Proton Calendar logo](assets/img/calendar-contacts/proton-calendar.svg){ .twemoji } [Proton Calendar (SaaS)](calendar-contacts.md#proton-calendar) -- ![Tutanota logo](assets/img/calendar-contacts/tutanota.svg){ .twemoji } [Tutanota (SaaS)](calendar-contacts.md#tutanota) +- ![Proton Calendar logo](assets/img/calendar-contacts/proton-calendar.svg){ .twemoji } [Proton](calendar-contacts.md#proton-calendar)
diff --git a/includes/abbreviations.en.md b/includes/abbreviations.en.md index 06ca0868..08aecca0 100644 --- a/includes/abbreviations.en.md +++ b/includes/abbreviations.en.md @@ -56,6 +56,7 @@ *[PII]: Personally Identifiable Information *[QNAME]: Qualified Name *[RSS]: Really Simple Syndication +*[SaaS]: Software as a service *[SELinux]: Security-Enhanced Linux *[SIM]: Subscriber Identity Module *[SMS]: Short Message Service (standard text messaging)