Merge branch 'master' of github.com:c9/newclient into theme/flat-dark

Conflicts:
	plugins/c9.ide.preview.markdown/markdown.js

node_modules/ace/lib/ace/ext/static_highlight.js

@@ -187,5 +187,5 @@ highlight.renderSync = function(input, mode, theme, lineStart, disableGutter) {
 };
 
 module.exports = highlight;
-module.exports.highlight =highlight;
+module.exports.highlight = highlight;
 });

package.json

@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.316",
+    "version": "3.1.318",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",
@@ -96,7 +96,7 @@
         "c9.ide.openfiles": "#7fa4a97fed",
         "c9.ide.preview": "#72a4521169",
         "c9.ide.preview.browser": "#cec211a76a",
-        "c9.ide.preview.markdown": "#85c08d5e1e",
+        "c9.ide.preview.markdown": "#da9d9c65cd",
         "c9.ide.pubsub": "#a85fb27eca",
         "c9.ide.readonly": "#e67bb593bd",
         "c9.ide.recentfiles": "#7c099abf40",
@@ -106,7 +106,7 @@
         "c9.ide.run.build": "#0598fff697",
         "c9.ide.run.debug.xdebug": "#61dcbd0180",
         "c9.ide.save": "#76cf52ab6d",
-        "c9.ide.scm": "#29fd01ffe3",
+        "c9.ide.scm": "#11d06d720a",
         "c9.ide.terminal.monitor": "#b76f1c9f24",
         "c9.ide.test": "#a1c0d9e5e0",
         "c9.ide.test.mocha": "#586fb0cdc2",

plugins/c9.fs/fs.errors.js

@@ -51,6 +51,7 @@ define(function(require, exports, module) {
             "ENOTDIR"       : "{Totype|type} {to|filename} is not a directory",
             "EEXIST"        : "{Totype|type} {to|filename} already exists",
             "EACCES"        : "Access denied acccessing this {type}",
+            "ENOSPC"        : "Your disk is full. Please create more space. Could not write {filename}",
             "EDISCONNECT"   : "The connection went away. Please try again.",
             "ENOTCONNECTED" : "You are disconnected. "
                 + "Please check your connection and try again"
@@ -81,6 +82,7 @@ define(function(require, exports, module) {
         
         fs.on("userError", function(e) {
             if (!m[e.name]) return;
+            if (e.error.code == "EEXIST") return;
             
             var args = e.args;
             var path = args[0];

plugins/c9.ide.layout.classic/less/splitter.less

@@ -1,6 +1,6 @@
 .splitter {
     position : relative;
-    z-index  : 10000;
+    z-index  : 100000;
     .box-sizing(border-box);
 }
 

plugins/c9.ide.terminal/terminal.js

@@ -262,7 +262,7 @@ define(function(require, exports, module) {
                     ["fontfamily", "Ubuntu Mono, Menlo, Consolas, monospace"], // Monaco, 
                     ["fontsize", "12"],
                     ["blinking", "false"],
-                    ["scrollback", 10000]
+                    ["scrollback", 1000]
                 ]);
                 
                 setSettings();