mirror
/
c9-core
kopia lustrzana https://github.com/c9/core
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge remote-tracking branch 'origin/master' into revert-12587-revert-12580-create-worker-retry

pull/268/head
Fabian Jakobs 2016-03-04 14:49:50 +00:00
rodzic 5f31e88af9 430e452a42
commit 7ff7dfeef2
5 zmienionych plików z 16 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
configs/client-default.js
Wyświetl plik

@ -320,7 +320,6 @@ module.exports = function(options) {
"plugins/c9.ide.language.generic/generic", "plugins/c9.ide.language.generic/generic",
"plugins/c9.ide.language.css/css", "plugins/c9.ide.language.css/css",
"plugins/c9.ide.language.html/html", "plugins/c9.ide.language.html/html",
// "plugins/c9.ide.language.codeintel/codeintel",
"plugins/c9.ide.language.javascript/javascript", "plugins/c9.ide.language.javascript/javascript",
"plugins/c9.ide.language.javascript.immediate/immediate", "plugins/c9.ide.language.javascript.immediate/immediate",
"plugins/c9.ide.language.javascript.infer/jsinfer", "plugins/c9.ide.language.javascript.infer/jsinfer",
@ -899,6 +898,9 @@ module.exports = function(options) {
staticPrefix: staticPrefix + "/plugins/c9.ide.collab/chat" staticPrefix: staticPrefix + "/plugins/c9.ide.collab/chat"
}); });
} }
if (options.platform !== "win32")
plugins.push("plugins/c9.ide.language.codeintel/codeintel");
return plugins; return plugins;
}; };

8
package.json
Wyświetl plik

@ -1,7 +1,7 @@
{ {
"name": "c9", "name": "c9",
"description": "New Cloud9 Client", "description": "New Cloud9 Client",
"version": "3.1.1647", "version": "3.1.1668",
"author": "Ajax.org B.V. <info@ajax.org>", "author": "Ajax.org B.V. <info@ajax.org>",
"private": true, "private": true,
"main": "bin/c9", "main": "bin/c9",
@ -65,9 +65,9 @@
"c9.ide.language.javascript.eslint": "#edaf80a3fe", "c9.ide.language.javascript.eslint": "#edaf80a3fe",
"c9.ide.language.javascript.tern": "#8423d558f6", "c9.ide.language.javascript.tern": "#8423d558f6",
"c9.ide.language.javascript.infer": "#325ac6880e", "c9.ide.language.javascript.infer": "#325ac6880e",
"c9.ide.language.jsonalyzer": "#7791dec360", "c9.ide.language.jsonalyzer": "#4b329741b1",
"c9.ide.language.codeintel": "#046d39603b", "c9.ide.language.codeintel": "#046d39603b",
"c9.ide.collab": "#36a4606970", "c9.ide.collab": "#11a0d3c5ce",
"c9.ide.local": "#10eb45842a", "c9.ide.local": "#10eb45842a",
"c9.ide.find": "#e33fbaed2f", "c9.ide.find": "#e33fbaed2f",
"c9.ide.find.infiles": "#c0a13737ef", "c9.ide.find.infiles": "#c0a13737ef",
@ -108,7 +108,7 @@
"c9.ide.run": "#4f0257bc0b", "c9.ide.run": "#4f0257bc0b",
"c9.ide.run.build": "#0598fff697", "c9.ide.run.build": "#0598fff697",
"c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.run.debug.xdebug": "#9956689819",
"c9.ide.save": "#417e4b53c4", "c9.ide.save": "#86f0f38160",
"c9.ide.scm": "#ca3c94b84f", "c9.ide.scm": "#ca3c94b84f",
"c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.terminal.monitor": "#1a4092ede2",
"c9.ide.test": "#a282ec1619", "c9.ide.test": "#a282ec1619",

4
plugins/c9.error/views/error-503.html.ejs
Wyświetl plik

@ -7,7 +7,9 @@
<body class="error503 light"> <body class="error503 light">
<div id="wrapper"> <div id="wrapper">
<h1>Service Unavailable</h1> <h1>Service Unavailable</h1>
<h2><em><%=statusCode%> - <%=scope%></em> <%=error%></h2> <% if (showStackTrace) { %>
<h2><em><%=statusCode%> - <%=scope%></em> <%=error%></h2>
<% } %>
<p style="margin-bottom:20px;width:600px"> <p style="margin-bottom:20px;width:600px">
The service reports it's unavailable at this time. This has been logged The service reports it's unavailable at this time. This has been logged
and the appropriate people have been notified. Please check the and the appropriate people have been notified. Please check the

5
plugins/c9.ide.dialog.common/question.js
Wyświetl plik

@ -27,6 +27,11 @@ define(function(require, module, exports) {
/***** Methods *****/ /***** Methods *****/
function show(title, header, msg, onYes, onNo, options) { 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) if (!options)
options = {}; options = {};

2
plugins/c9.ide.server/views/flat-load-screen.html
Wyświetl plik

@ -23,7 +23,7 @@
"Each workspace is its own Ubuntu virtual machine.", "Each workspace is its own Ubuntu virtual machine.",
"Run 'dpkg -l' in the terminal to see all packages installed.", "Run 'dpkg -l' in the terminal to see all packages installed.",
"Remember to run your code on port 8080, 8081, or 8082.", "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.", "It's better up here.",
"Happy coding!", "Happy coding!",
"Everything as you left it.", "Everything as you left it.",