Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI

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,

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',

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