Merge branch 'master' into community--change-from-taiga-to-git
This commit is contained in:
commit
c7cd437902
|
|
@ -7,7 +7,7 @@ fontcolor: '#1e5a5e'
|
|||
|
||||
 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).
|
||||
|
||||
---
|
||||
|
||||
|
|
|
|||
|
|
@ -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**: 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)_
|
||||
|
||||
---
|
||||
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
||||
|
||||
---
|
||||
|
|
|
|||
|
|
@ -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.<br>[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.<br>[Software-Entwicklung](https://de.wikipedia.org/wiki/Scrum)
|
||||
|
||||
|
||||
## Fragen-Board
|
||||
|
|
|
|||
|
|
@ -26,4 +26,4 @@ Source code: [https://github.com/go-gitea/gitea](https://github.com/go-gitea/git
|
|||
|
||||
<hr>
|
||||
|
||||
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.
|
||||
|
|
|
|||
|
|
@ -40,6 +40,6 @@ faq:
|
|||
-
|
||||
question: "How can I change my password?"
|
||||
answer: "<p>Log in to <a href='https://user.disroot.org' target='_blank'>https://user.disroot.org</a> and select <b>'Change Password'</b>.</p>
|
||||
<p>You will also need to change your password on <b>Nextcloud</b> 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>'I get an 'Invalid private key for encryption app' message'</i> or check <a href='https://howto.disroot.org/en/user/account/ussc#change-your-password' target='_blank'>this tutorial.</a></p>"
|
||||
<p>You will also need to change your password on <b>Nextcloud</b> 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>'I get an 'Invalid private key for encryption app' message'</i> or check <a href='https://howto.disroot.org/en/tutorials/user/account/administration/password' target='_blank'>this tutorial.</a></p>"
|
||||
|
||||
---
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ You understand and agree that **Disroot.org** provides you primarily with intern
|
|||
<a name="changes"></a>
|
||||
<br>
|
||||
## 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.
|
||||
<br>
|
||||
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)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue