Merge branch 'soon' into staging

www/common/outer/async-store.js

@@ -253,7 +253,7 @@ define([
                 return void cb({error: 'User drive removal blocked!'});
             }
 
-            store.rpc.removeOwnedChannel(data, function (err) {
+            store.rpc.removeOwnedChannel(channel, function (err) {
                 cb({error:err});
             });
         };

www/common/proxy-manager.js

@@ -464,7 +464,10 @@ define([
 
     // convert a folder to a Shared Folder
     var _convertFolderToSharedFolder = function (Env, data, cb) {
-        var path = data.path;
+        return void cb({
+            error: 'DISABLED'
+        }); // XXX CONVERT
+        /*var path = data.path;
         var folderElement = Env.user.userObject.find(path);
         // don't try to convert top-level elements (trash, root, etc) to shared-folders
         // TODO also validate that you're in root (not templates, etc)
@@ -554,7 +557,7 @@ define([
             Env.user.userObject.delete([path], function () {
                 cb();
             });
-        });
+        });*/
     };
 
     // Delete permanently some pads or folders

www/common/sframe-common-codemirror.js

@@ -399,17 +399,6 @@ define([
                     "Shift-Tab": function () {
                         editor.execCommand("indentLess");
                     },
-                    "Backspace": function () {
-                        var cursor = doc.getCursor();
-                        var line = doc.getLine(cursor.line);
-                        var beforeCursor = line.substring(0, cursor.ch);
-                        if (beforeCursor && beforeCursor.trim() === "") {
-                            editor.execCommand("indentLess");
-                        } else {
-                            editor.execCommand("delCharBefore");
-                        }
-
-                    },
                 });
                 $('.CodeMirror').css('font-size', fontSize+'px');
             };