+ Every tool provided by Cryptpad are based on a Zero Knowledge technology. It means that our server stored only encrypted data, and we have no way to decrypt it. Even data about your account, including your username, are encrypted.
+
+
+
+
+
+
+
+
Realtime
+
+ Our tools also use a Realtime technology, which means that you can edit the documents, slides or polls collaboratively with other people. Our unique technology has the advantage of combining both realtime and zero-knowledge at the same time.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Share documents
+
+ When you want to edit a document with other users or invite them to answer to a poll, you just have to share the URL of that document with them. All the information needed to access and edit it are contained in the "hash" of the URL.
+
+
+
+
+
+
+
+
User Account
+
+ In order to have Zero Knowledge user accounts, we needed a way to store your settings without knowing your username and password. To do so, our tools generate a unique key from your username and password, directly in your browser.
+
+
+
+
+
+
+
+
+
+
Try it out!
+
+
+
+
+
+
+
+
Rich Text editor
+
+
+
+ Edit rich text documents collaboratively with our realtime Zero Knowledge CkEditor application.
+
+
+
+
+
+
+
Code editor
+
+
+
+ Edit code from your software collaboratively with our realtime Zero Knowledge CodeMirror application.
+
+
+
+
+
+
+
Slide editor
+
+
+
+ Create your presentations using the Markdown syntax with our CryptSlide application, and display them in your browser.
+
+
+
+
+
+
+
Polls
+
+
+
+ Plan your meeting or your event, or vote for the best solution regarding your problem using our poll application.
+
+ Every tool provided by Cryptpad are based on a Zero Knowledge technology. It means that our server stored only encrypted data, and we have no way to decrypt it. Even data about your account, including your username, are encrypted.
+
+
+
+
+
+
+
+
Realtime
+
+ Our tools also use a Realtime technology, which means that you can edit the documents, slides or polls collaboratively with other people. Our unique technology has the advantage of combining both realtime and zero-knowledge at the same time.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Share documents
+
+ When you want to edit a document with other users or invite them to answer to a poll, you just have to share the URL of that document with them. All the information needed to access and edit it are contained in the "hash" of the URL.
+
+
+
+
+
+
+
+
User Account
+
+ In order to have Zero Knowledge user accounts, we needed a way to store your settings without knowing your username and password. To do so, our tools generate a unique key from your username and password, directly in your browser.
+
+
+
+
+
+
+
+
+
+
Try it out!
+
+
+
+
+
+
+
+
Rich Text editor
+
+
+
+ Edit rich text documents collaboratively with our realtime Zero Knowledge CkEditor application.
+
+
+
+
+
+
+
Code editor
+
+
+
+ Edit code from your software collaboratively with our realtime Zero Knowledge CodeMirror application.
+
+
+
+
+
+
+
Slide editor
+
+
+
+ Create your presentations using the Markdown syntax with our CryptSlide application, and display them in your browser.
+
+
+
+
+
+
+
Polls
+
+
+
+ Plan your meeting or your event, or vote for the best solution regarding your problem using our poll application.
+
diff --git a/customize.dist/toolbar.css b/customize.dist/toolbar.css
index a169fb4ce..f2caf1d80 100644
--- a/customize.dist/toolbar.css
+++ b/customize.dist/toolbar.css
@@ -13,7 +13,7 @@
display: none;
position: absolute;
background-color: #f9f9f9;
- min-width: 160px;
+ min-width: 200px;
box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.2);
z-index: 1000;
max-height: 300px;
@@ -391,7 +391,7 @@
background-color: #46E981;
}
.lag-red {
- background-color: #FF0073;
+ background-color: #FA5858;
}
.lag-orange {
background-color: #FE9A2E;
diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index 8f3d1881d..cf097ed36 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -279,7 +279,8 @@ define(function () {
// index.html
- out.main_p1 = 'CryptPad est l\'éditeur collaboratif en temps réel zero knowledge. Le chiffrement est effectué depuis votre navigateur, ce qui protège les données contre le serveur, le cloud, et la NSA. La clé de chiffrement est stockée dans l\'identifieur de fragment de l\'URL qui n\'est jamais envoyée au serveur mais est accessible depuis javascript, de sorte qu\'en partageant l\'URL, vous donnez l\'accès au pad à ceux qui souhaitent participer.';
+ //out.main_p1 = 'CryptPad est l\'éditeur collaboratif en temps réel zero knowledge. Le chiffrement est effectué depuis votre navigateur, ce qui protège les données contre le serveur, le cloud, et la NSA. La clé de chiffrement est stockée dans l\'identifieur de fragment de l\'URL qui n\'est jamais envoyée au serveur mais est accessible depuis javascript, de sorte qu\'en partageant l\'URL, vous donnez l\'accès au pad à ceux qui souhaitent participer.';
+ out.main_p1 = "
Collaborez en tout confiance
Développez vos idées collaborativement grâce à des documents partagés en temps-réel, tout en gardant vos données personnelles invisibles, même pour nous, avec la technologie Zero Knowledge.";
out.main_p2 = 'Ce projet utilise l\'éditeur visuel (WYSIWYG) CKEditor, l\'éditeur de code source CodeMirror, et le moteur temps-réel ChainPad.';
out.main_howitworks = 'Comment ça fonctionne';
out.main_howitworks_p1 = 'CryptPad utilise une variante de l\'algorithme d\'Operational transformation qui est capable de trouver un consensus distribué en utilisant une chaîne de bloc Nakamoto, un outil popularisé par le Bitcoin. De cette manière, l\'algorithme évite la nécessité d\'utiliser un serveur central pour résoudre les conflits d\'édition de l\'Operational Transformation, et sans ce besoin de résolution des conflits le serveur peut rester ignorant du contenu qui est édité dans le pad.';
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index dff57764f..970f47a15 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -276,7 +276,10 @@ define(function () {
// index.html
- out.main_p1 = 'CryptPad is the zero knowledge realtime collaborative editor. Encryption carried out in your web browser protects the data from the server, the cloud, and the NSA. The secret encryption key is stored in the URL fragment identifier which is never sent to the server but is available to javascript so by sharing the URL, you give authorization to others who want to participate.';
+ //out.main_p1 = 'CryptPad is the zero knowledge realtime collaborative editor. Encryption carried out in your web browser protects the data from the server, the cloud, and the NSA. The secret encryption key is stored in the URL fragment identifier which is never sent to the server but is available to javascript so by sharing the URL, you give authorization to others who want to participate.';
+ //out.main_p1 = "Type quick documents with friends and colleagues. With Zero Knowledge technology, the server doesn't know what you're doing.";
+ out.main_p1 = "
Collaborate in Confidence
Grow your ideas together with shared documents while Zero Knowledge technology secures your privacy; even from us.";
+
out.main_p2 = 'This project uses the CKEditor Visual Editor, CodeMirror, and the ChainPad realtime engine.';
out.main_howitworks = 'How It Works';
out.main_howitworks_p1 = 'CryptPad uses a variant of the Operational transformation algorithm which is able to find distributed consensus using a Nakamoto Blockchain, a construct popularized by Bitcoin. This way the algorithm can avoid the need for a central server to resolve Operational Transform Edit Conflicts and without the need for resolving conflicts, the server can be kept unaware of the content which is being edited on the pad.';
diff --git a/server.js b/server.js
index 6414c83bc..548a78949 100644
--- a/server.js
+++ b/server.js
@@ -46,7 +46,7 @@ Fs.exists(__dirname + "/customize", function (e) {
// FIXME I think this is a regression caused by a recent PR
// correct this hack without breaking the contributor's intended behaviour.
-var mainPages = config.mainPages || ['index', 'privacy', 'terms', 'about'];
+var mainPages = config.mainPages || ['index', 'privacy', 'terms', 'about', 'contact'];
var mainPagePattern = new RegExp('^\/(' + mainPages.join('|') + ').html$');
app.get(mainPagePattern, Express.static(__dirname + '/customize.dist'));
diff --git a/www/drive/file.css b/www/drive/file.css
index 42d478f18..f406bf4c7 100644
--- a/www/drive/file.css
+++ b/www/drive/file.css
@@ -54,6 +54,10 @@ li {
display: none;
position: absolute;
}
+.contextMenu li {
+ padding: 0;
+ font-size: 16px;
+}
.droppable {
background-color: #FE9A2E;
color: #222;
diff --git a/www/drive/file.less b/www/drive/file.less
index 5d7fd2edf..20b7175ca 100644
--- a/www/drive/file.less
+++ b/www/drive/file.less
@@ -79,6 +79,10 @@ li {
.contextMenu {
display: none;
position: absolute;
+ li {
+ padding: 0;
+ font-size: 16px;
+ }
}
.droppable {
diff --git a/www/drive/inner.html b/www/drive/inner.html
index dc82c7ee2..421443c4e 100644
--- a/www/drive/inner.html
+++ b/www/drive/inner.html
@@ -19,38 +19,38 @@
- 
CryptPad
+
+
+
-
-
-
-
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+