Removed conflict files after rebase
This commit is contained in:
parent
813feecb01
commit
2fbf9293ff
|
|
@ -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: "Anmelden"
|
||||
-
|
||||
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: "Anmelden"
|
||||
#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: "Zugang"
|
||||
#badge: EXPERIMENTAL
|
||||
---
|
||||
|
|
@ -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/">Verbinden</a>
|
||||
|
||||
---
|
||||
|
||||
|
||||
|
||||
|
||||
## 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)
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
---
|
||||
title: Cryptpad
|
||||
bgcolor: '#8EB726'
|
||||
content:
|
||||
items: '@self.modular'
|
||||
order:
|
||||
by: default
|
||||
dir: asc
|
||||
custom:
|
||||
- _cryptpad
|
||||
- _cryptpad-info
|
||||
- _cryptpad-highlights
|
||||
- _cryptpad-pads
|
||||
- _cryptpad-form
|
||||
- _cryptpad-file
|
||||
- _cryptpad-kanban
|
||||
- _green-bar
|
||||
|
||||
|
||||
body_classes: modular
|
||||
header_image: 'stop_watching_all_of_us.jpg'
|
||||
---
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
---
|
||||
title: Kontakt
|
||||
bgcolor: '#1F5C60'
|
||||
fontcolor: '#FFF'
|
||||
process:
|
||||
markdown: true
|
||||
twig: true
|
||||
twig_first: false
|
||||
---
|
||||
|
||||
[](mailto:support@disroot.org) support@disroot.org
|
||||
|
||||
[](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>
|
||||
|
||||
[](https://social.weho.st/@disroot) Mastodon: <a class="lighter" href="https://social.weho.st/@disroot/">social.weho.st/@disroot</a>
|
||||
|
||||
|
||||
---
|
||||
|
||||
 IRC: #disroot auf irc.libera.chat
|
||||
|
||||
[](xmpp:disroot@chat.disroot.org?join) Xmpp: <a class="lighter" href="xmpp:disroot@chat.disroot.org?join">disroot@chat.disroot.org/@disroot</a>
|
||||
|
||||
[](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>
|
||||
|
||||
[](https://cloud.disroot.org/call/di5y9zno
|
||||
) NextCloud: <a class="lighter" href="https://cloud.disroot.org/call/di5y9zno">cloud.disroot.org/call/di5y9zno</a>
|
||||
|
||||
|
||||
---
|
||||
|
||||
Alle aufgezählten Chaträume sind untereinander verbunden (gebridged). Das heißt, egal welchen Chatraum Du von der Liste wählst, Du kannst über einen Chat Relay Bot mit der ganzen Community kommunizieren.
|
||||
Loading…
Reference in New Issue