From 32891be320c642fc25f91315f53dac7278d3fcfd Mon Sep 17 00:00:00 2001 From: yflory Date: Wed, 11 Dec 2019 16:40:39 +0100 Subject: [PATCH 1/5] Fix export and username prompt --- www/common/common-interface.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/common/common-interface.js b/www/common/common-interface.js index 72438fec2..68db40c81 100644 --- a/www/common/common-interface.js +++ b/www/common/common-interface.js @@ -461,7 +461,7 @@ define([ opt = opt || {}; var inputBlock = opt.password ? UI.passwordInput() : dialog.textInput(); - var input = opt.password ? $(inputBlock).find('input')[0] : inputBlock; + var input = $(inputBlock).is('input') ? inputBlock : $(inputBlock).find('input')[0]; input.value = typeof(def) === 'string'? def: ''; var message; From 5f0244beb3e6526890ce59e7018cef019454c4db Mon Sep 17 00:00:00 2001 From: yflory Date: Thu, 12 Dec 2019 16:09:07 +0100 Subject: [PATCH 2/5] Fix kanban UI issues --- www/kanban/app-kanban.less | 3 +++ www/kanban/inner.js | 3 +++ www/kanban/jkanban.css | 1 + www/kanban/jkanban.js | 3 --- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less index 76efd749c..248c66c1d 100644 --- a/www/kanban/app-kanban.less +++ b/www/kanban/app-kanban.less @@ -74,6 +74,9 @@ #kanban-edit { font-weight: bold; } + &:hover { + cursor: move; + } } } diff --git a/www/kanban/inner.js b/www/kanban/inner.js index 035794b2a..5a9e10f47 100644 --- a/www/kanban/inner.js +++ b/www/kanban/inner.js @@ -184,6 +184,9 @@ define([ var save = function () { // Store the value var name = $input.val(); + if (!name || !name.trim()) { + return kanban.onChange(); + } // Remove the input $(el).text(name); // Save the value for the correct board diff --git a/www/kanban/jkanban.css b/www/kanban/jkanban.css index 4bbb28128..ed5a8f5db 100644 --- a/www/kanban/jkanban.css +++ b/www/kanban/jkanban.css @@ -36,6 +36,7 @@ margin: 0; padding: 0; display: inline; + cursor: text; } .kanban-board header .kanban-title-button { diff --git a/www/kanban/jkanban.js b/www/kanban/jkanban.js index f1f70955a..f3f4bf6d4 100644 --- a/www/kanban/jkanban.js +++ b/www/kanban/jkanban.js @@ -151,9 +151,6 @@ return handle.classList.contains('kanban-item'); }, accepts: function (el, target, source, sibling) { - if (sibling === null) { - return false; - } if (self.options.readOnly) { return false; } return true; }, From f110162164168d015d33c09e3fa1d4c87f437012 Mon Sep 17 00:00:00 2001 From: Weblate Date: Thu, 12 Dec 2019 15:09:44 +0000 Subject: [PATCH 3/5] Translated using Weblate (English) Currently translated at 100.0% (1158 of 1158 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1157 of 1157 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translated using Weblate (English) Currently translated at 100.0% (1156 of 1156 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ --- www/common/translations/messages.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json index 69d460e86..9a505391c 100644 --- a/www/common/translations/messages.json +++ b/www/common/translations/messages.json @@ -1251,5 +1251,8 @@ "share_linkPasswordAlert": "This item is password protected. When you send the link the recipient will have to enter the password.", "share_contactPasswordAlert": "This item is password protected. Because you are sharing it with a CryptPad contact, the recipient will not have to enter the password.", "share_embedPasswordAlert": "This item is password protected. When you embed this pad, viewers will be asked for the password.", - "passwordFaqLink": "Read more about passwords" + "passwordFaqLink": "Read more about passwords", + "share_noContactsLoggedIn": "You are not connected with anyone on CryptPad yet. Share the link to your profile for people to send you contact requests.", + "share_copyProfileLink": "Copy profile link", + "share_noContactsNotLoggedIn": "Log in or register to see your existing contacts and add new ones." } From 5ad69fcec801f88f644e6df6d9613aa69b0c07a4 Mon Sep 17 00:00:00 2001 From: Weblate Date: Thu, 12 Dec 2019 15:09:44 +0000 Subject: [PATCH 4/5] Translated using Weblate (French) Currently translated at 100.0% (1158 of 1158 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/ --- www/common/translations/messages.fr.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json index 3b3b3cdd4..cac8d471b 100644 --- a/www/common/translations/messages.fr.json +++ b/www/common/translations/messages.fr.json @@ -1251,5 +1251,8 @@ "share_linkPasswordAlert": "Cet élément est protégé par un mot de passe. Quand vous partagez le lien, le destinataire doit saisir le mot de passe.", "share_contactPasswordAlert": "Cet élément est protégé par un mot de passe. Quand vous le partagez avec un contact CryptPad, le destinataire n'a pas a saisir le mot de passe.", "share_embedPasswordAlert": "Cet élément est protégé par un mot de passe. Quand vous l'intégrez à une page, les visiteurs doivent saisir le mot de passe.", - "passwordFaqLink": "En lire plus sur les mots de passe" + "passwordFaqLink": "En lire plus sur les mots de passe", + "share_noContactsLoggedIn": "Vous n'avez pas encore ajouté de contacts sur CryptPad. Partagez le lien de votre profil pour que l'on vous envoie des demandes de contact.", + "share_copyProfileLink": "Copier le lien du profil", + "share_noContactsNotLoggedIn": "Connectez-vous ou enregistrez-vous pour voir vos contacts ou en ajouter de nouveaux." } From 408bc947658bb8eeb7afb3338ffdebbe61e7c085 Mon Sep 17 00:00:00 2001 From: Weblate Date: Thu, 12 Dec 2019 15:09:44 +0000 Subject: [PATCH 5/5] Translated using Weblate (German) Currently translated at 100.0% (1155 of 1155 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/ --- www/common/translations/messages.de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/common/translations/messages.de.json b/www/common/translations/messages.de.json index d2f6c1998..b92c21309 100644 --- a/www/common/translations/messages.de.json +++ b/www/common/translations/messages.de.json @@ -1070,7 +1070,7 @@ "notification_folderShared": "{0} hat einen Ordner mit dir geteilt: {1}", "share_selectAll": "Alle auswählen", "share_filterFriend": "Nach Namen suchen", - "share_linkFriends": "Mit Freunden teilen", + "share_linkFriends": "Mit Kontakten teilen", "share_withFriends": "Teilen", "share_deselectAll": "Alle abwählen", "notifications_dismiss": "Verbergen",