From 66a15da30d35cc669f2612f61d93c9e6ce3637ee Mon Sep 17 00:00:00 2001 From: Weblate Date: Thu, 7 Mar 2019 13:16:09 +0000 Subject: [PATCH 1/4] Translated using Weblate (Spanish) Currently translated at 47.4% (443 of 934 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/es/ --- www/common/translations/messages.es.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/www/common/translations/messages.es.json b/www/common/translations/messages.es.json index c7c5b9a4d..d4705139b 100644 --- a/www/common/translations/messages.es.json +++ b/www/common/translations/messages.es.json @@ -8,7 +8,8 @@ "whiteboard": "Pizarra", "contacts": "Contactos", "kanban": "Kanban", - "drive": "CryptDrive" + "drive": "CryptDrive", + "todo": "" }, "disconnected": "Desconectado", "synchronizing": "Sincronización", From 9a2ba5603015ca5f449eb1ef87413eb82382eb29 Mon Sep 17 00:00:00 2001 From: Weblate Date: Thu, 7 Mar 2019 13:19:08 +0000 Subject: [PATCH 2/4] Translated using Weblate (Spanish) Currently translated at 47.5% (444 of 934 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/es/ --- www/common/translations/messages.es.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/common/translations/messages.es.json b/www/common/translations/messages.es.json index d4705139b..5126cdd77 100644 --- a/www/common/translations/messages.es.json +++ b/www/common/translations/messages.es.json @@ -9,7 +9,7 @@ "contacts": "Contactos", "kanban": "Kanban", "drive": "CryptDrive", - "todo": "" + "todo": "Lista de tareas" }, "disconnected": "Desconectado", "synchronizing": "Sincronización", From 0b540038c08fc81d3a1a63c1e90e96cc2bc2c706 Mon Sep 17 00:00:00 2001 From: Weblate Date: Thu, 7 Mar 2019 13:22:41 +0000 Subject: [PATCH 3/4] Translated using Weblate (Spanish) Currently translated at 47.6% (445 of 934 strings) Translation: CryptPad/App Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/es/ --- www/common/translations/messages.es.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/www/common/translations/messages.es.json b/www/common/translations/messages.es.json index 5126cdd77..2f352295a 100644 --- a/www/common/translations/messages.es.json +++ b/www/common/translations/messages.es.json @@ -9,7 +9,8 @@ "contacts": "Contactos", "kanban": "Kanban", "drive": "CryptDrive", - "todo": "Lista de tareas" + "todo": "Lista de tareas", + "file": "Archivo" }, "disconnected": "Desconectado", "synchronizing": "Sincronización", From e92756200673cd5af6a024d5aad5df172bf5423b Mon Sep 17 00:00:00 2001 From: yflory Date: Fri, 8 Mar 2019 17:07:22 +0100 Subject: [PATCH 4/4] Fix registration with Internet Explorer --- customize.dist/credential.js | 8 +++++++- customize.dist/login.js | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/customize.dist/credential.js b/customize.dist/credential.js index 8635bf6c4..d1d88bd97 100644 --- a/customize.dist/credential.js +++ b/customize.dist/credential.js @@ -61,7 +61,13 @@ define([ } // grab an unused slice of the entropy - var A = bytes.slice(entropy.used, entropy.used + n); + // Note: Internet Explorer doesn't support .slice on Uint8Array + var A; + if (bytes.slice) { + A = bytes.slice(entropy.used, entropy.used + n); + } else { + A = bytes.subarray(entropy.used, entropy.used + n); + } // account for the bytes you used so you don't reuse bytes entropy.used += n; diff --git a/customize.dist/login.js b/customize.dist/login.js index 25fcc8dcf..21668140f 100644 --- a/customize.dist/login.js +++ b/customize.dist/login.js @@ -113,7 +113,8 @@ define([ }; var isProxyEmpty = function (proxy) { - return Object.keys(proxy).length === 0; + var l = Object.keys(proxy).length; + return l === 0 || (l === 2 && proxy._events && proxy.on); }; var setMergeAnonDrive = function () {