From 8d05489dabd110c04d4a1aa01376154585aba7df Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 10 May 2016 19:01:21 +0000 Subject: [PATCH 1/5] restrict access to ~. fixes +4538 --- package.json | 2 +- plugins/c9.vfs.client/vfs_client.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 55951003..fe0045df 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "c9.ide.language.javascript.infer": "#18acb93a3a", "c9.ide.language.jsonalyzer": "#d8183d84b4", "c9.ide.language.codeintel": "#e92ace1a56", - "c9.ide.collab": "#e9b3306fa7", + "c9.ide.collab": "#6e0f24df9a", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", "c9.ide.find.infiles": "#c0a13737ef", diff --git a/plugins/c9.vfs.client/vfs_client.js b/plugins/c9.vfs.client/vfs_client.js index 0fd09d42..0fb2d9c6 100644 --- a/plugins/c9.vfs.client/vfs_client.js +++ b/plugins/c9.vfs.client/vfs_client.js @@ -204,7 +204,7 @@ define(function(require, exports, module) { function reconnectNow() { reconnect(function(_err) { - connection.connect(); + connection && connection.connect(); }); } From c9887c46504a0e0429d58375791042018e2c8fc7 Mon Sep 17 00:00:00 2001 From: Harutyun Amirjanyan Date: Sat, 21 May 2016 13:39:41 +0400 Subject: [PATCH 2/5] call path.normalize on docId --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fe0045df..78977021 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "c9.ide.language.javascript.infer": "#18acb93a3a", "c9.ide.language.jsonalyzer": "#d8183d84b4", "c9.ide.language.codeintel": "#e92ace1a56", - "c9.ide.collab": "#6e0f24df9a", + "c9.ide.collab": "#be6b8a3054", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", "c9.ide.find.infiles": "#c0a13737ef", From fe1c51177984e37e6cc0e3065cb8581a172271cf Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 23 May 2016 14:17:04 +0400 Subject: [PATCH 3/5] cleanup --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 78977021..4116b281 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "c9.ide.language.javascript.infer": "#18acb93a3a", "c9.ide.language.jsonalyzer": "#d8183d84b4", "c9.ide.language.codeintel": "#e92ace1a56", - "c9.ide.collab": "#be6b8a3054", + "c9.ide.collab": "#9341da1251", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", "c9.ide.find.infiles": "#c0a13737ef", From 59e9c8d54d5af9be9739e11acf15196b529cf3b2 Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 24 May 2016 14:08:37 +0400 Subject: [PATCH 4/5] fix handling of ../ at the start of the path --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4116b281..71f55341 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "c9.ide.language.javascript.infer": "#18acb93a3a", "c9.ide.language.jsonalyzer": "#d8183d84b4", "c9.ide.language.codeintel": "#e92ace1a56", - "c9.ide.collab": "#9341da1251", + "c9.ide.collab": "#8aa9290191", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", "c9.ide.find.infiles": "#c0a13737ef", From d9dd593026b993fefd770751b05e168a8f94407a Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 24 May 2016 17:04:57 +0400 Subject: [PATCH 5/5] fix handling of filenames starting with ~ --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 71f55341..5e0d58fe 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "c9.ide.language.javascript.infer": "#18acb93a3a", "c9.ide.language.jsonalyzer": "#d8183d84b4", "c9.ide.language.codeintel": "#e92ace1a56", - "c9.ide.collab": "#8aa9290191", + "c9.ide.collab": "#11c2f80959", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", "c9.ide.find.infiles": "#c0a13737ef",