From 3b14ce7a4c0013c2846d36e2328935be2891021e Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Mon, 29 Feb 2016 20:42:33 +0000 Subject: [PATCH 01/29] add class to share button --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8bcd7914..fd765b7b 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "c9.ide.language.javascript.infer": "#325ac6880e", "c9.ide.language.jsonalyzer": "#7791dec360", "c9.ide.language.codeintel": "#046d39603b", - "c9.ide.collab": "#00bd850bba", + "c9.ide.collab": "#0d7395b2e3", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", "c9.ide.find.infiles": "#c0a13737ef", From cf52482b8b2054e16f6aef61dc3784c6b4c34216 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Tue, 1 Mar 2016 08:43:54 +0000 Subject: [PATCH 02/29] Revert "disable codeintel until shared space is deployed" This reverts commit ad924b7cab25b3d2858fec0c5b4d3d4dc30555fb. --- configs/client-default.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/client-default.js b/configs/client-default.js index f83b1026..8a6c8c25 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -320,7 +320,7 @@ module.exports = function(options) { "plugins/c9.ide.language.generic/generic", "plugins/c9.ide.language.css/css", "plugins/c9.ide.language.html/html", - // "plugins/c9.ide.language.codeintel/codeintel", + "plugins/c9.ide.language.codeintel/codeintel", "plugins/c9.ide.language.javascript/javascript", "plugins/c9.ide.language.javascript.immediate/immediate", "plugins/c9.ide.language.javascript.infer/jsinfer", From 506c26865fbb7fe00785595f5b4387bb8ada81b3 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Tue, 1 Mar 2016 09:06:41 +0000 Subject: [PATCH 03/29] Fix +12516 onNo is not a function --- plugins/c9.ide.dialog.common/question.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/c9.ide.dialog.common/question.js b/plugins/c9.ide.dialog.common/question.js index 2c292664..7e3be92e 100644 --- a/plugins/c9.ide.dialog.common/question.js +++ b/plugins/c9.ide.dialog.common/question.js @@ -27,6 +27,11 @@ define(function(require, module, exports) { /***** Methods *****/ function show(title, header, msg, onYes, onNo, options) { + if (onYes && typeof onYes !== "function") + return show(title, header, msg, null, null, onYes); + if (onNo && typeof onNo !== "function") + return show(title, header, msg, onYes, null, onNo); + if (!options) options = {}; From f29f9979022e130d50b8cfdc94d47449c2aa88d3 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Tue, 1 Mar 2016 09:07:03 +0000 Subject: [PATCH 04/29] Make buttons consistent with other save dialogs --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7a20bf05..6c632bbe 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "c9.ide.run": "#4f0257bc0b", "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", - "c9.ide.save": "#417e4b53c4", + "c9.ide.save": "#86f0f38160", "c9.ide.scm": "#ca3c94b84f", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#a282ec1619", From 574683451238c8ce30bd476ee96b179cb2b70c3c Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 1 Mar 2016 18:10:32 +0000 Subject: [PATCH 05/29] use path from bashrc for ruby linter --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6b27e510..b0be6742 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "c9.ide.language.javascript.eslint": "#edaf80a3fe", "c9.ide.language.javascript.tern": "#8423d558f6", "c9.ide.language.javascript.infer": "#325ac6880e", - "c9.ide.language.jsonalyzer": "#7791dec360", + "c9.ide.language.jsonalyzer": "#4b329741b1", "c9.ide.language.codeintel": "#046d39603b", "c9.ide.collab": "#36a4606970", "c9.ide.local": "#10eb45842a", From c0ed5754e248aa5e0cbf2f2e6f2819089c7a02de Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 3 Mar 2016 17:59:06 +0100 Subject: [PATCH 06/29] c9-auto-bump 3.1.1648 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4b1be114..693ce1db 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1647", + "version": "3.1.1648", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 8ff77955110bc1a2d49996d0ee800f1370e24c41 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 3 Mar 2016 18:14:03 +0100 Subject: [PATCH 07/29] c9-auto-bump 3.1.1649 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 693ce1db..62484d01 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1648", + "version": "3.1.1649", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 691b57b9fb6b6cc246bb32403b59eb04b675ed07 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 3 Mar 2016 19:18:19 +0100 Subject: [PATCH 08/29] c9-auto-bump 3.1.1650 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 62484d01..a1d0ff40 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1649", + "version": "3.1.1650", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 65881eba7c41c549f9d29ccd894383b0a25a81e5 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 3 Mar 2016 20:13:53 +0100 Subject: [PATCH 09/29] c9-auto-bump 3.1.1651 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a1d0ff40..605823c6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1650", + "version": "3.1.1651", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 87bf53508cc26a721900d694d86612d56b18ef06 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 3 Mar 2016 21:01:13 +0100 Subject: [PATCH 10/29] c9-auto-bump 3.1.1652 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c3de58f9..57a5f668 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1651", + "version": "3.1.1652", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 326f433f5aba1636e6387237db3873fd960ddbf0 Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Thu, 3 Mar 2016 20:29:50 +0000 Subject: [PATCH 11/29] Don't show lost_gear information on 503 error page --- plugins/c9.error/views/error-503.html.ejs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/c9.error/views/error-503.html.ejs b/plugins/c9.error/views/error-503.html.ejs index ac482ab7..86c37845 100644 --- a/plugins/c9.error/views/error-503.html.ejs +++ b/plugins/c9.error/views/error-503.html.ejs @@ -7,7 +7,9 @@

Service Unavailable

-

<%=statusCode%> - <%=scope%> <%=error%>

+ <% if (showStackTrace) { %> +

<%=statusCode%> - <%=scope%> <%=error%>

+ <% } %>

The service reports it's unavailable at this time. This has been logged and the appropriate people have been notified. Please check the From 180b2862e6c5fafb10a042d7156d2cba4c2335d9 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 3 Mar 2016 21:35:42 +0100 Subject: [PATCH 12/29] c9-auto-bump 3.1.1653 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 57a5f668..b0541d51 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1652", + "version": "3.1.1653", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From e4524696b191c61867714df8966e1a0c55e5e494 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 3 Mar 2016 22:45:32 +0100 Subject: [PATCH 13/29] c9-auto-bump 3.1.1654 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b0541d51..117560fa 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1653", + "version": "3.1.1654", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 8b0cfbb6e9b7ee147ed5006b453a85188c56e817 Mon Sep 17 00:00:00 2001 From: Nikolai Onken Date: Thu, 3 Mar 2016 22:08:45 +0000 Subject: [PATCH 14/29] Typo --- plugins/c9.ide.server/views/flat-load-screen.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/c9.ide.server/views/flat-load-screen.html b/plugins/c9.ide.server/views/flat-load-screen.html index b6c5c8c8..b30e268f 100644 --- a/plugins/c9.ide.server/views/flat-load-screen.html +++ b/plugins/c9.ide.server/views/flat-load-screen.html @@ -23,7 +23,7 @@ "Each workspace is its own Ubuntu virtual machine.", "Run 'dpkg -l' in the terminal to see all packages installed.", "Remember to run your code on port 8080, 8081, or 8082.", - "Use the Collaborate panel when collaborationg for optimal teamwork.", + "Use the Collaborate panel when collaborating for optimal teamwork.", "It's better up here.", "Happy coding!", "Everything as you left it.", From 4c12e143b3d43dc458e39a9d0e5d16e10ecf08bd Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 3 Mar 2016 23:18:22 +0100 Subject: [PATCH 15/29] c9-auto-bump 3.1.1655 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 117560fa..503b04e4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1654", + "version": "3.1.1655", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From bce36c044614c15a4f4dd8f77fa84f7ce428c7cd Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 4 Mar 2016 10:28:32 +0100 Subject: [PATCH 16/29] c9-auto-bump 3.1.1656 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 503b04e4..259bdfb0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1655", + "version": "3.1.1656", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From f8e049a20b7677720cc418a5b7c92d3144b79f85 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 4 Mar 2016 10:37:07 +0100 Subject: [PATCH 17/29] c9-auto-bump 3.1.1657 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 259bdfb0..d1f47775 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1656", + "version": "3.1.1657", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From cb7aa20d192fe8a128b670d6903aa4be47a52e58 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 4 Mar 2016 11:00:49 +0100 Subject: [PATCH 18/29] c9-auto-bump 3.1.1658 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d1f47775..67d703f8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1657", + "version": "3.1.1658", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 8b404f6e4bc20bb9badd357b09d58f841e259c87 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 4 Mar 2016 11:05:29 +0100 Subject: [PATCH 19/29] c9-auto-bump 3.1.1659 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 67d703f8..da3d29e4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1658", + "version": "3.1.1659", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 899ca744f779867172e13741f553cf2505a76f63 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 4 Mar 2016 11:07:31 +0100 Subject: [PATCH 20/29] c9-auto-bump 3.1.1660 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index da3d29e4..9215e1cc 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1659", + "version": "3.1.1660", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From b07ed8d3767b2a66f96fd65e5c64858d738643e0 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 4 Mar 2016 11:07:58 +0100 Subject: [PATCH 21/29] c9-auto-bump 3.1.1661 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9215e1cc..6125f42f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1660", + "version": "3.1.1661", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 22c2cd0b63fb845a729c29ab3a31ebf127260929 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Fri, 4 Mar 2016 10:53:00 +0000 Subject: [PATCH 22/29] Enable codeintel only when not on Windows --- configs/client-default.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configs/client-default.js b/configs/client-default.js index 8a6c8c25..7ad72e12 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -320,7 +320,6 @@ module.exports = function(options) { "plugins/c9.ide.language.generic/generic", "plugins/c9.ide.language.css/css", "plugins/c9.ide.language.html/html", - "plugins/c9.ide.language.codeintel/codeintel", "plugins/c9.ide.language.javascript/javascript", "plugins/c9.ide.language.javascript.immediate/immediate", "plugins/c9.ide.language.javascript.infer/jsinfer", @@ -899,6 +898,9 @@ module.exports = function(options) { staticPrefix: staticPrefix + "/plugins/c9.ide.collab/chat" }); } + + if (options.platform !== "win32") + plugins.push("plugins/c9.ide.language.codeintel/codeintel"); return plugins; }; From 211adf34a393097bf9c4c254aa9b794a69ba476d Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 4 Mar 2016 14:12:47 +0100 Subject: [PATCH 23/29] c9-auto-bump 3.1.1662 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6125f42f..e8e17c48 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1661", + "version": "3.1.1662", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From e1218e0057e1f3f84dc04ec9f89eb8e9450850f7 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 4 Mar 2016 14:13:07 +0100 Subject: [PATCH 24/29] c9-auto-bump 3.1.1663 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e8e17c48..df0a0239 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1662", + "version": "3.1.1663", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From da83b99ba15a4ef1f02d2d815702af119b62d588 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 4 Mar 2016 14:13:32 +0100 Subject: [PATCH 25/29] c9-auto-bump 3.1.1664 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4006bd1b..cefbfd8b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1663", + "version": "3.1.1664", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 1e6cce764d42ab1fc7b894ce331820117f0ea1b6 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 4 Mar 2016 14:54:57 +0100 Subject: [PATCH 26/29] c9-auto-bump 3.1.1665 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cefbfd8b..8467b3cd 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1664", + "version": "3.1.1665", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 7288f5b2fdfb9c70ebd69c8a6553393a58366fd1 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 4 Mar 2016 14:55:14 +0100 Subject: [PATCH 27/29] c9-auto-bump 3.1.1666 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8467b3cd..4f471944 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1665", + "version": "3.1.1666", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 5a6d65bbef74a9b5a4fc929037cb3289c7555d8d Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 4 Mar 2016 15:27:12 +0100 Subject: [PATCH 28/29] c9-auto-bump 3.1.1667 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4f471944..d845aedd 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1666", + "version": "3.1.1667", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 430e452a4264f652b55110800af8dbae52c62842 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 4 Mar 2016 15:49:05 +0100 Subject: [PATCH 29/29] c9-auto-bump 3.1.1668 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d845aedd..965b99fb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1667", + "version": "3.1.1668", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9",