From aba3114b941e6b97b677a1b5811b1b516ec6efb8 Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Wed, 15 Apr 2015 15:37:58 +0000
Subject: [PATCH 01/32] +6855 Don't show close button when Cloud9 is not
 installed

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4de6ffed..a4496e53 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#38f5840924",
+        "c9.ide.installer": "#2df1aa2d46",
         "c9.ide.mount": "#cb45b621f1",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",

From 36af8d78d2e21cb50b7d00441b02cfdd5f8e610c Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Wed, 15 Apr 2015 16:27:53 +0000
Subject: [PATCH 02/32] Add 'always install automatically'

---
 package.json                    | 2 +-
 plugins/c9.ide.dialog/dialog.js | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index a4496e53..f4fdf426 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#2df1aa2d46",
+        "c9.ide.installer": "#08deba2d3b",
         "c9.ide.mount": "#cb45b621f1",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",
diff --git a/plugins/c9.ide.dialog/dialog.js b/plugins/c9.ide.dialog/dialog.js
index c2b5da11..600bb7c7 100644
--- a/plugins/c9.ide.dialog/dialog.js
+++ b/plugins/c9.ide.dialog/dialog.js
@@ -254,7 +254,7 @@ define(function(require, module, exports) {
             
             // @todo this looks very similar to forms.js. Perhaps able to merge?
             function createItem(heading, name, options) {
-                var position = options.position || count++;
+                var position = options.position || (count += 100);
                 var node;
                 
                 switch(options.type) {
@@ -511,6 +511,13 @@ define(function(require, module, exports) {
                      */
                     "hide"
                 ],
+                
+                /**
+                 * 
+                 */
+                createElement: function(options){
+                    createItem(null, null, options);
+                },
     
                 /**
                  * Updates form elements with new values. This method currently

From 5033eed96b5691168bef41da2e9a556322293b04 Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Wed, 15 Apr 2015 17:14:25 +0000
Subject: [PATCH 03/32] +6855 Remember what is not installed in the settings
 and dont popup again

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f4fdf426..e0a3e5ad 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#08deba2d3b",
+        "c9.ide.installer": "#0c74250eda",
         "c9.ide.mount": "#cb45b621f1",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",

From f0d8b7c71584af77f2df58ad38d3ef71c5de9186 Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Wed, 15 Apr 2015 17:16:13 +0000
Subject: [PATCH 04/32] +6855 cwd in bash command should be ~./c9 by default

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e0a3e5ad..ecdf992d 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#0c74250eda",
+        "c9.ide.installer": "#0c03bc38fd",
         "c9.ide.mount": "#cb45b621f1",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",

From 3c6f99b4a1083c035bbd0b9a902e5de24c2fbfc9 Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Wed, 15 Apr 2015 17:44:24 +0000
Subject: [PATCH 05/32] +6855 trigger installer for missing nak

---
 package.json                      | 4 ++--
 plugins/c9.vfs.server/filelist.js | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index ecdf992d..6c4fcf7e 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
         "c9.ide.language.jsonalyzer": "#a1057f20db",
         "c9.ide.collab": "#7b09419b5c",
         "c9.ide.local": "#cf624506cc",
-        "c9.ide.find": "#4db399c1de",
+        "c9.ide.find": "#65efaa44d5",
         "c9.ide.find.infiles": "#72582de3cd",
         "c9.ide.find.replace": "#e4daf722b8",
         "c9.ide.run.debug": "#638e6b00b3",
@@ -83,7 +83,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#0c03bc38fd",
+        "c9.ide.installer": "#1bd7cb5d27",
         "c9.ide.mount": "#cb45b621f1",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",
diff --git a/plugins/c9.vfs.server/filelist.js b/plugins/c9.vfs.server/filelist.js
index c652f0a9..263fea82 100644
--- a/plugins/c9.vfs.server/filelist.js
+++ b/plugins/c9.vfs.server/filelist.js
@@ -94,8 +94,7 @@ define(function(require, exports, module) {
                     if (code == 127) {
                         err = new error.PreconditionFailed(
                             "Your instance seems to be missing the 'nak' utility\n" + 
-                            "If you are using an SSH workspace, please do:\n" +
-                            "    'curl https://raw.github.com/c9/install/master/install.sh | bash'");
+                            "Please re-install nak.");
                     } else if (code) {
                         err = new error.InternalServerError(
                             "'nak' utility failed with exit code " + code + 

From 2b748c1a15fd9195628dba3ee317df5804221788 Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Wed, 15 Apr 2015 18:04:15 +0000
Subject: [PATCH 06/32] +6855 use PTY as soon as pty.js is installed

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6c4fcf7e..b25bfdf4 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#1bd7cb5d27",
+        "c9.ide.installer": "#820c0839aa",
         "c9.ide.mount": "#cb45b621f1",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",

From bb376a07df9107046a2408446906e327333dcc05 Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Wed, 15 Apr 2015 21:09:32 +0000
Subject: [PATCH 07/32] +6855 Remember which tasks are not installed and allow
 the user to reinstall them later

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index b25bfdf4..0ed4913f 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
         "c9.ide.find.infiles": "#72582de3cd",
         "c9.ide.find.replace": "#e4daf722b8",
         "c9.ide.run.debug": "#638e6b00b3",
-        "c9.automate": "#86bf1ee1ca",
+        "c9.automate": "#6098a6fb56",
         "c9.ide.ace.emmet": "#e5f1a92ac3",
         "c9.ide.ace.gotoline": "#4d1a93172c",
         "c9.ide.ace.keymaps": "#43445d6306",
@@ -77,13 +77,13 @@
         "c9.ide.behaviors": "#6aad7006a0",
         "c9.ide.closeconfirmation": "#a28bfd8272",
         "c9.ide.configuration": "#f309bb47d2",
-        "c9.ide.dialog.wizard": "#c6401bdd13",
+        "c9.ide.dialog.wizard": "#08e8c79ebc",
         "c9.ide.fontawesome": "#781602c5d8",
         "c9.ide.format": "#f51451ac57",
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#820c0839aa",
+        "c9.ide.installer": "#4c4ed5e325",
         "c9.ide.mount": "#cb45b621f1",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",

From 274942f0cb56442519147feba5d30b7ecf12f7e2 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Wed, 15 Apr 2015 21:14:44 +0400
Subject: [PATCH 08/32] fix typo

---
 package.json                      | 4 ++--
 plugins/c9.cli.publish/publish.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 0ed4913f..56b3c76b 100644
--- a/package.json
+++ b/package.json
@@ -59,10 +59,10 @@
         "c9.ide.language.javascript.eslint": "#8832423ad1",
         "c9.ide.language.javascript.tern": "#7aab8b0b6a",
         "c9.ide.language.javascript.infer": "#393d215e96",
-        "c9.ide.language.jsonalyzer": "#a1057f20db",
+        "c9.ide.language.jsonalyzer": "#21b64e5820",
         "c9.ide.collab": "#7b09419b5c",
         "c9.ide.local": "#cf624506cc",
-        "c9.ide.find": "#65efaa44d5",
+        "c9.ide.find": "#12ec533318",
         "c9.ide.find.infiles": "#72582de3cd",
         "c9.ide.find.replace": "#e4daf722b8",
         "c9.ide.run.debug": "#638e6b00b3",
diff --git a/plugins/c9.cli.publish/publish.js b/plugins/c9.cli.publish/publish.js
index ad762b3e..09f82fb1 100644
--- a/plugins/c9.cli.publish/publish.js
+++ b/plugins/c9.cli.publish/publish.js
@@ -617,7 +617,7 @@ define(function(require, exports, module) {
                             additional.push({
                                 id: path,
                                 source: 'define("' + path + '", [],' + 
-                                    JSON.stringify(packedConfig, null, 4) + ')',
+                                    JSON.stringify(packedConfig, null, 4) + ');',
                                 literal : true,
                                 order: -1
                             });

From 5866cc4cc8afe4aeff4c605082d2386cd854c9ab Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Wed, 15 Apr 2015 21:41:30 +0000
Subject: [PATCH 09/32] +6855 pre-install script should stop execution

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 56b3c76b..ff346150 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#4c4ed5e325",
+        "c9.ide.installer": "#219cad6757",
         "c9.ide.mount": "#cb45b621f1",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",

From 7bea534341e45d1fe000b6bb11fe9b770e64afc0 Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Wed, 15 Apr 2015 22:04:33 +0000
Subject: [PATCH 10/32] update pty.js

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ff346150..b2cb4ec3 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#219cad6757",
+        "c9.ide.installer": "#b09c15584f",
         "c9.ide.mount": "#cb45b621f1",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",

From 82660c28541a251b6ac5797a9be16f6d9cceed4b Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Wed, 15 Apr 2015 22:05:06 +0000
Subject: [PATCH 11/32] remove dead code

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b2cb4ec3..76bc42da 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#b09c15584f",
+        "c9.ide.installer": "#c222caaa9c",
         "c9.ide.mount": "#cb45b621f1",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",

From d464139b75d84da052fea8c3d7cbfb70b17031af Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Wed, 15 Apr 2015 22:19:51 +0000
Subject: [PATCH 12/32] Reconnect installer if readfile fails. +6855

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 76bc42da..6812474b 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#c222caaa9c",
+        "c9.ide.installer": "#4c31717a97",
         "c9.ide.mount": "#cb45b621f1",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",

From 68fa6d861bfbf33b4de784d9d4f176c1f7f2cca9 Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Wed, 15 Apr 2015 23:46:32 +0000
Subject: [PATCH 13/32] Added terminal widget

---
 package.json                          |   2 +-
 plugins/c9.ide.ui/widgets.list.js     |   6 +
 plugins/c9.ide.ui/widgets.terminal.js | 401 ++++++++++++++++++++++++++
 3 files changed, 408 insertions(+), 1 deletion(-)
 create mode 100644 plugins/c9.ide.ui/widgets.terminal.js

diff --git a/package.json b/package.json
index 6812474b..1b8ca12c 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#4c31717a97",
+        "c9.ide.installer": "#7a354bbd17",
         "c9.ide.mount": "#cb45b621f1",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",
diff --git a/plugins/c9.ide.ui/widgets.list.js b/plugins/c9.ide.ui/widgets.list.js
index 8c62a39c..e321d142 100644
--- a/plugins/c9.ide.ui/widgets.list.js
+++ b/plugins/c9.ide.ui/widgets.list.js
@@ -509,6 +509,12 @@ define(function(require, exports, module) {
                 focus: function(){
                     return acetree.focus();
                 },
+                /**
+                 * 
+                 */
+                blur: function(){
+                    return acetree.blur();
+                },
                 /**
                  * 
                  */
diff --git a/plugins/c9.ide.ui/widgets.terminal.js b/plugins/c9.ide.ui/widgets.terminal.js
new file mode 100644
index 00000000..db58fa81
--- /dev/null
+++ b/plugins/c9.ide.ui/widgets.terminal.js
@@ -0,0 +1,401 @@
+define(function(require, exports, module) {
+    main.consumes = ["Plugin", "ui", "util", "commands"];
+    main.provides = ["Terminal"];
+    return main;
+
+    function main(options, imports, register) {
+        var Plugin = imports.Plugin;
+        var ui = imports.ui;
+        var util = imports.util;
+        var commands = imports.commands;
+        
+        var Aceterm = require("../c9.ide.terminal/aceterm/aceterm");
+        var libterm = require("../c9.ide.terminal/aceterm/libterm");
+        
+        /***** Constructors *****/
+        
+        /*
+            plugin.on("copy", function(e) {
+                if (e.native) return; // Ace handles this herself
+                
+                var data = aceterm.getCopyText();
+                e.clipboardData.setData("text/plain", data);
+            });
+            plugin.on("paste", function(e) {
+                if (e.native) return; // Ace handles this herself
+                
+                var data = e.clipboardData.getData("text/plain");
+                if (data !== false)
+                    aceterm.onPaste(data);
+            });
+        */
+        
+        function Terminal(options, forPlugin, baseclass) {
+            if (!options) throw new Error("options are required");
+            
+            var plugin = new Plugin("Ajax.org", main.consumes);
+            var emit = plugin.getEmitter();
+            if (baseclass) plugin.baseclass();
+            
+            var rows = options.rows || 0;
+            var cols = options.cols || 0;
+            
+            var aceterm, terminal;
+            var redirectEvents;
+            var meta = {};
+            
+            var excludedEvents = { 
+                "draw": 1, "load":1, "unload":1, "resize":1,
+                "addListener":1, "removeListener":1 
+            };
+            var renameEvents = {
+                "select": "changeSelection",
+                "scroll": "changeScrollTop"
+            };
+            
+            /***** Methods *****/
+            
+            function send(data) {
+                emit("input", { data: data });
+            }
+            
+            function _resize(force){
+                var ace = terminal.aceSession.ace;
+                
+                var size = ace.renderer.$size;
+                var config = ace.renderer.layerConfig;
+                
+                var h = size.scrollerHeight;
+                var w = size.scrollerWidth - 2 * config.padding;
+                
+                if (!h || config.lineHeight <= 1)
+                    return false;
+
+                // top 1px is for cursor outline
+                var _rows = Math.floor((h - 1) / config.lineHeight);
+                if (_rows <= 2 && !ace.renderer.scrollBarV.isVisible)
+                    w -= ace.renderer.scrollBarV.width;
+                var _cols = Math.floor(w / config.characterWidth);
+                
+                if (!_cols || !_rows)
+                    return;
+
+                // Don't do anything if the size remains the same
+                if (!force && _cols == terminal.cols && _rows == terminal.rows)
+                    return;
+                    
+                if (_cols > 1000 || _rows > 1000) {
+                    console.error("invalid terminal size");
+                    return;
+                }
+                
+                // do not resize terminal to very small heights during initialization
+                rows = Math.max(_rows, 2);
+                cols = Math.max(_cols, 2);
+                    
+                terminal.resize(_cols, _rows);
+
+                emit("resize", { cols: cols, rows: rows });
+            }
+            
+            /***** Life Cycle *****/
+            
+            var drawn = false;
+            function draw(htmlNode) {
+                if (drawn) return;
+                drawn = true;
+                
+                aceterm = Aceterm.createEditor(null, "ace/theme/idle_fingers");
+                aceterm.container.style.position = "absolute";
+                aceterm.container.style.left = "0px";
+                aceterm.container.style.right = "0px";
+                aceterm.container.style.top = "0px";
+                aceterm.container.style.bottom = "0px";
+                
+                htmlNode.appendChild(aceterm.container);
+                
+                terminal = new Aceterm(cols, rows, send);
+                aceterm.setSession(terminal.aceSession);
+                
+                aceterm.renderer.on("resize", function(){
+                    _resize();
+                });
+                
+                var cm = commands;
+                // TODO find better way for terminal and ace commands to coexist
+                aceterm.commands.addCommands(cm.getExceptionList());
+                cm.on("update", function() {
+                    aceterm.commands.addCommands(cm.getExceptionList());
+                }, plugin);
+                
+                aceterm.commands.exec = function(command) {
+                    return cm.exec(command);
+                };
+                
+                // Set Default Theme
+                // if (!options.theme)
+                //     options.theme = "custom-tree ace-tree-" + (options.baseName || "list");
+                
+                // Set properties
+                for (var prop in options) {
+                    if (prop == "container") continue;
+                    if (plugin.hasOwnProperty(prop)) 
+                        plugin[prop] = options[prop];
+                }
+                
+                // Configure redirected events
+                redirectEvents = {
+                    afterRender: aceterm.renderer,
+                    title: terminal,
+                    afterWrite: terminal
+                };
+                
+                emit.sticky("draw");
+            }
+            
+            plugin.on("load", function(){
+                if (options.container)
+                    plugin.attachTo(options.container);
+                
+                forPlugin.once("unload", function(){
+                    plugin.unload();
+                });
+            });
+            plugin.on("unload", function(){
+                if (aceterm) {
+                    var container = aceterm.container;
+                    aceterm.destroy();
+                    
+                    container.innerHTML = "";
+                    container.parentNode.removeChild(container);
+                }
+                
+                aceterm = null;
+                container = null;
+                meta = {};
+            });
+            plugin.on("newListener", function(type, fn){
+                if (excludedEvents[type]) return;
+                
+                if (renameEvents[type])
+                    type = renameEvents[type];
+                
+                if (redirectEvents[type])
+                    redirectEvents[type].on(type, fn);
+                else
+                    aceterm.on(type, fn);
+            });
+            plugin.on("removeListener", function(type, fn){
+                if (excludedEvents[type]) return;
+                
+                if (renameEvents[type])
+                    type = renameEvents[type];
+                
+                if (redirectEvents[type])
+                    redirectEvents[type].removeListener(type, fn);
+                else
+                    aceterm.removeListener(type, fn);
+            });
+            
+            /**
+             * @constructor
+             * Creates a new List instance.
+             * @param {Object} options
+             * @param {Plugin} plugin         The plugin responsible for creating this list.
+             */
+            plugin.freezePublicAPI({
+                // Getter Properties
+                /**
+                 * @ignore
+                 * @readonly
+                 */
+                get aceterm(){ return aceterm; },
+                /**
+                 * A meta data object that allows you to store whatever you want
+                 * in relation to this menu.
+                 * @property {Object} meta
+                 * @readonly
+                 */
+                get meta(){ return meta; },
+                // /**
+                //  * 
+                //  */
+                // get scrollTop(){ return model.getScrollTop(); },
+                // set scrollTop(value){ return model.setScrollTop(value); },
+                /**
+                 * 
+                 */
+                get focussed(){ return aceterm.isFocussed(); },
+                /**
+                 * 
+                 */
+                get container(){ return aceterm.container; },
+                /**
+                 * 
+                 */
+                get renderer(){ return aceterm.renderer; },
+                /**
+                 * 
+                 */
+                get selection(){ return aceterm.selection; },
+                /**
+                 * 
+                 */
+                get commands(){ return aceterm.commands; },
+                /**
+                 * 
+                 */
+                get cols(){ return cols; },
+                /**
+                 * 
+                 */
+                get rows(){ return rows; },
+                
+                // Getters and Setters for Properties
+                /**
+                 * 
+                 */
+                get textInput(){ return aceterm.textInput; },
+                set textInput(value){ return aceterm.textInput = value; },
+                /**
+                 *
+                 */
+                get scrollMargin(){ return aceterm.renderer.scrollMargin; },
+                set scrollMargin(value){ 
+                    aceterm.renderer.setScrollMargin(value[0], value[1]); 
+                },
+                /**
+                 * 
+                 */
+                get theme(){ return aceterm.renderer.theme.cssClass; },
+                set theme(value){ aceterm.renderer.setTheme({cssClass: value}); },
+                
+                 // Events
+                _events: [
+                    /**
+                     * @event draw Fires 
+                     */
+                    "draw",
+                    /**
+                     * @event click Fires 
+                     */
+                    "click",
+                    /**
+                     * @event userSelect Fires 
+                     */
+                    "userSelect",
+                    /**
+                     * @event focus Fires 
+                     */
+                    "focus",
+                    /**
+                     * @event blur Fires 
+                     */
+                    "blur",
+                    /**
+                     * @event select Fires 
+                     */
+                    "select",
+                    /**
+                     * @event scroll Fires 
+                     */
+                    "scroll",
+                    /**
+                     * @event scrollbarVisibilityChanged Fires 
+                     */
+                    "scrollbarVisibilityChanged",
+                    /**
+                     * @event resize Fires 
+                     */
+                    "resize",
+                    /**
+                     * @event afterRender Fires
+                     */
+                    "afterRender",
+                    /**
+                     * @event title Fires
+                     */
+                    "title",
+                    /**
+                     * @event afterWrite Fires
+                     */
+                    "afterWrite"
+                ],
+                
+                /**
+                 * 
+                 */
+                resize: function(){
+                    return aceterm.resize(true);
+                },
+                /**
+                 * 
+                 */
+                focus: function(){
+                    return aceterm.focus();
+                },
+                /**
+                 * 
+                 */
+                blur: function(){
+                    return aceterm.blur();
+                },
+                /**
+                 * 
+                 */
+                execCommand: function(cmd){
+                    return aceterm.execCommand(cmd);
+                },
+                /**
+                 * 
+                 */
+                scrollIntoView: function(anchor, lead, offset){ 
+                    return aceterm.renderer.scrollCaretIntoView(anchor, lead, offset);
+                },
+                /**
+                 * 
+                 */
+                enable: function(){
+                    return aceterm.enable();
+                },
+                /**
+                 * 
+                 */
+                disable: function(){
+                    return aceterm.enable();
+                },
+                /**
+                 * 
+                 */
+                write: function(data){
+                    return terminal.write(data);
+                },
+                /**
+                 * 
+                 */
+                attachTo: function(htmlNode, beforeNode){
+                    var container;
+                    if (drawn)
+                        container = aceterm.container;
+                    else {
+                        container = document.createElement("div");
+                        container.style.height = "100%";
+                    }
+                    
+                    htmlNode.insertBefore(container, beforeNode);
+                        
+                    if (!drawn)
+                        draw(container);
+                }
+            });
+            
+            plugin.load(null, options.baseName || "list");
+            
+            return plugin;
+        }
+        
+        register(null, {
+            Terminal: Terminal
+        });
+    }
+});
\ No newline at end of file

From 1b44970f26d066086d201cab0846236e58644dcf Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Thu, 16 Apr 2015 00:28:08 +0000
Subject: [PATCH 14/32] Terminal widget is now working

---
 package.json                          |  2 +-
 plugins/c9.ide.dialog/dialog.js       |  3 +++
 plugins/c9.ide.ui/lib_apf.js          |  3 +++
 plugins/c9.ide.ui/widgets.terminal.js | 14 ++++++--------
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 1b8ca12c..54d368b8 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#7a354bbd17",
+        "c9.ide.installer": "#e7a08d2cc0",
         "c9.ide.mount": "#cb45b621f1",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",
diff --git a/plugins/c9.ide.dialog/dialog.js b/plugins/c9.ide.dialog/dialog.js
index 600bb7c7..7cfbb603 100644
--- a/plugins/c9.ide.dialog/dialog.js
+++ b/plugins/c9.ide.dialog/dialog.js
@@ -130,6 +130,9 @@ define(function(require, module, exports) {
                     if (allowClose && e.keyCode == 27)
                         dialog.hide();
                 });
+                dialog.on("resize", function(){
+                    emit("resize");
+                });
                 
                 commands.addCommand({
                     name: plugin.name,
diff --git a/plugins/c9.ide.ui/lib_apf.js b/plugins/c9.ide.ui/lib_apf.js
index 4d12f382..617b89bb 100644
--- a/plugins/c9.ide.ui/lib_apf.js
+++ b/plugins/c9.ide.ui/lib_apf.js
@@ -20275,6 +20275,9 @@ apf.Interactive = function(){
         
         doResize(e);
         
+        if (_self.dispatchEvent)
+            _self.dispatchEvent("resize");
+        
         //overThreshold = true;
     }
     
diff --git a/plugins/c9.ide.ui/widgets.terminal.js b/plugins/c9.ide.ui/widgets.terminal.js
index db58fa81..4c7b1c2e 100644
--- a/plugins/c9.ide.ui/widgets.terminal.js
+++ b/plugins/c9.ide.ui/widgets.terminal.js
@@ -105,14 +105,7 @@ define(function(require, exports, module) {
                 if (drawn) return;
                 drawn = true;
                 
-                aceterm = Aceterm.createEditor(null, "ace/theme/idle_fingers");
-                aceterm.container.style.position = "absolute";
-                aceterm.container.style.left = "0px";
-                aceterm.container.style.right = "0px";
-                aceterm.container.style.top = "0px";
-                aceterm.container.style.bottom = "0px";
-                
-                htmlNode.appendChild(aceterm.container);
+                aceterm = Aceterm.createEditor(htmlNode, "ace/theme/idle_fingers");
                 
                 terminal = new Aceterm(cols, rows, send);
                 aceterm.setSession(terminal.aceSession);
@@ -269,6 +262,11 @@ define(function(require, exports, module) {
                  */
                 get theme(){ return aceterm.renderer.theme.cssClass; },
                 set theme(value){ aceterm.renderer.setTheme({cssClass: value}); },
+                /**
+                 * 
+                 */
+                get convertEol(){ return terminal.convertEol || false; },
+                set convertEol(value){ terminal.convertEol = value; },
                 
                  // Events
                 _events: [

From 94df4800fc495692142a37f93cfb527e99fd8a62 Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Thu, 16 Apr 2015 00:51:32 +0000
Subject: [PATCH 15/32] Add nice colors to the output

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 54d368b8..b735fab5 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#e7a08d2cc0",
+        "c9.ide.installer": "#3f8a2e4a0e",
         "c9.ide.mount": "#cb45b621f1",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",

From d606c2a1d6efab5cbdd30aa29311b44ab994bdfd Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Thu, 16 Apr 2015 02:29:13 +0000
Subject: [PATCH 16/32] Installer detail tweaking

---
 configs/client-default.js                                   | 1 +
 package.json                                                | 2 +-
 plugins/c9.ide.layout.classic/themes/default-dark-gray.less | 4 ++--
 plugins/c9.ide.layout.classic/themes/default-dark.less      | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/configs/client-default.js b/configs/client-default.js
index bc382dff..ad581a8a 100644
--- a/configs/client-default.js
+++ b/configs/client-default.js
@@ -240,6 +240,7 @@ module.exports = function(options) {
         },
         "plugins/c9.ide.ui/widgets.tree",
         "plugins/c9.ide.ui/widgets.datagrid",
+        "plugins/c9.ide.ui/widgets.terminal",
         "plugins/c9.ide.ui/focus",
         "plugins/c9.ide.ui/lib_apf",
         
diff --git a/package.json b/package.json
index b735fab5..7e9bea82 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#3f8a2e4a0e",
+        "c9.ide.installer": "#467006e798",
         "c9.ide.mount": "#cb45b621f1",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",
diff --git a/plugins/c9.ide.layout.classic/themes/default-dark-gray.less b/plugins/c9.ide.layout.classic/themes/default-dark-gray.less
index d35f07fc..6c792f2a 100644
--- a/plugins/c9.ide.layout.classic/themes/default-dark-gray.less
+++ b/plugins/c9.ide.layout.classic/themes/default-dark-gray.less
@@ -1606,8 +1606,8 @@
 @installer-text-shadow: none;
 @installer-font-family: Arial;
 
-@installer-log-color: #fff;
-@installer-log-gradient: linear-gradient(top,rgba(0, 0, 0, 0.29) 0%, rgba(0, 0, 0, 0.11) 8px, rgba(0, 0, 0, 0.01) 13px, transparent 15px);
+@installer-log-color: #333;
+@installer-log-gradient: linear-gradient(top, #DFEFF9 0%, #DFEFF9 100%);
 @installer-log-border: 1px solid white;
 @installer-log-border-color: rgba(255,255,255,0.06) rgba(0,0,0,0.3) rgba(0,0,0,0.3) rgba(255,255,255,0.06);
 @installer-log-border-radius: 0;
diff --git a/plugins/c9.ide.layout.classic/themes/default-dark.less b/plugins/c9.ide.layout.classic/themes/default-dark.less
index 3ef3edf0..796ae607 100644
--- a/plugins/c9.ide.layout.classic/themes/default-dark.less
+++ b/plugins/c9.ide.layout.classic/themes/default-dark.less
@@ -1606,8 +1606,8 @@
 @installer-text-shadow: none;
 @installer-font-family: Arial;
 
-@installer-log-color: #fff;
-@installer-log-gradient: linear-gradient(top,rgba(0, 0, 0, 0.29) 0%, rgba(0, 0, 0, 0.11) 8px, rgba(0, 0, 0, 0.01) 13px, transparent 15px);
+@installer-log-color: #333;
+@installer-log-gradient: linear-gradient(top, #DFEFF9 0%, #DFEFF9 100%);
 @installer-log-border: 1px solid white;
 @installer-log-border-color: rgba(255,255,255,0.06) rgba(0,0,0,0.3) rgba(0,0,0,0.3) rgba(255,255,255,0.06);
 @installer-log-border-radius: 0;

From 18fb0f5b01a2cb9503b790f0d688ffec14908f2a Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Thu, 16 Apr 2015 02:44:50 +0000
Subject: [PATCH 17/32] Attempted to implement clear()

---
 package.json                          | 2 +-
 plugins/c9.ide.ui/widgets.terminal.js | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7e9bea82..a4b329f2 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#467006e798",
+        "c9.ide.installer": "#6a565f792c",
         "c9.ide.mount": "#cb45b621f1",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",
diff --git a/plugins/c9.ide.ui/widgets.terminal.js b/plugins/c9.ide.ui/widgets.terminal.js
index 4c7b1c2e..0682a932 100644
--- a/plugins/c9.ide.ui/widgets.terminal.js
+++ b/plugins/c9.ide.ui/widgets.terminal.js
@@ -368,6 +368,13 @@ define(function(require, exports, module) {
                 write: function(data){
                     return terminal.write(data);
                 },
+                /**
+                 * 
+                 */
+                clear: function(data){
+                    terminal.ybase = 0;
+                    terminal.lines = terminal.lines.slice(-(terminal.ybase + terminal.rows));
+                },
                 /**
                  * 
                  */

From 840b76b31c37d4207a62773abaa1d911b0281471 Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Thu, 16 Apr 2015 17:38:25 +0000
Subject: [PATCH 18/32] Show the correct page

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a4b329f2..7d23213e 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#6a565f792c",
+        "c9.ide.installer": "#2992b068bc",
         "c9.ide.mount": "#cb45b621f1",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",

From 819230037cf9b799bd081bc0c9948519adb17b5a Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Thu, 16 Apr 2015 19:01:12 +0000
Subject: [PATCH 19/32] Items that were already installed should not be
 reinstalled (compare state)

Conflicts:
	plugins/c9.ide.installer/gui.js
---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 7d23213e..0fb864e6 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
         "c9.ide.language.javascript.tern": "#7aab8b0b6a",
         "c9.ide.language.javascript.infer": "#393d215e96",
         "c9.ide.language.jsonalyzer": "#21b64e5820",
-        "c9.ide.collab": "#7b09419b5c",
+        "c9.ide.collab": "#e446654bc3",
         "c9.ide.local": "#cf624506cc",
         "c9.ide.find": "#12ec533318",
         "c9.ide.find.infiles": "#72582de3cd",
@@ -83,7 +83,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#2992b068bc",
+        "c9.ide.installer": "#0571b1d5f9",
         "c9.ide.mount": "#cb45b621f1",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",

From ea8e9d55bc4505858585c32f915e2e635ffa07c9 Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Thu, 16 Apr 2015 19:06:17 +0000
Subject: [PATCH 20/32] Use updated version of sqlite

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0fb864e6..0c9a15cc 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
         "c9.ide.language.javascript.tern": "#7aab8b0b6a",
         "c9.ide.language.javascript.infer": "#393d215e96",
         "c9.ide.language.jsonalyzer": "#21b64e5820",
-        "c9.ide.collab": "#e446654bc3",
+        "c9.ide.collab": "#1afdbc3dc0",
         "c9.ide.local": "#cf624506cc",
         "c9.ide.find": "#12ec533318",
         "c9.ide.find.infiles": "#72582de3cd",

From bc7efcbba86bec7e3236449c4020eb821ec75571 Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Thu, 16 Apr 2015 19:23:03 +0000
Subject: [PATCH 21/32] After installation, the overview is nog longer shown
 again

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0c9a15cc..11ef7f8b 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#0571b1d5f9",
+        "c9.ide.installer": "#5a2fcfa850",
         "c9.ide.mount": "#cb45b621f1",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",

From b0a17cbe5b4c33248c397e6bbacb88697629c9e4 Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Thu, 16 Apr 2015 19:44:09 +0000
Subject: [PATCH 22/32] Fix handling reinstallation flow of packages and
 headless packages

Conflicts:
	plugins/c9.ide.installer/gui.js
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 11ef7f8b..e992b1de 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#5a2fcfa850",
+        "c9.ide.installer": "#9a336168ef",
         "c9.ide.mount": "#cb45b621f1",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",

From d6352a68d7b88971173a46e3de45ced1e2364911 Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Wed, 15 Apr 2015 21:41:30 +0000
Subject: [PATCH 23/32] fix merge error

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e992b1de..b0a83952 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#9a336168ef",
+        "c9.ide.installer": "#ea8a36c086",
         "c9.ide.mount": "#cb45b621f1",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",

From ced76a88c8747ac361f8a3f5a2c51870bc0d5cad Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Fri, 17 Apr 2015 19:03:27 +0000
Subject: [PATCH 24/32] nak and collab don't load when not installed

---
 package.json                          | 6 +++---
 plugins/c9.ide.ui/widgets.terminal.js | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index b0a83952..0d1e4ec7 100644
--- a/package.json
+++ b/package.json
@@ -60,9 +60,9 @@
         "c9.ide.language.javascript.tern": "#7aab8b0b6a",
         "c9.ide.language.javascript.infer": "#393d215e96",
         "c9.ide.language.jsonalyzer": "#21b64e5820",
-        "c9.ide.collab": "#1afdbc3dc0",
+        "c9.ide.collab": "#ae0ee72477",
         "c9.ide.local": "#cf624506cc",
-        "c9.ide.find": "#12ec533318",
+        "c9.ide.find": "#49dddb2aed",
         "c9.ide.find.infiles": "#72582de3cd",
         "c9.ide.find.replace": "#e4daf722b8",
         "c9.ide.run.debug": "#638e6b00b3",
@@ -83,7 +83,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#ea8a36c086",
+        "c9.ide.installer": "#bb56d0e813",
         "c9.ide.mount": "#cb45b621f1",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",
diff --git a/plugins/c9.ide.ui/widgets.terminal.js b/plugins/c9.ide.ui/widgets.terminal.js
index 0682a932..2ad72a73 100644
--- a/plugins/c9.ide.ui/widgets.terminal.js
+++ b/plugins/c9.ide.ui/widgets.terminal.js
@@ -5,12 +5,9 @@ define(function(require, exports, module) {
 
     function main(options, imports, register) {
         var Plugin = imports.Plugin;
-        var ui = imports.ui;
-        var util = imports.util;
         var commands = imports.commands;
         
         var Aceterm = require("../c9.ide.terminal/aceterm/aceterm");
-        var libterm = require("../c9.ide.terminal/aceterm/libterm");
         
         /***** Constructors *****/
         

From 6e318011670337b5c80572e98ab11823e002d563 Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Fri, 17 Apr 2015 19:36:08 +0000
Subject: [PATCH 25/32] debugging weird issues

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0d1e4ec7..7554a64f 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#bb56d0e813",
+        "c9.ide.installer": "#93574129b9",
         "c9.ide.mount": "#cb45b621f1",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",

From cb4241181b7e315d34ccf3f306a74f13f175f32f Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Fri, 17 Apr 2015 20:24:16 +0000
Subject: [PATCH 26/32] Fixes installer

---
 package.json                          | 2 +-
 plugins/c9.ide.ui/widgets.terminal.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 7554a64f..575817eb 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#93574129b9",
+        "c9.ide.installer": "#c6c5adb152",
         "c9.ide.mount": "#cb45b621f1",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",
diff --git a/plugins/c9.ide.ui/widgets.terminal.js b/plugins/c9.ide.ui/widgets.terminal.js
index 2ad72a73..4fa535a5 100644
--- a/plugins/c9.ide.ui/widgets.terminal.js
+++ b/plugins/c9.ide.ui/widgets.terminal.js
@@ -43,7 +43,7 @@ define(function(require, exports, module) {
             
             var excludedEvents = { 
                 "draw": 1, "load":1, "unload":1, "resize":1,
-                "addListener":1, "removeListener":1 
+                "addListener":1, "removeListener":1, "input":1
             };
             var renameEvents = {
                 "select": "changeSelection",

From 81fd9d5e1cc543c59edc4cab7195444c68cbe213 Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Fri, 17 Apr 2015 20:32:53 +0000
Subject: [PATCH 27/32] Fix tests depending on installer

---
 package.json                          | 2 +-
 plugins/c9.vfs.standalone/www/test.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 575817eb..a0afaf2d 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#c6c5adb152",
+        "c9.ide.installer": "#45d316217b",
         "c9.ide.mount": "#cb45b621f1",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",
diff --git a/plugins/c9.vfs.standalone/www/test.js b/plugins/c9.vfs.standalone/www/test.js
index 276a6ce0..ae30803d 100644
--- a/plugins/c9.vfs.standalone/www/test.js
+++ b/plugins/c9.vfs.standalone/www/test.js
@@ -400,7 +400,7 @@ require([
                     console.warn(msg);
                 }
             },
-            "installer": { createSession : function(){}, reinstall: function(){} },
+            "installer": { createSession : function(){}, reinstall: function(){}, isInstalled: function(){ return true; } },
             "run.gui": { getElement : function(){} },
             "debugger": {debug: function() {}, stop: function(){}},
             "focusManager": {

From 7ee0ebd31e1526444debb29b9c42e2308ffe942c Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Fri, 17 Apr 2015 20:51:41 +0000
Subject: [PATCH 28/32] Survive a disconnect

---
 package.json                          | 2 +-
 plugins/c9.ide.plugins/loader.js      | 9 ++++++++-
 plugins/c9.ide.ui/widgets.terminal.js | 3 +--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index a0afaf2d..dfc469a0 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
         "c9.ide.find.infiles": "#72582de3cd",
         "c9.ide.find.replace": "#e4daf722b8",
         "c9.ide.run.debug": "#638e6b00b3",
-        "c9.automate": "#6098a6fb56",
+        "c9.automate": "#b1b0cca13a",
         "c9.ide.ace.emmet": "#e5f1a92ac3",
         "c9.ide.ace.gotoline": "#4d1a93172c",
         "c9.ide.ace.keymaps": "#43445d6306",
diff --git a/plugins/c9.ide.plugins/loader.js b/plugins/c9.ide.plugins/loader.js
index c7066d34..023b2bcf 100644
--- a/plugins/c9.ide.plugins/loader.js
+++ b/plugins/c9.ide.plugins/loader.js
@@ -55,7 +55,14 @@ define(function(require, exports, module) {
             var install = [];
             
             if (loadFromDisk) {
-                fs.readdir("~/.c9/plugins", function(error, files){
+                fs.readdir("~/.c9/plugins", function handle(err, files){
+                    if (err) {
+                        if (err.code == "EDISCONNECT")
+                            fs.readdir("~/.c9/plugins", handle);
+                        console.error(err);
+                        return;
+                    }
+                    
                     files.forEach(function(f) {
                         if (!/^[_.]/.test(f.name))
                             loadOne({packageName: f.name}, false);
diff --git a/plugins/c9.ide.ui/widgets.terminal.js b/plugins/c9.ide.ui/widgets.terminal.js
index 4fa535a5..71c50ab2 100644
--- a/plugins/c9.ide.ui/widgets.terminal.js
+++ b/plugins/c9.ide.ui/widgets.terminal.js
@@ -369,8 +369,7 @@ define(function(require, exports, module) {
                  * 
                  */
                 clear: function(data){
-                    terminal.ybase = 0;
-                    terminal.lines = terminal.lines.slice(-(terminal.ybase + terminal.rows));
+                    terminal.clear();
                 },
                 /**
                  * 

From d4ec9e6eb7b5b528563bb6b53f235f636e77f748 Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Fri, 17 Apr 2015 21:06:27 +0000
Subject: [PATCH 29/32] Wizards should never be queued

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dfc469a0..9d6d0e39 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
         "c9.ide.behaviors": "#6aad7006a0",
         "c9.ide.closeconfirmation": "#a28bfd8272",
         "c9.ide.configuration": "#f309bb47d2",
-        "c9.ide.dialog.wizard": "#08e8c79ebc",
+        "c9.ide.dialog.wizard": "#ea640aa5a1",
         "c9.ide.fontawesome": "#781602c5d8",
         "c9.ide.format": "#f51451ac57",
         "c9.ide.help.support": "#60e88f5680",

From 55f10d6e999cc915c2d1edc26bfe9306cd67492e Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Fri, 17 Apr 2015 21:06:59 +0000
Subject: [PATCH 30/32] cleanup

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9d6d0e39..b2c4210b 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#45d316217b",
+        "c9.ide.installer": "#7ab1baf736",
         "c9.ide.mount": "#cb45b621f1",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",

From 9fb0a503556cfba9cfd6e172bcd45e6c339f87e2 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 20 Apr 2015 09:19:31 +0000
Subject: [PATCH 31/32] wait until collab is installed before trying to connect

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b2c4210b..22bcf55d 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
         "c9.ide.language.javascript.tern": "#7aab8b0b6a",
         "c9.ide.language.javascript.infer": "#393d215e96",
         "c9.ide.language.jsonalyzer": "#21b64e5820",
-        "c9.ide.collab": "#ae0ee72477",
+        "c9.ide.collab": "#504750d8f0",
         "c9.ide.local": "#cf624506cc",
         "c9.ide.find": "#49dddb2aed",
         "c9.ide.find.infiles": "#72582de3cd",

From 160eb5d75b76000b10d6167ec13bb0c7a2d3fcef Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 20 Apr 2015 16:59:18 +0000
Subject: [PATCH 32/32] bugfix for python3 c9/install/pull/46

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 22bcf55d..485b70af 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#7ab1baf736",
+        "c9.ide.installer": "#75413dd79a",
         "c9.ide.mount": "#cb45b621f1",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",