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

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

Browse Source
This commit is contained in:
yflory 2018-06-25 16:59:52 +02:00
commit 87dc528a99
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package.json
View File

@ -2,7 +2,11 @@
"name": "cryptpad", "name": "cryptpad",
"description": "realtime collaborative visual editor with zero knowlege server", "description": "realtime collaborative visual editor with zero knowlege server",
"version": "2.4.0", "version": "2.4.0",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0+",
"repository": {
"type": "git",
"url": "git://github.com/xwiki-labs/cryptpad.git"
},
"dependencies": { "dependencies": {
"chainpad-server": "~2.1.0", "chainpad-server": "~2.1.0",
"express": "~4.16.0", "express": "~4.16.0",

3
www/common/cryptpad-common.js
View File

@ -796,7 +796,7 @@ define([
}, },
// Messaging // Messaging
Q_FRIEND_REQUEST: common.messaging.onFriendRequest.fire, Q_FRIEND_REQUEST: common.messaging.onFriendRequest.fire,
EV_FIREND_COMPLETE: common.messaging.onFriendComplete.fire, EV_FRIEND_COMPLETE: common.messaging.onFriendComplete.fire,
// Network // Network
NETWORK_DISCONNECT: common.onNetworkDisconnect.fire, NETWORK_DISCONNECT: common.onNetworkDisconnect.fire,
NETWORK_RECONNECT: function (data) { NETWORK_RECONNECT: function (data) {
@ -890,7 +890,6 @@ define([
}).nThen(function (waitFor) { }).nThen(function (waitFor) {
var cfg = { var cfg = {
init: true, init: true,
//query: onMessage, // TODO temporary, will be replaced by a webworker channel
userHash: LocalStore.getUserHash(), userHash: LocalStore.getUserHash(),
anonHash: LocalStore.getFSHash(), anonHash: LocalStore.getFSHash(),
localToken: tryParsing(localStorage.getItem(Constants.tokenKey)), localToken: tryParsing(localStorage.getItem(Constants.tokenKey)),

1
www/common/outer/userObject.js
View File

@ -41,7 +41,6 @@ define([
if (!attr || !attr.trim()) { return void cb("E_INVAL_ATTR"); } if (!attr || !attr.trim()) { return void cb("E_INVAL_ATTR"); }
var data = exp.getFileData(id); var data = exp.getFileData(id);
data[attr] = clone(value); data[attr] = clone(value);
console.log(data);
cb(null); cb(null);
}; };
exp.getPadAttribute = function (href, attr, cb) { exp.getPadAttribute = function (href, attr, cb) {