Compare commits

...

10 Commits

Author SHA1 Message Date
Fede.- 2fbf9293ff Removed conflict files after rebase 2022-01-02 23:56:10 -03:00
l3o 813feecb01 Rebase conflict
Commit messages are not applicable!
(╯°□°)╯︵ ┻━┻
2022-01-02 23:48:58 -03:00
l3o 6d5f6d6bca it-news03-2021 (#307)
I translated the disnews number 3 into Italian

Co-authored-by: l3o <l3o@disroot.org>
Reviewed-on: Disroot/Website#307
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: l3o <l3o@no-reply@disroot.org>
Co-committed-by: l3o <l3o@no-reply@disroot.org>
2022-01-02 23:30:04 -03:00
Fede.- 88c9427202 Removed conflict files 2022-01-02 23:28:31 -03:00
Fede.- c31aec7840 Removed conflict files after rebase 2022-01-02 23:25:49 -03:00
Fede.- 52b55e1456 Remove conflict file 2022-01-02 23:21:49 -03:00
shadowsword@disroot.org fa50529345 updated after review 2022-01-02 23:21:49 -03:00
avg_joe b4a8659898 review (typos + suggestions) 2022-01-02 23:21:49 -03:00
shadowsword@disroot.org b99eeae4b3 minor fixes & cryptpad translation 2022-01-02 23:21:49 -03:00
muppeth b669824cbd
switched to mx10 record for custom domain perks page 2022-01-02 19:46:09 +01:00
7 changed files with 4 additions and 180 deletions

View File

@ -1,116 +0,0 @@
---
title: Services
section_id: services
bgcolor: '#FFF'
bg_img: tent.jpg
fontcolor: '#555'
text_align: left
services:
-
title: Email
icon: email.png
link: 'https://disroot.org/services/email'
text: "Freie und sichere Email-Accounts, nutzbar mit einem IMAP-Client oder via Online-Benutzeroberfläche."
button: 'https://mail.disroot.org'
buttontext: "Anmelden"
-
title: Cloud
icon: cloud.png
link: 'https://disroot.org/services/nextcloud/'
text: "Deine Daten unter Deiner Kontrolle! Sichern, Synchronisieren, Teilen von Kalendern, Kontakten und mehr."
button: 'https://cloud.disroot.org'
buttontext: "Anmelden"
-
title: Forum
icon: forum.png
link: 'https://disroot.org/services/forum'
text: "Diskussionsforen / Mailinglisten für Deine Projekte, Gruppen oder Gemeinschaften."
button: 'https://forum.disroot.org'
buttontext: "Anmelden"
-
title: XMPP-Chat
icon: xmpp.png
link: 'https://disroot.org/services/xmpp'
text: "Dezentralisiertes, sicheres und freies Instant-Messaging."
button: 'https://webchat.disroot.org'
buttontext: "Anmelden"
-
title: Pads
icon: pads.png
link: 'https://disroot.org/services/pads'
text: "Gemeinschaftlich und in Echtzeit Dokumente direkt im Webbrowser bearbeiten"
button: 'https://pad.disroot.org'
buttontext: "Ein Pad starten"
-
title: Calc
icon: calc.png
link: 'https://disroot.org/services/pads'
text: "Gemeinschaftlich und in Echtzeit Tabellen direkt im Webbrowser bearbeiten"
button: 'https://calc.disroot.org'
buttontext: "Ein Calc starten"
-
title: 'Paste-Bin'
icon: pastebin.png
link: 'https://disroot.org/services/privatebin'
text: "Minimalistischer, quelloffener und verschlüsselter Wegwerf-Container (Paste-Bin) mit Diskussionsboard."
button: 'https://bin.disroot.org'
buttontext: "Teile einen Paste-Bin"
-
title: Upload
icon: upload.png
link: 'https://disroot.org/services/upload'
text: "Software zur verschlüsselten, temporären Dateiaufbewahrung und -verbreitung."
button: 'https://upload.disroot.org'
buttontext: "Datei teilen"
-
title: Suche
icon: search.png
link: 'https://disroot.org/services/search'
text: "Eine anonyme Meta-Suchmaschine."
button: 'https://search.disroot.org'
buttontext: "Suche"
-
title: Umfragen
icon: polls.png
link: 'https://disroot.org/services/polls'
text: "Onlinedienst zur Abstimmung von Terminen oder um schnell eine gemeinsame Entscheidung zu treffen."
button: 'https://poll.disroot.org'
buttontext: "Umfrage starten"
-
title: Projekt-Board
icon: project_board.png
link: 'https://disroot.org/services/project-board'
text: "Ein Werkzeug zur Projektverwaltung im Kanban-Stil."
button: 'https://board.disroot.org'
buttontext: "Anmelden"
-
title: 'Calls'
icon: calls.png
link: 'https://disroot.org/services/calls'
text: "Ein Werkzeug für Videokonferenzen."
button: 'https://calls.disroot.org'
buttontext: "Aufruf"
-
title: 'Git'
icon: git.png
link: 'https://disroot.org/services/git'
text: "Eine Code-Hosting- und -Projektzusammenarbeits-Plattform."
button: 'https://git.disroot.org'
buttontext: "Log in"
-
title: 'Audio'
icon: mumble.png
link: 'https://disroot.org/services/audio'
text: "Eine Voice-Chat-Anwendung mit niedriger Latenz und hoher Sprachqualität."
button: 'https://mumble.disroot.org'
buttontext: "Log in"
#badge: EXPERIMENTAL
-
title: 'Cryptpad'
icon: cryptpad.png
link: 'https://disroot.org/services/cryptpad'
text: "Eine schon vom Design her vertraulich gestaltete Alternative zu gängigen Office-Tools."
button: 'https://cryptpad.disroot.org'
buttontext: "Access"
#badge: EXPERIMENTAL
---

View File

@ -1,28 +0,0 @@
---
title: Audio
bgcolor: '#FFF'
fontcolor: '#555'
body_classes: modular
wider_column: right
---
<a class="button button1" href="https://mumble.disroot.org/">Connect</a>
---
![mumble_logo](mumble.png?resize=100,100)
## Mumble
Disroots Audio-Anwendung wird mit *Mumble* Realisiert. Mumble ist eine kostenlose, quelloffene Voice-Chat-Anwendung mit niedriger Latenz und hoher Sprachqualität. Ursprünglich war sie für Gamer gedacht, aber sie kann auch zur Organisation von Audio-Meetings, Konferenzen usw. verwendet werden.
**HINWEIS!**
Du brauchst kein Konto, um Mumble zu benutzen. Aber Du Hast mehr Nutzerrechte, wenn Du Deinen Benutzernamen registrierst.
Disroot Mumble: [mumble.disroot.org](https://mumble.disroot.org)
Projekt-Homepage: [https://www.mumble.info](https://www.mumble.info)
Quellcode: [https://github.com/mumble-voip/mumble](https://github.com/mumble-voip/mumble)

View File

@ -1,32 +0,0 @@
---
title: Kontakt
bgcolor: '#1F5C60'
fontcolor: '#FFF'
process:
markdown: true
twig: true
twig_first: false
---
[![](email.png?classes=contact)](mailto:support@disroot.org) support@disroot.org
[![](email.png?classes=contact,pull-left)](mailto:cryptsupport@disroot.org) <div> <br/> cryptsupport@disroot.org <br/> GPG: <a class="lighter" href="https://keyserver.ubuntu.com/pks/lookup?search=cryptsupport%40disroot.org&fingerprint=on&op=index?"><b>server.ubuntu.com</b></a><br/> Fingerprint: FFC9 DCE6 5A96 98B0 FE49 EA83 6734 AE05 298C 41E8 </div>
[![](mastodon.png?classes=contact)](https://social.weho.st/@disroot) Mastodon: <a class="lighter" href="https://social.weho.st/@disroot/">social.weho.st/@disroot</a>
---
![](irc.png?classes=contact) IRC: #disroot auf irc.libera.chat
[![](xmpp.png?classes=contact)](xmpp:disroot@chat.disroot.org?join) Xmpp: <a class="lighter" href="xmpp:disroot@chat.disroot.org?join">disroot@chat.disroot.org/@disroot</a>
[![](webchat.png?classes=contact)](https://webchat.disroot.org/#converse/room?jid=disroot@chat.disroot.org) Xmpp <a class="lighter" href="https://webchat.disroot.org/#converse/room?jid=disroot@chat.disroot.org">webchat</a>
[![](nextcloud.png?classes=contact)](https://cloud.disroot.org/call/di5y9zno
) NextCloud: <a class="lighter" href="https://cloud.disroot.org/call/di5y9zno">cloud.disroot.org/call/di5y9zno</a>
---
All listed chatrooms are bridged together. This means that no matter which chatroom from this list you choose, you will be able to communicate with all the comunity via a chat relay bot.

View File

@ -18,5 +18,5 @@ Once you have your own domain, you need to do two things in order to link it to
Simply create a **TXT** record with: **disroot.org-yourdomain.ltd** (replacing `yourdomain.ltd` with **your domain name**, of course). This will indicate you do in fact own that domain.
## 2: Point your domain to disroot.org
**1st.** Set MX record to **mx01.disroot.org.** **`(don't forget the final dot!)`**
**1st.** Set MX record to **disroot.org.** **`(don't forget the final dot!)`**
**2nd.** Set **"v=spf1 mx a ptr include:disroot.org -all"** This allows you to send emails from your own servers as well as **Disroot**'s. This is just a default setting that should be applicable to most of the scenarios. If you want to learn more about SPF records and would like to tweak yours, check the web for more info (e.g. [this page](https://www.dmarcanalyzer.com/spf/how-to-create-an-spf-txt-record/)).

View File

@ -18,5 +18,5 @@ Una vez que tengas tu propio dominio, necesitas hacer dos cosas para vincularlo
Simplemente, crea un registro **TXT** con: **disroot.org-tudominio.ltd** (remplazando `tudominio.ltd` con **tu propio nombre de dominio**, claro). Esto indicará que realmente ese dominio te pertence.
## 2: Apunta tu dominio a disroot.org
**1ro.** Asigna en el registro MX a **mx01.disroot.org.** **`(¡no te olvides del punto final!)`**
**1ro.** Asigna en el registro MX a **disroot.org.** **`(¡no te olvides del punto final!)`**
**2do.** Configura **"v=spf1 mx a ptr include:disroot.org -all"** para que puedas enviar correos tanto desde tus propios servidores como desde los de **Disroot**. Esta es simplemente una configuración por defecto que debería ser aplicable en la mayoría de los casos. Si quieres aprender más acerca de los registros SPF y modificar los tuyos, busca más información en la web (p.ej.: en [esta página](https://www.dmarcanalyzer.com/es/spf-3/spf-record/)).

View File

@ -18,5 +18,5 @@ Une fois que vous avez votre propre domaine, vous devez faire deux choses afin d
Créez simplement un enregistrement **TXT** avec : **disroot.org-votredomain.ltd** (en remplaçant `votredomain.ltd` par **votre nom de domaine**, bien sûr). Cela indiquera que vous êtes bien le propriétaire de ce domaine.
## 2 : Faites pointer votre domaine vers disroot.org
**1er.** Définissez l'enregistrement MX sur **mx01.disroot.org.** **`(n'oubliez pas le point final !)`**.
**1er.** Définissez l'enregistrement MX sur **disroot.org.** **`(n'oubliez pas le point final !)`**.
**2ème.** Définissez **"v=spf1 mx a ptr include:disroot.org -all "** Cela vous permet d'envoyer des emails depuis vos propres serveurs ainsi que ceux de **Disroot**. Il s'agit simplement d'un paramètre par défaut qui devrait être applicable à la plupart des scénarios. Si vous souhaitez en savoir plus sur les enregistrements SPF et modifier les vôtres, consultez le Web pour plus d'informations (par exemple, [cette page](https://www.dmarcanalyzer.com/spf/how-to-create-an-spf-txt-record/)).

View File

@ -18,5 +18,5 @@ Una volta che hai il tuo dominio, devi fare due cose per collegarlo a disroot.or
Crea semplicemente un record **TXT** con: **disroot.org-yourdomain.ltd** (sostituendo `yourdomain.ltd` con **il tuo nome di dominio**). Questo dimostrerà che possiedi quel dominio.
## 2: Punta il tuo dominio su disroot.org
**Primo** Imposta il record MX su **mx01.disroot.org.** **`(non dimenticare il punto finale!)`**
**Primo** Imposta il record MX su **disroot.org.** **`(non dimenticare il punto finale!)`**
**Secondo** Imposta **"v=spf1 mx a ptr include:disroot.org -all"** Questo ti permetterà di inviare email dai tuoi server così come da **Disroot**. Questa è solo un'impostazione predefinita che dovrebbe essere applicabile alla maggior parte degli scenari. Se vuoi saperne di più sui record SPF e desideri modificare i tuoi, controlla ad esempio [questa pagina](https://www.dmarcanalyzer.com/spf/how-to-create-an-spf-txt-record/) per maggiori informazioni.