web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
yflory 2019-12-18 18:11:12 +01:00
commit 4d1079e1e2
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server.js
View File

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

1
www/common/common-ui-elements.js
View File

@ -16,7 +16,6 @@ define([
'/bower_components/nthen/index.js', '/bower_components/nthen/index.js',
'/common/invitation.js', '/common/invitation.js',
'/bower_components/scrypt-async/scrypt-async.js',
'css!/customize/fonts/cptools/style.css', 'css!/customize/fonts/cptools/style.css',
'/bower_components/croppie/croppie.min.js', '/bower_components/croppie/croppie.min.js',
'css!/bower_components/croppie/croppie.css', 'css!/bower_components/croppie/croppie.css',

2
www/common/outer/roster.js
View File

@ -384,7 +384,7 @@ var factory = function (Util, Hash, CPNetflux, Sortify, nThen, Crypto) {
} }
// reject commandws wehere the members are not proper objects // reject commandws wehere the members are not proper objects
if (!isMap(args[curve])) { throw new Error("INVALID_CONTENT"); } 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]; var data = args[curve];
// if no role was provided, assume VIEWER // if no role was provided, assume VIEWER