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

customize.dist/ckeditor-config.js

@@ -11,6 +11,7 @@ CKEDITOR.editorConfig = function( config ) {
     config.removePlugins= 'resize,elementspath';
     config.resize_enabled= false; //bottom-bar
     config.extraPlugins= 'autolink,colorbutton,colordialog,font,indentblock,justify,mediatag,print,blockbase64,mathjax,wordcount';
+    config.fontSize_sizes = '(Default)/unset;8/8px;9/9px;10/10px;11/11px;12/12px;14/14px;16/16px;18/18px;20/20px;22/22px;24/24px;26/26px;28/28px;36/36px;48/48px;72/72px'; // XXX translation for default?
     config.toolbarGroups= [
         // {"name":"clipboard","groups":["clipboard","undo"]},
         //{"name":"editing","groups":["find","selection"]},

www/common/onlyoffice/inner.js

@@ -355,7 +355,6 @@ define([
             APP.FM.handleFile(blob, data);
         };
 
-        Messages.oo_login = 'Log in...'; // XXX
         var noLogin = false;
 
         var makeCheckpoint = function (force) {
@@ -1120,12 +1119,12 @@ define([
 
         var x2tSaveAndConvertData = function(data, filename, extension, finalFilename) {
             // Perform the x2t conversion
-            require(['/common/onlyoffice/x2t/x2t.js'], function() { // XXX why does this fail without an access-control-allow-origin header?
+            require(['/common/onlyoffice/x2t/x2t.js'], function() { // FIXME why does this fail without an access-control-allow-origin header?
                 var x2t = window.Module;
                 x2t.run();
                 if (x2tInitialized) {
                     debug("x2t runtime already initialized");
-                    x2tSaveAndConvertDataInternal(x2t, data, filename, extension, finalFilename); // XXX shouldn't this return ?
+                    return void x2tSaveAndConvertDataInternal(x2t, data, filename, extension, finalFilename);
                 }
 
                 x2t.onRuntimeInitialized = function() {