diff --git a/.gitignore b/.gitignore index 68173967..73aa11e6 100644 --- a/.gitignore +++ b/.gitignore @@ -85,4 +85,5 @@ foo.js hello.js plugins/c9.docker/containers/ci/files/github_c9_newclient plugins/c9.docker/containers/shared/files/plugins/salesforce* -security-audit.log \ No newline at end of file +plugins/c9.docker/containers/shared/files/plugins/google* +security-audit.log diff --git a/configs/client-default.js b/configs/client-default.js index fe8c5d99..53961f67 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", @@ -903,6 +902,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; }; diff --git a/package.json b/package.json index bde3b8eb..b6e271d5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1602", + "version": "3.1.1666", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", @@ -65,9 +65,9 @@ "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.collab": "#11a0d3c5ce", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", "c9.ide.find.infiles": "#c0a13737ef", @@ -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", 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 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 = {}; diff --git a/plugins/c9.ide.server/views/flat-load-screen.html b/plugins/c9.ide.server/views/flat-load-screen.html index 964404a4..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 working together.", + "Use the Collaborate panel when collaborating for optimal teamwork.", "It's better up here.", "Happy coding!", "Everything as you left it.",