Merge branch 'master' into green_badge

This commit is contained in:
meaz 2020-07-17 06:34:55 +00:00
commit 052494f227
56 changed files with 304 additions and 18 deletions

1
pages/.gitignore vendored
View File

@ -1,2 +1,3 @@
privacy_policy/_pp
tos/_tos
cryptocurrency/

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

View File

@ -0,0 +1,14 @@
---
title: 'Green bar'
bgcolor: '#8EB726'
fontcolor: '#1F5C60'
text_align: center
---
## Disroot Team
Disroot was founded by **Antilopa** and **Muppeth** in 2015.
In July 2019 **Fede** and **Meaz** joined the Team.
![antilopa](antilopa.png "Antilopa") ![muppeth](muppeth.png "Muppeth") ![fede](fede.png "Fede") ![meaz](meaz.png "Meaz")

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

View File

@ -2,6 +2,8 @@
title: Federation and Decentralization
fontcolor: '#555'
wider_column: right
bgcolor: '#fff'
---
# Föderation und Dezentralisierung

View File

@ -2,6 +2,8 @@
title: Federation and Decentralization
fontcolor: '#555'
wider_column: right
bgcolor: '#fff'
---
# Federation and Decentralization

View File

@ -2,6 +2,8 @@
title: Federation and Decentralization
fontcolor: '#555'
wider_column: right
bgcolor: '#fff'
---
# Federación y Descentralización

View File

@ -2,6 +2,8 @@
title: 'Fédération et Décentralisation'
fontcolor: '#555'
wider_column: right
bgcolor: '#fff'
---
# Fédération et Décentralisation

View File

@ -2,6 +2,8 @@
title: Federation and Decentralization
fontcolor: '#555'
wider_column: right
bgcolor: '#fff'
---
# Federazione e decentralizzazione

View File

@ -2,6 +2,8 @@
title: Federation and Decentralization
fontcolor: '#555'
wider_column: right
bgcolor: '#fff'
---
# Объединение и Децентрализация

View File

@ -2,6 +2,8 @@
title: privacy
fontcolor: '#555'
wider_column: left
bgcolor: '#fff'
---
<br>

View File

@ -2,6 +2,8 @@
title: privacy
fontcolor: '#555'
wider_column: left
bgcolor: '#fff'
---
<br>

View File

@ -2,6 +2,8 @@
title: privacy
fontcolor: '#555'
wider_column: left
bgcolor: '#fff'
---
<br>

View File

@ -2,6 +2,8 @@
title: 'vie privée'
fontcolor: '#555'
wider_column: left
bgcolor: '#fff'
---
<br>

View File

@ -2,6 +2,8 @@
title: privacy
fontcolor: '#555'
wider_column: left
bgcolor: '#fff'
---
<br>

View File

@ -2,6 +2,8 @@
title: privacy
fontcolor: '#555'
wider_column: left
bgcolor: '#fff'
---
<br>

View File

@ -2,6 +2,8 @@
title: Transparency
fontcolor: '#555'
wider_column: right
bgcolor: '#fff'
---
# Transparenz und Offenheit

View File

@ -2,6 +2,8 @@
title: Transparency
fontcolor: '#555'
wider_column: right
bgcolor: '#fff'
---
# Transparency and openness

View File

@ -2,6 +2,8 @@
title: Transparency
fontcolor: '#555'
wider_column: right
bgcolor: '#fff'
---
# Transparencia y apertura

View File

@ -2,6 +2,8 @@
title: Transparence
fontcolor: '#555'
wider_column: right
bgcolor: '#fff'
---
# Transparence et ouverture

View File

@ -2,6 +2,8 @@
title: Transparency
fontcolor: '#555'
wider_column: right
bgcolor: '#fff'
---
# Trasparenza e apertura

View File

@ -2,6 +2,8 @@
title: Transparency
fontcolor: '#555'
wider_column: right
bgcolor: '#fff'
---
# Прозрачность и открытость

View File

@ -1,6 +1,6 @@
---
title: 'About'
bgcolor: '#fff'
bgcolor: '#1F5C60'
content:
items: '@self.modular'
order:
@ -8,6 +8,7 @@ content:
dir: asc
custom:
- _about-who-and-why
- _core-team
- _federation
- _privacy
- _transparency

View File

@ -0,0 +1,39 @@
---
title: 'Mumble Clients'
bgcolor: '#FFF'
fontcolor: '#327E82'
text_align: left
clients:
-
title: Mumble
logo: mumble.png
link: https://www.mumble.info/
text:
platforms: [fa-linux, fa-windows, fa-apple]
-
title: Mumble-Web
logo: webbrowser.png
link: https://audio.disroot.org
text: Our online Disroot mumble!
platforms: [fa-linux, fa-windows, fa-apple, fa-android]
-
title: Plumble
logo: plumble.png
link: https://github.com/acomminos/Plumble
text:
platforms: [fa-android]
-
title: Mumla
logo: mumla.png
link: https://monal.im/
text: A fork of Plumble
platforms: [fa-android]
---
<div class=clients markdown=1>
</div>

View File

@ -0,0 +1,39 @@
---
title: 'Clients Mumble'
bgcolor: '#FFF'
fontcolor: '#327E82'
text_align: left
clients:
-
title: Mumble
logo: mumble.png
link: https://www.mumble.info/
text:
platforms: [fa-linux, fa-windows, fa-apple]
-
title: Mumble-Web
logo: webbrowser.png
link: https://audio.disroot.org
text: Notre mumble Disroot en ligne!
platforms: [fa-linux, fa-windows, fa-apple, fa-android]
-
title: Plumble
logo: plumble.png
link: https://github.com/acomminos/Plumble
text:
platforms: [fa-android]
-
title: Mumla
logo: mumla.png
link: https://monal.im/
text: Un fork de Plumble
platforms: [fa-android]
---
<div class=clients markdown=1>
</div>

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 101 KiB

View File

@ -0,0 +1,9 @@
---
title: 'Mumble Clients'
bgcolor: '#FFFFFF'
fontcolor: '#327E82'
text_align: center
---
# Use your favorite Mumble client
There are clients on desktop/web/mobile.<br>

View File

@ -0,0 +1,9 @@
---
title: 'Clients Mumble'
bgcolor: '#FFFFFF'
fontcolor: '#327E82'
text_align: center
---
# Utilisez votre client Mumble préféré
Il y a des clients de bureau, sur le web, sur mobile.<br>

View File

@ -10,6 +10,8 @@ content:
- _mumble
- _mumble-highlights
- _mumble-feature1
- _mumble-clients_header
- _mumble-clients
body_classes: modular
header_image: audio_banner.jpg
---

View File

@ -10,6 +10,8 @@ content:
- _mumble
- _mumble-highlights
- _mumble-feature1
- _mumble-clients_header
- _mumble-clients
body_classes: modular
header_image: audio_banner.jpg
---

View File

@ -10,6 +10,8 @@ content:
- _mumble
- _mumble-highlights
- _mumble-feature1
- _mumble-clients_header
- _mumble-clients
body_classes: modular
header_image: audio_banner.jpg
---

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

View File

@ -10,7 +10,7 @@ text_align: center
![](graph.png?lightbox=1024)
Unterstützt von <button class="button button4">277</button>
Unterstützt von <button class="button button4">224</button>
_(Click the number for an overview)_

View File

@ -10,7 +10,7 @@ text_align: center
![](graph.png?lightbox=1024)
Supported by <button class="button button4">183</button> Disrooters
Supported by <button class="button button4">224</button> Disrooters
_(Click the number for an overview)_
![](graph_support.png?lightbox=1024&resize=40,40&class=transparent)

View File

@ -10,7 +10,7 @@ text_align: center
![](graph.png?lightbox=1024)
Apoyado por <button class="button button4">277</button> Disrooters
Apoyado por <button class="button button4">224</button> Disrooters
_(Clickea el número para una vista general)_
![](graph_support.png?lightbox=1024&resize=40,40&class=transparent)

View File

@ -10,7 +10,7 @@ text_align: center
![](graph.png?lightbox=1024)
Soutenu par <button class="button button4">277</button> Disrooters
Soutenu par <button class="button button4">224</button> Disrooters
_(Cliquez sur le numéro pour un aperçu)_
![](graph_support.png?lightbox=1024&resize=40,40&class=transparent)

View File

@ -10,7 +10,7 @@ text_align: center
![](graph.png?lightbox=1024)
Supportato da <button class="button4">277</button> Disrooters
Supportato da <button class="button4">224</button> Disrooters
_(Click the number for an overview)_
![](graph_support.png?lightbox=1024&resize=40,40&class=transparent)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 17 KiB

View File

@ -0,0 +1,44 @@
---
title: 'New webmail!'
media_order: roundcube.png
published: true
date: '20-04-2020 00:30'
taxonomy:
category:
- news
tag:
- roundcube
- webmail
- news
body_classes: 'single single-post'
---
Dear Disrooters:
Starting from June 8th, we are going to replace the current webmail (powered by **Rainloop**) with a brand new toy powered by **Roundcube**.
For the last 4 years we have been using **Rainloop** for our webmail experience. But due to some missing features and a need to improve the platform's integration, we have decided to re-introduce a webmail environment built on **Roundcube**.
**Roundcube** has been widely used for the last 10 years and it provides the modern, fast, simple and reliable solution one could expect. Here are some feature highlights:
* A nice responsive Disroot flavored skin (and dark mode)
* Better filter support
* Email and mailbox archiving
* Custom themes
* The interface is translated in more than 80 languages.
* Drag-&-drop message management: move your messages with your mouse.
* Full support for MIME and HTML messages.
* Attachment previews: see the images directly within your messages.
* Threaded message listing: Display conversations in a threaded mode.
* Folders: Manage your folders (add, remove, or hide).
* Two factor authentication: add a second level of authentication to your account log-in.
And many more...
In the near future we are planning to integrate it with mailbox encryption as well as **Nextcloud** (calendars, contacts and attachments) and other services currently provided by **Disroot**. We think **Roundcube** will enable us to further improve your email experience.
We hope you'll like the new looks and new features. We sure are looking forward to this switch and future improvements.
**!! Warning for 2FA users!!**
For those of you that have 2FA enabled on the current webmail, you will have to re-set it up again once the new webmail is up and running. Sorry for the inconvenience!

View File

@ -0,0 +1,44 @@
---
title: '¡Nuevo webmail!'
media_order: roundcube.png
published: true
date: '20-04-2020 00:30'
taxonomy:
category:
- noticias
tag:
- roundcube
- webmail
- noticias
body_classes: 'single single-post'
---
Queridxs Disrooters:
A partir del 8 de junio, reemplazaremos el actual webmail (desarrollado por **Rainloop**) por un nuevo juguete creado por **Roundcube**.
Durante los últimos cuatro años hemos estado utilizando **Rainloop** para nuestra experiencia con el webmail. Pero, debido a algunas características ausentes y a una necesidad de mejorar la integración con la plataforma, decidimos re introducir un entorno de webmail construido sobre **Roundcube**.
**Roundcube** ha sido utilizado ampliamente durante los últimos diez años y proporciona la solución moderna, rápida, simple y confiable que unx podría esperar. Aquí algunas características destacadas:
* Tema de Disroot con buena adaptación (y modo oscuro)
* Mejor soporte de filtros
* Archivado de correo y bandeja de entrada
* Temas personalizados
* La interfaz está traducida a más de ochenta idiomas.
* Gestión de mensajes arrastrar-&-soltar: mueve tus mensajes con el ratón.
* Soporte completo para mensajes MIME y HTML.
* Vista previa de adjuntos: ve las imágenes directamente dentro de tus mensajes.
* Lista de mensajes enlazados: muestra las conversaciones en modo de hilos.
* Carpetas: gestiona tus carpetas (agregar, quitar o esconder).
* Autenticación de dos factores: agrega un segundo nivel de autenticación a tu inicio de sesión.
* Y mucho más...
Para el futuro próximo estamos planeando integrarlo con el cifrado del buzón además de con **Nextcloud** (calendarios, contactos y adjuntos) y otros servicios ofrecidos actualmente por **Disroot**. Pensamos que **Roundcube** nos permitirá mejorar sus experiencias con el correo electrónico.
Esperamos que les guste el nuevo look y las nuevas características. Nosotrxs, seguro, estamos esperando este cambio y las futuras mejoras.
**!! ¡Aviso a lxs usuarixs de 2FA!**
Aquellxs de ustedes que tienen la 2FA habilitada en el actual webmail, tendrán que re-configurarla de nuevo una vez que el nuevo esté funcionando. ¡Disculpen por las molestias!

View File

@ -0,0 +1,44 @@
---
title: 'Nuova webmail!'
media_order: roundcube.png
published: true
date: '20-04-2020 00:30'
taxonomy:
category:
- news
tag:
- roundcube
- webmail
- news
body_classes: 'single single-post'
---
Cari Disrooters,
a partire dall'8 giugno, andremo a sostituire l'attuale webmail (**Rainloop**) con un nuovo software: **Roundcube**.
Negli ultimi 4 anni abbiamo utilizzato **Rainloop**, ma a causa di alcune funzionalità mancanti e della necessità di migliorare l'integrazione della piattaforma, abbiamo deciso di introdurre un ambiente di webmail basato su **Roundcube**.
**Roundcube** è un software ampliamente testato negli ultimi 10 anni e offre una soluzione per webmail moderna, veloce, semplice e affidabile. Ecco alcuni punti salienti delle sue funzionalità:
* Una interfaccia grafica integrata in Disroot (anche per tema scuro scuro)
* Miglior supporto per i filtri
* Archiviazione email e mailbox
* Temi personalizzati
* Interfaccia tradotta in oltre 80 lingue
* Funzione "drag & drop" per la gestione dei messaggi: sposta i messaggi con il mouse
* Pieno supporto per messaggi MIME e HTML
* Anteprime degli allegati: vedi le immagini direttamente nei tuoi messaggi
* Elenco dei messaggi "thread": visualizza le conversazioni in modalità threaded
* Cartelle: gestisci le tue cartelle (aggiungi, rimuovi o nascondi)
* Autentificazione a due fattori: aggiungi un secondo livello di sicurezza per l'accesso alla tua webamil
E molto altro...
Per il futuro prossimo stiamo pianificando di integrare la crittografia delle casselle di posta, così da affiancarla a **Nextcloud** (calendari, contatti e allegati) e altri servizi attualmente forniti da **Disroot**. Riteniamo che **Roundcube** ci consentirà di migliorare ulteriormente la tua esperienza di posta elettronica da web.
Speriamo che questa implementazione sia di tuo gradimento. Noi siamo impazienti di implementare **Roundcube**!
**!! Avvertimento per utenti con 2FA attivo!!**
Per quelli di voi che ora hanno l'autentificazione a due fattori attiva, sarà necessario reimpostare la 2FA nuovamente una volta che la nuova webmail sarà attiva e funzionante. Ci dispiace per l'inconveniente!

Binary file not shown.

After

Width:  |  Height:  |  Size: 98 KiB

View File

@ -30,7 +30,7 @@ faq:
<p>After login out and back into the cloud again you should see your files and the message should have disappeared.</p>
<p>If you don't remember your old password, it's still possible to reset the account but it won't be possible to recover any files on the cloud as they are encrypted with the old key.</p>"
<p>If you don't remember your old password, it's still possible to reset the account but it won't be possible to recover any files on the cloud as they are encrypted with the old key. What you have to do is to remove all files from Nextcloud (this does not include calendars, contacts, etc., just files), and to contact us (support@disroot.org). We will then proceed wiping the key so the new key pair based on your current password can be re-generated automatically upon new login.</p>"
-
question: "Does my Disroot account expire?"
answer: "<p> No. We do not to expire unused accounts. However we appreciate when people take responsibility for their account, and its impact on the <b>Disroot</b> resources, and request account deletion when they decide not to use our services any longer.</p>"

View File

@ -30,7 +30,7 @@ faq:
<p>Après vous être déconnecté et être retourné dans le cloud, vous devriez voir vos fichiers et le message devrait avoir disparu.</p>
<p>Si vous ne vous souvenez plus de votre ancien mot de passe, il est toujours possible de réinitialiser le compte, mais il ne sera pas possible de récupérer les fichiers sur le cloud car ils sont chiffrés par l'ancienne clé.</p>"
<p>Si vous ne vous souvenez pas de votre ancien mot de passe, il est toujours possible de réinitialiser le compte mais il ne sera pas possible de récupérer les fichiers sur le cloud car ils sont chiffrés avec l'ancienne clé. Ce que vous devez faire c'est de supprimer tous les fichiers de Nextcloud (cela n'inclut pas les calendriers, les contacts, etc., mais seulement les fichiers), et nous contactez (support@disroot.org). Nous procéderons alors à l'effacement de la clé afin que la nouvelle paire de clés basée sur votre mot de passe actuel puisse être générée automatiquement lors de la nouvelle connexion.</p>"
-
question: "Mon compte Disroot expire-t-il ?"
answer: "<p> Non. Nous n'expirons pas les comptes non utilisés. Cependant, nous apprécions que les gens assument la responsabilité de leur compte et de son impact sur les ressources <b>Disroot</b>, et nous demandons la suppression du compte quand ils décident de ne plus utiliser nos services.</p>"

View File

@ -6,11 +6,11 @@ fontcolor: '#FFF'
wider_column: right
---
![](qr1223.png)
![](qr0508.png)
---
# Bitcoin
Sende Deine Bitcoin an unser Portemonnaie:
bc1qju6pzk7lgfxcj0ddedv2l5vfvlmava93g4zxnl
bc1qa9xy9zrcy52xccmjhlzunvd5y7dqst0qh4up8e

View File

@ -6,11 +6,11 @@ fontcolor: '#FFF'
wider_column: right
---
![](qr1223.png)
![](qr0508.png)
---
# Bitcoin
Send your bitcoins to our wallet at:
bc1qju6pzk7lgfxcj0ddedv2l5vfvlmava93g4zxnl
bc1qa9xy9zrcy52xccmjhlzunvd5y7dqst0qh4up8e

View File

@ -5,10 +5,10 @@ fontcolor: '#FFF'
wider_column: right
---
![](qr1223.png)
![](qr0508.png)
---
# Bitcoin
Envía [bitcoins](https://es.wikipedia.org/wiki/Bitcoin) a nuestra cartera a:
bc1qju6pzk7lgfxcj0ddedv2l5vfvlmava93g4zxnl
bc1qa9xy9zrcy52xccmjhlzunvd5y7dqst0qh4up8e

View File

@ -5,10 +5,10 @@ fontcolor: '#FFF'
wider_column: right
---
![](qr1223.png)
![](qr0508.png)
---
# Bitcoin
Envoyez vos bitcoins à notre porte-monnaie:
bc1qju6pzk7lgfxcj0ddedv2l5vfvlmava93g4zxnl
bc1qa9xy9zrcy52xccmjhlzunvd5y7dqst0qh4up8e

View File

@ -6,10 +6,10 @@ fontcolor: '#FFF'
wider_column: right
---
![](qr1223.png)
![](qr0508.png)
---
# Bitcoin
Invia i tuoi bitcoin nel nostro portafoglio a:
bc1qju6pzk7lgfxcj0ddedv2l5vfvlmava93g4zxnl
bc1qa9xy9zrcy52xccmjhlzunvd5y7dqst0qh4up8e

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB