Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
commit
87dc528a99
|
@ -2,7 +2,11 @@
|
|||
"name": "cryptpad",
|
||||
"description": "realtime collaborative visual editor with zero knowlege server",
|
||||
"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": {
|
||||
"chainpad-server": "~2.1.0",
|
||||
"express": "~4.16.0",
|
||||
|
|
|
@ -796,7 +796,7 @@ define([
|
|||
},
|
||||
// Messaging
|
||||
Q_FRIEND_REQUEST: common.messaging.onFriendRequest.fire,
|
||||
EV_FIREND_COMPLETE: common.messaging.onFriendComplete.fire,
|
||||
EV_FRIEND_COMPLETE: common.messaging.onFriendComplete.fire,
|
||||
// Network
|
||||
NETWORK_DISCONNECT: common.onNetworkDisconnect.fire,
|
||||
NETWORK_RECONNECT: function (data) {
|
||||
|
@ -890,7 +890,6 @@ define([
|
|||
}).nThen(function (waitFor) {
|
||||
var cfg = {
|
||||
init: true,
|
||||
//query: onMessage, // TODO temporary, will be replaced by a webworker channel
|
||||
userHash: LocalStore.getUserHash(),
|
||||
anonHash: LocalStore.getFSHash(),
|
||||
localToken: tryParsing(localStorage.getItem(Constants.tokenKey)),
|
||||
|
|
|
@ -41,7 +41,6 @@ define([
|
|||
if (!attr || !attr.trim()) { return void cb("E_INVAL_ATTR"); }
|
||||
var data = exp.getFileData(id);
|
||||
data[attr] = clone(value);
|
||||
console.log(data);
|
||||
cb(null);
|
||||
};
|
||||
exp.getPadAttribute = function (href, attr, cb) {
|
||||
|
|
Loading…
Reference in New Issue