From 213154a7426284c13058b8c069d7a2bc03c12686 Mon Sep 17 00:00:00 2001
From: Erik Michelson
Date: Tue, 8 Sep 2020 10:06:30 +0200
Subject: [PATCH 1/2] Update matrix chat link from riot.im to app.element.io
and change room alias
Signed-off-by: Erik Michelson
---
README.md | 4 ++--
SECURITY.md | 4 ++--
public/docs/features.md | 2 +-
public/views/index/body.ejs | 2 +-
public/views/shared/help-modal.ejs | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/README.md b/README.md
index e02b9346d..0a3d8fe4d 100644
--- a/README.md
+++ b/README.md
@@ -85,8 +85,8 @@ which lets you use CodiMD from the comfort of your command line.
Licensed under AGPLv3. For our list of contributors, see [AUTHORS](AUTHORS).
-[matrix.org-image]: https://img.shields.io/matrix/codimd:matrix.org?logo=matrix&server_fqdn=matrix.org
-[matrix.org-url]: https://riot.im/app/#/room/#codimd:matrix.org
+[matrix.org-image]: https://img.shields.io/matrix/hedgedoc:matrix.org?logo=matrix&server_fqdn=matrix.org
+[matrix.org-url]: https://app.element.io/#/room/#hedgedoc:matrix.org
[travis-image]: https://travis-ci.org/codimd/server.svg?branch=master
[travis-url]: https://travis-ci.org/codimd/server
[github-version-badge]: https://img.shields.io/github/release/codimd/server.svg
diff --git a/SECURITY.md b/SECURITY.md
index 3819d0af3..f5c3d4480 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -16,7 +16,7 @@ which will take care of the encryption for you.
We'll get back to you as soon as possible. You can expect an answer within
3 days, in rare cases within a month. If you don't get a reply within a month,
-please reach out for other contact addresses in the [community chat](https://riot.im/app/#/room/#codimd:matrix.org).
+please reach out for other contact addresses in the [community chat](https://app.element.io/#/room/#hedgedoc:matrix.org).
When your findings are accepted as a security issue, we'll work an a fix or
at least a workaround for the next release. With the release that contained
@@ -29,4 +29,4 @@ a fix yourself and contribute it to CodiMD, as well as publish them as you
like and allow people to make in informed decision about using CodiMD.
If you have any further questions, feel free to reach out to the
-[community chat](https://riot.im/app/#/room/#codimd:matrix.org) or the mentioned contacts above.
+[community chat](https://app.element.io/#/room/#hedgedoc:matrix.org) or the mentioned contacts above.
diff --git a/public/docs/features.md b/public/docs/features.md
index 9a225fe21..4852c4d98 100644
--- a/public/docs/features.md
+++ b/public/docs/features.md
@@ -7,7 +7,7 @@ This means that you can write notes with other people on your **desktop**, **tab
You can sign-in via multiple auth providers like **Facebook**, **Twitter**, **GitHub** and many more on the [*homepage*](/).
If you experience any *issues*, feel free to report it on [**GitHub**](https://github.com/codimd/server/issues).
-Or meet us on [**Matrix.org**](https://riot.im/app/#/room/#codimd:matrix.org) for dev-talk and interactive help.
+Or meet us on [**Matrix.org**](https://app.element.io/#/room/#hedgedoc:matrix.org) for dev-talk and interactive help.
**Thank you very much!**
## Workspace
diff --git a/public/views/index/body.ejs b/public/views/index/body.ejs
index 6506ae7df..2464cac44 100644
--- a/public/views/index/body.ejs
+++ b/public/views/index/body.ejs
@@ -158,7 +158,7 @@
<%- __('Powered by %s', 'CodiMD') %> | <%= __('Releases') %> | <%= __('Source Code') %><% if(imprint) { %> | <%= __('Imprint') %><% } %><% if(privacyStatement) { %> | <%= __('Privacy') %><% } %><% if(termsOfUse) { %> | <%= __('Terms of Use') %><% } %>
diff --git a/public/views/shared/help-modal.ejs b/public/views/shared/help-modal.ejs
index eb5566a8e..a85389df0 100644
--- a/public/views/shared/help-modal.ejs
+++ b/public/views/shared/help-modal.ejs
@@ -17,7 +17,7 @@
<%= __('Join the community') %>
-
<%= __('Meet us on %s', 'Matrix') %>
+
<%= __('Meet us on %s', 'Matrix') %>
<%= __('Report an issue') %>
From fcacbb21757badd865657adfb7ebc9586868360a Mon Sep 17 00:00:00 2001
From: Erik Michelson
Date: Mon, 28 Sep 2020 13:05:22 +0200
Subject: [PATCH 2/2] Change all element.io links to matrix.to links
Signed-off-by: Erik Michelson
---
README.md | 2 +-
SECURITY.md | 4 ++--
public/docs/features.md | 2 +-
public/views/index/body.ejs | 2 +-
public/views/shared/help-modal.ejs | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index 0a3d8fe4d..80060e2b9 100644
--- a/README.md
+++ b/README.md
@@ -86,7 +86,7 @@ which lets you use CodiMD from the comfort of your command line.
Licensed under AGPLv3. For our list of contributors, see [AUTHORS](AUTHORS).
[matrix.org-image]: https://img.shields.io/matrix/hedgedoc:matrix.org?logo=matrix&server_fqdn=matrix.org
-[matrix.org-url]: https://app.element.io/#/room/#hedgedoc:matrix.org
+[matrix.org-url]: https://matrix.to/#/#hedgedoc:matrix.org
[travis-image]: https://travis-ci.org/codimd/server.svg?branch=master
[travis-url]: https://travis-ci.org/codimd/server
[github-version-badge]: https://img.shields.io/github/release/codimd/server.svg
diff --git a/SECURITY.md b/SECURITY.md
index f5c3d4480..6d5a8c614 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -16,7 +16,7 @@ which will take care of the encryption for you.
We'll get back to you as soon as possible. You can expect an answer within
3 days, in rare cases within a month. If you don't get a reply within a month,
-please reach out for other contact addresses in the [community chat](https://app.element.io/#/room/#hedgedoc:matrix.org).
+please reach out for other contact addresses in the [community chat](https://matrix.to/#/#hedgedoc:matrix.org).
When your findings are accepted as a security issue, we'll work an a fix or
at least a workaround for the next release. With the release that contained
@@ -29,4 +29,4 @@ a fix yourself and contribute it to CodiMD, as well as publish them as you
like and allow people to make in informed decision about using CodiMD.
If you have any further questions, feel free to reach out to the
-[community chat](https://app.element.io/#/room/#hedgedoc:matrix.org) or the mentioned contacts above.
+[community chat](https://matrix.to/#/#hedgedoc:matrix.org) or the mentioned contacts above.
diff --git a/public/docs/features.md b/public/docs/features.md
index 4852c4d98..e6c81ae77 100644
--- a/public/docs/features.md
+++ b/public/docs/features.md
@@ -7,7 +7,7 @@ This means that you can write notes with other people on your **desktop**, **tab
You can sign-in via multiple auth providers like **Facebook**, **Twitter**, **GitHub** and many more on the [*homepage*](/).
If you experience any *issues*, feel free to report it on [**GitHub**](https://github.com/codimd/server/issues).
-Or meet us on [**Matrix.org**](https://app.element.io/#/room/#hedgedoc:matrix.org) for dev-talk and interactive help.
+Or meet us on [**Matrix.org**](https://matrix.to/#/#hedgedoc:matrix.org) for dev-talk and interactive help.
**Thank you very much!**
## Workspace
diff --git a/public/views/index/body.ejs b/public/views/index/body.ejs
index 2464cac44..1f941f140 100644
--- a/public/views/index/body.ejs
+++ b/public/views/index/body.ejs
@@ -158,7 +158,7 @@
<%- __('Powered by %s', 'CodiMD') %> | <%= __('Releases') %> | <%= __('Source Code') %><% if(imprint) { %> | <%= __('Imprint') %><% } %><% if(privacyStatement) { %> | <%= __('Privacy') %><% } %><% if(termsOfUse) { %> | <%= __('Terms of Use') %><% } %>
diff --git a/public/views/shared/help-modal.ejs b/public/views/shared/help-modal.ejs
index a85389df0..d1fe50bba 100644
--- a/public/views/shared/help-modal.ejs
+++ b/public/views/shared/help-modal.ejs
@@ -17,7 +17,7 @@