Merge remote-tracking branch 'origin/master' into deploy-abuse

node_modules/c9/request_timeout.js

@@ -1,3 +1,8 @@
+/**
+ * the default response timeout in node.js is 2min. If a request takes longer
+ * to process then it needs to be increased
+ */
+
 module.exports = function(timeout) {
     return function(req, res, next) {
         req.setTimeout(timeout);

node_modules/c9/rest_client.js

@@ -111,6 +111,10 @@ function RestClient(host, port, config) {
                 done(e);
             });
     
+            res.on("timeout", function() {
+                done(new Error("Request timed out"));
+            });
+    
             var called = false;
             function done(err, json) {
                 if (called)

package.json

@@ -90,7 +90,7 @@
         "c9.ide.help.support": "#6bcfa8ceff",
         "c9.ide.imgeditor": "#ed89162aa7",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#3e6f7a72c9",
+        "c9.ide.installer": "#dbfbb98527",
         "c9.ide.mount": "#250f8d91a2",
         "c9.ide.navigate": "#f358997d93",
         "c9.ide.newresource": "#f1f0624768",

plugins/c9.ide.errorhandler/raygun.js

@@ -1420,7 +1420,9 @@ window.TraceKit = TraceKit;
   var blackListedErrors = {
     'Error with empty message': {},
     'Script error.': {},
-    'DealPly is not defined': { factor: 10e5 }
+    'DealPly is not defined': { factor: 10e5 },
+    "Cannot read property 'style' of null": { factor: 10e3 },
+    "Project with id '<id>' does not exist": { factor: 10e2 },
   };
   var groupedErrors = [{
     regex: /^((?:Project|User) with id ')(\d+)(' does not exist)/i,
@@ -1432,7 +1434,7 @@ window.TraceKit = TraceKit;
     regex: /^(Cannot GET \/)([\s\S]*)/i,
     pullOut: { 1: 'url' }
   }, {
-    regex: /^(Error whilst parsing: Unexpected end whilst parsing xpath \/)([\s\S]*)/i,
+    regex: /^(Error whilst parsing: Unexpected end whilst parsing (?:xpath|xml|string))([\s\S]*)/i,
     pullOut: { 1: 'apfStuff' }
   }];
   function processUnhandledException(stackTrace, options) {
@@ -1498,6 +1500,7 @@ window.TraceKit = TraceKit;
         parts.forEach(function(p, i) {
           if (g.pullOut[i - 1]) {
             finalCustomData[g.pullOut[i - 1]] = p;
+            message += "<" + g.pullOut[i - 1] + ">";
           } else {
             message += p;
           }

scripts/setup-local-dev.sh

@@ -1,5 +1,7 @@
 #!/bin/bash -e
 
+set -e
+
 while [ "$1" ]; do
   case "$1" in
     --compress) COMPRESS=1 ;;
@@ -111,6 +113,30 @@ if [ "$os" == "windows" ]; then
     ' > $dest/package.json
 
     popd
+    # create shortcuts
+    echo '
+        var WshShell = WScript.CreateObject("WScript.Shell");
+        var strDesktop = WshShell.SpecialFolders("Desktop");
+        var cwd = WScript.ScriptFullName.replace(/\\[^\\]+$/, "");
+        var link1 = WshShell.CreateShortcut(cwd + "\\Cloud9#.lnk");
+        link1.TargetPath = cwd + "\\build\\win32-dev\\bin\\Cloud9.exe";
+        link1.IconLocation = cwd + "\\build\\win32\\Cloud9.ico";
+        link1.Description = "Cloud9";
+        link1.WorkingDirectory = cwd;
+        link1.Save();
+
+        var link2 = WshShell.CreateShortcut(cwd + "\\Cloud9#packed.lnk");
+        link2.TargetPath = link1.TargetPath;
+        link2.Arguments = "--packed --no-devtools";
+        link2.IconLocation = link1.IconLocation;
+        link2.Description = "Cloud9";
+        link2.WorkingDirectory = cwd;
+        link2.Save();
+        ' > ./shortcut.wscript.js
+    cscript //NoLogo //B //E:jscript ./shortcut.wscript.js
+    rm -f ./shortcut.wscript.js
+    
+    bash ./makelocal.sh
 fi