From 663a1138b425da3f4ec0f00c5e5fe9ab909c3a73 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 18 Dec 2019 12:01:58 -0500
Subject: [PATCH 1/3] trim leading spaces from domains

---
 server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server.js b/server.js
index ca98795f2..c47c4e450 100644
--- a/server.js
+++ b/server.js
@@ -214,7 +214,7 @@ app.get('/api/config', function(req, res){
             // FIXME don't send websocketURL if websocketPath is provided. deprecated.
             websocketURL:'ws' + ((useSecureWebsockets) ? 's' : '') + '://' + host + ':' +
                 websocketPort + '/cryptpad_websocket',
-            httpUnsafeOrigin: config.httpUnsafeOrigin.replace(/^ /, ''),
+            httpUnsafeOrigin: config.httpUnsafeOrigin.replace(/^\s*/, ''),
             adminEmail: config.adminEmail,
             adminKeys: admins,
             inactiveTime: config.inactiveTime,

From 90d8a7a6849929a6ded91e48c7038b8febedb1bc Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 18 Dec 2019 12:02:26 -0500
Subject: [PATCH 2/3] remove an unused dependency

---
 www/common/common-ui-elements.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index c1c8bf2b1..82cce9d10 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -16,7 +16,6 @@ define([
     '/bower_components/nthen/index.js',
     '/common/invitation.js',
 
-    '/bower_components/scrypt-async/scrypt-async.js',
     'css!/customize/fonts/cptools/style.css',
     '/bower_components/croppie/croppie.min.js',
     'css!/bower_components/croppie/croppie.css',

From 9824136917c2c5bf7c594d3e1cb2196459b6ef54 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 18 Dec 2019 12:02:42 -0500
Subject: [PATCH 3/3] fix a typo

---
 www/common/outer/roster.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/outer/roster.js b/www/common/outer/roster.js
index 8755bbd79..651efd30c 100644
--- a/www/common/outer/roster.js
+++ b/www/common/outer/roster.js
@@ -384,7 +384,7 @@ var factory = function (Util, Hash, CPNetflux, Sortify, nThen, Crypto) {
             }
             // reject commandws wehere the members are not proper objects
             if (!isMap(args[curve])) { throw new Error("INVALID_CONTENT"); }
-            if (members[curve]) { throw new Error("ARLEADY_PRESNET"); }
+            if (members[curve]) { throw new Error("ARLEADY_PRESENT"); }
 
             var data = args[curve];
             // if no role was provided, assume VIEWER