diff --git a/and_so_it_begins.png b/and_so_it_begins.png index 0295eba2e..64f59af17 100644 Binary files a/and_so_it_begins.png and b/and_so_it_begins.png differ diff --git a/cryptofist.png b/cryptofist.png index 973083a2b..ce480a1b5 100644 Binary files a/cryptofist.png and b/cryptofist.png differ diff --git a/customize.dist/alt-favicon.png b/customize.dist/alt-favicon.png index 52ec0a4bc..23753684f 100644 Binary files a/customize.dist/alt-favicon.png and b/customize.dist/alt-favicon.png differ diff --git a/customize.dist/bkabout.jpg b/customize.dist/bkabout.jpg index 01a51c176..d9434609e 100644 Binary files a/customize.dist/bkabout.jpg and b/customize.dist/bkabout.jpg differ diff --git a/customize.dist/bkregister.jpg b/customize.dist/bkregister.jpg index 03660433f..a67a3b03e 100644 Binary files a/customize.dist/bkregister.jpg and b/customize.dist/bkregister.jpg differ diff --git a/customize.dist/bkwhat.jpg b/customize.dist/bkwhat.jpg index 3549f7acb..90a2841e3 100644 Binary files a/customize.dist/bkwhat.jpg and b/customize.dist/bkwhat.jpg differ diff --git a/customize.dist/cryptpad-new-logo-colors-logoonly.png b/customize.dist/cryptpad-new-logo-colors-logoonly.png index 6ad292df0..722438d54 100644 Binary files a/customize.dist/cryptpad-new-logo-colors-logoonly.png and b/customize.dist/cryptpad-new-logo-colors-logoonly.png differ diff --git a/customize.dist/images/AaronMacSween.jpg b/customize.dist/images/AaronMacSween.jpg index 2ee96ea6f..95afcda67 100644 Binary files a/customize.dist/images/AaronMacSween.jpg and b/customize.dist/images/AaronMacSween.jpg differ diff --git a/customize.dist/images/CalebJames.jpg b/customize.dist/images/CalebJames.jpg index 65d5a6cae..0e29dd116 100644 Binary files a/customize.dist/images/CalebJames.jpg and b/customize.dist/images/CalebJames.jpg differ diff --git a/customize.dist/images/Catalin.jpg b/customize.dist/images/Catalin.jpg index 109a5404b..508c0692e 100644 Binary files a/customize.dist/images/Catalin.jpg and b/customize.dist/images/Catalin.jpg differ diff --git a/customize.dist/images/LudovicDuboist.jpg b/customize.dist/images/LudovicDuboist.jpg index 6a9988942..09bf4afba 100644 Binary files a/customize.dist/images/LudovicDuboist.jpg and b/customize.dist/images/LudovicDuboist.jpg differ diff --git a/customize.dist/images/Pierre-new.jpg b/customize.dist/images/Pierre-new.jpg index 4f197aeb0..c8dafbe41 100644 Binary files a/customize.dist/images/Pierre-new.jpg and b/customize.dist/images/Pierre-new.jpg differ diff --git a/customize.dist/images/YannFlory.jpg b/customize.dist/images/YannFlory.jpg index 19d10ec56..9c358d1a6 100644 Binary files a/customize.dist/images/YannFlory.jpg and b/customize.dist/images/YannFlory.jpg differ diff --git a/customize.dist/images/aaron.jpg b/customize.dist/images/aaron.jpg index f746cf7e4..f443f4490 100644 Binary files a/customize.dist/images/aaron.jpg and b/customize.dist/images/aaron.jpg differ diff --git a/customize.dist/images/atest.jpg b/customize.dist/images/atest.jpg index 4ce7014fe..a6d6e0fa9 100644 Binary files a/customize.dist/images/atest.jpg and b/customize.dist/images/atest.jpg differ diff --git a/customize.dist/images/avatar.png b/customize.dist/images/avatar.png index 019c0e657..f6ee7d7d7 100644 Binary files a/customize.dist/images/avatar.png and b/customize.dist/images/avatar.png differ diff --git a/customize.dist/images/bkcontact.jpg b/customize.dist/images/bkcontact.jpg index dde71bae0..bae61ba1a 100644 Binary files a/customize.dist/images/bkcontact.jpg and b/customize.dist/images/bkcontact.jpg differ diff --git a/customize.dist/images/caleb.jpg b/customize.dist/images/caleb.jpg index 1903d87b9..415ff0a9b 100644 Binary files a/customize.dist/images/caleb.jpg and b/customize.dist/images/caleb.jpg differ diff --git a/customize.dist/images/drive_screenshot.png b/customize.dist/images/drive_screenshot.png index b1170561c..74f89c06d 100644 Binary files a/customize.dist/images/drive_screenshot.png 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 index 81928ffb1..8219cc2b0 100644 Binary files a/customize.dist/images/logo_white.png and b/customize.dist/images/logo_white.png differ diff --git a/customize.dist/images/ludovic.jpg b/customize.dist/images/ludovic.jpg index 684e0692e..02842eee3 100644 Binary files a/customize.dist/images/ludovic.jpg and b/customize.dist/images/ludovic.jpg differ diff --git a/customize.dist/images/pad_screenshot.png b/customize.dist/images/pad_screenshot.png index cbc837f58..cbb155697 100644 Binary files a/customize.dist/images/pad_screenshot.png and b/customize.dist/images/pad_screenshot.png differ diff --git a/customize.dist/images/pierre.jpg b/customize.dist/images/pierre.jpg index fea27c787..79f514438 100644 Binary files a/customize.dist/images/pierre.jpg and b/customize.dist/images/pierre.jpg differ diff --git a/customize.dist/images/yann.jpg b/customize.dist/images/yann.jpg index 6c5e144fd..ed381e86c 100644 Binary files a/customize.dist/images/yann.jpg and b/customize.dist/images/yann.jpg differ diff --git a/customize.dist/main-favicon.png b/customize.dist/main-favicon.png index 354d88ece..212975b6d 100644 Binary files a/customize.dist/main-favicon.png and b/customize.dist/main-favicon.png differ diff --git a/customize.dist/pages.js b/customize.dist/pages.js index 7a723b225..756f80caa 100644 --- a/customize.dist/pages.js +++ b/customize.dist/pages.js @@ -76,7 +76,7 @@ define([ ]) ]) ]), - h('div.cp-version-footer', "CryptPad v1.17.0 (Ratatoskr)") + h('div.cp-version-footer', "CryptPad v1.18.0 (Snallygaster)") ]); }; diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js index 197cd99a0..0dedd63fb 100644 --- a/customize.dist/translations/messages.fr.js +++ b/customize.dist/translations/messages.fr.js @@ -1,7 +1,7 @@ define(function () { var out = {}; - out.main_title = "CryptPad: Éditeur collaboratif en temps réel, zero knowledge"; + out.main_title = "CryptPad : Éditeur collaboratif en temps réel, zero knowledge"; out.main_slogan = "L'unité est la force, la collaboration est la clé"; out.type = {}; @@ -75,9 +75,9 @@ define(function () { out.supportCryptpad = "Soutenir CryptPad"; - out.formattedMB = "{0} Mo"; - out.formattedGB = "{0} Go"; - out.formattedKB = "{0} Ko"; + out.formattedMB = "{0} Mo"; + out.formattedGB = "{0} Go"; + out.formattedKB = "{0} Ko"; out.greenLight = "Tout fonctionne bien"; out.orangeLight = "Votre connexion est lente, ce qui réduit la qualité de l'éditeur"; @@ -197,7 +197,7 @@ define(function () { out.okButton = 'OK (Entrée)'; out.cancel = "Annuler"; - out.cancelButton = 'Annuler (Echap)'; + out.cancelButton = 'Annuler (Échap)'; out.historyText = "Historique"; out.historyButton = "Afficher l'historique du document"; @@ -281,8 +281,8 @@ define(function () { out.canvas_enable = "Activer le dessin"; 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"; @@ -294,11 +294,11 @@ define(function () { out.profile_namePlaceholder = 'Nom ou pseudo pour le profil'; out.profile_avatar = "Avatar"; out.profile_upload = " Importer un nouvel avatar"; - out.profile_error = "Erreur lors de la création du profil : {0}"; + out.profile_error = "Erreur lors de la création du profil : {0}"; out.profile_register = "Vous devez vous inscrire pour pouvoir créer un profil !"; out.profile_create = "Créer un profil"; out.profile_description = "Description"; - out.profile_fieldSaved = 'Nouvelle valeur enregistrée: {0}'; + 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.'; @@ -306,8 +306,8 @@ define(function () { out.profile_viewMyProfile = "Voir mon profil"; // contacts/userlist - out.userlist_addAsFriendTitle = 'Ajouter "{0}" comme contact'; - out.userlist_thisIsYou = 'Vous ("{0}")'; + out.userlist_addAsFriendTitle = 'Ajouter « {0} » comme contact'; + out.userlist_thisIsYou = 'Vous (« {0} »)'; out.userlist_pending = "En attente..."; out.contacts_title = "Contacts"; out.contacts_addError = "Erreur lors de l'ajout de ce contact dans votre liste"; @@ -316,7 +316,7 @@ define(function () { out.contacts_request = '{0} souhaite vous ajouter en tant que contact. Accepter ?'; out.contacts_send = 'Envoyer'; out.contacts_remove = 'Supprimer ce contact'; - out.contacts_confirmRemove = 'Êtes-vous sûr de voulour supprimer {0} de vos contacts ?'; + out.contacts_confirmRemove = 'Êtes-vous sûr de vouloir supprimer {0} de vos contacts ?'; out.contacts_typeHere = "Entrez un message ici..."; @@ -475,8 +475,8 @@ define(function () { out.settings_resetButton = "Supprimer"; out.settings_reset = "Supprimer tous les fichiers et dossiers de votre CryptDrive"; out.settings_resetPrompt = "Cette action va supprimer tous les pads de votre drive.
"+ - "Êtes-vous sûr de vouloir continuer ?
" + - "Tapez “I love CryptPad” pour confirmer."; + "Êtes-vous sûr de vouloir continuer ?
" + + "Tapez « I love CryptPad » pour confirmer."; out.settings_resetDone = "Votre drive est désormais vide!"; out.settings_resetError = "Texte de vérification incorrect. Votre CryptDrive n'a pas été modifié."; @@ -576,7 +576,7 @@ define(function () { out.main_slide = 'Présentations'; out.main_slide_p = 'Créez vos présentations en syntaxe Markdown collaborativement de manière sécurisée et affichez les dans votre navigateur.'; out.main_poll = 'Sondages'; - out.main_poll_p = 'Plannifiez vos réunions ou évènements, ou votez pour la meilleure solution concernant votre problème.'; + out.main_poll_p = 'Planifiez 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'; @@ -605,7 +605,7 @@ define(function () { out.whatis_title = "Qu'est-ce que CryptPad"; out.whatis_collaboration = 'Collaboration rapide, facile'; out.whatis_collaboration_p1 = "Avec CryptPad, vous pouvez créer rapidement des documents collaboratifs pour prendre des notes à plusieurs. Quand vous vous enregistrez et vous vous connectez, vous obtenez la possibilité d'importer des fichiers dans un CryptDrive où vous pouvez organiser tous vos pads (documents). En tant qu'utilisateur enregistré, vous possédez 50 Mo de stockage gratuit."; - out.whatis_collaboration_p2 = "Vous pouvez partager l'accès à un document simplement en partageant le lien. Vous pouvez aussi partager un lien spécial fournissant un accès en lecture seule au pad, permettant du publier des travaux collaboratifs tout en restant maître de l'édition."; + out.whatis_collaboration_p2 = "Vous pouvez partager l'accès à un document simplement en partageant le lien. Vous pouvez aussi partager un lien spécial fournissant un accès en lecture seule au pad, permettant de publier des travaux collaboratifs tout en restant maître de l'édition."; out.whatis_collaboration_p3 = "Vous pouvez créer des documents de texte avec CKEditor tout comme des documents Markdown qui sont rendus en temps-réel pendant que vous tapez. Vous pouvez aussi utiliser l'application de sondage pour planifier des évènements avec plusieurs participants."; out.whatis_zeroknowledge = 'Zero Knowledge'; out.whatis_zeroknowledge_p1 = "Nous ne souhaitons pas connaître ce que vous tapez et grâce à la cryptographie moderne, vous pouvez être assuré que nous ne le pouvons pas. CryptPad utilise un chiffrement à 100% côté client pour protéger le contenu que vous tapez de nous, les personnes contrôlant le serveur."; @@ -614,7 +614,7 @@ define(function () { out.whatis_drive = "Organisation avec CryptDrive"; out.whatis_drive_p1 = "Dés que vous accédez à un pad dans CryptPad, celui-ci est automatiquement ajouté à votre CryptDrive, dans le dossier principal. Vous pouvez alors ranger ce pad dans un dossier ou le déplacer vers la corbeille. CryptDrive vous permet de rechercher parmi vos pads et de les organiser quand vous le souaitez, comme vous le souhaitez."; out.whatis_drive_p2 = "Avec le glisser-déposer intuitif, vous pouvez déplacer vos pads dans votre drive tout en conservant les liens vers ces pads pour que vos collaborateurs n'en perdent pas l'accès"; - out.whatis_drive_p3 = "Vous pouvez également importer des fichier dans votre CryptDrive et les partager avec des collègues. Les fichiers importés peuvent être rangés de la même manière que vos pads collaboratifs."; + out.whatis_drive_p3 = "Vous pouvez également importer des fichiers dans votre CryptDrive et les partager avec des collègues. Les fichiers importés peuvent être rangés de la même manière que vos pads collaboratifs."; out.whatis_business = 'CryptPad for Business'; out.whatis_business_p1 = "Le chiffrement Zero Knowledge de CryptPad excelle pour multiplier l'efficacité des protocoles de sécurité existants en recréant les contrôles d'accès organisationnels de manière cryptographique. Puisque les données sensibles ne peuvent être déchiffrées qu'en utilisant les identifiants d'un employé, CryptPad empêche d'éventuels hackers ayant réussi à s'introduire dans le serveur d'avoir accès en clair à ces données. Découvrez-en plus sur la manière dont CryptPad peut aider votre entreprise en lisant le CryptPad Whitepaper."; out.whatis_business_p2 = "CryptPad est déployable sur site et les développeurs CryptPad chez XWiki SAS peuvent effectuer du développement, des personnalisations et du support commercial. Contactez-nous à sales@cryptpad.fr pour plus d'informations."; @@ -643,7 +643,7 @@ define(function () { out.tos_title = "Conditions d'utilisation de CryptPad"; out.tos_legal = "Veuillez ne pas être malveillant, abusif, ou faire quoi que ce soit d'illégal."; - out.tos_availability = "Nous espérons que vous trouvez ce service utile, mais nous ne pouvons garantir ses performances et disponibilités. Nous vous recommandons d'exporter vos données régurlièrement."; + out.tos_availability = "Nous espérons que vous trouvez ce service utile, mais nous ne pouvons garantir ses performances et disponibilités. Nous vous recommandons d'exporter vos données régulièrement."; out.tos_e2ee = "Le contenu sur CryptPad peuvent être lus et modifiés par quiconque est en mesure de deviner ou d'obtenir de quelque manière que ce soit l'identificateur de fragment du pad. Nous vous recommandons d'utiliser des technologies de messagerie chiffrées de bout à bout (end-to-end encryption ou e2ee) pour partager les liens, et déclinons toute responsabilité dans le cas ou un tel lien serait divulgué."; out.tos_logs = "Les meta-données fournies par votre navigateur au serveur peuvent être enregistrées dans le but de maintenir le service."; out.tos_3rdparties = "Nous ne fournissons aucune donnée individuelle à des tierces parties à moins d'y être contraints par la loi."; @@ -725,7 +725,7 @@ define(function () { out.tips = {}; out.tips.shortcuts = "`ctrl+b`, `ctrl+i` et `ctrl+u` sont des raccourcis rapides pour mettre en gras, en italique ou souligner."; out.tips.indent = "Dans les listes à puces ou numérotées, vous pouvez utiliser `Tab` ou `Maj+Tab` pour augmenter ou réduire rapidement l'indentation."; - out.tips.store = "Dés que vous ouvrez un nouveau pad, il est automatiquement stocké dans votre CryptDrive si vous êtes connectés."; + out.tips.store = "Dès que vous ouvrez un nouveau pad, il est automatiquement stocké dans votre CryptDrive si vous êtes connectés."; out.tips.marker = "Vous pouvez surligner du texte dans un pad en utilisant l'option \"marker\" dans le menu déroulant des styles."; out.tips.driveUpload = "Les utilisateurs enregistrés peuvent importer des fichiers en les faisant glisser et en les déposant dans leur CryptDrive."; out.tips.filenames = "Vous pouvez renommer les fichiers de votre CryptDrive, ce nom ne sera visible que par vous."; diff --git a/package.json b/package.json index df7b3bd79..3cc3a4873 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cryptpad", "description": "realtime collaborative visual editor with zero knowlege server", - "version": "1.17.0", + "version": "1.18.0", "dependencies": { "chainpad-server": "^1.0.1", "express": "~4.10.1", diff --git a/screenshot.png b/screenshot.png index cbc837f58..cbb155697 100644 Binary files a/screenshot.png and b/screenshot.png differ diff --git a/www/common/pdfjs/web/images/findbarButton-next-rtl.png b/www/common/pdfjs/web/images/findbarButton-next-rtl.png index bef02743f..65fee0145 100644 Binary files a/www/common/pdfjs/web/images/findbarButton-next-rtl.png and b/www/common/pdfjs/web/images/findbarButton-next-rtl.png differ diff --git a/www/common/pdfjs/web/images/findbarButton-next-rtl@2x.png b/www/common/pdfjs/web/images/findbarButton-next-rtl@2x.png index 1da6dc949..0ddd6cbe8 100644 Binary files a/www/common/pdfjs/web/images/findbarButton-next-rtl@2x.png and b/www/common/pdfjs/web/images/findbarButton-next-rtl@2x.png differ diff --git a/www/common/pdfjs/web/images/findbarButton-next@2x.png b/www/common/pdfjs/web/images/findbarButton-next@2x.png index 0250307c0..6eb9bc0c1 100644 Binary files a/www/common/pdfjs/web/images/findbarButton-next@2x.png and b/www/common/pdfjs/web/images/findbarButton-next@2x.png differ diff --git a/www/common/pdfjs/web/images/findbarButton-previous-rtl@2x.png b/www/common/pdfjs/web/images/findbarButton-previous-rtl@2x.png index 0250307c0..6eb9bc0c1 100644 Binary files a/www/common/pdfjs/web/images/findbarButton-previous-rtl@2x.png and b/www/common/pdfjs/web/images/findbarButton-previous-rtl@2x.png differ diff --git a/www/common/pdfjs/web/images/findbarButton-previous.png b/www/common/pdfjs/web/images/findbarButton-previous.png index bef02743f..65fee0145 100644 Binary files a/www/common/pdfjs/web/images/findbarButton-previous.png and b/www/common/pdfjs/web/images/findbarButton-previous.png differ diff --git a/www/common/pdfjs/web/images/findbarButton-previous@2x.png b/www/common/pdfjs/web/images/findbarButton-previous@2x.png index 1da6dc949..0ddd6cbe8 100644 Binary files a/www/common/pdfjs/web/images/findbarButton-previous@2x.png and b/www/common/pdfjs/web/images/findbarButton-previous@2x.png differ diff --git a/www/common/pdfjs/web/images/loading-icon.gif b/www/common/pdfjs/web/images/loading-icon.gif index 1c72ebb55..87985e938 100644 Binary files a/www/common/pdfjs/web/images/loading-icon.gif and b/www/common/pdfjs/web/images/loading-icon.gif differ diff --git a/www/common/pdfjs/web/images/loading-small.png b/www/common/pdfjs/web/images/loading-small.png index 8831a8058..a726ddfa0 100644 Binary files a/www/common/pdfjs/web/images/loading-small.png and b/www/common/pdfjs/web/images/loading-small.png differ diff --git a/www/common/pdfjs/web/images/loading-small@2x.png b/www/common/pdfjs/web/images/loading-small@2x.png index b25b4452a..16551c210 100644 Binary files a/www/common/pdfjs/web/images/loading-small@2x.png and b/www/common/pdfjs/web/images/loading-small@2x.png differ diff --git a/www/common/pdfjs/web/images/secondaryToolbarButton-documentProperties@2x.png b/www/common/pdfjs/web/images/secondaryToolbarButton-documentProperties@2x.png index adb240eaa..d4aabd80b 100644 Binary files a/www/common/pdfjs/web/images/secondaryToolbarButton-documentProperties@2x.png and b/www/common/pdfjs/web/images/secondaryToolbarButton-documentProperties@2x.png differ diff --git a/www/common/pdfjs/web/images/secondaryToolbarButton-firstPage.png b/www/common/pdfjs/web/images/secondaryToolbarButton-firstPage.png index e68846aa5..2610c69a9 100644 Binary files a/www/common/pdfjs/web/images/secondaryToolbarButton-firstPage.png and b/www/common/pdfjs/web/images/secondaryToolbarButton-firstPage.png differ diff --git a/www/common/pdfjs/web/images/secondaryToolbarButton-firstPage@2x.png b/www/common/pdfjs/web/images/secondaryToolbarButton-firstPage@2x.png index 3ad8af517..e8fc3a422 100644 Binary files a/www/common/pdfjs/web/images/secondaryToolbarButton-firstPage@2x.png and b/www/common/pdfjs/web/images/secondaryToolbarButton-firstPage@2x.png differ diff --git a/www/common/pdfjs/web/images/secondaryToolbarButton-handTool@2x.png b/www/common/pdfjs/web/images/secondaryToolbarButton-handTool@2x.png index 5c13f77ff..ec4c17b7c 100644 Binary files a/www/common/pdfjs/web/images/secondaryToolbarButton-handTool@2x.png and b/www/common/pdfjs/web/images/secondaryToolbarButton-handTool@2x.png differ diff --git a/www/common/pdfjs/web/images/secondaryToolbarButton-lastPage.png b/www/common/pdfjs/web/images/secondaryToolbarButton-lastPage.png index be763e0c4..6502d9e95 100644 Binary files a/www/common/pdfjs/web/images/secondaryToolbarButton-lastPage.png and b/www/common/pdfjs/web/images/secondaryToolbarButton-lastPage.png differ diff --git a/www/common/pdfjs/web/images/secondaryToolbarButton-lastPage@2x.png b/www/common/pdfjs/web/images/secondaryToolbarButton-lastPage@2x.png index 8570984f2..9562f8ade 100644 Binary files a/www/common/pdfjs/web/images/secondaryToolbarButton-lastPage@2x.png and b/www/common/pdfjs/web/images/secondaryToolbarButton-lastPage@2x.png differ diff --git a/www/common/pdfjs/web/images/secondaryToolbarButton-rotateCcw@2x.png b/www/common/pdfjs/web/images/secondaryToolbarButton-rotateCcw@2x.png index b9e743122..fb67ccf49 100644 Binary files a/www/common/pdfjs/web/images/secondaryToolbarButton-rotateCcw@2x.png and b/www/common/pdfjs/web/images/secondaryToolbarButton-rotateCcw@2x.png differ diff --git a/www/common/pdfjs/web/images/secondaryToolbarButton-rotateCw@2x.png b/www/common/pdfjs/web/images/secondaryToolbarButton-rotateCw@2x.png index cb257b41c..2f31b0e8e 100644 Binary files a/www/common/pdfjs/web/images/secondaryToolbarButton-rotateCw@2x.png and b/www/common/pdfjs/web/images/secondaryToolbarButton-rotateCw@2x.png differ diff --git a/www/common/pdfjs/web/images/secondaryToolbarButton-selectTool.png b/www/common/pdfjs/web/images/secondaryToolbarButton-selectTool.png index f6de0bcf6..a2b322882 100644 Binary files a/www/common/pdfjs/web/images/secondaryToolbarButton-selectTool.png and b/www/common/pdfjs/web/images/secondaryToolbarButton-selectTool.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-bookmark.png b/www/common/pdfjs/web/images/toolbarButton-bookmark.png index a187be6c9..1ff41c836 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-bookmark.png and b/www/common/pdfjs/web/images/toolbarButton-bookmark.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-bookmark@2x.png b/www/common/pdfjs/web/images/toolbarButton-bookmark@2x.png index 4efbaa675..bd3334bb1 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-bookmark@2x.png and b/www/common/pdfjs/web/images/toolbarButton-bookmark@2x.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-download.png b/www/common/pdfjs/web/images/toolbarButton-download.png index eaab35f09..6caa752ee 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-download.png and b/www/common/pdfjs/web/images/toolbarButton-download.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-download@2x.png b/www/common/pdfjs/web/images/toolbarButton-download@2x.png index 896face45..fc14be1ad 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-download@2x.png and b/www/common/pdfjs/web/images/toolbarButton-download@2x.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-menuArrows@2x.png b/www/common/pdfjs/web/images/toolbarButton-menuArrows@2x.png index f7570bc0d..e4c338e37 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-menuArrows@2x.png and b/www/common/pdfjs/web/images/toolbarButton-menuArrows@2x.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-openFile.png b/www/common/pdfjs/web/images/toolbarButton-openFile.png index b5cf1bd06..777447cc4 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-openFile.png and b/www/common/pdfjs/web/images/toolbarButton-openFile.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-openFile@2x.png b/www/common/pdfjs/web/images/toolbarButton-openFile@2x.png index 91ab76593..da9d40d0c 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-openFile@2x.png and b/www/common/pdfjs/web/images/toolbarButton-openFile@2x.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-pageDown-rtl.png b/www/common/pdfjs/web/images/toolbarButton-pageDown-rtl.png index 1957f79ab..492e2bcab 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-pageDown-rtl.png and b/www/common/pdfjs/web/images/toolbarButton-pageDown-rtl.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-pageDown-rtl@2x.png b/www/common/pdfjs/web/images/toolbarButton-pageDown-rtl@2x.png index 16ebcb8ef..be33e0bb3 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-pageDown-rtl@2x.png and b/www/common/pdfjs/web/images/toolbarButton-pageDown-rtl@2x.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-pageDown.png b/www/common/pdfjs/web/images/toolbarButton-pageDown.png index 8219ecf83..5d4fcc843 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-pageDown.png and b/www/common/pdfjs/web/images/toolbarButton-pageDown.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-pageDown@2x.png b/www/common/pdfjs/web/images/toolbarButton-pageDown@2x.png index 758c01d83..11382b65b 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-pageDown@2x.png and b/www/common/pdfjs/web/images/toolbarButton-pageDown@2x.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-pageUp-rtl.png b/www/common/pdfjs/web/images/toolbarButton-pageUp-rtl.png index 98e7ce481..3893fba3b 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-pageUp-rtl.png and b/www/common/pdfjs/web/images/toolbarButton-pageUp-rtl.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-pageUp-rtl@2x.png b/www/common/pdfjs/web/images/toolbarButton-pageUp-rtl@2x.png index a01b02380..dba223c61 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-pageUp-rtl@2x.png and b/www/common/pdfjs/web/images/toolbarButton-pageUp-rtl@2x.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-pageUp.png b/www/common/pdfjs/web/images/toolbarButton-pageUp.png index fb9daa337..d9bf9afec 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-pageUp.png and b/www/common/pdfjs/web/images/toolbarButton-pageUp.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-pageUp@2x.png b/www/common/pdfjs/web/images/toolbarButton-pageUp@2x.png index a5cfd755b..e062df8a1 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-pageUp@2x.png and b/www/common/pdfjs/web/images/toolbarButton-pageUp@2x.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-print@2x.png b/www/common/pdfjs/web/images/toolbarButton-print@2x.png index 53d18daf7..c533004c4 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-print@2x.png and b/www/common/pdfjs/web/images/toolbarButton-print@2x.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-search@2x.png b/www/common/pdfjs/web/images/toolbarButton-search@2x.png index 456b13324..fc15afa80 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-search@2x.png and b/www/common/pdfjs/web/images/toolbarButton-search@2x.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-secondaryToolbarToggle-rtl.png b/www/common/pdfjs/web/images/toolbarButton-secondaryToolbarToggle-rtl.png index 843709527..751b9c6f4 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-secondaryToolbarToggle-rtl.png and b/www/common/pdfjs/web/images/toolbarButton-secondaryToolbarToggle-rtl.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-secondaryToolbarToggle-rtl@2x.png b/www/common/pdfjs/web/images/toolbarButton-secondaryToolbarToggle-rtl@2x.png index 9d9bfa4f6..c1c88a826 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-secondaryToolbarToggle-rtl@2x.png and b/www/common/pdfjs/web/images/toolbarButton-secondaryToolbarToggle-rtl@2x.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-secondaryToolbarToggle.png b/www/common/pdfjs/web/images/toolbarButton-secondaryToolbarToggle.png index 1f90f83da..16e3493fe 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-secondaryToolbarToggle.png and b/www/common/pdfjs/web/images/toolbarButton-secondaryToolbarToggle.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-secondaryToolbarToggle@2x.png b/www/common/pdfjs/web/images/toolbarButton-secondaryToolbarToggle@2x.png index b066fe5cb..19e87ff4b 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-secondaryToolbarToggle@2x.png and b/www/common/pdfjs/web/images/toolbarButton-secondaryToolbarToggle@2x.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-sidebarToggle-rtl.png b/www/common/pdfjs/web/images/toolbarButton-sidebarToggle-rtl.png index 6f85ec061..feff0d243 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-sidebarToggle-rtl.png and b/www/common/pdfjs/web/images/toolbarButton-sidebarToggle-rtl.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-sidebarToggle-rtl@2x.png b/www/common/pdfjs/web/images/toolbarButton-sidebarToggle-rtl@2x.png index 291e00679..a808e0aa0 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-sidebarToggle-rtl@2x.png and b/www/common/pdfjs/web/images/toolbarButton-sidebarToggle-rtl@2x.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-sidebarToggle.png b/www/common/pdfjs/web/images/toolbarButton-sidebarToggle.png index 025dc9040..3c7636c6a 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-sidebarToggle.png and b/www/common/pdfjs/web/images/toolbarButton-sidebarToggle.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-sidebarToggle@2x.png b/www/common/pdfjs/web/images/toolbarButton-sidebarToggle@2x.png index 7f834df94..bec35f2d5 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-sidebarToggle@2x.png and b/www/common/pdfjs/web/images/toolbarButton-sidebarToggle@2x.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-viewOutline-rtl.png b/www/common/pdfjs/web/images/toolbarButton-viewOutline-rtl.png index aaa943021..e9e1cc96f 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-viewOutline-rtl.png and b/www/common/pdfjs/web/images/toolbarButton-viewOutline-rtl.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-viewOutline-rtl@2x.png b/www/common/pdfjs/web/images/toolbarButton-viewOutline-rtl@2x.png index 3410f70df..f81b1e5ba 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-viewOutline-rtl@2x.png and b/www/common/pdfjs/web/images/toolbarButton-viewOutline-rtl@2x.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-viewOutline.png b/www/common/pdfjs/web/images/toolbarButton-viewOutline.png index 976365a50..2b868d120 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-viewOutline.png and b/www/common/pdfjs/web/images/toolbarButton-viewOutline.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-viewOutline@2x.png b/www/common/pdfjs/web/images/toolbarButton-viewOutline@2x.png index b6a197fdf..e8176f76b 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-viewOutline@2x.png and b/www/common/pdfjs/web/images/toolbarButton-viewOutline@2x.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-viewThumbnail.png b/www/common/pdfjs/web/images/toolbarButton-viewThumbnail.png index 584ba5588..91d5e8a2b 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-viewThumbnail.png and b/www/common/pdfjs/web/images/toolbarButton-viewThumbnail.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-zoomIn.png b/www/common/pdfjs/web/images/toolbarButton-zoomIn.png index 513d081bc..f3d230205 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-zoomIn.png and b/www/common/pdfjs/web/images/toolbarButton-zoomIn.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-zoomIn@2x.png b/www/common/pdfjs/web/images/toolbarButton-zoomIn@2x.png index d5d49d5ff..2f84c9f22 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-zoomIn@2x.png and b/www/common/pdfjs/web/images/toolbarButton-zoomIn@2x.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-zoomOut.png b/www/common/pdfjs/web/images/toolbarButton-zoomOut.png index 156c26b94..99fa9990d 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-zoomOut.png and b/www/common/pdfjs/web/images/toolbarButton-zoomOut.png differ diff --git a/www/common/pdfjs/web/images/toolbarButton-zoomOut@2x.png b/www/common/pdfjs/web/images/toolbarButton-zoomOut@2x.png index 959e1919d..4e4e3e113 100644 Binary files a/www/common/pdfjs/web/images/toolbarButton-zoomOut@2x.png and b/www/common/pdfjs/web/images/toolbarButton-zoomOut@2x.png differ diff --git a/www/common/pdfjs/web/images/treeitem-collapsed-rtl.png b/www/common/pdfjs/web/images/treeitem-collapsed-rtl.png index ec574c5bc..59f43148f 100644 Binary files a/www/common/pdfjs/web/images/treeitem-collapsed-rtl.png and b/www/common/pdfjs/web/images/treeitem-collapsed-rtl.png differ diff --git a/www/common/pdfjs/web/images/treeitem-collapsed-rtl@2x.png b/www/common/pdfjs/web/images/treeitem-collapsed-rtl@2x.png index 6ad9ebcdf..0ac7f37e0 100644 Binary files a/www/common/pdfjs/web/images/treeitem-collapsed-rtl@2x.png and b/www/common/pdfjs/web/images/treeitem-collapsed-rtl@2x.png differ diff --git a/www/common/sframe-app-framework.js b/www/common/sframe-app-framework.js index d83086fb2..2bb6090aa 100644 --- a/www/common/sframe-app-framework.js +++ b/www/common/sframe-app-framework.js @@ -362,8 +362,11 @@ define([ }).nThen(function (waitFor) { cpNfInner = common.startRealtime({ // really basic operational transform - //transformFunction: options.transformFunction || JsonOT.validate, - patchTransformer: options.patchTransformer || JsonOT.patchTransformer, + transformFunction: options.transformFunction || JsonOT.validate, + + // This one causes a big mess. + //patchTransformer: options.patchTransformer || JsonOT.patchTransformer, + // cryptpad debug logging (default is 1) // logLevel: 0, validateContent: options.validateContent || function (content) { diff --git a/www/common/sframe-chainpad-netflux-inner.js b/www/common/sframe-chainpad-netflux-inner.js index 34e0a2284..0f150842c 100644 --- a/www/common/sframe-chainpad-netflux-inner.js +++ b/www/common/sframe-chainpad-netflux-inner.js @@ -38,6 +38,7 @@ define([ var userName = config.userName; var initialState = config.initialState; var transformFunction = config.transformFunction; + var patchTransformer = config.patchTransformer; var validateContent = config.validateContent; var avgSyncMilliseconds = config.avgSyncMilliseconds; var logLevel = typeof(config.logLevel) !== 'undefined'? config.logLevel : 1; @@ -50,6 +51,7 @@ define([ userName: userName, initialState: initialState, transformFunction: transformFunction, + patchTransformer: patchTransformer, validateContent: validateContent, avgSyncMilliseconds: avgSyncMilliseconds, logLevel: logLevel diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js index aa10bc29c..e1ca45c3c 100644 --- a/www/common/sframe-common-outer.js +++ b/www/common/sframe-common-outer.js @@ -468,6 +468,14 @@ define([ }); }); }); + sframeChan.on('Q_CONTACTS_REMOVE_FRIEND', function (curvePublic, cb) { + messenger.removeFriend(curvePublic, function (e, info) { + cb({ + error: e, + data: info, + }); + }); + }); sframeChan.on('Q_CONTACTS_OPEN_FRIEND_CHANNEL', function (curvePublic, cb) { messenger.openFriendChannel(curvePublic, function (e) { diff --git a/www/common/sframe-messenger-inner.js b/www/common/sframe-messenger-inner.js index c0dced050..9f2ed24a4 100644 --- a/www/common/sframe-messenger-inner.js +++ b/www/common/sframe-messenger-inner.js @@ -66,6 +66,11 @@ define([], function () { //cb({ error: err, data: data, }); }); }; + messenger.removeFriend = function (curvePublic, cb) { + sFrameChan.query('Q_CONTACTS_REMOVE_FRIEND', curvePublic, function (err, data) { + cb(err || data.error, data.data); + }); + }; messenger.openFriendChannel = function (curvePublic, cb) { sFrameChan.query('Q_CONTACTS_OPEN_FRIEND_CHANNEL', curvePublic, function (err, data) { cb(err || data.error); diff --git a/www/common/sframe-protocol.js b/www/common/sframe-protocol.js index 34655fcd6..d568592ed 100644 --- a/www/common/sframe-protocol.js +++ b/www/common/sframe-protocol.js @@ -148,6 +148,7 @@ define({ 'Q_CONTACTS_GET_FRIEND_LIST': true, 'Q_CONTACTS_GET_MY_INFO': true, 'Q_CONTACTS_GET_FRIEND_INFO': true, + 'Q_CONTACTS_REMOVE_FRIEND': true, 'Q_CONTACTS_OPEN_FRIEND_CHANNEL': true, 'Q_CONTACTS_GET_STATUS': true, 'Q_CONTACTS_GET_MORE_HISTORY': true, diff --git a/www/contacts/messenger-ui.js b/www/contacts/messenger-ui.js index 93de3a21f..fddad4497 100644 --- a/www/contacts/messenger-ui.js +++ b/www/contacts/messenger-ui.js @@ -318,10 +318,10 @@ define([ }; var removeFriend = function (curvePublic) { - messenger.removeFriend(curvePublic, function (e, removed) { + messenger.removeFriend(curvePublic, function (e /*, removed */) { if (e) { return void console.error(e); } find.inList(curvePublic).remove(); - console.log(removed); + //console.log(removed); }); }; diff --git a/www/slide/app-slide.less b/www/slide/app-slide.less index 6ea85e458..f9bb7b09c 100644 --- a/www/slide/app-slide.less +++ b/www/slide/app-slide.less @@ -176,7 +176,7 @@ div#cp-app-slide-modal { position: fixed; top: 0px; left: 0px; - z-index: 100000; + z-index: 1000000; // one order of magnitude higher than alertify height: 100vh; width: 100%; } @@ -329,4 +329,4 @@ p { pre.cp-slide-css-error { color: white; -} \ No newline at end of file +}