Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

www/slide/inner.js

@@ -3,6 +3,10 @@ define([
     'less!/customize/src/less/toolbar.less',
     'less!/customize/src/less/cryptpad.less',
     'less!/slide/slide.less',
+    'css!cm/lib/codemirror.css',
+    'css!cm/addon/dialog/dialog.css',
+    'css!cm/addon/fold/foldgutter.css',
+
 ], function ($) {
     $('.loading-hidden').removeClass('loading-hidden');
 });

www/slide/main.js

@@ -53,7 +53,7 @@ define([
         var andThen = function () {
             var $iframe = $('#pad-iframe').contents();
             var $contentContainer = $iframe.find('#editorContainer');
-            var CodeMirror = Cryptpad.createCodemirror(ifrw, Cryptpad, 'slide');
+            var CodeMirror = Cryptpad.createCodemirror(ifrw, Cryptpad, 'markdown');
             editor = CodeMirror.editor;
 
             var $bar = $('#pad-iframe')[0].contentWindow.$('#cme_toolbox');