Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

customize.dist/images/mastodon.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="61.076954mm" height="65.47831mm" viewBox="0 0 216.4144 232.00976">
+  <path fill="#2b90d9" d="M211.80734 139.0875c-3.18125 16.36625-28.4925 34.2775-57.5625 37.74875-15.15875 1.80875-30.08375 3.47125-45.99875 2.74125-26.0275-1.1925-46.565-6.2125-46.565-6.2125 0 2.53375.15625 4.94625.46875 7.2025 3.38375 25.68625 25.47 27.225 46.39125 27.9425 21.11625.7225 39.91875-5.20625 39.91875-5.20625l.8675 19.09s-14.77 7.93125-41.08125 9.39c-14.50875.7975-32.52375-.365-53.50625-5.91875C9.23234 213.82 1.40609 165.31125.20859 116.09125c-.365-14.61375-.14-28.39375-.14-39.91875 0-50.33 32.97625-65.0825 32.97625-65.0825C49.67234 3.45375 78.20359.2425 107.86484 0h.72875c29.66125.2425 58.21125 3.45375 74.8375 11.09 0 0 32.975 14.7525 32.975 65.0825 0 0 .41375 37.13375-4.59875 62.915"/>
+  <path fill="#fff" d="M177.50984 80.077v60.94125h-24.14375v-59.15c0-12.46875-5.24625-18.7975-15.74-18.7975-11.6025 0-17.4175 7.5075-17.4175 22.3525v32.37625H96.20734V85.42325c0-14.845-5.81625-22.3525-17.41875-22.3525-10.49375 0-15.74 6.32875-15.74 18.7975v59.15H38.90484V80.077c0-12.455 3.17125-22.3525 9.54125-29.675 6.56875-7.3225 15.17125-11.07625 25.85-11.07625 12.355 0 21.71125 4.74875 27.8975 14.2475l6.01375 10.08125 6.015-10.08125c6.185-9.49875 15.54125-14.2475 27.8975-14.2475 10.6775 0 19.28 3.75375 25.85 11.07625 6.36875 7.3225 9.54 17.22 9.54 29.675"/>
+</svg>

customize.dist/pages.js

@@ -68,7 +68,7 @@ define([
                             languageSelector()
                         ])
                     ], ''),
-                    footerCol('footer_applications', [
+                    /*footerCol('footer_applications', [
                         footLink('/drive/', 'main_drive'),
                         footLink('/pad/', 'main_richText'),
                         footLink('/code/', 'main_code'),
@@ -76,19 +76,31 @@ define([
                         footLink('/poll/', 'main_poll'),
                         footLink('/kanban/', 'main_kanban'),
                         footLink('/whiteboard/', null, Msg.type.whiteboard)
+                    ]),*/
+                    footerCol('footer_product', [
+                        footLink('https://cryptpad.fr/what-is-cryptpad.html', 'topbar_whatIsCryptpad'),
+                        footLink('/faq.html', 'faq_link'),
+                        footLink('https://github.com/xwiki-labs/cryptpad', null, 'GitHub'),
+                        footLink('https://opencollective.com/cryptpad/contribute/', null, 'Donate'),
                     ]),
                     footerCol('footer_aboutUs', [
-                        footLink('https://blog.cryptpad.fr', 'blog'),
+                        /*footLink('https://blog.cryptpad.fr', 'blog'),
-                        footLink('https://labs.xwiki.com', null, 'XWiki Labs'),
+                        footLink('https://labs.xwiki.com', null, 'XWiki Labs'),*/
                         footLink('http://www.xwiki.com', null, 'XWiki SAS'),
-                        footLink('https://www.open-paas.org', null, 'OpenPaaS')
+                        footLink('https://www.open-paas.org', null, 'OpenPaaS'),
+                        footLink('/about.html', 'footer_team'),
+                        footLink('/contact.html', 'contact'),
+                    ]),
+                    footerCol('footer_legal', [
+                        footLink('/terms.html', 'footer_tos'),
+                        footLink('/privacy.html', 'privacy'),
                     ]),
-                    footerCol('footer_contact', [
+                    /*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.cp-version-footer', "CryptPad v2.19.0 (Tapir)")
@@ -132,12 +144,12 @@ define([
             button,
             h('div.collapse.navbar-collapse.justify-content-end#menuCollapse', [
                 //h('a.nav-item.nav-link', { href: '/what-is-cryptpad.html'}, Msg.topbar_whatIsCryptpad), // Moved the FAQ
-                h('a.nav-item.nav-link', { href: '/faq.html'}, Msg.faq_link),
+                //h('a.nav-item.nav-link', { href: '/faq.html'}, Msg.faq_link),
                 h('a.nav-item.nav-link', { href: 'https://blog.cryptpad.fr/'}, Msg.blog),
                 h('a.nav-item.nav-link', { href: '/features.html'}, Msg.features),
                 h('a.nav-item.nav-link', { href: '/privacy.html'}, Msg.privacy),
-                h('a.nav-item.nav-link', { href: '/contact.html'}, Msg.contact),
+                //h('a.nav-item.nav-link', { href: '/contact.html'}, Msg.contact),
-                h('a.nav-item.nav-link', { href: '/about.html'}, Msg.about),
+                //h('a.nav-item.nav-link', { href: '/about.html'}, Msg.about),
             ].concat(rightLinks))
         );
     };

customize.dist/pages/contact.js

@@ -1,8 +1,9 @@
 define([
+    '/api/config',
     '/common/hyperscript.js',
     '/customize/messages.js',
     '/customize/pages.js'
-], function (h, Msg, Pages) {
+], function (Config, h, Msg, Pages) {
     return function () {
         return h('div#cp-main', [
             Pages.infopageTopbar(),
@@ -12,35 +13,72 @@ define([
                 )
             ]),
             h('div.container.cp-container', [
+                Config.adminEmail !== 'i.did.not.read.my.config@cryptpad.fr' ? h('div.row.cp-iconCont.align-items-center', [
+                    h('div.col-12',
+                        Pages.setHTML(h('h4.text-center'), Msg.contact_admin)
+                    ),
+                    h('div.col-12.col-sm-6.col-md-3.col-lg-3',
+                        h('a.card', {href : "mailto:"+Config.adminEmail},
+                            h('div.card-body',
+                                h('p', [
+                                    h('img', {src: '/customize/images/email.svg'}),
+                                    Msg.contact_email || 'Email'
+                                ])
+                            )
+                        )
+                    ),
+                ]) : undefined,
                 h('div.row.cp-iconCont.align-items-center', [
                     h('div.col-12',
-                        Pages.setHTML(h('h4.text-center'), Msg.main_about_p26)
+                        Pages.setHTML(h('h4.text-center'), Msg.contact_dev)
                     ),
                     h('div.col-12.col-sm-6.col-md-3.col-lg-3',
                         h('a.card', {href : "https://twitter.com/cryptpad"}, 
                             h('div.card-body',
-                                Pages.setHTML(h('p'), Msg.main_about_p22)
+                                h('p', [
+                                    h('img', {src: '/customize/images/twitter.svg'}),
+                                    Msg.contact_devTwitter || 'Twitter'
+                                ])
+                            )
+                        )
+                    ),
+                    h('div.col-12.col-sm-6.col-md-3.col-lg-3',
+                        h('a.card', {href : "https://social.weho.st/@cryptpad"}, 
+                            h('div.card-body',
+                                h('p', [
+                                    h('img', {src: '/customize/images/mastodon.svg'}),
+                                    Msg.contact_devMastodon || 'Mastodon'
+                                ])
                             )
                         )
                     ),
                     h('div.col-12.col-sm-6.col-md-3.col-lg-3',
                         h('a.card', {href : "https://github.com/xwiki-labs/cryptpad/issues/"},
                             h('div.card-body',
-                                Pages.setHTML(h('p'), Msg.main_about_p23)
+                                h('p', [
+                                    h('img', {src: '/customize/images/issue.svg'}),
+                                    Msg.contact_devBug || 'Bug report'
+                                ])
                             )
                         )
                     ),
                     h('div.col-12.col-sm-6.col-md-3.col-lg-3',
                         h('a.card', {href : "https://riot.im/app/#/room/#cryptpad:matrix.org"},
                             h('div.card-body',
-                                Pages.setHTML(h('p'), Msg.main_about_p24)
+                                h('p', [
+                                    h('img', {src: '/customize/images/sayhi.svg'}),
+                                    Msg.contact_devChat || 'Chat'
+                                ])
                             )
                         )
                     ),
                     h('div.col-12.col-sm-6.col-md-3.col-lg-3',
-                        h('a.card', {href : "mailto:research@xwiki.com"},
+                        h('a.card', {href : "mailto:contact@cryptpad.fr"},
                             h('div.card-body',
-                                Pages.setHTML(h('p'), Msg.main_about_p25)
+                                h('p', [
+                                    h('img', {src: '/customize/images/email.svg'}),
+                                    Msg.contact_email || 'Email'
+                                ])
                             )
                         )
                     ),

customize.dist/src/less2/pages/page-contact.less

@@ -19,10 +19,8 @@
             }
             div {
                 .card {
-                    padding: 4em 1em 0.5em 1em;
                     box-shadow: 0 5px 15px rgba(69,145,196, 0.3);
                     border-color: #fff;
-                    text-align: center;
                     margin-bottom: 1em;
                     &:hover, &:focus {
                         text-decoration: none;
@@ -40,37 +38,17 @@
                     @media (max-width: 335px) {
                         min-height: 162px;
                     }
-                }
+                    img {
-                &:nth-child(2) {
+                        max-width: 50px;
-                    .card {
+                        margin-bottom: 10px;
-                        background-image: url(/customize/images/twitter.svg);
-                        background-repeat: no-repeat;
-                        background-position: 50% 10%;
-                        background-size: 3rem;
-                    }
-                }
-                &:nth-child(3) {
-                    .card {
-                        background-image: url(/customize/images/issue.svg);
-                        background-repeat: no-repeat;
-                        background-position: 50% 10%;
-                        background-size: 3rem;
                     }
-                }
+                    p {
-                &:nth-child(4) {
+                        display: flex;
-                    .card {
+                        flex-flow: column;
-                        background-image: url(/customize/images/sayhi.svg);
+                        justify-content: center;
-                        background-repeat: no-repeat;
+                        align-items: center;
-                        background-position: 50% 10%;
+                        margin: 0;
-                        background-size: 3rem;
+                        height: 100%;
-                    }
-                }
-                &:nth-child(5) {
-                    .card {
-                        background-image: url(/customize/images/email.svg);
-                        background-repeat: no-repeat;
-                        background-position: 50% 10%;
-                        background-size: 3rem;
                     }
                 }
             }

server.js

@@ -18,6 +18,11 @@ try {
     console.log("You can customize the configuration by copying config/config.example.js to config/config.js");
     config = require('./config/config.example');
 }
+
+if (config.adminEmail === 'i.did.not.read.my.config@cryptpad.fr') {
+    console.log("You can configure the administrator email (adminEmail) in your config/config.js file");
+}
+
 var websocketPort = config.websocketPort || config.httpPort;
 var useSecureWebsockets = config.useSecureWebsockets || false;
 

www/common/translations/messages.de.json

@@ -606,20 +606,6 @@
     "main_about_p26": "Wenn du Fragen oder Kommentare hast, freuen wir uns, von dir zu hören!",
     "main_info": "<h2>Vertrauenswürdige Zusammenarbeit</h2> Lass deine Ideen gemeinsam wachsen, während die <strong>Zero-Knowledge</strong>-Technologie den Schutz deiner Daten <strong>sogar uns gegenüber</strong> sichert.",
     "main_catch_phrase": "Die Cloud ohne Preisgabe deiner Daten",
-    "main_richText": "Rich-Text-Editor",
-    "main_code": "Code-Editor",
-    "main_slide": "Folien-Editor",
-    "main_poll": "Umfragen",
-    "main_drive": "CryptDrive",
-    "main_richTextPad": "Rich-Text-Pad",
-    "main_codePad": "Markdown/Code-Pad",
-    "main_sheetPad": "Tabellen (Beta)",
-    "main_slidePad": "Markdown-Präsentation",
-    "main_pollPad": "Umfrage oder Terminabstimmung",
-    "main_whiteboardPad": "Whiteboard",
-    "main_kanbanPad": "Kanban-Board",
-    "main_localPads": "Lokale Dokumente",
-    "main_yourCryptDrive": "Dein CryptDrive",
     "main_footerText": "Mit CryptPad kannst du schnell kollaborative Dokumente erstellen, um Notizen oder Ideen zusammen mit anderen zu bearbeiten.",
     "footer_applications": "Anwendungen",
     "footer_contact": "Kontakt",
@@ -1028,5 +1014,6 @@
     "debug_getGraphText": "Dies ist der DOT-Code für die Generierung eines Graphen des Dokumentverlaufs:",
     "fm_passwordProtected": "Dieses Dokument ist mit einem Passwort geschützt",
     "mdToolbar_toc": "Inhaltsverzeichnis",
-    "markdown_toc": "Inhalt"
+    "markdown_toc": "Inhalt",
+    "fm_expirablePad": "Dieses Pad läuft am {0} aus"
 }

www/common/translations/messages.el.json

@@ -442,18 +442,6 @@
     "main_about_p26": "Αν έχετε απορίες ή σχόλια, επικοινωνήστε μαζί μας!",
     "main_info": "<h2>Συνεργαστείτε με ασφάλεια</h2> Αναπτύξτε τις ιδέες σας μαζί με κοινά αρχεία όσο η τεχνολογία <strong>Zero Knowledge</strong> εξασφαλίζει την ιδιωτικότητά σας; <strong>ακόμη κι από εμάς</strong>.",
     "main_catch_phrase": "Το Zero Knowledge σύννεφο",
-    "main_richText": "Επεξεργαστής Εμπλουτισμένου Κειμένου",
-    "main_code": "Επεξεργαστής κώδικα",
-    "main_slide": "Επεξεργαστής Slide",
-    "main_poll": "Δημοσκοπήσεις",
-    "main_drive": "CryptDrive",
-    "main_richTextPad": "Pad εμπλουτισμένου κειμένου",
-    "main_codePad": "Pad κώδικα",
-    "main_slidePad": "Markdown παρουσίαση",
-    "main_pollPad": "Δημοσκόπηση ή Χρονοδιάγραμμα",
-    "main_whiteboardPad": "Πίνακας σχεδιασμού",
-    "main_localPads": "Τοπικά pads",
-    "main_yourCryptDrive": "Το CryptDrive σας",
     "main_footerText": "Με το CryptPad, μπορείτε να δημιουργήσετε γρήγορα συνεργατικά έγγραφα για κοινόχρηστες σημειώσεις και καταγραφή ιδεών.",
     "footer_applications": "Εφαρμογές",
     "footer_contact": "Επικοινωνία",

www/common/translations/messages.es.json

@@ -203,11 +203,6 @@
     "settings_resetTipsButton": "Restaurar consejos",
     "settings_resetTipsDone": "Todos los consejos ahora están visibles",
     "main_info": "<h1>Colabora con Confianza</h1><br>Cultiva ideas juntos con documentos compartidos con tecnología <strong>Zero Knowledge</strong> que protege tu privacidad.",
-    "main_richText": "Editor de Texto Enriquecido",
-    "main_code": "Editor de código",
-    "main_slide": "Editor de presentación",
-    "main_poll": "Encuestas",
-    "main_drive": "CryptDrive",
     "footer_applications": "Aplicaciones",
     "footer_contact": "Contacto",
     "footer_aboutUs": "Acerca de nosotros",
@@ -440,12 +435,5 @@
     "settings_codeUseTabs": "Utilizar tabulaciones en vez de espacios",
     "pad_showToolbar": "Mostrar la barra de herramientas",
     "pad_hideToolbar": "Esconder la barra de herramientas",
-    "main_catch_phrase": "El Cloud Zero Knowledge",
+    "main_catch_phrase": "El Cloud Zero Knowledge"
-    "main_richTextPad": "Pad de Texto Enriquecido",
-    "main_codePad": "Pad de Código",
-    "main_slidePad": "Presentación Markdown",
-    "main_pollPad": "Encuesta",
-    "main_whiteboardPad": "Pizarra",
-    "main_localPads": "Pad Locales",
-    "main_yourCryptDrive": "Tu CryptDrive"
 }

www/common/translations/messages.fr.json

@@ -7,7 +7,7 @@
         "kanban": "Kanban",
         "slide": "Présentation",
         "drive": "CryptDrive",
-        "whiteboard": "Tableau Blanc",
+        "whiteboard": "Dessin",
         "file": "Fichier",
         "media": "Média",
         "todo": "Todo",
@@ -18,7 +18,7 @@
     "button_newcode": "Nouvelle page de code",
     "button_newpoll": "Nouveau sondage",
     "button_newslide": "Nouvelle présentation",
-    "button_newwhiteboard": "Nouveau tableau blanc",
+    "button_newwhiteboard": "Nouveau dessin",
     "button_newkanban": "Nouveau kanban",
     "common_connectionLost": "<b>Connexion au serveur perdue</b><br>Vous êtes désormais en mode lecture seule jusqu'au retour de la connexion.",
     "websocketError": "Impossible de se connecter au serveur WebSocket...",
@@ -610,20 +610,6 @@
     "main_about_p26": "Si vous avez une question ou des remarques, n'hésitez pas à nous contacter !",
     "main_info": "<h2>Collaborez avec confiance</h2>Développez vos idées en groupe avec des documents partagés; la technologie <strong>Zero Knowledge</strong> sécurise vos données.",
     "main_catch_phrase": "Le Cloud Zero Knowledge",
-    "main_richText": "Éditeur de texte",
-    "main_code": "Éditeur de code",
-    "main_slide": "Présentations",
-    "main_poll": "Sondages",
-    "main_drive": "CryptDrive",
-    "main_richTextPad": "Éditeur de texte",
-    "main_codePad": "Éditeur de code",
-    "main_sheetPad": "Tableur (Beta)",
-    "main_slidePad": "Éditeur de Présentations",
-    "main_pollPad": "Sondage ou Planning",
-    "main_whiteboardPad": "Tableau blanc",
-    "main_kanbanPad": "Kanban",
-    "main_localPads": "Pads Locaux",
-    "main_yourCryptDrive": "Votre CryptDrive",
     "main_footerText": "Avec CryptPad, vous pouvez créer des documents collaboratifs rapidement pour prendre des notes à plusieurs.",
     "footer_applications": "Applications",
     "footer_contact": "Contact",
@@ -1029,5 +1015,6 @@
     "debug_getGraphWait": "Génération du graphe... Veuillez patienter.",
     "debug_getGraphText": "Voici le code DOT permettant de générer un graphe de l’historique de ce document :",
     "mdToolbar_toc": "Table des matières",
-    "fm_expirablePad": "Ce pad expirera le {0}"
+    "fm_expirablePad": "Ce pad expirera le {0}",
+    "button_newsheet": "Nouveau tableur"
 }

www/common/translations/messages.pt-br.json

@@ -271,11 +271,6 @@
     "upload_progress": "Progress",
     "download_button": "Decrypt & Download",
     "main_info": "<h1>Collaborate in Confidence</h1><br> Grow your ideas together with shared documents while <strong>Zero Knowledge</strong> technology secures your privacy; even from us.",
-    "main_richText": "Rich Text editor",
-    "main_code": "Code editor",
-    "main_slide": "Slide editor",
-    "main_poll": "Polls",
-    "main_drive": "CryptDrive",
     "footer_applications": "Applications",
     "footer_contact": "Contact",
     "footer_aboutUs": "About us",

www/common/translations/messages.ro.json

@@ -246,11 +246,6 @@
     "upload_uploadPending": "Ai deja o încărcare în desfășurare. Anulezi și încarci noul fișier?",
     "upload_success": "Fișierul tău ({0}) a fost ncărcat și adăugat la drive-ul tău cu succes.",
     "main_info": "<h1>Colaborează în siguranță</h1><br> Dezvoltă-ți ideile împreună cu documentele partajate în timp ce tehnologia <strong>Zero Knowledge</strong> îți păstrează securitatea; chiar și de noi.",
-    "main_richText": "Rich Text editor",
-    "main_code": "Editor cod",
-    "main_slide": "Editor slide-uri",
-    "main_poll": "Sondaj",
-    "main_drive": "CryptDrive",
     "footer_applications": "Aplicații",
     "footer_contact": "Contact",
     "footer_aboutUs": "Despre noi",
@@ -411,5 +406,17 @@
     "pad_mediatagTitle": "Setări etichetă Media",
     "pad_mediatagWidth": "Lățime (px)",
     "pad_mediatagHeight": "Înălțime (px)",
-    "pad_mediatagRatio": "Păstrează proporția"
+    "pad_mediatagRatio": "Păstrează proporția",
+    "pad_mediatagPreview": "Previzualizare",
+    "pad_mediatagImport": "Salvează în CryptDrive-ul tău",
+    "pad_mediatagOptions": "Proprietățile imaginii",
+    "kanban_newBoard": "Board nou",
+    "kanban_item": "Obiect {0}",
+    "kanban_todo": "De făcut",
+    "kanban_done": "Realizat",
+    "kanban_working": "În curs",
+    "kanban_deleteBoard": "Ești sigur că vrei să ștergi acest board?",
+    "kanban_addBoard": "Adaugă un board",
+    "kanban_removeItem": "Înlătură acest obiect",
+    "kanban_removeItemConfirm": "Ești sigur că vrei să ștergi acest obiect?"
 }

www/common/translations/messages.ru.json

@@ -106,5 +106,39 @@
     "userListButton": "Список пользователей",
     "chatButton": "Чат",
     "userAccountButton": "Ваш профиль",
-    "newButton": "Создать"
+    "newButton": "Создать",
+    "uploadButton": "Загрузить файлы",
+    "uploadButtonTitle": "Загрузить новый файл в эту папку",
+    "saveTemplateButton": "Сохранить как образец",
+    "saveTemplatePrompt": "Выбрать название для образца",
+    "templateSaved": "Образец сохранен!",
+    "selectTemplate": "Выберите образец или нажмите Esc",
+    "useTemplate": "Начать с образца?",
+    "useTemplateOK": "Выбрать образец (Enter)",
+    "template_import": "Импортировать образец",
+    "template_empty": "Образцы отсутствуют",
+    "presentButtonTitle": "Начать режим презентации",
+    "backgroundButtonTitle": "Изменить фоновый цвет в презентации",
+    "colorButtonTitle": "Изменить цвет шрифта в презентации",
+    "propertiesButton": "Свойства",
+    "propertiesButtonTitle": "Свойства пэда",
+    "printText": "Распечатать",
+    "printButton": "Печать (Enter)",
+    "printButtonTitle2": "Распечатайте ваш документ или экспортируйте его как PDF",
+    "printSlideNumber": "Показать номер слайда",
+    "printDate": "Показать дату",
+    "printTitle": "Показать название пэда",
+    "printTransition": "Включить анимации перевода",
+    "printBackground": "Использовать фоновую картинку",
+    "printBackgroundButton": "Выберите картинку",
+    "printBackgroundRemove": "Удалить фоновую картинку",
+    "filePickerButton": "Вставить файл из CryptDrive",
+    "filePicker_close": "Закрыть",
+    "filePicker_description": "Выберите файл из вашего CryptDrive чтобы вставить его или выберите новый",
+    "filePicker_filter": "Филтровать файлы по именам",
+    "or": "или",
+    "tags_title": "Теги (только для вас)",
+    "tags_add": "Обновить теги страницы",
+    "tags_searchHint": "Начните поиск в вашем CryptDrive при помощи # чтобы найти пэды с тегами",
+    "tags_notShared": "Ваши теги не разделяются с другими пользователями"
 }

www/common/translations/messages.zh.json

@@ -274,11 +274,6 @@
     "upload_progress": "進度",
     "download_button": "解密 & 下載",
     "main_info": "<h1>Collaborate in Confidence</h1><br> 利用共同享文件發嚮點子，透過 <strong>零知識 </strong> 科技確保隱私安全; 對任何網路服務商都要加以提防。",
-    "main_richText": "富文字編輯器",
-    "main_code": "代碼編輯器",
-    "main_slide": "投影片編輯器",
-    "main_poll": "調查",
-    "main_drive": "CryptDrive",
     "footer_applications": "應用程式",
     "footer_contact": "聯繫",
     "footer_aboutUs": "關於 Cryptpad",