Merge branch 'master' into ui/packed2

gero3 · May 3, 2012 · ab08281 · ab08281
2 parents 83fc66f + dc6c0c5
commit ab08281
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/configs/local.js b/configs/local.js
@@ -0,0 +1,12 @@
+
+var config = require("./default");
+
+config.containers.master.plugins.forEach(function(plugin) {
+    if (plugin.packagePath) {
+        if (/\/cloud9.core$/.test(plugin.packagePath)) {
+            plugin.socketIoTransports = ["websocket", "htmlfile", "xhr-multipart", "xhr-polling"];
+        }
+    }
+});
+
+module.exports = config;
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
     "description": "Cloud9 IDE",
     "version": "0.7.0",
     "homepage" : "http://github.com/ajaxorg/cloud9",
-    "engines": {"node": ">= 0.6.0"},
+    "engines": {"node": ">= 0.6.15"},
     "author": "Ajax.org B.V. <info@ajax.org>",
     "help": {
         "web": "https://github.com/ajaxorg/cloud9/blob/master/README.md",
@@ -57,4 +57,4 @@
         "start": "sh ./bin/cloud9.sh",
         "postinstall": "node ./node_modules/mappings/scripts/postinstall-notice.js"
     }
-}
+}