Merge branch 'staging' into 5.2-candidate
This commit is contained in:
commit
a804a0d9bc
4 changed files with 501 additions and 245 deletions
730
package-lock.json
generated
730
package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
@ -15,7 +15,7 @@
|
|||
"@mcrowe/minibloom": "^0.2.0",
|
||||
"chainpad-crypto": "^0.2.5",
|
||||
"chainpad-server": "^5.1.0",
|
||||
"express": "~4.16.0",
|
||||
"express": "~4.18.2",
|
||||
"fs-extra": "^7.0.0",
|
||||
"get-folder-size": "^2.0.1",
|
||||
"netflux-websocket": "^0.1.20",
|
||||
|
|
|
@ -171,10 +171,12 @@ define([
|
|||
var data;
|
||||
// apparently some browser extensions send messages to random targets
|
||||
// which can trigger parse errors that interrupt normal behaviour
|
||||
// we therefore log a warning and ignore any messages we can't parse
|
||||
try {
|
||||
data = typeof(msg.data) === "object" ? msg.data : JSON.parse(msg.data);
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
console.warn(err);
|
||||
return;
|
||||
}
|
||||
if (typeof(data.ack) !== "undefined") {
|
||||
if (acks[data.txid]) { acks[data.txid](!data.ack); }
|
||||
|
|
|
@ -1571,8 +1571,10 @@
|
|||
"form_answer_new": "Soumettre de nouveau",
|
||||
"form_deleteAll": "Tout supprimer",
|
||||
"form_responseNotification": "Nouvelles réponses au formulaire : <b>{0}</b>",
|
||||
"form_alreadyAnsweredMult": "Vous avez répondu à ce formulaire sur :",
|
||||
"form_exportJSON": "Exporter au format JSON",
|
||||
"team_inviteUses": "Nombre d'utilisations autorisées pour ce lien (0 = sans limite)",
|
||||
"team_inviteRole": "Rôle initial"
|
||||
"form_alreadyAnsweredMult": "Réponses précédentes à ce formulaire :",
|
||||
"form_exportJSON": "Exporter en JSON",
|
||||
"team_inviteUses": "Utilisations autorisées pour ce lien (0 = sans limite)",
|
||||
"team_inviteRole": "Rôle initial",
|
||||
"team_linkUses": "({0}/{1} restant)",
|
||||
"team_linkUsesInfinite": "(usages illimités)"
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue