From e696c879a6f67350ec59438313901211bfa6675f Mon Sep 17 00:00:00 2001 From: Daniel Gray Date: Wed, 5 Aug 2020 04:36:59 +0000 Subject: [PATCH 01/10] Fix fragmented sentence --- pages/services/chat.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/services/chat.html b/pages/services/chat.html index de105b51..920f6d39 100644 --- a/pages/services/chat.html +++ b/pages/services/chat.html @@ -50,7 +50,7 @@ description: "chat.privacytools.io is our official Matrix homeserver. You can re

No. Messages sent to the #general chat are encrypted from with client-to-server encryption, i.e. HTTPS. This means that your messages can't be viewed by an attacker on your network, or your ISP, etc. However, because this is a public chat room anybody can view your messages if they are a member, and newcomers will be able to see all message history. Do not say anything in rooms that don't use End-to-End (E2E) encryption that you wouldn't want tied to you personally.

Isn't Matrix behind Cloudflare?

-

Matrix.org is, chat.privacytools.io isn't. If you use our homeserver and our Element install, you should be good.

+

The default matrix.org homeserver is behind Cloudflare. The PrivacyTools homeserver (element.privacytools.io is not.

Isn't Matrix slow?

It can be, for some! Due to the trememdous amount of people registering on the matrix.org homeserver, it is often overloaded and occasionally slow to respond. Therefore, users on that homeserver occasionally report a less than ideal chat experience. If that's you, you can fix this problem by switching to another homeserver. Good alternatives include... -- 2.47.2 From d48f834436706618c2f7509434ff6b9f16ed0b85 Mon Sep 17 00:00:00 2001 From: Daniel Gray Date: Wed, 5 Aug 2020 04:46:48 +0000 Subject: [PATCH 02/10] Mnetion code of conduct. --- pages/services/chat.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pages/services/chat.html b/pages/services/chat.html index 920f6d39..8c79b86f 100644 --- a/pages/services/chat.html +++ b/pages/services/chat.html @@ -21,6 +21,8 @@ description: "chat.privacytools.io is our official Matrix homeserver. You can re

Connection Information

To register on or connect to our homeserver, simply use https://chat.privacytools.io as the homeserver in your Matrix client.

+

Please see our community code of conduct before joining our rooms or using our services.

+ {% include cardv2.html title="Element" -- 2.47.2 From 585eccd6ac7db10bb53466ad6d5bd2659d1c5e2e Mon Sep 17 00:00:00 2001 From: Daniel Gray Date: Wed, 5 Aug 2020 04:51:16 +0000 Subject: [PATCH 03/10] One parahraph --- pages/services/chat.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pages/services/chat.html b/pages/services/chat.html index 8c79b86f..1fe8f736 100644 --- a/pages/services/chat.html +++ b/pages/services/chat.html @@ -19,9 +19,7 @@ description: "chat.privacytools.io is our official Matrix homeserver. You can re

Connection Information

-

To register on or connect to our homeserver, simply use https://chat.privacytools.io as the homeserver in your Matrix client.

- -

Please see our community code of conduct before joining our rooms or using our services.

+

To register on or connect to our homeserver, simply use https://chat.privacytools.io as the homeserver in your Matrix client.

Please see our community code of conduct before joining our rooms or using our services.

{% include cardv2.html -- 2.47.2 From 309ff43d744e92102ffbf9b525e47dd9f0ec8406 Mon Sep 17 00:00:00 2001 From: Daniel Nathan Gray Date: Wed, 5 Aug 2020 11:44:50 +0000 Subject: [PATCH 04/10] Update homeserver to correct address Co-authored-by: Mikaela Suomalainen --- pages/services/chat.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/services/chat.html b/pages/services/chat.html index 1fe8f736..c815ced2 100644 --- a/pages/services/chat.html +++ b/pages/services/chat.html @@ -50,7 +50,7 @@ description: "chat.privacytools.io is our official Matrix homeserver. You can re

No. Messages sent to the #general chat are encrypted from with client-to-server encryption, i.e. HTTPS. This means that your messages can't be viewed by an attacker on your network, or your ISP, etc. However, because this is a public chat room anybody can view your messages if they are a member, and newcomers will be able to see all message history. Do not say anything in rooms that don't use End-to-End (E2E) encryption that you wouldn't want tied to you personally.

Isn't Matrix behind Cloudflare?

-

The default matrix.org homeserver is behind Cloudflare. The PrivacyTools homeserver (element.privacytools.io is not. +

The default matrix.org homeserver is behind Cloudflare. The PrivacyTools homeserver (chat.privacytools.io is not.

Isn't Matrix slow?

It can be, for some! Due to the trememdous amount of people registering on the matrix.org homeserver, it is often overloaded and occasionally slow to respond. Therefore, users on that homeserver occasionally report a less than ideal chat experience. If that's you, you can fix this problem by switching to another homeserver. Good alternatives include... -- 2.47.2 From 3605ab1a6781b8a755c6df170d91a5cd980a6825 Mon Sep 17 00:00:00 2001 From: Daniel Gray Date: Sat, 8 Aug 2020 07:54:36 +0000 Subject: [PATCH 05/10] Remove mention of RiotX, it no longer exists --- pages/services/chat.html | 1 - 1 file changed, 1 deletion(-) diff --git a/pages/services/chat.html b/pages/services/chat.html index c815ced2..694b77f8 100644 --- a/pages/services/chat.html +++ b/pages/services/chat.html @@ -90,7 +90,6 @@ description: "chat.privacytools.io is our official Matrix homeserver. You can re

  • #plume:disroot.org: Discussion for Plume: Federated blogging.
  • #element-android:matrix.org: Element Android discussion and support.
  • #element-ios:matrix.org: Element iOS discussion and support.
    • -
  • #riotx:matrix.org: RiotX (soon to be: Element Android) discussion and support.
  • #element-web:matrix.org: Element Web/Desktop discussion and support.

    • If you are a room operator and want your room listed here, feel free to contact us. Especially if you operate a large room and/or are a member of our homeserver!

    -- 2.47.2 From 786632c73ebf0e6ac014e89e2c0ec21f52adca63 Mon Sep 17 00:00:00 2001 From: Daniel Gray Date: Sat, 8 Aug 2020 07:56:31 +0000 Subject: [PATCH 06/10] Update name of git repo --- _includes/sections/instant-messenger.html | 2 +- _includes/sections/teamchat.html | 2 +- pages/services/chat.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html index bf7d6b53..c0cc44d3 100644 --- a/_includes/sections/instant-messenger.html +++ b/_includes/sections/instant-messenger.html @@ -78,7 +78,7 @@ website="https://element.io" privacy-policy="https://element.io/privacy" forum="https://forum.privacytools.io/t/discussion-element-io/665" - github="https://github.com/vector-im/riot-web/" + github="https://github.com/vector-im/element-web" windows="https://element.io/get-started" mac="https://element.io/get-started" linux="https://element.io/get-started" diff --git a/_includes/sections/teamchat.html b/_includes/sections/teamchat.html index 207912cf..6a86d563 100644 --- a/_includes/sections/teamchat.html +++ b/_includes/sections/teamchat.html @@ -17,7 +17,7 @@ website="https://element.io" privacy-policy="https://element.io/privacy" forum="https://forum.privacytools.io/t/discussion-element-io/665" - github="https://github.com/vector-im/riot-web/" + github="https://github.com/vector-im/element-web" windows="https://element.io/get-started" mac="https://element.io/get-started" linux="https://element.io/get-started" diff --git a/pages/services/chat.html b/pages/services/chat.html index 694b77f8..f5e52982 100644 --- a/pages/services/chat.html +++ b/pages/services/chat.html @@ -30,7 +30,7 @@ description: "chat.privacytools.io is our official Matrix homeserver. You can re website="https://element.io" privacy-policy="https://element.io/privacy" forum="https://forum.privacytools.io/t/discussion-element-io/665" - github="https://github.com/vector-im/riot-web/" + github="https://github.com/vector-im/element-web" windows="https://element.io/get-started" mac="https://element.io/get-started" linux="https://element.io/get-started" -- 2.47.2 From b501e31ff853518c6c010bf216038606419918c7 Mon Sep 17 00:00:00 2001 From: Daniel Gray Date: Sat, 8 Aug 2020 07:58:18 +0000 Subject: [PATCH 07/10] replace privacytoolsIO to privacytools for github --- pages/services/chat.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/services/chat.html b/pages/services/chat.html index f5e52982..92d87ec2 100644 --- a/pages/services/chat.html +++ b/pages/services/chat.html @@ -72,10 +72,10 @@ description: "chat.privacytools.io is our official Matrix homeserver. You can re

    To join a room, just type /join [room address] in any room. You can run this command from any server, not just ours!

    The PrivacyTools administration operates the following channels:

      -
    • #dev:privacytools.io: Discussions relating to building www.privacytools.io.
      • +
    • #dev:privacytools.io: Discussions relating to building www.privacytools.io.
    • #forum:privacytools.io: All PrivacyTools Forum updates (Automated).
    • #general:privacytools.io: Main discussion room.
      • -
    • #github:privacytools.io: GitHub updates for @privacytoolsIO (Automated).
      • +
    • #github:privacytools.io: GitHub updates for @privacytools (Automated).
    • #guides:privacytools.io: Privacy Guides development work.
    • #privacy:privacytools.io: On-topic privacy, security, opsec discussion and support.
    • #wiki:privacytools.io: Wiki-building discussion room.
      • -- 2.47.2 From 68abe89b93523a9a21c9faaf308daeb4020c06a0 Mon Sep 17 00:00:00 2001 From: Daniel Gray Date: Sat, 8 Aug 2020 08:01:13 +0000 Subject: [PATCH 08/10] Fix synapse letter. --- pages/services/chat.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/services/chat.html b/pages/services/chat.html index 92d87ec2..69df9020 100644 --- a/pages/services/chat.html +++ b/pages/services/chat.html @@ -58,7 +58,7 @@ description: "chat.privacytools.io is our official Matrix homeserver. You can re
    • ours of course, at chat.privacytools.io, you're here right?
    • feneas.org, tchncs.de, weho.st, pine64.org, kde.org, halogen.city...
    • purchasing an instance from Element Matrix Services
      • -
    • running your own by installing synapse — certainly the best option for the technically inclined!
      • +
    • running your own by installing Synapse — certainly the best option for the technically inclined!

    Note that at time of writing, switching homeservers requires re-registering with another account at that server, as nomadic identities haven't been implemented yet.

    -- 2.47.2 From 9419e08e2445031dfae9a779deb856b78670d5a1 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Tue, 11 Aug 2020 14:39:19 -0500 Subject: [PATCH 09/10] Don't link to same page --- pages/services/chat.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/services/chat.html b/pages/services/chat.html index 69df9020..6e997954 100644 --- a/pages/services/chat.html +++ b/pages/services/chat.html @@ -50,7 +50,7 @@ description: "chat.privacytools.io is our official Matrix homeserver. You can re

    No. Messages sent to the #general chat are encrypted from with client-to-server encryption, i.e. HTTPS. This means that your messages can't be viewed by an attacker on your network, or your ISP, etc. However, because this is a public chat room anybody can view your messages if they are a member, and newcomers will be able to see all message history. Do not say anything in rooms that don't use End-to-End (E2E) encryption that you wouldn't want tied to you personally.

    Isn't Matrix behind Cloudflare?

    -

    The default matrix.org homeserver is behind Cloudflare. The PrivacyTools homeserver (chat.privacytools.io is not. +

    The default matrix.org homeserver is behind Cloudflare. The PrivacyTools homeserver is not.

    Isn't Matrix slow?

    It can be, for some! Due to the trememdous amount of people registering on the matrix.org homeserver, it is often overloaded and occasionally slow to respond. Therefore, users on that homeserver occasionally report a less than ideal chat experience. If that's you, you can fix this problem by switching to another homeserver. Good alternatives include... -- 2.47.2 From 0d32dc12ad36259d506ec5f5879b1eddcb8d3b43 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Tue, 11 Aug 2020 14:43:47 -0500 Subject: [PATCH 10/10] Correct HTML Syntax --- pages/services/chat.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pages/services/chat.html b/pages/services/chat.html index 6e997954..a9d62fa8 100644 --- a/pages/services/chat.html +++ b/pages/services/chat.html @@ -19,7 +19,8 @@ description: "chat.privacytools.io is our official Matrix homeserver. You can re

    Connection Information

    -

    To register on or connect to our homeserver, simply use https://chat.privacytools.io as the homeserver in your Matrix client.

    Please see our community code of conduct before joining our rooms or using our services.

    +

    To register on or connect to our homeserver, simply use https://chat.privacytools.io as the homeserver in your Matrix client.

    +

    You must read and accept our community code of conduct before joining our rooms or using our services.

    {% include cardv2.html -- 2.47.2