From 9820ac278fca150994ae2bacb8f2baaf57fcdd75 Mon Sep 17 00:00:00 2001 From: ansuz Date: Mon, 25 Jun 2018 13:45:25 +0200 Subject: [PATCH 1/4] address npm warnings --- package.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 63d365e84..61016d411 100644 --- a/package.json +++ b/package.json @@ -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", From fb5553f918a30c91099e99ee99eb319198c88b05 Mon Sep 17 00:00:00 2001 From: ansuz Date: Mon, 25 Jun 2018 14:25:37 +0200 Subject: [PATCH 2/4] fix typo --- www/common/cryptpad-common.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js index 5242267a6..e20b4698c 100644 --- a/www/common/cryptpad-common.js +++ b/www/common/cryptpad-common.js @@ -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) { From d76f3dceabe4814f9a58b6d8308ad21dfccaaa9a Mon Sep 17 00:00:00 2001 From: ansuz Date: Mon, 25 Jun 2018 14:30:41 +0200 Subject: [PATCH 3/4] remove comment --- www/common/cryptpad-common.js | 1 - 1 file changed, 1 deletion(-) diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js index e20b4698c..15ac1c703 100644 --- a/www/common/cryptpad-common.js +++ b/www/common/cryptpad-common.js @@ -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)), From 7dc393a2d2e60e9d9fed116298df990ffaf2535e Mon Sep 17 00:00:00 2001 From: ansuz Date: Mon, 25 Jun 2018 15:33:54 +0200 Subject: [PATCH 4/4] remove debug log --- www/common/outer/userObject.js | 1 - 1 file changed, 1 deletion(-) diff --git a/www/common/outer/userObject.js b/www/common/outer/userObject.js index 25d0629a9..31e70a3bb 100644 --- a/www/common/outer/userObject.js +++ b/www/common/outer/userObject.js @@ -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) {