Merge branch 'master' into covid_19_kit

This commit is contained in:
antil0pa 2020-03-30 14:09:49 +02:00
commit 20f8dbc9e8
4 changed files with 25 additions and 4 deletions

View File

@ -97,4 +97,20 @@ services:
text: "A code hosting and project collaboration."
button: 'https://git.disroot.org'
buttontext: "Log in"
-
title: 'Audio'
icon: mumble.png
link: 'https://disroot.org/services/audio'
text: "A low latency, high quality voice chat application.."
button: 'https://mumble.disroot.org'
buttontext: "Log in"
badge: EXPERIMENTAL
-
title: 'Cryptpad'
icon: cryptpad.png
link: 'https://disroot.org/services/cryptpad'
text: "A private-by-design alternative to popular office tools."
button: 'https://cryptpad.disroot.org'
buttontext: "Access"
badge: EXPERIMENTAL
---

View File

@ -23,6 +23,6 @@ You don't need any account to use Mumble. But you have more rights if you regist
Disroot Mumble: [mumble.disroot.org](https://mumble.disroot.org)
Project homepage: <https://www.mumble.info/>
Project homepage: [https://www.mumble.info](https://www.mumble.info)
Source code: <https://github.com/mumble-voip/mumble>
Source code: [https://github.com/mumble-voip/mumble](https://github.com/mumble-voip/mumble)

View File

@ -13,5 +13,10 @@ wider_column: right
![](cryptpad_logo.png)
## Cryptpad
Disroot's Cryptpad is powered by Cryptpad. It provides a totally end-to-end encrypted collaborative office suite. It allows you to create, share and work together on text documents, spreadsheets, presentations, whiteboards or organize your project on a kanban board. All this with zero knowledge where data is encrypted before it leaves your computer.
Disroot cryptpad provides a totally end-to-end encrypted collaborative office suite. It allows you to create, share and work together on text documents, spreadsheets, presentations, whiteboards or organize your project on a kanban board. All this with zero knowledge where data is encrypted before it leaves your computer.
Disroot Cryptpad: [cryptpad.disroot.org](https://cryptpad.disroot.org)
Project homepage: [https://cryptpad.fr](https://cryptpad.fr)
Source code: [https://github.com/xwiki-labs/cryptpad](https://github.com/xwiki-labs/cryptpad)

View File

@ -1,6 +1,6 @@
---
title: Cryptpad
bgcolor: '#fff'
bgcolor: '#8EB726'
content:
items: '@self.modular'
order: