dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into inviteUI

This commit is contained in:
yflory 2019-12-12 16:23:53 +01:00
parent 998e2f81d2 f2a84fba78
commit d04d36c8cd
8 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/common/common-interface.js
View File

@ -475,7 +475,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;

2
www/common/translations/messages.de.json
View File

@ -1070,7 +1070,7 @@
"notification_folderShared": "{0} hat einen Ordner mit dir geteilt: <b>{1}</b>",
"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",

5
www/common/translations/messages.fr.json
View File

@ -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."
}

5
www/common/translations/messages.json
View File

@ -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."
}

3
www/kanban/app-kanban.less
View File

@ -74,6 +74,9 @@
#kanban-edit {
font-weight: bold;
}
&:hover {
cursor: move;
}
}
}

3
www/kanban/inner.js
View File

@ -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

1
www/kanban/jkanban.css
View File

@ -36,6 +36,7 @@
margin: 0;
padding: 0;
display: inline;
cursor: text;
}
.kanban-board header .kanban-title-button {

3
www/kanban/jkanban.js
View File

@ -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;
},