diff --git a/.jshintignore b/.jshintignore
index 45011b5dc..aad5dea36 100644
--- a/.jshintignore
+++ b/.jshintignore
@@ -9,3 +9,5 @@ www/scratch
www/common/toolbar.js
www/common/hyperscript.js
www/common/tippy.min.js
+
+www/pad/wysiwygarea-plugin.js
diff --git a/bower.json b/bower.json
index b04ff3a6b..0880e56ef 100644
--- a/bower.json
+++ b/bower.json
@@ -39,6 +39,7 @@
"require-css": "0.1.10",
"less": "^2.7.2",
"bootstrap": "#v4.0.0-alpha.6",
- "diff-dom": "2.1.1"
+ "diff-dom": "2.1.1",
+ "open-sans-fontface": "^1.4.2"
}
}
diff --git a/config.example.js b/config.example.js
index 749fe4793..7af6cf8af 100644
--- a/config.example.js
+++ b/config.example.js
@@ -82,23 +82,6 @@ module.exports = {
*/
websocketPath: '/cryptpad_websocket',
- /* it is assumed that your websocket will bind to the same port as http
- * you can override this behaviour by supplying a number via websocketPort
- */
- //websocketPort: 3000,
-
- /* if you want to run a different version of CryptPad but using the same websocket
- * server, you should use the other server port as websocketPort and disable
- * the websockets on that server
- */
- //useExternalWebsocket: false,
-
- /* If CryptPad is proxied without using https, the server needs to know.
- * Specify 'useSecureWebsockets: true' so that it can send
- * Content Security Policy Headers that prevent http and https from mixing
- */
- useSecureWebsockets: false,
-
/* CryptPad can log activity to stdout
* This may be useful for debugging
*/
@@ -119,6 +102,7 @@ module.exports = {
'terms',
'about',
'contact',
+ 'what-is-cryptpad'
],
/* Limits, Donations, Subscriptions and Contact
@@ -237,14 +221,6 @@ module.exports = {
*/
suppressRPCErrors: false,
-
- /* WARNING: EXPERIMENTAL
- *
- * CryptPad features experimental support for encrypted file upload.
- * Our encryption format is still liable to change. As such, we do not
- * guarantee that files uploaded now will be supported in the future
- */
-
/* Setting this value to anything other than true will cause file upload
* attempts to be rejected outright.
*/
diff --git a/customize.dist/CryptPad-white-logo.svg b/customize.dist/CryptPad-white-logo.svg
new file mode 100644
index 000000000..26131b502
--- /dev/null
+++ b/customize.dist/CryptPad-white-logo.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/customize.dist/CryptPad_logo_color.svg b/customize.dist/CryptPad_logo_color.svg
new file mode 100644
index 000000000..64fc86682
--- /dev/null
+++ b/customize.dist/CryptPad_logo_color.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/customize.dist/alt-favicon.png b/customize.dist/alt-favicon.png
index 169ce4ef2..52ec0a4bc 100644
Binary files a/customize.dist/alt-favicon.png and b/customize.dist/alt-favicon.png differ
diff --git a/customize.dist/bg14.jpg b/customize.dist/bg14.jpg
new file mode 100644
index 000000000..7f5211229
Binary files /dev/null and b/customize.dist/bg14.jpg differ
diff --git a/customize.dist/bg3.jpg b/customize.dist/bg3.jpg
deleted file mode 100644
index 04d3a04e0..000000000
Binary files a/customize.dist/bg3.jpg and /dev/null differ
diff --git a/customize.dist/bkabout.jpg b/customize.dist/bkabout.jpg
new file mode 100644
index 000000000..43de08268
Binary files /dev/null and b/customize.dist/bkabout.jpg differ
diff --git a/customize.dist/bkregister.jpg b/customize.dist/bkregister.jpg
new file mode 100644
index 000000000..03660433f
Binary files /dev/null and b/customize.dist/bkregister.jpg differ
diff --git a/customize.dist/code.svg b/customize.dist/code.svg
new file mode 100644
index 000000000..29647b529
--- /dev/null
+++ b/customize.dist/code.svg
@@ -0,0 +1,14 @@
+
+
+
diff --git a/customize.dist/cryptpad-new-logo-colors-logoonly.png b/customize.dist/cryptpad-new-logo-colors-logoonly.png
new file mode 100644
index 000000000..6ad292df0
Binary files /dev/null and b/customize.dist/cryptpad-new-logo-colors-logoonly.png differ
diff --git a/customize.dist/fonts/neuropolitical.ttf b/customize.dist/fonts/neuropolitical.ttf
new file mode 100644
index 000000000..26bbb63ce
Binary files /dev/null and b/customize.dist/fonts/neuropolitical.ttf differ
diff --git a/customize.dist/fonts/open-sans.less b/customize.dist/fonts/open-sans.less
new file mode 100644
index 000000000..7a1bcbb90
--- /dev/null
+++ b/customize.dist/fonts/open-sans.less
@@ -0,0 +1,133 @@
+/* Open Sans @font-face kit */
+
+@OpenSansPath: "/bower_components/open-sans-fontface/fonts";
+
+/* BEGIN Light */
+@font-face {
+ font-family: 'Open Sans';
+ src: url('@{OpenSansPath}/Light/OpenSans-Light.eot');
+ src: url('@{OpenSansPath}/Light/OpenSans-Light.eot?#iefix') format('embedded-opentype'),
+ url('@{OpenSansPath}/Light/OpenSans-Light.woff') format('woff'),
+ url('@{OpenSansPath}/Light/OpenSans-Light.ttf') format('truetype'),
+ url('@{OpenSansPath}/Light/OpenSans-Light.svg#OpenSansLight') format('svg');
+ font-weight: 300;
+ font-style: normal;
+}
+/* END Light */
+
+/* BEGIN Light Italic */
+@font-face {
+ font-family: 'Open Sans';
+ src: url('@{OpenSansPath}/LightItalic/OpenSans-LightItalic.eot');
+ src: url('@{OpenSansPath}/LightItalic/OpenSans-LightItalic.eot?#iefix') format('embedded-opentype'),
+ url('@{OpenSansPath}/LightItalic/OpenSans-LightItalic.woff') format('woff'),
+ url('@{OpenSansPath}/LightItalic/OpenSans-LightItalic.ttf') format('truetype'),
+ url('@{OpenSansPath}/LightItalic/OpenSans-LightItalic.svg#OpenSansLightItalic') format('svg');
+ font-weight: 300;
+ font-style: italic;
+}
+/* END Light Italic */
+
+/* BEGIN Regular */
+@font-face {
+ font-family: 'Open Sans';
+ src: url('@{OpenSansPath}/Regular/OpenSans-Regular.eot');
+ src: url('@{OpenSansPath}/Regular/OpenSans-Regular.eot?#iefix') format('embedded-opentype'),
+ url('@{OpenSansPath}/Regular/OpenSans-Regular.woff') format('woff'),
+ url('@{OpenSansPath}/Regular/OpenSans-Regular.ttf') format('truetype'),
+ url('@{OpenSansPath}/Regular/OpenSans-Regular.svg#OpenSansRegular') format('svg');
+ font-weight: normal;
+ font-style: normal;
+}
+/* END Regular */
+
+/* BEGIN Italic */
+@font-face {
+ font-family: 'Open Sans';
+ src: url('@{OpenSansPath}/Italic/OpenSans-Italic.eot');
+ src: url('@{OpenSansPath}/Italic/OpenSans-Italic.eot?#iefix') format('embedded-opentype'),
+ url('@{OpenSansPath}/Italic/OpenSans-Italic.woff') format('woff'),
+ url('@{OpenSansPath}/Italic/OpenSans-Italic.ttf') format('truetype'),
+ url('@{OpenSansPath}/Italic/OpenSans-Italic.svg#OpenSansItalic') format('svg');
+ font-weight: normal;
+ font-style: italic;
+}
+/* END Italic */
+
+/* BEGIN Semibold */
+@font-face {
+ font-family: 'Open Sans';
+ src: url('@{OpenSansPath}/Semibold/OpenSans-Semibold.eot');
+ src: url('@{OpenSansPath}/Semibold/OpenSans-Semibold.eot?#iefix') format('embedded-opentype'),
+ url('@{OpenSansPath}/Semibold/OpenSans-Semibold.woff') format('woff'),
+ url('@{OpenSansPath}/Semibold/OpenSans-Semibold.ttf') format('truetype'),
+ url('@{OpenSansPath}/Semibold/OpenSans-Semibold.svg#OpenSansSemibold') format('svg');
+ font-weight: 600;
+ font-style: normal;
+}
+/* END Semibold */
+
+/* BEGIN Semibold Italic */
+@font-face {
+ font-family: 'Open Sans';
+ src: url('@{OpenSansPath}/SemiboldItalic/OpenSans-SemiboldItalic.eot');
+ src: url('@{OpenSansPath}/SemiboldItalic/OpenSans-SemiboldItalic.eot?#iefix') format('embedded-opentype'),
+ url('@{OpenSansPath}/SemiboldItalic/OpenSans-SemiboldItalic.woff') format('woff'),
+ url('@{OpenSansPath}/SemiboldItalic/OpenSans-SemiboldItalic.ttf') format('truetype'),
+ url('@{OpenSansPath}/SemiboldItalic/OpenSans-SemiboldItalic.svg#OpenSansSemiboldItalic') format('svg');
+ font-weight: 600;
+ font-style: italic;
+}
+/* END Semibold Italic */
+
+/* BEGIN Bold */
+@font-face {
+ font-family: 'Open Sans';
+ src: url('@{OpenSansPath}/Bold/OpenSans-Bold.eot');
+ src: url('@{OpenSansPath}/Bold/OpenSans-Bold.eot?#iefix') format('embedded-opentype'),
+ url('@{OpenSansPath}/Bold/OpenSans-Bold.woff') format('woff'),
+ url('@{OpenSansPath}/Bold/OpenSans-Bold.ttf') format('truetype'),
+ url('@{OpenSansPath}/Bold/OpenSans-Bold.svg#OpenSansBold') format('svg');
+ font-weight: bold;
+ font-style: normal;
+}
+/* END Bold */
+
+/* BEGIN Bold Italic */
+@font-face {
+ font-family: 'Open Sans';
+ src: url('@{OpenSansPath}/BoldItalic/OpenSans-BoldItalic.eot');
+ src: url('@{OpenSansPath}/BoldItalic/OpenSans-BoldItalic.eot?#iefix') format('embedded-opentype'),
+ url('@{OpenSansPath}/BoldItalic/OpenSans-BoldItalic.woff') format('woff'),
+ url('@{OpenSansPath}/BoldItalic/OpenSans-BoldItalic.ttf') format('truetype'),
+ url('@{OpenSansPath}/BoldItalic/OpenSans-BoldItalic.svg#OpenSansBoldItalic') format('svg');
+ font-weight: bold;
+ font-style: italic;
+}
+/* END Bold Italic */
+
+/* BEGIN Extrabold */
+@font-face {
+ font-family: 'Open Sans';
+ src: url('@{OpenSansPath}/ExtraBold/OpenSans-ExtraBold.eot');
+ src: url('@{OpenSansPath}/ExtraBold/OpenSans-ExtraBold.eot?#iefix') format('embedded-opentype'),
+ url('@{OpenSansPath}/ExtraBold/OpenSans-ExtraBold.woff') format('woff'),
+ url('@{OpenSansPath}/ExtraBold/OpenSans-ExtraBold.ttf') format('truetype'),
+ url('@{OpenSansPath}/ExtraBold/OpenSans-ExtraBold.svg#OpenSansExtrabold') format('svg');
+ font-weight: 800;
+ font-style: normal;
+}
+/* END Extrabold */
+
+/* BEGIN Extrabold Italic */
+@font-face {
+ font-family: 'Open Sans';
+ src: url('@{OpenSansPath}/ExtraBoldItalic/OpenSans-ExtraBoldItalic.eot');
+ src: url('@{OpenSansPath}/ExtraBoldItalic/OpenSans-ExtraBoldItalic.eot?#iefix') format('embedded-opentype'),
+ url('@{OpenSansPath}/ExtraBoldItalic/OpenSans-ExtraBoldItalic.woff') format('woff'),
+ url('@{OpenSansPath}/ExtraBoldItalic/OpenSans-ExtraBoldItalic.ttf') format('truetype'),
+ url('@{OpenSansPath}/ExtraBoldItalic/OpenSans-ExtraBoldItalic.svg#OpenSansExtraboldItalic') format('svg');
+ font-weight: 800;
+ font-style: italic;
+}
+/* END Extrabold Italic */
diff --git a/customize.dist/images/AaronMacSween.jpg b/customize.dist/images/AaronMacSween.jpg
new file mode 100644
index 000000000..2ee96ea6f
Binary files /dev/null and b/customize.dist/images/AaronMacSween.jpg differ
diff --git a/customize.dist/images/CalebJames.jpg b/customize.dist/images/CalebJames.jpg
new file mode 100644
index 000000000..65d5a6cae
Binary files /dev/null and b/customize.dist/images/CalebJames.jpg differ
diff --git a/customize.dist/images/Catalin.jpg b/customize.dist/images/Catalin.jpg
new file mode 100644
index 000000000..109a5404b
Binary files /dev/null and b/customize.dist/images/Catalin.jpg differ
diff --git a/customize.dist/images/LudovicDuboist.jpg b/customize.dist/images/LudovicDuboist.jpg
new file mode 100644
index 000000000..6a9988942
Binary files /dev/null and b/customize.dist/images/LudovicDuboist.jpg differ
diff --git a/customize.dist/images/Pierre-new.jpg b/customize.dist/images/Pierre-new.jpg
new file mode 100644
index 000000000..4f197aeb0
Binary files /dev/null and b/customize.dist/images/Pierre-new.jpg differ
diff --git a/customize.dist/images/YannFlory.jpg b/customize.dist/images/YannFlory.jpg
new file mode 100644
index 000000000..19d10ec56
Binary files /dev/null and b/customize.dist/images/YannFlory.jpg differ
diff --git a/customize.dist/images/aaron.jpg b/customize.dist/images/aaron.jpg
new file mode 100644
index 000000000..f746cf7e4
Binary files /dev/null and b/customize.dist/images/aaron.jpg differ
diff --git a/customize.dist/images/atest.jpg b/customize.dist/images/atest.jpg
new file mode 100644
index 000000000..4ce7014fe
Binary files /dev/null and b/customize.dist/images/atest.jpg differ
diff --git a/customize.dist/images/caleb.jpg b/customize.dist/images/caleb.jpg
new file mode 100644
index 000000000..1903d87b9
Binary files /dev/null and b/customize.dist/images/caleb.jpg differ
diff --git a/customize.dist/images/drive_screenshot.png b/customize.dist/images/drive_screenshot.png
new file mode 100644
index 000000000..b1170561c
Binary files /dev/null and b/customize.dist/images/drive_screenshot.png differ
diff --git a/customize.dist/images/logo_white.png b/customize.dist/images/logo_white.png
new file mode 100644
index 000000000..81928ffb1
Binary files /dev/null and b/customize.dist/images/logo_white.png differ
diff --git a/customize.dist/images/logo_white.svg b/customize.dist/images/logo_white.svg
new file mode 100644
index 000000000..d1cd2bc73
--- /dev/null
+++ b/customize.dist/images/logo_white.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/customize.dist/images/ludovic.jpg b/customize.dist/images/ludovic.jpg
new file mode 100644
index 000000000..684e0692e
Binary files /dev/null and b/customize.dist/images/ludovic.jpg differ
diff --git a/customize.dist/images/pad_screenshot.png b/customize.dist/images/pad_screenshot.png
new file mode 100644
index 000000000..cbc837f58
Binary files /dev/null and b/customize.dist/images/pad_screenshot.png differ
diff --git a/customize.dist/images/pierre.jpg b/customize.dist/images/pierre.jpg
new file mode 100644
index 000000000..fea27c787
Binary files /dev/null and b/customize.dist/images/pierre.jpg differ
diff --git a/customize.dist/images/yann.jpg b/customize.dist/images/yann.jpg
new file mode 100644
index 000000000..6c5e144fd
Binary files /dev/null and b/customize.dist/images/yann.jpg differ
diff --git a/customize.dist/main-favicon.png b/customize.dist/main-favicon.png
index 54169c07e..354d88ece 100644
Binary files a/customize.dist/main-favicon.png and b/customize.dist/main-favicon.png differ
diff --git a/customize.dist/main.js b/customize.dist/main.js
index 633f4c573..4049ec659 100644
--- a/customize.dist/main.js
+++ b/customize.dist/main.js
@@ -25,6 +25,14 @@ define([
$main.find('#data').removeClass('hidden');
if (Cryptpad.isLoggedIn()) {
+ if (window.location.pathname === '/') {
+ window.location = '/drive/';
+ return;
+ }
+
+ $main.find('a[href="/drive/"] div.pad-button-text h4')
+ .text(Messages.main_yourCryptDrive);
+
var name = localStorage[Cryptpad.userNameKey] || sessionStorage[Cryptpad.userNameKey];
var $loggedInBlock = $main.find('#loggedIn');
var $hello = $loggedInBlock.find('#loggedInHello');
diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index b7b94940c..9e2759786 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -2,7 +2,8 @@ define([
'/api/config',
'/common/hyperscript.js',
'/common/cryptpad-common.js',
-], function (Config, h, Cryptpad) {
+ 'jquery'
+], function (Config, h, Cryptpad, $) {
var Pages = {};
var Msg = Cryptpad.Messages;
var urlArgs = Config.requireConf.urlArgs;
@@ -12,286 +13,408 @@ define([
return e;
};
- var indexContent = function () {
- return [
- h('div.page.category.first#knowmore', [
- h('center', [
- h('h1', Msg.main_howitworks)
- ])
- ]),
- h('div.page', [
- h('div.info-container', [
- h('div.left.image', [
- h('img', {
- src: '/customize/images/zeroknowledge_small.png?' + urlArgs ,
- alt: 'Zero Knowledge'
- })
- ]),
- h('div.right', [
- h('h2', Msg.main_zeroKnowledge),
- setHTML(h('p'), Msg.main_zeroKnowledge_p)
- ])
- ])
- ]),
- h('div.page.even', [
- h('div.info-container', [
- h('div.left', [
- h('h2', Msg.main_writeItDown),
- h('p', Msg.main_writeItDown_p)
+ var footerCol = function (title, L, literal) {
+ return h('div.col-6.col-sm-3', [
+ h('ul.list-unstyled', [
+ h('li.footer-title', {
+ 'data-localization': title,
+ }, title? Msg[title]: literal )
+ ].concat(L.map(function (l) {
+ return h('li', [ l ]);
+ }))
+ )
+ ]);
+ };
+
+ var footLink = function (ref, loc, text) {
+ var attrs = {
+ href: ref,
+ };
+ if (!/^\//.test(ref)) {
+ attrs.target = '_blank';
+ attrs.rel = 'noopener noreferrer';
+ }
+ if (loc) {
+ attrs['data-localization'] = loc;
+ text = Msg[loc];
+ }
+ return h('a', attrs, text);
+ };
+
+ var infopageFooter = function () {
+ return h('footer', [
+ h('div.container', [
+ h('div.row', [
+ footerCol(null, [
+ h('div.cp-bio-foot', [
+ h('p', Msg.main_footerText)
+ ])
+ ], ''),
+ /* footerCol(null, [
+ footLink('/about.html', 'about'),
+ footLink('/terms.html', 'terms'),
+ footLink('/privacy.html', 'privacy'),
+ ], 'CryptPad'),*/
+ footerCol('footer_applications', [
+ footLink('/drive/', 'main_drive'),
+ footLink('/pad/', 'main_richText'),
+ footLink('/code/', 'main_code'),
+ footLink('/slide/', 'main_slide'),
+ footLink('/poll/', 'main_poll'),
+ footLink('/whiteboard/', null, Msg.type.whiteboard)
]),
- h('div.right.image', [
- h('img', {
- alt: "User account",
- src: '/customize/images/realtime_small.png?' + urlArgs,
- })
- ])
- ])
- ]),
- h('div.page', [
- h('div.info-container', [
- h('div.left.image', [
- h('img', {
- src: '/customize/images/key_small.png?' + urlArgs,
- alt: 'User account'
- })
+ footerCol('footer_aboutUs', [
+ footLink('https://blog.cryptpad.fr', 'blog'),
+ footLink('https://labs.xwiki.com', null, 'XWiki Labs'),
+ footLink('http://www.xwiki.com', null, 'XWiki SAS'),
+ footLink('https://www.open-paas.org', null, 'OpenPaaS')
]),
- h('div.right', [
- h('h2', Msg.main_share),
- h('p', Msg.main_share_p)
+ footerCol('footer_contact', [
+ footLink('https://riot.im/app/#/room/#cryptpad:matrix.org', null, 'Chat'),
+ footLink('https://twitter.com/cryptpad', null, 'Twitter'),
+ footLink('https://github.com/xwiki-labs/cryptpad', null, 'GitHub'),
+ footLink('/contact.html', null, 'Email')
])
])
]),
- h('div.page.even', [
- h('div.info-container', [
- h('div.left', [
- h('h2', Msg.main_organize),
- h('p', Msg.main_organize_p)
+ h('div.cp-version-footer', "CryptPad v1.13.0 (Naiad)")
+ ]);
+ };
+
+ var infopageTopbar = function () {
+ var rightLinks;
+ var username = window.localStorage.getItem('User_name');
+ if (username === null) {
+ rightLinks = [
+ h('a.nav-item.nav-link.cp-login-btn', { href: '/login/'}, Msg.login_login),
+ h('a.nav-item.nav-link.cp-register-btn', { href: '/register/'}, Msg.login_register)
+ ];
+ } else {
+ rightLinks = h('a.nav-item.nav-link.cp-user-btn', { href: '/drive/' }, [
+ h('i.fa.fa-user-circle'),
+ " ",
+ username
+ ]);
+ }
+
+ return h('nav.navbar.navbar-toggleable-md',
+ h('button.navbar-toggler.navbar-toggler-right', {'type':'button'}, {'data-toggle':'collapse'}, {'data-target':'#menuCollapse'}, {'aria-controls': 'menuCollapse'}, {'aria-expanded':'false'}, {'aria-label':'Toggle navigation'},
+ [h('i.fa.fa-bars ')
]),
- h('div.right.image', [
- h('img', {
- src: '/customize/images/organize.png?' + urlArgs,
- alt: 'User account'
- })
- ])
- ])
- ])
- ];
+ h('a.navbar-brand', { href: '/index.html'}),
+ h('div.collapse.navbar-collapse.justify-content-end#menuCollapse', [
+ h('a.nav-item.nav-link', { href: '/what-is-cryptpad.html'}, Msg.topbar_whatIsCryptpad),
+ h('a.nav-item.nav-link', { href: 'https://blog.cryptpad.fr/'}, Msg.blog),
+ h('a.nav-item.nav-link', { href: '/contact.html'}, Msg.contact),
+ h('a.nav-item.nav-link', { href: '/about.html'}, Msg.about),
+ ].concat(rightLinks))
+ );
};
Pages['/about.html'] = function () {
- return h('div#main_other', [
- h('center', [
- h('h1', Msg.about)
+ return h('div#cp-main', [
+ infopageTopbar(),
+ h('div.container-fluid.cp-about-intro', [
+ h('div.container', [
+ h('center', [
+ h('h1', Msg.about),
+ setHTML(h('p'), 'CryptPad is created inside of the Research Team at XWiki SAS, a small business located in Paris France and Iasi Romania. There are 3 core team members working on CryptPad plus a number of contributors both inside and outside of XWiki SAS.'),
+ ]),
+ ]),
+ ]),
+ h('div.container.cp-container', [
+ h('div.row', [
+ h('div.cp-develop-about.col-12',[
+ h('div.cp-icon-cent'),
+ h('h2.text-center', 'Core Developers')
+ ]),
+ ]),
+ h('div.row.align-items-center', [
+ h('div.col-12.col-sm-12.col-md-12.col-lg-6.cp-bio-avatar', [
+ h('img.img-fluid', {'src': '/customize/images/CalebJames.jpg'})
+ ]),
+ h('div.col-12.col-sm-12.col-md-12.col-lg-6.cp-profile-det', [
+ h('h3', "Caleb James Delisle"),
+ h('hr'),
+ setHTML(h('div#bioCaleb'), '
Caleb is a cryptography developer, Machine Technology graduate of the Franklin County Technical School and lifelong tinkerer. In 2011, he started the cjdns Open Source project to show that secure networking could be invisible and easily deployed. After joining XWiki SAS in 2014, he started the CryptPad project with the intent of bringing the same transparent security to collaborative editing. He\'s always trying to learn from more experienced colleagues and when someone passes through the Research Team office, his favorite words are "Pull up a chair!".
Aaron transitioned into distributed systems development from a background in jazz and live stage performance. He appreciates the elegance of biological systems and functional programming, and focused on both as a student at the University of Toronto, where he studied cognitive and computer sciences. He moved to Paris in 2015 to work as a research engineer at XWiki SAS, after having dedicated significant time to various cryptography-related software projects. He spends his spare time experimenting with guitars, photography, science fiction, and spicy food.
In 2015, Yann graduated with an engineering degree from Ecole Centrale de Lille majoring in Data Science. In his studies he worked on a project to detect defects in optical fiber using image processing technology. Upon joining XWiki SAS, Yann developed a Wiki page recommendation system, a common API for accessing data server-side and client-side, and an integrated development environment for development of XWiki applications. Yann is soft spoken but brutally efficient, he is known to say "It will take 5 minutes".
Resident CSS wizard and emoji extraordinaire, Pierre is passionate about anything related to technology. He loves to hack around computers and put parts together. He is currently studying at 42, where he learns about algorithms, networking, kernel programming and graphics. As a part of an internship, he joined XWiki SAS and worked on CryptPad to improve user experience. He also maintains the Spanish translation.
Catalin is a Maths majour and has worked in B2B sales for 12 years. Design was always his passion and 3 years ago he started to dedicate himself to web design and front-end. At the beginning of 2017 he joined the XWiki, where he worked both on the business and the community side of XWiki, including the research team and CryptPad.
A graduate of PolyTech (X90) and Telecom School in Paris, Ludovic Dubost started his career as a software architect for Netscape Communications Europe. He then became CTO of NetValue, one of the first French start-ups that went public. He left NetValue after the company was purchased by Nielsen/NetRatings and in 2004 launched XWiki, the next generation wiki. Since the very beginning, Ludovic has been immensely helpful to the CryptPad project. He believed in the idea when there was nothing more than the collaborative pad and his help with sales strategy for the project.
`
+* There is a corresponding less file called `less2/pages/page-index.less`
+* Finally there is a corresponding line in main.less which imports that less file: `div#main.cp-page-index { @import "./pages/page-index.less"; }`
+ * cp-page-index class means:
+ * cp -> cryptpad
+ * page -> this is a style for accessing a page's less file
+ * index -> the name of the page and of the less file (page-index.less)
+* And everything which is standardized across pages is included from `page-index.less` as variables and mixins.
+
+Rules:
+* All of our new classes and ids should start with `cp-`.
+* You may make as many files as you need, for different purposes, but they can only contain mixins and variables.
+* All mixins and variables must be prefixed with the name of the file where they're defined and and underscore.
+ * e.g. `@colortheme_toolbar-poll-bg: #006304;` defined in `colortheme.less`
+* All mixin / variable files go in an `/include/` directory.
+* Document the meaning of your variable or mixin in a comment, consider that your mixin will be used by people other than you and if they do not have a definition of what it means, an update to it's style which seems logical to you might break their usage of it.
\ No newline at end of file
diff --git a/customize.dist/template.js b/customize.dist/template.js
index 6c3361789..a9067f35f 100644
--- a/customize.dist/template.js
+++ b/customize.dist/template.js
@@ -3,50 +3,15 @@ define([
'/common/hyperscript.js',
'/common/cryptpad-common.js',
'/customize/pages.js',
- '/api/config',
'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
-], function ($, h, Cryptpad, Pages, Config) {
+], function ($, h, Cryptpad, Pages) {
$(function () {
- var urlArgs = Config.requireConf.urlArgs;
- var Messages = Cryptpad.Messages;
var $body = $('body');
var isMainApp = function () {
return /^\/(pad|code|slide|poll|whiteboard|file|media|contacts|drive|settings|profile|todo)\/$/.test(location.pathname);
};
- var rightLink = function (ref, loc, txt) {
- return h('span.link.right', [
- h('a', { href: ref, 'data-localization': loc}, txt)
- ]);
- };
-
- var $topbar = $(h('div#cryptpadTopBar', [
- h('span', [
- h('a.gotoMain', {href: '/'}, [
- h('img.cryptpad-logo', {
- src: '/customize/cryptofist_mini.png?' + urlArgs,
- alt: '',
- }),
- 'CryptPad'
- ])
- ]),
- h('span#user-menu.right.dropdown-bar'),
- h('span#language-selector.right.dropdown-bar'),
-
- rightLink('/about.html', 'about', 'About'),
- rightLink('/privacy.html', 'privacy', 'Privacy'),
- rightLink('/terms.html', 'terms', 'ToS'),
- rightLink('/contact.html', 'contact', 'Contact'),
- rightLink('https://blog.cryptpad.fr/', 'blog', 'Blog'),
- h('span.link.right', [
- h('button#upgrade.upgrade.btn.buttonSuccess', {
- style: { display: 'none' }
- })
- ])
- ]
- ));
-
var infoPage = function () {
return h('div#mainBlock.hidden', typeof(Pages[location.pathname]) === 'function'?
Pages[location.pathname](): [h('div#container')]);
@@ -54,67 +19,6 @@ $(function () {
var $main = $(infoPage());
- var footerCol = function (title, L, literal) {
- return h('div.col', [
- h('ul.list-unstyled', [
- h('li.title', {
- 'data-localization': title,
- }, title? Messages[title]: literal )
- ].concat(L.map(function (l) {
- return h('li', [ l ]);
- }))
- )
- ]);
- };
-
- var footLink = function (ref, loc, text) {
- var attrs = {
- href: ref,
- };
- if (!/^\//.test(ref)) {
- attrs.target = '_blank';
- attrs.rel = 'noopener noreferrer';
- }
- if (loc) {
- attrs['data-localization'] = loc;
- text = Messages[loc];
- }
- return h('a', attrs, text);
- };
-
- var $footer = $(h('footer', [
- h('div.container', [
- h('div.row', [
- footerCol(null, [
- footLink('/about.html', 'about'),
- footLink('/terms.html', 'terms'),
- footLink('/privacy.html', 'privacy'),
- ], 'CryptPad'),
- footerCol('footer_applications', [
- footLink('/drive/', 'main_drive'),
- footLink('/pad/', 'main_richText'),
- footLink('/code/', 'main_code'),
- footLink('/slide/', 'main_slide'),
- footLink('/poll/', 'main_poll'),
- footLink('/whiteboard/', null, Messages.type.whiteboard)
- ]),
- footerCol('footer_aboutUs', [
- footLink('https://blog.cryptpad.fr', 'blog'),
- footLink('https://labs.xwiki.com', null, 'XWiki Labs'),
- footLink('http://www.xwiki.com', null, 'XWiki SAS'),
- footLink('https://www.open-paas.org', null, 'OpenPaaS')
- ]),
- footerCol('footer_contact', [
- footLink('https://riot.im/app/#/room/#cryptpad:matrix.org', null, 'Chat'),
- footLink('https://twitter.com/cryptpad', null, 'Twitter'),
- footLink('https://github.com/xwiki-labs/cryptpad', null, 'GitHub'),
- footLink('/contact.html', null, 'Email')
- ])
- ])
- ]),
- h('div.version-footer', "CryptPad v1.12.0 (Minotaur)")
- ]));
-
var pathname = location.pathname;
if (isMainApp()) {
@@ -174,13 +78,24 @@ $(function () {
return;
}
+ } else {
+ // add class on info-pages
+ var css = location.pathname.replace(/(index)?\.html$/gi, "") // .html
+ .replace(/[^a-zA-Z]+/gi, '-') // any non-alpha character
+ .replace(/^-|-$/g, ''); // starting/trailing dashes
+ if (css === '')
+ {
+ css = 'index';
+ }
+ $('body').addClass('cp-page-' + css);
}
require([
- 'less!/customize/src/less/cryptpad.less',
+ 'less!/customize/src/less2/main.less',
'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
+ '/bower_components/bootstrap/dist/js/bootstrap.min.js'
], function () {
- $body.append($topbar).append($main).append($footer);
+ $body.append($main);
if (/^\/user\//.test(pathname)) {
require([ '/user/main.js'], function () {});
diff --git a/customize.dist/testimonial.svg b/customize.dist/testimonial.svg
new file mode 100644
index 000000000..4c1b0074e
--- /dev/null
+++ b/customize.dist/testimonial.svg
@@ -0,0 +1,19 @@
+
+
+
diff --git a/customize.dist/translations/messages.es.js b/customize.dist/translations/messages.es.js
index 65afe91f0..82e7fc0a9 100644
--- a/customize.dist/translations/messages.es.js
+++ b/customize.dist/translations/messages.es.js
@@ -104,7 +104,7 @@ define(function () {
out.main_p2 = 'Este proyecto utiliza el editor de texto visual CKEditor, CodeMirror, y el motor en tiempo real ChainPad.';
out.main_howitworks = '¿Cómo funciona?';
out.main_howitworks_p1 = "CryptPad utiliza una variante del algoritmo de transformación operacional (página en inglés) que es capaz de encontrar un consenso distribuido usando un Blockchain Nakamoto (página en inglés), popularizado por Bitcoin. De esta manera el algoritmo puede evitar la necesidad de un servidor central para resolver conflictos de edición de la transformación operacional y sin necesidad de resolver conflictos, el servidor puede mantenerse inconsciente del contenido que se está editando en el pad.";
- out.main_about_p2 = 'Si tienes preguntas o comentarios, puedes enviarnos un tweet, abrir un issue en GitHub, saludarnos en nuestro canal IRC (irc.freenode.net), o envíanos un email.';
+ out.main_about_p2 = 'Si tienes preguntas o comentarios, puedes enviarnos un tweet, abrir un issue en GitHub. saludarnos en nuestro canal Matrix o en IRC (#cryptpad on irc.freenode.net), o envianos un email.';
out.button_newpad = 'Crear nuevo pad de texto enriquecido';
out.button_newcode = 'Crear nuevo pad de código';
@@ -291,7 +291,7 @@ define(function () {
out.blog = "Blog";
out.initialState = [
- '
',
+ '
',
'Esto es CryptPad, el editor colaborativo en tiempo real Zero Knowledge. Todo está guardado cuando escribes.',
' ',
'Comparte el enlace a este pad para editar con amigos o utiliza el botón Compartir para obtener un enlace sólo lectura que permite leer pero no escribir.',
@@ -299,13 +299,13 @@ define(function () {
'
',
'Vamos, empieza a escribir...',
- '
',
+ '',
'
'
].join('');
out.codeInitialState = "/*\n Esto es CryptPad, el editor colaborativo en tiempo real zero knowledge.\n Lo que escribes aquí está cifrado de manera que sólo las personas con el enlace pueden acceder a ello.\n Incluso el servidor no puede ver lo que escribes.\n Lo que ves aquí, lo que escuchas aquí, cuando sales, se queda aquí\n*/";
out.slideInitialState = "# CryptSlide\n* Esto es CryptPad, el editor colaborativo en tiempo real zero knowledge.\n* Lo que escribes aquí está cifrado de manera que sólo las personas con el enlace pueden acceder a ello.\n* Incluso el servidor no puede ver lo que escribes.\n* Lo que ves aquí, lo que escuchas aquí, cuando sales, se queda aquí\n\n---\n# Cómo utilizarlo\n1. Escribe tu contenido en Markdown\n - Puedes aprender más sobre Markdown [aquí](http://www.markdowntutorial.com/)\n2. Separa tus diapositivas con ---\n3. Haz clic en \"Presentar\" para ver el resultado - Tus diapositivas se actualizan en tiempo real";
- out.driveReadmeTitle = "¿Qué es CryptDrive?";
+ out.driveReadmeTitle = "¿Qué es CryptPad?";
out.readme_welcome = "¡Bienvenido a CryptPad!";
out.readme_p1 = "Bienvenido a CryptPad, aquí podrás anotar cosas solo o con otra gente.";
out.readme_p2 = "Este pad es una guía rápida para aprender a usar a CryptPad para tomar notas, organizarlas y trabajar con más personas.";
@@ -554,5 +554,30 @@ define(function () {
out.todo_markAsCompleteTitle = "Marcar esta tarea como completa";
out.todo_markAsIncompleteTitle = "Marcar esta tarea como incompleta";
out.todo_removeTaskTitle = "Borrar esta tarea de la lista";
+
+ // 1.13.0 - Naiad
+ out.topbar_whatIsCryptpad = "Qué es CryptPad";
+ out.header_homeTitle = "Volver a la página de inicio";
+ out.userListButton = "Lista de usuarios";
+ out.userAccountButton = "Tu cuenta";
+ out.canvas_saveToDrive = "Guardar esta imagen como archivo en tu CryptDrive";
+ out.canvas_currentBrush = "Pincel actual";
+ out.canvas_chooseColor = "Eligir un color";
+ out.fm_viewListButton = "Lista";
+ out.fm_viewGridButton = "Cuadrícula";
+ out.settings_cat_code = "Código";
+ out.settings_codeIndentation = "Indentación del editor de código (espacios)";
+ out.settings_codeUseTabs = "Utilizar tabulaciones en vez de espacios";
+ out.pad_showToolbar = "Mostrar la barra de herramientas";
+ out.pad_hideToolbar = "Esconder la barra de herramientas";
+ out.main_catch_phrase = "El Cloud Zero Knowledge";
+ out.main_richTextPad = "Pad de Texto Enriquecido";
+ out.main_codePad = "Pad de Código";
+ out.main_slidePad = "Presentación Markdown";
+ out.main_pollPad = "Encuesta";
+ out.main_whiteboardPad = "Pizarra";
+ out.main_localPads = "Pad Locales";
+ out.main_yourCryptDrive = "Tu CryptDrive";
+
return out;
});
diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index a63196f95..ed955b373 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -116,6 +116,10 @@ define(function () {
out.shareButton = 'Partager';
out.shareSuccess = 'Lien copié dans le presse-papiers';
+ out.userListButton = "Liste d'utilisateurs";
+
+ out.userAccountButton = "Votre compte";
+
out.newButton = 'Nouveau';
out.newButtonTitle = 'Créer un nouveau pad';
out.uploadButton = 'Importer des fichiers';
@@ -240,10 +244,13 @@ define(function () {
out.canvas_delete = "Supprimer la sélection";
out.canvas_disable = "Désactiver le dessin";
out.canvas_enable = "Activer le dessin";
- out.canvas_width = "Épaisseur";
+ out.canvas_width = "Taille";
out.canvas_opacity = "Opacité";
- out.canvas_opacityLabel = "opacité: {0}";
- out.canvas_widthLabel = "taille: {0}";
+ out.canvas_opacityLabel = "Opacité: {0}";
+ out.canvas_widthLabel = "Taille: {0}";
+ out.canvas_saveToDrive = "Sauvegarder cette image en tant que fichier dans CryptDrive";
+ out.canvas_currentBrush = "Pinceau actuel";
+ out.canvas_chooseColor = "Choisir une couleur";
// Profile
out.profileButton = "Profil"; // dropdown menu
@@ -257,6 +264,9 @@ define(function () {
out.profile_description = "Description";
out.profile_fieldSaved = 'Nouvelle valeur enregistrée: {0}';
+ out.profile_inviteButton = "Inviter";
+ out.profile_inviteButtonTitle = 'Créer un lien pour inviter cet utilisateur à se connecter avec vous.';
+ out.profile_inviteExplanation = "Cliquer sur OK créera un lien vers une session de messagerie sécurisée uniquement accessible par {0}.
Le lien peut être copié et partagé de manière publique.";
out.profile_viewMyProfile = "Voir mon profil";
// contacts/userlist
@@ -338,6 +348,8 @@ define(function () {
out.fm_backup_title = 'Lien de secours';
out.fm_nameFile = 'Comment souhaitez-vous nommer ce fichier ?';
out.fm_error_cantPin = "Erreur interne du serveur. Veuillez recharger la page et essayer de nouveau.";
+ out.fm_viewListButton = "Liste";
+ out.fm_viewGridButton = "Grille";
// File - Context menu
out.fc_newfolder = "Nouveau dossier";
out.fc_rename = "Renommer";
@@ -383,8 +395,6 @@ define(function () {
out.login_invalPass = 'Mot de passe requis';
out.login_unhandledError = "Une erreur inattendue s'est produite :(";
- out.login_notRegistered = 'Pas encore inscrit ?';
-
out.register_importRecent = "Importer l'historique (Recommendé)";
out.register_acceptTerms = "J'accepte les conditions d'utilisation";
out.register_passwordsDontMatch = "Les mots de passe doivent être identiques!";
@@ -403,11 +413,12 @@ define(function () {
"
Vous pouvez importer les pads récents de ce navigateur pour les avoir dans votre compte utilisateur.
",
"
Si vous utilisez un ordinateur partagé, vous devez vous déconnecter avant de partir, fermer l'onglet n'est pas suffisant.
",
""
- ];
+ ].join('');
// Settings
out.settings_cat_account = "Compte";
out.settings_cat_drive = "CryptDrive";
+ out.settings_cat_code = "Code";
out.settings_title = "Préférences";
out.settings_save = "Sauver";
@@ -454,6 +465,9 @@ define(function () {
out.settings_logoutEverywhere = "Se déconnecter de force de toutes les autres sessions.";
out.settings_logoutEverywhereConfirm = "Êtes-vous sûr ? Vous devrez vous reconnecter sur tous vos autres appareils.";
+ out.settings_codeIndentation = "Indentation dans l'éditeur de code (nombre d'espaces)";
+ out.settings_codeUseTabs = "Utiliser des tabulations au lieu d'espaces";
+
out.upload_title = "Hébergement de fichiers";
out.upload_serverError = "Erreur interne: impossible d'importer le fichier pour l'instant.";
out.upload_uploadPending = "Vous avez déjà un fichier en cours d'importation. Souhaitez-vous l'annuler et importer ce nouveau fichier ?";
@@ -473,10 +487,14 @@ define(function () {
out.todo_title = "CryptTodo";
out.todo_newTodoNamePlaceholder = "Décrivez votre tâche...";
out.todo_newTodoNameTitle = "Ajouter cette tâche à votre liste";
- out.todo_markAsCompleteTitle = "Marquer tâche comme terminée";
- out.todo_markAsIncompleteTitle = "Marquer tâche comme non incomplète";
+ out.todo_markAsCompleteTitle = "Marquer cette tâche comme terminée";
+ out.todo_markAsIncompleteTitle = "Marquer cette tâche comme incomplète";
out.todo_removeTaskTitle = "Enlever cette tâche de votre liste";
+ // pad
+ out.pad_showToolbar = "Afficher la barre d'outils";
+ out.pad_hideToolbar = "Cacher la barre d'outils";
+
// general warnings
out.warn_notPinned = "Ce pad n'est stocké dans aucun CryptDrive. Il va expirer après 3 mois d'inactivité. En savoir plus...";
@@ -486,9 +504,10 @@ define(function () {
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_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.';
//contact.html
- out.main_about_p2 = 'Si vous avez des questions ou commentaires, vous pouvez nous tweeter, ouvrir une issue sur Github, venir dire bonjour sur IRC (irc.freenode.net), ou nous envoyer un email.';
+ out.main_about_p2 = 'Si vous avez des questions ou commentaires, vous pouvez nous tweeter, ouvrir une issue sur GitHub, venir dire bonjour sur notre salle Matrix ou IRC (#cryptpad sur irc.freenode.net), ou bien encore nous envoyer un email.';
- out.main_info = "
Collaborez avec confiance
Développez vos idées en groupe avec des document partagés; la technologie Zero Knowledge sécurise vos données.";
+ out.main_info = "
Collaborez avec confiance
Développez vos idées en groupe avec des documents partagés; la technologie Zero Knowledge sécurise vos données.";
+ out.main_catch_phrase = "Le Cloud Zero Knowledge";
out.main_howitworks = 'Comment ça fonctionne';
out.main_zeroKnowledge = 'Zero Knowledge';
@@ -510,6 +529,15 @@ define(function () {
out.main_poll_p = 'Plannifiez vos réunions ou évènements, ou votez pour la meilleure solution concernant votre problème.';
out.main_drive = 'CryptDrive';
+ out.main_richTextPad = 'Pad de Texte Riche';
+ out.main_codePad = 'Pad de Code';
+ out.main_slidePad = 'Présentation Markdown';
+ out.main_pollPad = 'Sondage ou Planning';
+ out.main_whiteboardPad = 'Tableau blanc';
+ out.main_localPads = 'Pads Locaux';
+ out.main_yourCryptDrive = 'Votre CryptDrive';
+ out.main_footerText = "Avec CryptPad, vous pouvez créer des documents collaboratifs rapidement pour prendre des notes à plusieurs.";
+
out.footer_applications = "Applications";
out.footer_contact = "Contact";
out.footer_aboutUs = "À propos";
@@ -520,6 +548,8 @@ define(function () {
out.terms = "Conditions";
out.blog = "Blog";
+ out.topbar_whatIsCryptpad = "Qu'est-ce que CryptPad";
+
// privacy.html
out.policy_title = 'Politique de confidentialité de CryptPad';
@@ -560,11 +590,12 @@ define(function () {
out.header_support = '';
out.updated_0_header_logoTitle = 'Retourner vers votre CryptDrive';
out.header_logoTitle = out.updated_0_header_logoTitle;
+ out.header_homeTitle = "Aller sur la page d'accueil";
// Initial states
out.initialState = [
- '
',
+ '
',
'Voici CryptPad, l\'éditeur collaboratif en temps-réel Zero Knowledge. Tout est sauvegardé dés que vous le tapez.',
' ',
'Partagez le lien vers ce pad avec des amis ou utilisez le bouton Partager pour obtenir le lien de lecture-seule, qui permet la lecture mais non la modification.',
@@ -572,7 +603,7 @@ define(function () {
'
',
'',
'Lancez-vous, commencez à taper...',
- '
',
+ '',
'
'
].join('');
@@ -600,7 +631,7 @@ define(function () {
' - La présentation est mise à jour en temps-réel'
].join('');
- out.driveReadmeTitle = "Qu'est-ce que CryptDrive ?";
+ out.driveReadmeTitle = "Qu'est-ce que CryptPad ?";
out.readme_welcome = "Bienvenue dans CryptPad !";
out.readme_p1 = "Bienvenue dans CryptPad, le lieu où vous pouvez prendre des notes seul ou avec des amis.";
out.readme_p2 = "Ce pad va vous donner un aperçu de la manière dont vous pouvez utiliser CryptPad pour prendre des notes, les organiser et travailler en groupe sur celles-ci.";
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index 9cceee9ff..262f9890c 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -118,6 +118,10 @@ define(function () {
out.shareButton = 'Share';
out.shareSuccess = 'Copied link to clipboard';
+ out.userListButton = "User list";
+
+ out.userAccountButton = "Your account";
+
out.newButton = 'New';
out.newButtonTitle = 'Create a new pad';
out.uploadButton = 'Upload files';
@@ -244,8 +248,11 @@ define(function () {
out.canvas_enable = "Enable draw";
out.canvas_width = "Width";
out.canvas_opacity = "Opacity";
- out.canvas_opacityLabel = "opacity: {0}";
+ out.canvas_opacityLabel = "Opacity: {0}";
out.canvas_widthLabel = "Width: {0}";
+ out.canvas_saveToDrive = "Save this image as a file in your CryptDrive";
+ out.canvas_currentBrush = "Current brush";
+ out.canvas_chooseColor = "Choose a color";
// Profile
out.profileButton = "Profile"; // dropdown menu
@@ -329,10 +336,10 @@ define(function () {
out.updated_0_fm_info_trash = 'Empty your trash to free space in your CryptDrive.';
out.fm_info_trash = out.updated_0_fm_info_trash;
out.fm_info_allFiles = 'Contains all the files from "Documents", "Unsorted" and "Trash". You can\'t move or remove files from here.'; // Same here
- out.fm_info_anonymous = 'You are not logged in so these pads may be deleted (find out why). ' +
+ out.fm_info_anonymous = 'You are not logged in so your pads will expire after 3 months (find out more). ' +
'Sign up or Log in to keep them alive.';
out.fm_alert_backupUrl = "Backup link for this drive. " +
- "It is highly recommended that you keep ip for yourself only. " +
+ "It is highly recommended that you keep it secret. " +
"You can use it to retrieve all your files in case your browser memory got erased. " +
"Anybody with that link can edit or remove all the files in your file manager. ";
out.fm_alert_anonymous = "Hello there, you are currently using CryptPad anonymously, that's ok but your pads may be deleted after a period of " +
@@ -342,6 +349,8 @@ define(function () {
out.fm_backup_title = 'Backup link';
out.fm_nameFile = 'How would you like to name that file?';
out.fm_error_cantPin = "Internal server error. Please reload the page and try again.";
+ out.fm_viewListButton = "List view";
+ out.fm_viewGridButton = "Grid view";
// File - Context menu
out.fc_newfolder = "New folder";
out.fc_rename = "Rename";
@@ -387,8 +396,6 @@ define(function () {
out.login_invalPass = 'Password required';
out.login_unhandledError = 'An unexpected error occurred :(';
- out.login_notRegistered = 'Not registered?';
-
out.register_importRecent = "Import pad history (Recommended)";
out.register_acceptTerms = "I accept the terms of service";
out.register_passwordsDontMatch = "Passwords do not match!";
@@ -397,13 +404,15 @@ define(function () {
out.register_header = "Welcome to CryptPad";
out.register_explanation = [
- "
Lets go over a couple things first
",
- "
",
- "
Your password is your secret key which encrypts all of your pads. If you lose it there is no way we can recover your data.
",
- "
You can import pads which were recently viewed in your browser so you have them in your account.
",
- "
If you are using a shared computer, you need to log out when you are done, closing the tab is not enough.
",
+ "
Lets go over a couple things first:
",
+ "
",
+ "
Your password is your secret key which encrypts all of your pads. If you lose it there is no way we can recover your data.
",
+ "
You can import pads which were recently viewed in your browser so you have them in your account.
",
+ "
If you are using a shared computer, you need to log out when you are done, closing the tab is not enough.
",
"
"
].join('');
+ out.register_testimonial =" \"Tools like Etherpad and Google Docs [...] all share a weakness, which is that whomever owns the document server can see everything you're typing. Cryptpad is a free/open project that uses some of the ideas behind blockchain to implement a \"zero-knowledge\" version of a collaborative document editor, ensuring that only the people working on a document can see it.\" ";
+ out.register_testimonial_name = "Cory Doctorow";
out.register_writtenPassword = "I have written down my username and password, proceed";
out.register_cancel = "Go back";
@@ -415,6 +424,7 @@ define(function () {
// Settings
out.settings_cat_account = "Account";
out.settings_cat_drive = "CryptDrive";
+ out.settings_cat_code = "Code";
out.settings_title = "Settings";
out.settings_save = "Save";
@@ -461,6 +471,9 @@ define(function () {
out.settings_logoutEverywhere = "Force log out of all other web sessions";
out.settings_logoutEverywhereConfirm = "Are you sure? You will need to log in with all your devices.";
+ out.settings_codeIndentation = 'Code editor indentation (spaces)';
+ out.settings_codeUseTabs = "Indent using tabs (instead of spaces)";
+
out.upload_title = "File upload";
out.upload_serverError = "Server Error: unable to upload your file at this time.";
out.upload_uploadPending = "You already have an upload in progress. Cancel it and upload your new file?";
@@ -484,6 +497,10 @@ define(function () {
out.todo_markAsIncompleteTitle = "Mark this task as incomplete";
out.todo_removeTaskTitle = "Remove this task from your todo list";
+ // pad
+ out.pad_showToolbar = "Show toolbar";
+ out.pad_hideToolbar = "Hide toolbar";
+
// general warnings
out.warn_notPinned = "This pad is not in anyone's CryptDrive. It will expire after 3 months. Learn more...";
@@ -495,9 +512,10 @@ define(function () {
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.';
// contact.html
- out.main_about_p2 = 'If you have any questions or comments, you can tweet us, open an issue on github, come say hi on irc (irc.freenode.net), or send us an email.';
+ out.main_about_p2 = 'If you have any questions or comments, feel free to reach out! You can tweet us, open an issue on GitHub. Come say hi on our Matrix channel or IRC (#cryptpad on irc.freenode.net), or send us an email.';
- out.main_info = "
Collaborate in Confidence
Grow your ideas together with shared documents while Zero Knowledge technology secures your privacy; even from us.";
+ out.main_info = "
Collaborate in Confidence
Grow your ideas together with shared documents while Zero Knowledge technology secures your privacy; even from us.";
+ out.main_catch_phrase = "The Zero Knowledge Cloud";
out.main_howitworks = 'How It Works';
out.main_zeroKnowledge = 'Zero Knowledge';
@@ -520,6 +538,15 @@ define(function () {
out.main_poll_p = 'Plan your meeting or your event, or vote for the best solution regarding your problem.';
out.main_drive = 'CryptDrive';
+ out.main_richTextPad = 'Rich Text Pad';
+ out.main_codePad = 'Markdown/Code Pad';
+ out.main_slidePad = 'Markdown Presentation';
+ out.main_pollPad = 'Poll or Schedule';
+ out.main_whiteboardPad = 'Whiteboard';
+ out.main_localPads = 'Local Pads';
+ out.main_yourCryptDrive = 'Your CryptDrive';
+ out.main_footerText = "With CryptPad, you can make quick collaborative documents for taking notes and writing down ideas together.";
+
out.footer_applications = "Applications";
out.footer_contact = "Contact";
out.footer_aboutUs = "About us";
@@ -530,6 +557,27 @@ define(function () {
out.terms = "ToS";
out.blog = "Blog";
+ out.topbar_whatIsCryptpad = "What is CryptPad";
+
+ // what-is-cryptpad.html
+
+ out.whatis_title = 'What is CryptPad';
+ out.whatis_collaboration = 'Fast, Easy Collaboration';
+ out.whatis_collaboration_p1 = 'With CryptPad, you can make quick collaborative documents for taking notes and writing down ideas together. When you sign up and log in, you get file upload capability and a CryptDrive where you can organize all of your pads. As a registered user you get 50MB of space for free.';
+ out.whatis_collaboration_p2 = 'You can share access to a CryptPad document simply by sharing the link. You can also share a link which provides read only access to a pad, allowing you to publicise your collaborative work while still being able to edit it.';
+ out.whatis_collaboration_p3 = 'You can make simple rich text documents with CKEditor as well as Markdown documents which are rendered in realtime while you type. You can also use the poll app for scheduling events with multiple participants.';
+ out.whatis_zeroknowledge = 'Zero Knowledge';
+ out.whatis_zeroknowledge_p1 = "We don't want to know what you're typing and with modern cryptography, you can be sure that we can't know. CryptPad uses 100% client side encryption to protect the content that you type from us, the people who host the server.";
+ out.whatis_zeroknowledge_p2 = 'When you sign up and log in, your username and password are computed into a secret key using scrypt key derivation function. Neither this key, nor the username and password are ever sent to the server. Instead they are used on the client side to decrypt the content of your CryptDrive, which contains the keys to all pads that you are able to access.';
+ out.whatis_zeroknowledge_p3 = 'When you share the link to a document, you\'re sharing the cryptographic key for accessing that document but since the key is in the fragment identifier, it is never directly sent to the server. Check out our privacy blog post to learn more about what types of metadata we do and do not have access to.';
+ out.whatis_drive = 'Organization with CryptDrive';
+ out.whatis_drive_p1 = 'Whenever you access a pad in CryptPad, the pad is automatically added to your CryptDrive in the main folder. Later on, you can organize these pads into folders or you can put them in the trash bin. CryptDrive allows you to search through your pads and to organize them whenever you want, however you want.';
+ out.whatis_drive_p2 = 'With intuitive drag-and-drop, you can move pads around in your drive and the link to these pads will stay the same so your collaborators will never lose access.';
+ out.whatis_drive_p3 = 'You can also upload files in your CryptDrive and share them with colleagues. Uploaded files can be organized just like collaborative pads.';
+ out.whatis_business = 'CryptPad for Business';
+ out.whatis_business_p1 = 'CryptPad\'s Zero Knowledge encryption is excellent for multiplying the effectiveness of existing security protocols by mirroring organizational access controls in cryptography. Because sensitive assets can only be decrypted using employee access credentials, CryptPad removes the hacker jackpot which exists in traditional IT servers. Read the CryptPad Whitepaper to learn more about how it can help your business.';
+ out.whatis_business_p2 = 'CryptPad is deployable on premises and the CryptPad developers at XWiki SAS are able to offer commercial support, customization and development. Reach out to sales@cryptpad.fr for more information.';
+
// privacy.html
out.policy_title = 'CryptPad Privacy Policy';
@@ -571,11 +619,12 @@ define(function () {
out.header_support = '';
out.updated_0_header_logoTitle = 'Go to your CryptDrive';
out.header_logoTitle = out.updated_0_header_logoTitle;
+ out.header_homeTitle = 'Go to CryptPad homepage';
// Initial states
out.initialState = [
- '
',
+ '
',
'This is CryptPad, the Zero Knowledge realtime collaborative editor. Everything is saved as you type.',
' ',
'Share the link to this pad to edit with friends or use the Share button to share a read-only link which allows viewing but not editing.',
@@ -583,7 +632,7 @@ define(function () {
'
',
'Go ahead, just start typing...',
- '
',
+ '',
'
'
].join('');
@@ -613,7 +662,7 @@ define(function () {
// Readme
- out.driveReadmeTitle = "What is CryptDrive?";
+ out.driveReadmeTitle = "What is CryptPad?";
out.readme_welcome = "Welcome to CryptPad !";
out.readme_p1 = "Welcome to CryptPad, this is where you can take note of things alone and with friends.";
out.readme_p2 = "This pad will give you a quick walk through of how you can use CryptPad to take notes, keep them organized and work together on them.";
diff --git a/customize.dist/translations/messages.pt-br.js b/customize.dist/translations/messages.pt-br.js
index 6ea5865d4..e2c29fae1 100644
--- a/customize.dist/translations/messages.pt-br.js
+++ b/customize.dist/translations/messages.pt-br.js
@@ -484,7 +484,7 @@ define(function () {
// Initial states
out.initialState = [
- '
',
+ '
',
'This is CryptPad, the Zero Knowledge realtime collaborative editor. Everything is saved as you type.',
' ',
'Share the link to this pad to edit with friends or use the Share button to share a read-only link which allows viewing but not editing.',
@@ -492,7 +492,7 @@ define(function () {
'
',
'Go ahead, just start typing...',
- '
',
+ '',
'
'
].join('');
@@ -522,7 +522,7 @@ define(function () {
// Readme
- out.driveReadmeTitle = "What is CryptDrive?";
+ out.driveReadmeTitle = "What is CryptPad?";
out.readme_welcome = "Welcome to CryptPad !";
out.readme_p1 = "Welcome to CryptPad, this is where you can take note of things alone and with friends.";
out.readme_p2 = "This pad will give you a quick walk through of how you can use CryptPad to take notes, keep them organized and work together on them.";
diff --git a/customize.dist/translations/messages.ro.js b/customize.dist/translations/messages.ro.js
index 0eeb8f7f2..61881eb36 100644
--- a/customize.dist/translations/messages.ro.js
+++ b/customize.dist/translations/messages.ro.js
@@ -331,10 +331,10 @@ define(function () {
out.header_france = "With from by ";
out.header_support = "";
out.header_logoTitle = "Mergi la pagina principală";
- out.initialState = "
Acesta este CryptPad, editorul colaborativ bazat pe tehnologia Zero Knowledge în timp real. Totul este salvat pe măsură ce scrii. Partajează link-ul către acest pad pentru a edita cu prieteni sau folosește Share butonul pentru a partaja read-only link permițând vizualizarea dar nu și editarea.
Îndrăznește, începe să scrii...
";
+ out.initialState = "
Acesta este CryptPad, editorul colaborativ bazat pe tehnologia Zero Knowledge în timp real. Totul este salvat pe măsură ce scrii. Partajează link-ul către acest pad pentru a edita cu prieteni sau folosește Share butonul pentru a partaja read-only link permițând vizualizarea dar nu și editarea.
Îndrăznește, începe să scrii...
";
out.codeInitialState = "/*\n Acesta este editorul colaborativ de cod bazat pe tehnologia Zero Knowledge CryptPad.\n Ce scrii aici este criptat, așa că doar oamenii care au link-ul pot să-l acceseze.\n Poți să alegi ce limbaj de programare pus n evidență și schema de culori UI n dreapta sus.\n*/";
out.slideInitialState = "# CryptSlide\n* Acesta este un editor colaborativ bazat pe tehnologia Zero Knowledge.\n* Ce scrii aici este criptat, așa că doar oamenii care au link-ul pot să-l acceseze.\n* Nici măcar serverele nu au acces la ce scrii tu.\n* Ce vezi aici, ce auzi aici, atunci când pleci, lași aici.\n\n-\n# Cum se folosește\n1. Scrie-ți conținutul slide-urilor folosind sintaxa markdown\n - Află mai multe despre sintaxa markdown [aici](http://www.markdowntutorial.com/)\n2. Separă-ți slide-urile cu -\n3. Click pe butonul \"Play\" pentru a vedea rezultatele - Slide-urile tale sunt actualizate în timp real.";
- out.driveReadmeTitle = "Ce este CryptDrive?";
+ out.driveReadmeTitle = "Ce este CryptPad?";
out.readme_welcome = "Bine ai venit n CryptPad !";
out.readme_p1 = "Bine ai venit în CryptPad, acesta este locul unde îți poți lua notițe, singur sau cu prietenii.";
out.readme_p2 = "Acest pad o să îți ofere un scurt ghid în cum poți să folosești CryptPad pentru a lua notițe, a le ține organizate și a colabora pe ele.";
diff --git a/customize.dist/translations/messages.zh.js b/customize.dist/translations/messages.zh.js
index ac0d9ce77..d835f928e 100644
--- a/customize.dist/translations/messages.zh.js
+++ b/customize.dist/translations/messages.zh.js
@@ -467,7 +467,7 @@ define(function () {
// Initial states
out.initialState = [
- '