From 85168ecc134f7f1fba453216fca614d57674cfe8 Mon Sep 17 00:00:00 2001 From: fede Date: Wed, 7 Apr 2021 18:06:17 -0300 Subject: [PATCH 01/12] Fixed dead link to Account Administration --- pages/02.about/_privacy/2col.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/02.about/_privacy/2col.en.md b/pages/02.about/_privacy/2col.en.md index 37cf8ed0..078cfe8d 100644 --- a/pages/02.about/_privacy/2col.en.md +++ b/pages/02.about/_privacy/2col.en.md @@ -13,7 +13,7 @@ In the last few decades information has become very valuable and more and more e **Own your own data:** Many networks use your data to make money by analyzing your interactions and using this information to advertise things to you. **Disroot** doesn't use your data for any purpose other than allowing you to connect and use the service. -Your files on the cloud are encrypted with your user password, every bin-paste and file uploaded on **Lufi** service is client side encrypted too, meaning that even server administrators have no access to your data. Whenever there is a possibility for encryption, we enable it and if it's not possible, we advice to use external encryption software. The less we, as admins, know about your data, the better :D. (Tip of the day: *Never lose your password!*) [Check this tutorial](https://howto.disroot.org/en/tutorials/user/account/ussc) +Your files on the cloud are encrypted with your user password, every bin-paste and file uploaded on **Lufi** service is client side encrypted too, meaning that even server administrators have no access to your data. Whenever there is a possibility for encryption, we enable it and if it's not possible, we advice to use external encryption software. The less we, as admins, know about your data, the better :D. (Tip of the day: *Never lose your password!*) [Check this tutorial](https://howto.disroot.org/en/tutorials/user/account/administration) --- From 8c12b5158ed8f77c5d6859c595fe737c19c29799 Mon Sep 17 00:00:00 2001 From: meaz Date: Thu, 8 Apr 2021 09:16:10 +0000 Subject: [PATCH 02/12] Fix link on home page FR --- pages/01.home/_donation/2col.fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/01.home/_donation/2col.fr.md b/pages/01.home/_donation/2col.fr.md index 22860789..d81f6a27 100644 --- a/pages/01.home/_donation/2col.fr.md +++ b/pages/01.home/_donation/2col.fr.md @@ -7,7 +7,7 @@ fontcolor: '#1e5a5e' ![](premium.png?class=reward) Disroot compte sur les dons et le soutien de sa communauté et des utilisateurs de ses services. Si vous souhaitez que le projet se poursuive et contribuer à créer un environnement favorable à de nouveaux disrooters potentiels, veuillez utiliser l'une des méthodes disponibles pour apporter une contribution financière. Des [alias et des renvois de domaine](/services/email#alias) sont disponibles pour les donateurs réguliers. -Vous pouvez également collaborer en achetant de l'espace [stockage supplémentaire de courrier électronique] (/services/email#storage) et/ou du [stockage cloud supplémentaire](/services/nextcloud#storage). +Vous pouvez également collaborer en achetant de l'espace [stockage supplémentaire de courrier électronique](/services/email#storage) et/ou du [stockage cloud supplémentaire](/services/nextcloud#storage). --- From ef4e972c499554441815336093f033f58a87d1c4 Mon Sep 17 00:00:00 2001 From: avg_joe Date: Thu, 8 Apr 2021 17:25:43 +0200 Subject: [PATCH 03/12] faq pw change --- pages/10.faq/_user/faq.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/10.faq/_user/faq.en.md b/pages/10.faq/_user/faq.en.md index ddbace85..83a864b0 100644 --- a/pages/10.faq/_user/faq.en.md +++ b/pages/10.faq/_user/faq.en.md @@ -40,6 +40,6 @@ faq: - question: "How can I change my password?" answer: "

Log in to https://user.disroot.org and select 'Change Password'.

-

You will also need to change your password on Nextcloud to be able to access your files, which are encrypted using your password. To do it, follow the steps as described in the answer to 'I get an 'Invalid private key for encryption app' message' or check this tutorial.

" +

You will also need to change your password on Nextcloud to be able to access your files, which are encrypted using your password. To do it, follow the steps as described in the answer to 'I get an 'Invalid private key for encryption app' message' or check this tutorial.

" --- From e21f23c0cb836f9facd6cf1a882410f214397b54 Mon Sep 17 00:00:00 2001 From: avg_joe Date: Thu, 8 Apr 2021 17:29:18 +0200 Subject: [PATCH 04/12] clients: mumble-web --- pages/03.services/04.audio/_mumble-clients/clients.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/03.services/04.audio/_mumble-clients/clients.en.md b/pages/03.services/04.audio/_mumble-clients/clients.en.md index 774d594b..c3f38616 100644 --- a/pages/03.services/04.audio/_mumble-clients/clients.en.md +++ b/pages/03.services/04.audio/_mumble-clients/clients.en.md @@ -13,7 +13,7 @@ clients: - title: Mumble-Web logo: webbrowser.png - link: https://audio.disroot.org + link: https://mumble.disroot.org/ text: Our online Disroot mumble! platforms: [fa-linux, fa-windows, fa-apple, fa-android] From bf0d7828631b4562ae46faa07dd7de972b6b33fc Mon Sep 17 00:00:00 2001 From: avg_joe Date: Thu, 8 Apr 2021 17:34:18 +0200 Subject: [PATCH 05/12] xmpp: search.jabber.network --- pages/03.services/07.xmpp/_xmpp-chatrooms/2col.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/03.services/07.xmpp/_xmpp-chatrooms/2col.en.md b/pages/03.services/07.xmpp/_xmpp-chatrooms/2col.en.md index d588ab46..40ca7c7b 100644 --- a/pages/03.services/07.xmpp/_xmpp-chatrooms/2col.en.md +++ b/pages/03.services/07.xmpp/_xmpp-chatrooms/2col.en.md @@ -10,7 +10,7 @@ wider_column: left With XMPP your can create and join private or public rooms in the network. Rooms address are simple to remember and resemble email mailinglists like: *your_room*@chat.disroot.org. Additionally you can set various privacy settings per room such as: Whether the room history should be stored on the server, whether the room is publicly searchable and open for anyone to join, you can set admins and moderators for the room and room encryption. -Check the [global room list](https://search.jabbercat.org/rooms/1) of all the servers that voluntarily submit their public rooms to global directory. +Check the [global room list](https://search.jabber.network/rooms/1) of all the servers that voluntarily submit their public rooms to global directory. --- From 840be13020952257be7956449415f6461f2e733e Mon Sep 17 00:00:00 2001 From: avg_joe Date: Thu, 8 Apr 2021 17:59:48 +0200 Subject: [PATCH 06/12] tos: replace disource announcement with blog --- pages/tos/_tos/fullbar.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/tos/_tos/fullbar.en.md b/pages/tos/_tos/fullbar.en.md index 2bb1294f..0645cafe 100755 --- a/pages/tos/_tos/fullbar.en.md +++ b/pages/tos/_tos/fullbar.en.md @@ -156,7 +156,7 @@ You understand and agree that **Disroot.org** provides you primarily with intern
## 14. Changes on these Terms -We reserve the right to modify these conditions at any time. We highly evaluate transparency and do our best to make sure users are notified as soon as possible about any major changes via email, social networks and/or the announcement [forum](https://forum.disroot.org/c/disroot/disroot-changelog). Minor changes will most likely only be published on the announcement forum. +We reserve the right to modify these conditions at any time. We highly evaluate transparency and do our best to make sure users are notified as soon as possible about any major changes via email, social networks and/or on our [blog](https://disroot.org/en/blog). Minor changes will most likely only be published on our blog.
You can follow the history of changes on this document on our git repository [**here**](https://git.disroot.org/Disroot/Disroot-ToS/commits/branch/master) From 5fc8d5c4a8e0dfca1ae2ba74458afb26cef4f58a Mon Sep 17 00:00:00 2001 From: avg_joe Date: Thu, 8 Apr 2021 18:03:40 +0200 Subject: [PATCH 07/12] DE taiga scrum wiki --- pages/03.services/13.project-board/_taiga-features/2col.de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/03.services/13.project-board/_taiga-features/2col.de.md b/pages/03.services/13.project-board/_taiga-features/2col.de.md index ba7bcd72..9eeaab9a 100644 --- a/pages/03.services/13.project-board/_taiga-features/2col.de.md +++ b/pages/03.services/13.project-board/_taiga-features/2col.de.md @@ -10,7 +10,7 @@ Für diejenigen, die bisher nichts mit Projektmanagement-Tools und Scrum zu tun ## Scrum-Projekt -Mit Backlog, Sprintplanung, User-Story-Punkten und all den anderen Annehmlichkeiten, die jedes Scrum-Projekt benötigt.
[Software-Entwicklung](https://de.wikipedia.org/wiki/Scrum_(software_development)) +Mit Backlog, Sprintplanung, User-Story-Punkten und all den anderen Annehmlichkeiten, die jedes Scrum-Projekt benötigt.
[Software-Entwicklung](https://de.wikipedia.org/wiki/Scrum) ## Fragen-Board From e67095748f9104f6de422bdc2f741588f2efe15f Mon Sep 17 00:00:00 2001 From: avg_joe Date: Thu, 8 Apr 2021 18:08:35 +0200 Subject: [PATCH 08/12] valid mumble link --- pages/03.services/04.audio/_mumble-features1/2col.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/03.services/04.audio/_mumble-features1/2col.en.md b/pages/03.services/04.audio/_mumble-features1/2col.en.md index 8e4c1a43..244aee05 100644 --- a/pages/03.services/04.audio/_mumble-features1/2col.en.md +++ b/pages/03.services/04.audio/_mumble-features1/2col.en.md @@ -5,7 +5,7 @@ wider_column: left ## Easy to use -Download the Mumble app available on your device (desktop, Android or iOS), connect to [mumble.disroot.org](mumble.disroot.org) and you can already start creating an audio channel and talk to people! +Download the Mumble app available on your device (desktop, Android or iOS), connect to [mumble.disroot.org](https://mumble.disroot.org/) and you can already start creating an audio channel and talk to people! ## Great audio quality From 52d10c9072d9622311f66a3d57c24cfb82a88b1e Mon Sep 17 00:00:00 2001 From: avg_joe Date: Thu, 8 Apr 2021 18:11:36 +0200 Subject: [PATCH 09/12] git: add https for valid link --- pages/03.services/15.git/_gitea/2col.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/03.services/15.git/_gitea/2col.en.md b/pages/03.services/15.git/_gitea/2col.en.md index c6d2e69b..42ee7c30 100644 --- a/pages/03.services/15.git/_gitea/2col.en.md +++ b/pages/03.services/15.git/_gitea/2col.en.md @@ -26,4 +26,4 @@ Source code: [https://github.com/go-gitea/gitea](https://github.com/go-gitea/git
-You need to create a seperate account on [git.disroot.org](git.disroot.org) to use this service. **Disroot** account credentials are not supported. +You need to create a seperate account on [git.disroot.org](https://git.disroot.org/) to use this service. **Disroot** account credentials are not supported. From ab83a9d4fa6d621e8a55103f483da08796ce14d3 Mon Sep 17 00:00:00 2001 From: fede Date: Thu, 8 Apr 2021 17:16:11 -0300 Subject: [PATCH 10/12] Removed howto link + Text update --- pages/02.about/_privacy/2col.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/02.about/_privacy/2col.en.md b/pages/02.about/_privacy/2col.en.md index 078cfe8d..621c7f9b 100644 --- a/pages/02.about/_privacy/2col.en.md +++ b/pages/02.about/_privacy/2col.en.md @@ -13,7 +13,7 @@ In the last few decades information has become very valuable and more and more e **Own your own data:** Many networks use your data to make money by analyzing your interactions and using this information to advertise things to you. **Disroot** doesn't use your data for any purpose other than allowing you to connect and use the service. -Your files on the cloud are encrypted with your user password, every bin-paste and file uploaded on **Lufi** service is client side encrypted too, meaning that even server administrators have no access to your data. Whenever there is a possibility for encryption, we enable it and if it's not possible, we advice to use external encryption software. The less we, as admins, know about your data, the better :D. (Tip of the day: *Never lose your password!*) [Check this tutorial](https://howto.disroot.org/en/tutorials/user/account/administration) +Your files on the cloud are encrypted with your user password, every bin-paste and file uploaded on **Lufi** service is client side encrypted too, meaning that even server administrators have no access to your data. Whenever there is a possibility for encryption, we enable it and if it's not possible, we advice to use external encryption software. The less we, as admins, know about your data, the better :D.(_**Tip of the day**: Since your files on **Nextcloud** are encrypted with your user's password, if you forget it you will not be able to access your files again, so **make sure to NEVER lose your password!** (We suggest using a password manger)_ --- From 86563bff2b2c65f96dc70a696bdc8f7c03a10d73 Mon Sep 17 00:00:00 2001 From: fede Date: Wed, 7 Apr 2021 18:06:17 -0300 Subject: [PATCH 11/12] Fixed dead link to Account Administration --- pages/02.about/_privacy/2col.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/02.about/_privacy/2col.en.md b/pages/02.about/_privacy/2col.en.md index 37cf8ed0..078cfe8d 100644 --- a/pages/02.about/_privacy/2col.en.md +++ b/pages/02.about/_privacy/2col.en.md @@ -13,7 +13,7 @@ In the last few decades information has become very valuable and more and more e **Own your own data:** Many networks use your data to make money by analyzing your interactions and using this information to advertise things to you. **Disroot** doesn't use your data for any purpose other than allowing you to connect and use the service. -Your files on the cloud are encrypted with your user password, every bin-paste and file uploaded on **Lufi** service is client side encrypted too, meaning that even server administrators have no access to your data. Whenever there is a possibility for encryption, we enable it and if it's not possible, we advice to use external encryption software. The less we, as admins, know about your data, the better :D. (Tip of the day: *Never lose your password!*) [Check this tutorial](https://howto.disroot.org/en/tutorials/user/account/ussc) +Your files on the cloud are encrypted with your user password, every bin-paste and file uploaded on **Lufi** service is client side encrypted too, meaning that even server administrators have no access to your data. Whenever there is a possibility for encryption, we enable it and if it's not possible, we advice to use external encryption software. The less we, as admins, know about your data, the better :D. (Tip of the day: *Never lose your password!*) [Check this tutorial](https://howto.disroot.org/en/tutorials/user/account/administration) --- From c969df70259bbd165495be9310242ffdb6c1cf56 Mon Sep 17 00:00:00 2001 From: fede Date: Thu, 8 Apr 2021 17:16:11 -0300 Subject: [PATCH 12/12] Removed howto link + Text update --- pages/02.about/_privacy/2col.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/02.about/_privacy/2col.en.md b/pages/02.about/_privacy/2col.en.md index 078cfe8d..621c7f9b 100644 --- a/pages/02.about/_privacy/2col.en.md +++ b/pages/02.about/_privacy/2col.en.md @@ -13,7 +13,7 @@ In the last few decades information has become very valuable and more and more e **Own your own data:** Many networks use your data to make money by analyzing your interactions and using this information to advertise things to you. **Disroot** doesn't use your data for any purpose other than allowing you to connect and use the service. -Your files on the cloud are encrypted with your user password, every bin-paste and file uploaded on **Lufi** service is client side encrypted too, meaning that even server administrators have no access to your data. Whenever there is a possibility for encryption, we enable it and if it's not possible, we advice to use external encryption software. The less we, as admins, know about your data, the better :D. (Tip of the day: *Never lose your password!*) [Check this tutorial](https://howto.disroot.org/en/tutorials/user/account/administration) +Your files on the cloud are encrypted with your user password, every bin-paste and file uploaded on **Lufi** service is client side encrypted too, meaning that even server administrators have no access to your data. Whenever there is a possibility for encryption, we enable it and if it's not possible, we advice to use external encryption software. The less we, as admins, know about your data, the better :D.(_**Tip of the day**: Since your files on **Nextcloud** are encrypted with your user's password, if you forget it you will not be able to access your files again, so **make sure to NEVER lose your password!** (We suggest using a password manger)_ ---