From 7756b34fd5dfb1dc8491688a491a6cb66b8fabcc Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Sun, 3 Jan 2016 14:02:15 +0100 Subject: [PATCH 01/21] Backport 'console' completion fix from language-library-ui branch --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d9bd9e03..fe583b1d 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "c9.ide.language.javascript": "#1a0b1584c2", "c9.ide.language.javascript.immediate": "#c8b1e5767a", "c9.ide.language.javascript.eslint": "#586becb51d", - "c9.ide.language.javascript.tern": "#b03b4dc50b", + "c9.ide.language.javascript.tern": "#f9ba3813d7", "c9.ide.language.javascript.infer": "#001fe08ecb", "c9.ide.language.jsonalyzer": "#1454bd1ed7", "c9.ide.collab": "#10c224f9b8", From 034d78aeb8da7bbe33e671ba692e0404ce4cd322 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Sun, 3 Jan 2016 14:04:46 +0100 Subject: [PATCH 02/21] Fix uncontextual early predictions --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fe583b1d..98f766d7 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "c9" ], "c9plugins": { - "c9.ide.language": "#9374163ea5", + "c9.ide.language": "#baff0204f2", "c9.ide.language.css": "#be07d72209", "c9.ide.language.generic": "#2b5cc6275e", "c9.ide.language.html": "#9be847c0ce", From 5f9de12c30f40070193975e87a91a3349b228556 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Sun, 3 Jan 2016 13:57:00 +0100 Subject: [PATCH 03/21] Fix --helpWithSudo --- server.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server.js b/server.js index 2ecaed27..a64ebe82 100755 --- a/server.js +++ b/server.js @@ -84,6 +84,7 @@ function main(argv, config, onLoaded) { .describe("domains", "Primary and any secondary top-level domains to use (e.g, c9.io,c9.dev)") .describe("exclude", "Exclude specified service") .describe("include", "Include only specified service") + .describe("helpWithSudo", "Ask for sudo password on startup") .default("domains", inContainer && process.env.C9_HOSTNAME || process.env.C9_DOMAINS) .boolean("help") .describe("help", "Show command line options."); @@ -107,7 +108,7 @@ function main(argv, config, onLoaded) { var delayed = expanded.filter(function(c) { return delayLoadConfigs.indexOf(c) !== -1 }); var notDelayed = expanded.filter(function(c) { return delayLoadConfigs.indexOf(c) === -1 }); - if (options.helpWithSudo) + if (options.argv.helpWithSudo) return child_process.execFile("sudo", ["echo -n"], main.bind(null, argv.filter(function(a) { return a !== "--helpWithSudo"; }), config, onLoaded)); From 33cd4df8a3f489e9caf64b0ba8deba924505a197 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Sun, 3 Jan 2016 14:06:06 +0100 Subject: [PATCH 04/21] Fix preferred completion handling w/caching Conflicts, added tests removed for now: plugins/c9.ide.language/language_test.js --- package.json | 2 +- server.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 98f766d7..bfb8fc53 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "c9" ], "c9plugins": { - "c9.ide.language": "#baff0204f2", + "c9.ide.language": "#630462418b", "c9.ide.language.css": "#be07d72209", "c9.ide.language.generic": "#2b5cc6275e", "c9.ide.language.html": "#9be847c0ce", diff --git a/server.js b/server.js index a64ebe82..f04bc837 100755 --- a/server.js +++ b/server.js @@ -205,4 +205,4 @@ function start(configName, options, callback) { plugin.name = name; }); }); -} \ No newline at end of file +} From f8e8ea142c31b032c8d76a572980eacf1dfa070a Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Jan 2016 14:14:05 +0100 Subject: [PATCH 05/21] c9-auto-bump 3.1.894 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 34fe98a2..d9ba808d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.893", + "version": "3.1.894", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 1388058889b1d3180c9b6fb2c8b3bd266db6ede9 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Jan 2016 14:39:53 +0100 Subject: [PATCH 06/21] c9-auto-bump 3.1.895 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d9ba808d..95a076db 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.894", + "version": "3.1.895", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 3a74876997bf7e741358ccf881c4d7f32ea877d6 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Jan 2016 15:50:32 +0100 Subject: [PATCH 07/21] c9-auto-bump 3.1.896 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 95a076db..6c948f8f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.895", + "version": "3.1.896", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 6ca77bbeb2e79fefebc942ca3a39e6a2d615a651 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Jan 2016 15:50:51 +0100 Subject: [PATCH 08/21] c9-auto-bump 3.1.897 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6c948f8f..52fd2469 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.896", + "version": "3.1.897", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From b08dec3a5667af9d3c033d3572e6d7cc90debed9 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Jan 2016 15:52:15 +0100 Subject: [PATCH 09/21] c9-auto-bump 3.1.898 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 52fd2469..d315b771 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.897", + "version": "3.1.898", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 7fb73c9c74e63c900c0465872da3e66b27b4c2f9 Mon Sep 17 00:00:00 2001 From: Dana Ivan Date: Mon, 4 Jan 2016 15:13:32 +0000 Subject: [PATCH 10/21] Standardizes user traits sent to analytics --- node_modules/c9/format-user-analytics.js | 46 ++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 node_modules/c9/format-user-analytics.js diff --git a/node_modules/c9/format-user-analytics.js b/node_modules/c9/format-user-analytics.js new file mode 100644 index 00000000..b7612ba3 --- /dev/null +++ b/node_modules/c9/format-user-analytics.js @@ -0,0 +1,46 @@ +if (define === undefined) { + var define = function(fn) { + fn(require, exports, module); + }; +} + +define(function(require, exports, module) { + "use strict"; + + function formatUser(user) { + if (!user) return {}; // empty traits get ignored + + var traits = { + uid: user.id || user.uid, + username: user.name || user.username, + email: user.email, + createdAt: user.date_add, + active: !!user.active, + firstName: getFirstName(user), + lastName: getLastName(user), + name: user.fullname || user.name, + pricingPlan: user.premium ? "Premium" : "Free", + region: user.region + }; + + return traits; + } + + function getFirstName(user){ + if (user.firstname) return user.firstname; + + if (!user.fullname) return undefined; + + return user.fullname.split(' ').slice(0, 1).join(' '); + } + + function getLastName(user){ + if (user.lastname) return user.lastname; + + if (!user.fullname) return undefined; + + return user.fullname.split(' ').slice(1).join(' '); + } + + module.exports = formatUser; +}); \ No newline at end of file From bb010cea8eb2ddc5b129d97ad625200c1448b3db Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Jan 2016 16:28:32 +0100 Subject: [PATCH 11/21] c9-auto-bump 3.1.899 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d315b771..5daabe69 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.898", + "version": "3.1.899", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 2045f424021672c1968b99e7c807c24461e3bcfe Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Jan 2016 16:34:52 +0100 Subject: [PATCH 12/21] c9-auto-bump 3.1.900 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5daabe69..94052017 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.899", + "version": "3.1.900", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 3db465c10017cc2f2f3e9525d21ec318a331e376 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Jan 2016 16:43:59 +0100 Subject: [PATCH 13/21] c9-auto-bump 3.1.901 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 94052017..d939fc9c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.900", + "version": "3.1.901", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 4328d7dc7ea27e458b01505d5cd24457c5d95af9 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Jan 2016 16:48:21 +0100 Subject: [PATCH 14/21] c9-auto-bump 3.1.902 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d939fc9c..e3303b92 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.901", + "version": "3.1.902", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 799b98d08a3f7bb102cb176de0689af0e4709052 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Jan 2016 17:13:29 +0100 Subject: [PATCH 15/21] c9-auto-bump 3.1.903 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e3303b92..dcebd32f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.902", + "version": "3.1.903", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From ec5d57a5bb7e8edf8ab7d933e0f35c55e306e0bb Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Jan 2016 19:28:56 +0100 Subject: [PATCH 16/21] c9-auto-bump 3.1.904 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7d8aa6b0..e037b3ef 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.903", + "version": "3.1.904", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 28f0ec10106164dd419e995bb7d00a6031cae829 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Jan 2016 20:16:58 +0100 Subject: [PATCH 17/21] c9-auto-bump 3.1.905 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e037b3ef..1738cc35 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.904", + "version": "3.1.905", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 32c8d42b46f5ac0acecd365d74ddcbe81863f565 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Jan 2016 22:08:16 +0100 Subject: [PATCH 18/21] c9-auto-bump 3.1.906 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1738cc35..bacc98af 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.905", + "version": "3.1.906", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 09ebb83340be572ea961878879a4bbc838eae767 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 5 Jan 2016 09:54:54 +0100 Subject: [PATCH 19/21] c9-auto-bump 3.1.907 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bacc98af..9b86fd16 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.906", + "version": "3.1.907", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 72c0199f68decbdf7932cffea4b80508ad57af38 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 5 Jan 2016 10:34:16 +0100 Subject: [PATCH 20/21] c9-auto-bump 3.1.908 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9b86fd16..b47adb11 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.907", + "version": "3.1.908", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 564b2e884daafbbfb1c5d7ec2ec517f9134c44a5 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 5 Jan 2016 11:00:00 +0100 Subject: [PATCH 21/21] c9-auto-bump 3.1.909 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b47adb11..a43477db 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.908", + "version": "3.1.909", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9",