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 smf-plugins 

Conflicts:
	npm-shrinkwrap.json
pull/134/merge
Fabian Jakobs 2015-09-05 11:15:07 +00:00
rodzic a1c088e4eb a1b90ab235
commit d850730f34
2 zmienionych plików z 19 dodań i 15 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -390,20 +390,6 @@ module.exports = function(options) {
"plugins/c9.ide.run.debug.xdebug/xdebug",
"plugins/c9.ide.run.debug/debuggers/gdb/gdbdebugger",
// Test
"plugins/c9.ide.test/test",
"plugins/c9.ide.test/testpanel",
"plugins/c9.ide.test/testrunner",
{
packagePath: "plugins/c9.ide.test/all",
staticPrefix: staticPrefix + "/plugins/c9.ide.test"
},
"plugins/c9.ide.test/results",
"plugins/c9.ide.test/coverage",
"plugins/c9.ide.test/coverageview",
"plugins/c9.ide.test.mocha/mocha",
// Console
{
packagePath: "plugins/c9.ide.terminal/terminal",
@ -718,6 +704,24 @@ module.exports = function(options) {
staticPrefix: staticPrefix + "/plugins/c9.ide.collab/notifications"
},
];
if (!options.sdk) {
plugins.push(
// Test
"plugins/c9.ide.test/test",
"plugins/c9.ide.test/testpanel",
"plugins/c9.ide.test/testrunner",
{
packagePath: "plugins/c9.ide.test/all",
staticPrefix: staticPrefix + "/plugins/c9.ide.test"
},
"plugins/c9.ide.test/results",
"plugins/c9.ide.test/coverage",
"plugins/c9.ide.test/coverageview",
"plugins/c9.ide.test.mocha/mocha"
);
}
if (options.standalone || options.local) {
plugins.push(

2
package.json
Wyświetl plik

@ -1,7 +1,7 @@
{
"name": "c9",
"description": "New Cloud9 Client",
"version": "3.0.2592",
"version": "3.0.2598",
"author": "Ajax.org B.V. <info@ajax.org>",
"private": true,
"main": "bin/c9",